Merge pull request #6 from JeringTech/Misc_Refactorings

Made misc refactorings
JeringTech · Nov 16, 2018 · fb66f5b · fb66f5b
2 parents c213afa + bdb79a7
commit fb66f5b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 7 deletions.
diff --git a/src/NodeJS/InvocationData/InvocationException.cs b/src/NodeJS/InvocationData/InvocationException.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Runtime.Serialization;
 
 namespace Jering.Javascript.NodeJS
 {
     /// <summary>
     /// Represents an exception caused by an error caught in NodeJS.
     /// </summary>
+    [Serializable]
     public class InvocationException : Exception
     {
         /// <summary>
@@ -24,5 +26,14 @@ public InvocationException(string message, string stack)
             : base(message + Environment.NewLine + stack)
         {
         }
+
+        /// <summary>
+        /// Creates a <see cref="InvocationException"/> instance.
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="context"></param>
+        protected InvocationException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
     }
 }
diff --git a/src/NodeJS/Javascript/Servers/OutOfProcess/Http/HttpServer.ts b/src/NodeJS/Javascript/Servers/OutOfProcess/Http/HttpServer.ts
@@ -245,7 +245,7 @@ function patchLStat() {
                 throw ex;
             }
         }
-    };
+    }
 
     // It's only necessary to apply this workaround on Windows
     let appRootDirLong: string = null;

diff --git a/src/NodeJS/NodeJSServiceImplementations/OutOfProcess/Http/HttpNodeJSService.cs b/src/NodeJS/NodeJSServiceImplementations/OutOfProcess/Http/HttpNodeJSService.cs
@@ -151,7 +151,6 @@ protected override void OnConnectionEstablishedMessageReceived(string connection
 
                     // Skip over "Port - "
                     i += 7;
-                    continue;
                 }
                 else if (currentChar == ']')
                 {

diff --git a/src/NodeJS/NodeJSServiceImplementations/OutOfProcess/Http/InvocationContent.cs b/src/NodeJS/NodeJSServiceImplementations/OutOfProcess/Http/InvocationContent.cs
@@ -21,7 +21,7 @@ public class InvocationContent : HttpContent
         //private static readonly Encoding UTF8NoBOM = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true);
 
         // Arbitrary boundary
-        internal static byte[] BOUNDARY_BYTES = Encoding.UTF8.GetBytes("--Uiw6+hXl3k+5ia0cUYGhjA==");
+        internal static readonly byte[] BOUNDARY_BYTES = Encoding.UTF8.GetBytes("--Uiw6+hXl3k+5ia0cUYGhjA==");
 
         private readonly IJsonService _jsonService;
         private readonly InvocationRequest _invocationRequest;

diff --git a/src/NodeJS/NodeJSServiceImplementations/OutOfProcess/NodeJSProcessFactory.cs b/src/NodeJS/NodeJSServiceImplementations/OutOfProcess/NodeJSProcessFactory.cs
@@ -82,8 +82,6 @@ private Process CreateProcess(ProcessStartInfo startInfo)
             }
         }
 
-        // TODO verify that this escaping works for non-windows platforms
-        // https://www.appveyor.com/docs/getting-started-with-appveyor-for-linux/
         internal string EscapeCommandLineArg(string arg)
         {
             var stringBuilder = new StringBuilder();

diff --git a/src/NodeJS/NodeJSServiceImplementations/OutOfProcess/OutOfProcessNodeJSService.cs b/src/NodeJS/NodeJSServiceImplementations/OutOfProcess/OutOfProcessNodeJSService.cs
@@ -174,7 +174,7 @@ internal async Task<(bool, T)> TryInvokeCoreAsync<T>(InvocationRequest invocatio
                 {
                     if (Logger?.IsEnabled(LogLevel.Debug) == true)
                     {
-                        Logger.LogDebug($"Before first semaphore wait, count: {_processSemaphore.CurrentCount}. Thread ID: {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                        Logger.LogDebug(string.Format(Strings.LogDebug_OutOfProcessNodeJSService_BeforeFirstSemaphore, _processSemaphore.CurrentCount, Thread.CurrentThread.ManagedThreadId.ToString()));
                     }
 
                     await _processSemaphore.WaitAsync().ConfigureAwait(false);
@@ -190,7 +190,7 @@ internal async Task<(bool, T)> TryInvokeCoreAsync<T>(InvocationRequest invocatio
 
                         if (Logger?.IsEnabled(LogLevel.Debug) == true)
                         {
-                            Logger.LogDebug($"Before second semaphore wait, count: {_processSemaphore.CurrentCount}. Thread ID: {Thread.CurrentThread.ManagedThreadId.ToString()}");
+                            Logger.LogDebug(string.Format(Strings.LogDebug_OutOfProcessNodeJSService_BeforeSecondSemaphore, _processSemaphore.CurrentCount, Thread.CurrentThread.ManagedThreadId.ToString()));
                         }
 
                         await _processSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);

diff --git a/src/NodeJS/Strings.Designer.cs b/src/NodeJS/Strings.Designer.cs
diff --git a/src/NodeJS/Strings.resx b/src/NodeJS/Strings.resx
@@ -142,4 +142,10 @@
   <data name="InvocationException_OutOfProcessNodeJSService_InvocationTimedOut" xml:space="preserve">
     <value>The Node invocation timed out after {0}ms. You can change the timeout duration by setting the {1} property on {2}. Do ensure that your NodeJS function always invokes the callback (or throws an exception synchronously), even if it encounters an error.</value>
   </data>
+  <data name="LogDebug_OutOfProcessNodeJSService_BeforeFirstSemaphore" xml:space="preserve">
+    <value>Before first semaphore wait, count: {0}. Thread ID: {1}.</value>
+  </data>
+  <data name="LogDebug_OutOfProcessNodeJSService_BeforeSecondSemaphore" xml:space="preserve">
+    <value>Before second semaphore wait, count: {0}. Thread ID: {1}.</value>
+  </data>
 </root>