In JavaScriptEngineSwitcher.Node:

Taritsyn · Taritsyn · commit 5213faccd412 · 2021-11-26T18:50:15.000+03:00
1. Jering.Javascript.NodeJS was updated to version 6.2.0;
	2. Added support of .NET Core App 3.1 and .NET 5.0.
diff --git a/src/JavaScriptEngineSwitcher.Node/DefaultNodeJsService.cs b/src/JavaScriptEngineSwitcher.Node/DefaultNodeJsService.cs
@@ -48,14 +48,14 @@ public Task InvokeFromFileAsync(string modulePath, string exportName = null, obj
 			return StaticNodeJSService.InvokeFromFileAsync(modulePath, exportName, args, cancellationToken);
 		}
 
-		public Task<T> InvokeFromStringAsync<T>(string moduleString, string newCacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
+		public Task<T> InvokeFromStringAsync<T>(string moduleString, string cacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
 		{
-			return StaticNodeJSService.InvokeFromStringAsync<T>(moduleString, newCacheIdentifier, exportName, args, cancellationToken);
+			return StaticNodeJSService.InvokeFromStringAsync<T>(moduleString, cacheIdentifier, exportName, args, cancellationToken);
 		}
 
-		public Task InvokeFromStringAsync(string moduleString, string newCacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
+		public Task InvokeFromStringAsync(string moduleString, string cacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
 		{
-			return StaticNodeJSService.InvokeFromStringAsync(moduleString, newCacheIdentifier, exportName, args, cancellationToken);
+			return StaticNodeJSService.InvokeFromStringAsync(moduleString, cacheIdentifier, exportName, args, cancellationToken);
 		}
 
 		public Task<T> InvokeFromStringAsync<T>(Func<string> moduleFactory, string cacheIdentifier, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
@@ -68,14 +68,14 @@ public Task InvokeFromStringAsync(Func<string> moduleFactory, string cacheIdenti
 			return StaticNodeJSService.InvokeFromStringAsync(moduleFactory, cacheIdentifier, exportName, args, cancellationToken);
 		}
 
-		public Task<T> InvokeFromStreamAsync<T>(Stream moduleStream, string newCacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
+		public Task<T> InvokeFromStreamAsync<T>(Stream moduleStream, string cacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
 		{
-			return StaticNodeJSService.InvokeFromStreamAsync<T>(moduleStream, newCacheIdentifier, exportName, args, cancellationToken);
+			return StaticNodeJSService.InvokeFromStreamAsync<T>(moduleStream, cacheIdentifier, exportName, args, cancellationToken);
 		}
 
-		public Task InvokeFromStreamAsync(Stream moduleStream, string newCacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
+		public Task InvokeFromStreamAsync(Stream moduleStream, string cacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
 		{
-			return StaticNodeJSService.InvokeFromStreamAsync(moduleStream, newCacheIdentifier, exportName, args, cancellationToken);
+			return StaticNodeJSService.InvokeFromStreamAsync(moduleStream, cacheIdentifier, exportName, args, cancellationToken);
 		}
 
 		public Task<T> InvokeFromStreamAsync<T>(Func<Stream> moduleFactory, string cacheIdentifier, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)
@@ -98,6 +98,11 @@ public Task<bool> TryInvokeFromCacheAsync(string moduleCacheIdentifier, string e
 			return StaticNodeJSService.TryInvokeFromCacheAsync(moduleCacheIdentifier, exportName, args, cancellationToken);
 		}
 
+		public void MoveToNewProcess()
+		{
+			throw new NotSupportedException();
+		}
+
 		#region IDisposable implementation
 
 		public void Dispose()
diff --git a/src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj b/src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Product>JS Engine Switcher: Node</Product>
     <VersionPrefix>3.10.0</VersionPrefix>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -17,16 +17,17 @@
   <Import Project="../../build/nuget-for-dotnet-lib.props" />
 
   <PropertyGroup>
-    <Description>JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS) version 5.4.4).
+    <Description>JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS) version 6.2.0).
 
 This package does not contain the `node.exe`. Therefore, you need to install the Node.js (https://nodejs.org) and add the `node.exe`'s directory to the `Path` environment variable (automatically done by the official installer).</Description>
     <PackageTags>$(PackageCommonTags);Node.js;Jering.Javascript.NodeJS</PackageTags>
     <PackageIconFullPath>../../Icons/JavaScriptEngineSwitcher_Node_Logo128x128.png</PackageIconFullPath>
-    <PackageReleaseNotes>Jering.Javascript.NodeJS was updated to version 5.4.4.</PackageReleaseNotes>
+    <PackageReleaseNotes>1. Jering.Javascript.NodeJS was updated to version 6.2.0;
+2. Added support of .NET Core App 3.1 and .NET 5.0.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jering.Javascript.NodeJS" Version="5.4.4" />
+    <PackageReference Include="Jering.Javascript.NodeJS" Version="6.2.0" />
 
     <ProjectReference Include="../JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.csproj" />
   </ItemGroup>
diff --git a/src/JavaScriptEngineSwitcher.Node/NodeJsEngine.cs b/src/JavaScriptEngineSwitcher.Node/NodeJsEngine.cs
@@ -133,7 +133,7 @@ public NodeJsEngine(INodeJSService service, NodeSettings settings)
 			{
 				Task<string> versionTask = _jsService.InvokeFromStringAsync<string>(
 					@"module.exports = (callback) => {
-	var version = process.versions.node;
+	let version = process.versions.node;
 	callback(null , version);
 };"
 				);
diff --git a/src/JavaScriptEngineSwitcher.Node/Resources/engine-helpers.js b/src/JavaScriptEngineSwitcher.Node/Resources/engine-helpers.js
@@ -131,6 +131,6 @@ module.exports = {
 			delete context[variableName];
 		}
 
-		callback(null, undefined);
+		callback(null);
 	}
 };
diff --git a/src/JavaScriptEngineSwitcher.Node/readme.txt b/src/JavaScriptEngineSwitcher.Node/readme.txt
@@ -13,7 +13,7 @@
    ===========
    JavaScriptEngineSwitcher.Node contains adapter `NodeJsEngine` (wrapper for the
    Jering.Javascript.NodeJS (https://github.com/JeringTech/Javascript.NodeJS)
-   version 5.4.4).
+   version 6.2.0).
 
    This package does not contain the `node.exe`. Therefore, you need to install the
    Node.js (https://nodejs.org) and add the `node.exe`'s directory to the `Path`
@@ -22,7 +22,8 @@
    =============
    RELEASE NOTES
    =============
-   Jering.Javascript.NodeJS was updated to version 5.4.4.
+   1. Jering.Javascript.NodeJS was updated to version 6.2.0;
+   2. Added support of .NET Core App 3.1 and .NET 5.0.
 
    =============
    DOCUMENTATION

Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,14 @@ public Task InvokeFromFileAsync(string modulePath, string exportName = null, obj`
`48`	`48`	`return StaticNodeJSService.InvokeFromFileAsync(modulePath, exportName, args, cancellationToken);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public Task<T> InvokeFromStringAsync<T>(string moduleString, string newCacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
	`51`	`+ public Task<T> InvokeFromStringAsync<T>(string moduleString, string cacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
`52`	`52`	`{`
`53`		`- return StaticNodeJSService.InvokeFromStringAsync<T>(moduleString, newCacheIdentifier, exportName, args, cancellationToken);`
	`53`	`+ return StaticNodeJSService.InvokeFromStringAsync<T>(moduleString, cacheIdentifier, exportName, args, cancellationToken);`
`54`	`54`	`}`
`55`	`55`
`56`		`- public Task InvokeFromStringAsync(string moduleString, string newCacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
	`56`	`+ public Task InvokeFromStringAsync(string moduleString, string cacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
`57`	`57`	`{`
`58`		`- return StaticNodeJSService.InvokeFromStringAsync(moduleString, newCacheIdentifier, exportName, args, cancellationToken);`
	`58`	`+ return StaticNodeJSService.InvokeFromStringAsync(moduleString, cacheIdentifier, exportName, args, cancellationToken);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public Task<T> InvokeFromStringAsync<T>(Func<string> moduleFactory, string cacheIdentifier, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
`@@ -68,14 +68,14 @@ public Task InvokeFromStringAsync(Func<string> moduleFactory, string cacheIdenti`
`68`	`68`	`return StaticNodeJSService.InvokeFromStringAsync(moduleFactory, cacheIdentifier, exportName, args, cancellationToken);`
`69`	`69`	`}`
`70`	`70`
`71`		`- public Task<T> InvokeFromStreamAsync<T>(Stream moduleStream, string newCacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
	`71`	`+ public Task<T> InvokeFromStreamAsync<T>(Stream moduleStream, string cacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
`72`	`72`	`{`
`73`		`- return StaticNodeJSService.InvokeFromStreamAsync<T>(moduleStream, newCacheIdentifier, exportName, args, cancellationToken);`
	`73`	`+ return StaticNodeJSService.InvokeFromStreamAsync<T>(moduleStream, cacheIdentifier, exportName, args, cancellationToken);`
`74`	`74`	`}`
`75`	`75`
`76`		`- public Task InvokeFromStreamAsync(Stream moduleStream, string newCacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
	`76`	`+ public Task InvokeFromStreamAsync(Stream moduleStream, string cacheIdentifier = null, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
`77`	`77`	`{`
`78`		`- return StaticNodeJSService.InvokeFromStreamAsync(moduleStream, newCacheIdentifier, exportName, args, cancellationToken);`
	`78`	`+ return StaticNodeJSService.InvokeFromStreamAsync(moduleStream, cacheIdentifier, exportName, args, cancellationToken);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public Task<T> InvokeFromStreamAsync<T>(Func<Stream> moduleFactory, string cacheIdentifier, string exportName = null, object[] args = null, CancellationToken cancellationToken = default)`
`@@ -98,6 +98,11 @@ public Task<bool> TryInvokeFromCacheAsync(string moduleCacheIdentifier, string e`
`98`	`98`	`return StaticNodeJSService.TryInvokeFromCacheAsync(moduleCacheIdentifier, exportName, args, cancellationToken);`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ public void MoveToNewProcess()`
	`102`	`+ {`
	`103`	`+ throw new NotSupportedException();`
	`104`	`+ }`
	`105`	`+`
`101`	`106`	`#region IDisposable implementation`
`102`	`107`
`103`	`108`	`public void Dispose()`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public NodeJsEngine(INodeJSService service, NodeSettings settings)`
`133`	`133`	`{`
`134`	`134`	`Task<string> versionTask = _jsService.InvokeFromStringAsync<string>(`
`135`	`135`	`@"module.exports = (callback) => {`
`136`		`- var version = process.versions.node;`
	`136`	`+ let version = process.versions.node;`
`137`	`137`	`callback(null , version);`
`138`	`138`	`};"`
`139`	`139`	`);`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,6 @@ module.exports = {`
`131`	`131`	`delete context[variableName];`
`132`	`132`	`}`
`133`	`133`
`134`		`- callback(null, undefined);`
	`134`	`+ callback(null);`
`135`	`135`	`}`
`136`	`136`	`};`