Added OnBeforeStartExternalProcess callback which to NodeServicesOptions (and OutOfProcessNodeInstance, SocketNodeInstance and HttpNodeInstance) to configure environment of the node.exe process to be started, and the path to the node executable itself. Fixes aspnet#20

thunder7553 · SteveSandersonMS · commit 7119815d04b4 · 2016-07-18T14:24:07.000+01:00
diff --git a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs
@@ -14,7 +14,7 @@ public NodeServicesOptions()
             HostingModel = DefaultNodeHostingModel;
             WatchFileExtensions = (string[])DefaultWatchFileExtensions.Clone();
         }
-
+        public Action<System.Diagnostics.ProcessStartInfo> OnBeforeStartExternalProcess { get; set; }
         public NodeHostingModel HostingModel { get; set; }
         public Func<INodeInstance> NodeInstanceFactory { get; set; }
         public string ProjectPath { get; set; }
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
@@ -28,21 +28,22 @@ internal class HttpNodeInstance : OutOfProcessNodeInstance
             ContractResolver = new CamelCasePropertyNamesContractResolver()
         };
 
-	    private readonly HttpClient _client;
+        private readonly HttpClient _client;
         private bool _disposed;
         private int _portNumber;
 
-        public HttpNodeInstance(string projectPath, string[] watchFileExtensions, int port = 0)
+        public HttpNodeInstance(string projectPath, string[] watchFileExtensions, int port = 0, Action<System.Diagnostics.ProcessStartInfo> onBeforeStartExternalProcess = null)
             : base(
                 EmbeddedResourceReader.Read(
                     typeof(HttpNodeInstance),
                     "/Content/Node/entrypoint-http.js"),
                 projectPath,
                 watchFileExtensions,
-                MakeCommandLineOptions(port))
+                MakeCommandLineOptions(port),
+                onBeforeStartExternalProcess)
         {
             _client = new HttpClient();
-		}
+        }
 
         private static string MakeCommandLineOptions(int port)
         {
@@ -112,18 +113,19 @@ protected override void OnOutputDataReceived(string outputData)
             }
         }
 
-	    protected override void Dispose(bool disposing) {
-	        base.Dispose(disposing);
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
 
-	        if (!_disposed)
+            if (!_disposed)
             {
-	            if (disposing)
+                if (disposing)
                 {
-	                _client.Dispose();
-	            }
+                    _client.Dispose();
+                }
 
-	            _disposed = true;
-	        }
-	    }
-	}
+                _disposed = true;
+            }
+        }
+    }
 }
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
@@ -31,10 +31,11 @@ public OutOfProcessNodeInstance(
             string entryPointScript,
             string projectPath,
             string[] watchFileExtensions,
-            string commandLineArguments)
+            string commandLineArguments,
+             Action<System.Diagnostics.ProcessStartInfo> onBeforeStartExternalProcess = null)
         {
             _entryPointScript = new StringAsTempFile(entryPointScript);
-            _nodeProcess = LaunchNodeProcess(_entryPointScript.FileName, projectPath, commandLineArguments);
+            _nodeProcess = LaunchNodeProcess(_entryPointScript.FileName, projectPath, commandLineArguments, onBeforeStartExternalProcess);
             _watchFileExtensions = watchFileExtensions;
             _fileSystemWatcher = BeginFileWatcher(projectPath);
             ConnectToInputOutputStreams();
@@ -111,7 +112,7 @@ private void EnsureFileSystemWatcherIsDisposed()
             }
         }
 
