github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-25 02:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix various path issues

Browse Source
This commit is contained in:
SteveSandersonMS
2015-11-05 11:46:10 -08:00
parent b5fb560c54
commit 46dc743177
12 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Microsoft.AspNet.NodeServices/HostingModels/HttpNodeInstance.cs
View File

@@ -15,8 +15,8 @@ namespace Microsoft.AspNet.NodeServices {
private int _portNumber;
public HttpNodeInstance(int port = 0)
: base(EmbeddedResourceReader.Read(typeof(HttpNodeInstance), "/Content/Node/entrypoint-http.js"), port.ToString())
public HttpNodeInstance(string projectPath, int port = 0)
: base(EmbeddedResourceReader.Read(typeof(HttpNodeInstance), "/Content/Node/entrypoint-http.js"), projectPath, port.ToString())
{
}

4
Microsoft.AspNet.NodeServices/HostingModels/InputOutputStreamNodeInstance.cs
View File

@@ -24,8 +24,8 @@ namespace Microsoft.AspNet.NodeServices {
ContractResolver = new CamelCasePropertyNamesContractResolver()
};
public InputOutputStreamNodeInstance()
: base(EmbeddedResourceReader.Read(typeof(InputOutputStreamNodeInstance), "/Content/Node/entrypoint-stream.js"))
public InputOutputStreamNodeInstance(string projectPath)
: base(EmbeddedResourceReader.Read(typeof(InputOutputStreamNodeInstance), "/Content/Node/entrypoint-stream.js"), projectPath)
{
}

10
Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
View File

@@ -12,6 +12,7 @@ namespace Microsoft.AspNet.NodeServices {
private object _childProcessLauncherLock;
private bool disposed;
private StringAsTempFile _entryPointScript;
private string _projectPath;
private string _commandLineArguments;
private Process _nodeProcess;
private TaskCompletionSource<bool> _nodeProcessIsReadySource;
@@ -24,10 +25,11 @@ namespace Microsoft.AspNet.NodeServices {
}
}
public OutOfProcessNodeInstance(string entryPointScript, string commandLineArguments = null)
public OutOfProcessNodeInstance(string entryPointScript, string projectPath, string commandLineArguments = null)
{
this._childProcessLauncherLock = new object();
this._entryPointScript = new StringAsTempFile(entryPointScript);
this._projectPath = projectPath;
this._commandLineArguments = commandLineArguments ?? string.Empty;
}
@@ -49,20 +51,20 @@ namespace Microsoft.AspNet.NodeServices {
lock (this._childProcessLauncherLock) {
if (this._nodeProcess == null || this._nodeProcess.HasExited) {
var startInfo = new ProcessStartInfo("node") {
Arguments = this._entryPointScript.FileName + " " + this._commandLineArguments,
Arguments = "\"" + this._entryPointScript.FileName + "\" " + this._commandLineArguments,
UseShellExecute = false,
RedirectStandardInput = true,
RedirectStandardOutput = true,
RedirectStandardError = true
};
// Append current directory to NODE_PATH so it can locate node_modules
// Append projectPath to NODE_PATH so it can locate node_modules
var existingNodePath = Environment.GetEnvironmentVariable("NODE_PATH") ?? string.Empty;
if (existingNodePath != string.Empty) {
existingNodePath += ":";
}
var nodePathValue = existingNodePath + Path.Combine(Directory.GetCurrentDirectory(), "node_modules");
var nodePathValue = existingNodePath + Path.Combine(this._projectPath, "node_modules");
#if DNX451
startInfo.EnvironmentVariables.Add("NODE_PATH", nodePathValue);
#else