mirror of
https://github.com/aspnet/JavaScriptServices.git
synced 2025-12-23 01:58:29 +00:00
refactor: apply default vs transform to xproj
refactor(spa-services): clean code refactor(node-services): clean code, extract classes nto separate files refactor(angular-services): prime cache cleanup
This commit is contained in:
Andrei Tserakhau
@@ -3,126 +3,42 @@ using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Microsoft.AspNetCore.NodeServices {
|
||||
/**
|
||||
* Class responsible for launching the Node child process, determining when it is ready to accept invocations,
|
||||
* and finally killing it when the parent process exits. Also it restarts the child process if it dies.
|
||||
*/
|
||||
public abstract class OutOfProcessNodeInstance : INodeServices {
|
||||
private object _childProcessLauncherLock;
|
||||
private bool disposed;
|
||||
private StringAsTempFile _entryPointScript;
|
||||
private string _projectPath;
|
||||
private string _commandLineArguments;
|
||||
private Process _nodeProcess;
|
||||
namespace Microsoft.AspNetCore.NodeServices
|
||||
{
|
||||
/// <summary>
|
||||
/// Class responsible for launching the Node child process, determining when it is ready to accept invocations,
|
||||
/// and finally killing it when the parent process exits. Also it restarts the child process if it dies.
|
||||
/// </summary>
|
||||
/// <seealso cref="Microsoft.AspNetCore.NodeServices.INodeServices" />
|
||||
public abstract class OutOfProcessNodeInstance : INodeServices
|
||||
{
|
||||
private readonly object _childProcessLauncherLock;
|
||||
private readonly string _commandLineArguments;
|
||||
private readonly StringAsTempFile _entryPointScript;
|
||||
private TaskCompletionSource<bool> _nodeProcessIsReadySource;
|
||||
|
||||
protected Process NodeProcess {
|
||||
get {
|
||||
// This is only exposed to support the unreliable OutOfProcessNodeRunner, which is just to verify that
|
||||
// other hosting/transport mechanisms are possible. This shouldn't really be exposed.
|
||||
return this._nodeProcess;
|
||||
}
|
||||
}
|
||||
private readonly string _projectPath;
|
||||
private bool _disposed;
|
||||
|
||||
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;
|
||||
_childProcessLauncherLock = new object();
|
||||
_entryPointScript = new StringAsTempFile(entryPointScript);
|
||||
_projectPath = projectPath;
|
||||
_commandLineArguments = commandLineArguments ?? string.Empty;
|
||||
}
|
||||
|
||||
public abstract Task<T> Invoke<T>(NodeInvocationInfo invocationInfo);
|
||||
protected Process NodeProcess { get; private set; }
|
||||
|
||||
public Task<T> Invoke<T>(string moduleName, params object[] args) {
|
||||
return this.InvokeExport<T>(moduleName, null, args);
|
||||
}
|
||||
public Task<T> Invoke<T>(string moduleName, params object[] args)
|
||||
=> InvokeExport<T>(moduleName, null, args);
|
||||
|
||||
public async Task<T> InvokeExport<T>(string moduleName, string exportedFunctionName, params object[] args) {
|
||||
return await this.Invoke<T>(new NodeInvocationInfo {
|
||||
public Task<T> InvokeExport<T>(string moduleName, string exportedFunctionName, params object[] args)
|
||||
=> Invoke<T>(new NodeInvocationInfo
|
||||
{
|
||||
ModuleName = moduleName,
|
||||
ExportedFunctionName = exportedFunctionName,
|
||||
Args = args
|
||||
});
|
||||
}
|
||||
|
||||
protected async Task EnsureReady() {
|
||||
lock (this._childProcessLauncherLock) {
|
||||
if (this._nodeProcess == null || this._nodeProcess.HasExited) {
|
||||
var startInfo = new ProcessStartInfo("node") {
|
||||
Arguments = "\"" + this._entryPointScript.FileName + "\" " + this._commandLineArguments,
|
||||
UseShellExecute = false,
|
||||
RedirectStandardInput = true,
|
||||
RedirectStandardOutput = true,
|
||||
RedirectStandardError = true,
|
||||
WorkingDirectory = this._projectPath
|
||||
};
|
||||
|
||||
// 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(this._projectPath, "node_modules");
|
||||
#if NET451
|
||||
startInfo.EnvironmentVariables.Add("NODE_PATH", nodePathValue);
|
||||
#else
|
||||
startInfo.Environment.Add("NODE_PATH", nodePathValue);
|
||||
#endif
|
||||
|
||||
this.OnBeforeLaunchProcess();
|
||||
this._nodeProcess = Process.Start(startInfo);
|
||||
this.ConnectToInputOutputStreams();
|
||||
}
|
||||
}
|
||||
|
||||
var task = this._nodeProcessIsReadySource.Task;
|
||||
var initializationSucceeded = await task;
|
||||
|
||||
if (!initializationSucceeded) {
|
||||
throw new InvalidOperationException("The Node.js process failed to initialize", task.Exception);
|
||||
}
|
||||
}
|
||||
|
||||
private void ConnectToInputOutputStreams() {
|
||||
var initializationIsCompleted = false; // TODO: Make this thread-safe? (Interlocked.Exchange etc.)
|
||||
this._nodeProcessIsReadySource = new TaskCompletionSource<bool>();
|
||||
|
||||
this._nodeProcess.OutputDataReceived += (sender, evt) => {
|
||||
if (evt.Data == "[Microsoft.AspNetCore.NodeServices:Listening]" && !initializationIsCompleted) {
|
||||
this._nodeProcessIsReadySource.SetResult(true);
|
||||
initializationIsCompleted = true;
|
||||
} else if (evt.Data != null) {
|
||||
this.OnOutputDataReceived(evt.Data);
|
||||
}
|
||||
};
|
||||
|
||||
this._nodeProcess.ErrorDataReceived += (sender, evt) => {
|
||||
if (evt.Data != null) {
|
||||
this.OnErrorDataReceived(evt.Data);
|
||||
if (!initializationIsCompleted) {
|
||||
this._nodeProcessIsReadySource.SetResult(false);
|
||||
initializationIsCompleted = true;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
this._nodeProcess.BeginOutputReadLine();
|
||||
this._nodeProcess.BeginErrorReadLine();
|
||||
}
|
||||
|
||||
protected virtual void OnBeforeLaunchProcess() {
|
||||
}
|
||||
|
||||
protected virtual void OnOutputDataReceived(string outputData) {
|
||||
Console.WriteLine("[Node] " + outputData);
|
||||
}
|
||||
|
||||
protected virtual void OnErrorDataReceived(string errorData) {
|
||||
Console.WriteLine("[Node] " + errorData);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
@@ -130,23 +46,124 @@ namespace Microsoft.AspNetCore.NodeServices {
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
|
||||
protected virtual void Dispose(bool disposing)
|
||||
public abstract Task<T> Invoke<T>(NodeInvocationInfo invocationInfo);
|
||||
|
||||
protected async Task EnsureReady()
|
||||
{
|
||||
if (!disposed) {
|
||||
if (disposing) {
|
||||
this._entryPointScript.Dispose();
|
||||
}
|
||||
lock (_childProcessLauncherLock)
|
||||
{
|
||||
if (NodeProcess == null || NodeProcess.HasExited)
|
||||
{
|
||||
var startInfo = new ProcessStartInfo("node")
|
||||
{
|
||||
Arguments = "\"" + _entryPointScript.FileName + "\" " + _commandLineArguments,
|
||||
UseShellExecute = false,
|
||||
RedirectStandardInput = true,
|
||||
RedirectStandardOutput = true,
|
||||
RedirectStandardError = true,
|
||||
WorkingDirectory = _projectPath
|
||||
};
|
||||
|
||||
if (this._nodeProcess != null && !this._nodeProcess.HasExited) {
|
||||
this._nodeProcess.Kill(); // TODO: Is there a more graceful way to end it? Or does this still let it perform any cleanup?
|
||||
}
|
||||
// Append projectPath to NODE_PATH so it can locate node_modules
|
||||
var existingNodePath = Environment.GetEnvironmentVariable("NODE_PATH") ?? string.Empty;
|
||||
if (existingNodePath != string.Empty)
|
||||
{
|
||||
existingNodePath += ":";
|
||||
}
|
||||
|
||||
disposed = true;
|
||||
var nodePathValue = existingNodePath + Path.Combine(_projectPath, "node_modules");
|
||||
#if NET451
|
||||
startInfo.EnvironmentVariables.Add("NODE_PATH", nodePathValue);
|
||||
#else
|
||||
startInfo.Environment.Add("NODE_PATH", nodePathValue);
|
||||
#endif
|
||||
|
||||
OnBeforeLaunchProcess();
|
||||
NodeProcess = Process.Start(startInfo);
|
||||
ConnectToInputOutputStreams();
|
||||
}
|
||||
}
|
||||
|
||||
var task = _nodeProcessIsReadySource.Task;
|
||||
var initializationSucceeded = await task;
|
||||
|
||||
if (!initializationSucceeded)
|
||||
{
|
||||
throw new InvalidOperationException("The Node.js process failed to initialize", task.Exception);
|
||||
}
|
||||
}
|
||||
|
||||
~OutOfProcessNodeInstance() {
|
||||
Dispose (false);
|
||||
private void ConnectToInputOutputStreams()
|
||||
{
|
||||
var initializationIsCompleted = false; // TODO: Make this thread-safe? (Interlocked.Exchange etc.)
|
||||
_nodeProcessIsReadySource = new TaskCompletionSource<bool>();
|
||||
|
||||
NodeProcess.OutputDataReceived += (sender, evt) =>
|
||||
{
|
||||
if (evt.Data == "[Microsoft.AspNetCore.NodeServices:Listening]" && !initializationIsCompleted)
|
||||
{
|
||||
_nodeProcessIsReadySource.SetResult(true);
|
||||
initializationIsCompleted = true;
|
||||
}
|
||||
else if (evt.Data != null)
|
||||
{
|
||||
OnOutputDataReceived(evt.Data);
|
||||
}
|
||||
};
|
||||
|
||||
NodeProcess.ErrorDataReceived += (sender, evt) =>
|
||||
{
|
||||
if (evt.Data != null)
|
||||
{
|
||||
OnErrorDataReceived(evt.Data);
|
||||
if (!initializationIsCompleted)
|
||||
{
|
||||
_nodeProcessIsReadySource.SetResult(false);
|
||||
initializationIsCompleted = true;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
NodeProcess.BeginOutputReadLine();
|
||||
NodeProcess.BeginErrorReadLine();
|
||||
}
|
||||
|
||||
protected virtual void OnBeforeLaunchProcess()
|
||||
{
|
||||
}
|
||||
|
||||
protected virtual void OnOutputDataReceived(string outputData)
|
||||
{
|
||||
Console.WriteLine("[Node] " + outputData);
|
||||
}
|
||||
|
||||
protected virtual void OnErrorDataReceived(string errorData)
|
||||
{
|
||||
Console.WriteLine("[Node] " + errorData);
|
||||
}
|
||||
|
||||
protected virtual void Dispose(bool disposing)
|
||||
{
|
||||
if (!_disposed)
|
||||
{
|
||||
if (disposing)
|
||||
{
|
||||
_entryPointScript.Dispose();
|
||||
}
|
||||
|
||||
if (NodeProcess != null && !NodeProcess.HasExited)
|
||||
{
|
||||
NodeProcess.Kill();
|
||||
// TODO: Is there a more graceful way to end it? Or does this still let it perform any cleanup?
|
||||
}
|
||||
|
||||
_disposed = true;
|
||||
}
|
||||
}
|
||||
|
||||
~OutOfProcessNodeInstance()
|
||||
{
|
||||
Dispose(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user