-        private static Process LaunchNodeProcess(string entryPointFilename, string projectPath, string commandLineArguments)
+        private static Process LaunchNodeProcess(string entryPointFilename, string projectPath, string commandLineArguments, Action<System.Diagnostics.ProcessStartInfo> onBeforeStartExternalProcess)
         {
             var startInfo = new ProcessStartInfo("node")
             {
@@ -136,6 +137,10 @@ private static Process LaunchNodeProcess(string entryPointFilename, string proje
 #else
             startInfo.Environment["NODE_PATH"] = nodePathValue;
 #endif
+            if (onBeforeStartExternalProcess != null)
+            {
+                onBeforeStartExternalProcess(startInfo);
+            }
 
             var process = Process.Start(startInfo);
 
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/SocketNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/SocketNodeInstance.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
     /// <seealso cref="Microsoft.AspNetCore.NodeServices.HostingModels.OutOfProcessNodeInstance" />
     internal class SocketNodeInstance : OutOfProcessNodeInstance
     {
-        private readonly static JsonSerializerSettings jsonSerializerSettings =  new JsonSerializerSettings
+        private readonly static JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings
         {
             ContractResolver = new CamelCasePropertyNamesContractResolver()
         };
@@ -36,16 +36,17 @@ internal class SocketNodeInstance : OutOfProcessNodeInstance
         private string _socketAddress;
         private VirtualConnectionClient _virtualConnectionClient;
 
-        public SocketNodeInstance(string projectPath, string[] watchFileExtensions, string socketAddress): base(
+        public SocketNodeInstance(string projectPath, string[] watchFileExtensions, string socketAddress, Action<System.Diagnostics.ProcessStartInfo> onBeforeStartExternalProcess = null) : base(
                 EmbeddedResourceReader.Read(
                     typeof(SocketNodeInstance),
                     "/Content/Node/entrypoint-socket.js"),
                 projectPath,
                 watchFileExtensions,
-                MakeNewCommandLineOptions(socketAddress))
+                MakeNewCommandLineOptions(socketAddress),
+                onBeforeStartExternalProcess)
         {
             _socketAddress = socketAddress;
-		}
+        }
 
         protected override async Task<T> InvokeExportAsync<T>(NodeInvocationInfo invocationInfo)
         {
@@ -170,7 +171,7 @@ private static async Task<T> ReadJsonAsync<T>(Stream stream)
 
         private static async Task<byte[]> ReadAllBytesAsync(Stream input)
         {
-            byte[] buffer = new byte[16*1024];
+            byte[] buffer = new byte[16 * 1024];
 
             using (var ms = new MemoryStream())
             {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public NodeServicesOptions()`
`14`	`14`	`HostingModel = DefaultNodeHostingModel;`
`15`	`15`	`WatchFileExtensions = (string[])DefaultWatchFileExtensions.Clone();`
`16`	`16`	`}`
`17`		`-`
	`17`	`+ public Action<System.Diagnostics.ProcessStartInfo> OnBeforeStartExternalProcess { get; set; }`
`18`	`18`	`public NodeHostingModel HostingModel { get; set; }`
`19`	`19`	`public Func<INodeInstance> NodeInstanceFactory { get; set; }`
`20`	`20`	`public string ProjectPath { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,11 @@ public OutOfProcessNodeInstance(`
`31`	`31`	`string entryPointScript,`
`32`	`32`	`string projectPath,`
`33`	`33`	`string[] watchFileExtensions,`
`34`		`- string commandLineArguments)`
	`34`	`+ string commandLineArguments,`
	`35`	`+ Action<System.Diagnostics.ProcessStartInfo> onBeforeStartExternalProcess = null)`
`35`	`36`	`{`
`36`	`37`	`_entryPointScript = new StringAsTempFile(entryPointScript);`
`37`		`- _nodeProcess = LaunchNodeProcess(_entryPointScript.FileName, projectPath, commandLineArguments);`
	`38`	`+ _nodeProcess = LaunchNodeProcess(_entryPointScript.FileName, projectPath, commandLineArguments, onBeforeStartExternalProcess);`
`38`	`39`	`_watchFileExtensions = watchFileExtensions;`
`39`	`40`	`_fileSystemWatcher = BeginFileWatcher(projectPath);`
`40`	`41`	`ConnectToInputOutputStreams();`
`@@ -111,7 +112,7 @@ private void EnsureFileSystemWatcherIsDisposed()`
`111`	`112`	`}`
`112`	`113`	`}`
`113`	`114`
`114`		`- private static Process LaunchNodeProcess(string entryPointFilename, string projectPath, string commandLineArguments)`
	`115`	`+ private static Process LaunchNodeProcess(string entryPointFilename, string projectPath, string commandLineArguments, Action<System.Diagnostics.ProcessStartInfo> onBeforeStartExternalProcess)`
`115`	`116`	`{`
`116`	`117`	`var startInfo = new ProcessStartInfo("node")`
`117`	`118`	`{`
`@@ -136,6 +137,10 @@ private static Process LaunchNodeProcess(string entryPointFilename, string proje`
`136`	`137`	`#else`
`137`	`138`	`startInfo.Environment["NODE_PATH"] = nodePathValue;`
`138`	`139`	`#endif`
	`140`	`+ if (onBeforeStartExternalProcess != null)`
	`141`	`+ {`
	`142`	`+ onBeforeStartExternalProcess(startInfo);`
	`143`	`+ }`
`139`	`144`
`140`	`145`	`var process = Process.Start(startInfo);`
`141`	`146`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels`
`25`	`25`	`/// <seealso cref="Microsoft.AspNetCore.NodeServices.HostingModels.OutOfProcessNodeInstance" />`
`26`	`26`	`internal class SocketNodeInstance : OutOfProcessNodeInstance`
`27`	`27`	`{`
`28`		`- private readonly static JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings`
	`28`	`+ private readonly static JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings`
`29`	`29`	`{`
`30`	`30`	`ContractResolver = new CamelCasePropertyNamesContractResolver()`
`31`	`31`	`};`
`@@ -36,16 +36,17 @@ internal class SocketNodeInstance : OutOfProcessNodeInstance`
`36`	`36`	`private string _socketAddress;`
`37`	`37`	`private VirtualConnectionClient _virtualConnectionClient;`
`38`	`38`
`39`		`- public SocketNodeInstance(string projectPath, string[] watchFileExtensions, string socketAddress): base(`
	`39`	`+ public SocketNodeInstance(string projectPath, string[] watchFileExtensions, string socketAddress, Action<System.Diagnostics.ProcessStartInfo> onBeforeStartExternalProcess = null) : base(`
`40`	`40`	`EmbeddedResourceReader.Read(`
`41`	`41`	`typeof(SocketNodeInstance),`
`42`	`42`	`"/Content/Node/entrypoint-socket.js"),`
`43`	`43`	`projectPath,`
`44`	`44`	`watchFileExtensions,`
`45`		`- MakeNewCommandLineOptions(socketAddress))`
	`45`	`+ MakeNewCommandLineOptions(socketAddress),`
	`46`	`+ onBeforeStartExternalProcess)`
`46`	`47`	`{`
`47`	`48`	`_socketAddress = socketAddress;`
`48`		`- }`
	`49`	`+ }`
`49`	`50`
`50`	`51`	`protected override async Task<T> InvokeExportAsync<T>(NodeInvocationInfo invocationInfo)`
`51`	`52`	`{`
`@@ -170,7 +171,7 @@ private static async Task<T> ReadJsonAsync<T>(Stream stream)`
`170`	`171`
`171`	`172`	`private static async Task<byte[]> ReadAllBytesAsync(Stream input)`
`172`	`173`	`{`
`173`		`- byte[] buffer = new byte[16*1024];`
	`174`	`+ byte[] buffer = new byte[16 * 1024];`
`174`	`175`
`175`	`176`	`using (var ms = new MemoryStream())`
`176`	`177`	`{`