In JavaScriptEngineSwitcher.ChakraCore fixed a error “Out of stack space”

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec

@@ -20,7 +20,8 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.debian-x64
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</description>
 		<summary>JavaScriptEngineSwitcher.ChakraCore contains adapter `ChakraCoreJsEngine` (wrapper for the ChakraCore).</summary>
-		<releaseNotes>Attempt to prevent occurrence of the access violation exception in the `CallFunction` method.</releaseNotes>
+		<releaseNotes>1. Attempt to prevent occurrence of the access violation exception in the `CallFunction` method;
+2. Fixed a error “Out of stack space”.</releaseNotes>
 		<copyright>Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript ChakraCore</tags>
@@ -35,6 +36,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
 				<dependency id="System.Diagnostics.Tools" version="4.0.1" />
 				<dependency id="System.Reflection.Extensions" version="4.0.1" />
 				<dependency id="System.Reflection.TypeExtensions" version="4.1.0" />
+				<dependency id="System.Threading.Thread" version="4.0.0" />
 				<dependency id="Microsoft.Extensions.PlatformAbstractions" version="1.0.0" />
 				<dependency id="JavaScriptEngineSwitcher.Core" version="2.1.2" />
 			</group>

NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,8 +30,9 @@
    =============
    RELEASE NOTES
    =============
-   Attempt to prevent occurrence of the access violation exception in the
-   `CallFunction` method.
+   1. Attempt to prevent occurrence of the access violation exception in the
+      `CallFunction` method;
+   2. Fixed a error “Out of stack space”.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.ChakraCore.Net4/JavaScriptEngineSwitcher.ChakraCore.Net40.csproj

@@ -187,6 +187,9 @@
     <Compile Include="..\JavaScriptEngineSwitcher.ChakraCore\Resources\Strings.ru-ru.Designer.cs">
       <Link>Resources\Strings.ru-ru.Designer.cs</Link>
     </Compile>
+    <Compile Include="..\JavaScriptEngineSwitcher.ChakraCore\ScriptDispatcher.cs">
+      <Link>ScriptDispatcher.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\JavaScriptEngineSwitcher.ChakraCore\Resources\Strings.resx">

src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs

@@ -40,15 +40,10 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
 		/// <summary>
 		/// Instance of JS context
 		/// </summary>
-		private readonly JsContext _jsContext;
+		private JsContext _jsContext;
 
 		/// <summary>
-		/// Synchronizer of code execution
-		/// </summary>
-		private readonly object _executionSynchronizer = new object();
-
-		/// <summary>
-		/// List of external objects
+		/// Set of external objects
 		/// </summary>
 		private readonly HashSet<object> _externalObjects = new HashSet<object>();
 
@@ -62,6 +57,11 @@ public sealed class ChakraCoreJsEngine : JsEngineBase
 		/// </summary>
 		private readonly HashSet<JsNativeFunction> _nativeFunctions = new HashSet<JsNativeFunction>();
 
+		/// <summary>
+		/// Script dispatcher
+		/// </summary>
+		private readonly ScriptDispatcher _dispatcher = new ScriptDispatcher();
+
 		/// <summary>
 		/// Gets a name of JS engine
 		/// </summary>
@@ -108,7 +108,7 @@ public ChakraCoreJsEngine()
 		{ }
 
 		/// <summary>
-		/// Constructs a instance of adapter for the ChakraCore JS engine
+		/// Constructs an instance of adapter for the ChakraCore JS engine
 		/// </summary>
 		/// <param name="settings">Settings of the ChakraCore JS engine</param>
 		public ChakraCoreJsEngine(ChakraCoreSettings settings)
@@ -135,21 +135,24 @@ public ChakraCoreJsEngine(ChakraCoreSettings settings)
 
 			_externalObjectFinalizeCallback = ExternalObjectFinalizeCallback;
 
-			try
-			{
-				_jsRuntime = JsRuntime.Create(attributes, null);
-				_jsContext = _jsRuntime.CreateContext();
-			}
-			catch (Exception e)
+			_dispatcher.Invoke(() =>
 			{
-				throw new JsEngineLoadException(
-					string.Format(CoreStrings.Runtime_JsEngineNotLoaded,
-						EngineName, e.Message), EngineName, EngineVersion, e);
-			}
+				try
+				{
+					_jsRuntime = JsRuntime.Create(attributes, null);
+					_jsContext = _jsRuntime.CreateContext();
+				}
+				catch (Exception e)
+				{
+					throw new JsEngineLoadException(
+						string.Format(CoreStrings.Runtime_JsEngineNotLoaded,
+							EngineName, e.Message), EngineName, EngineVersion, e);
+				}
+			});
 		}
 
 		/// <summary>
-		/// Destructs instance of adapter for the ChakraCore JS engine
+		/// Destructs an instance of adapter for the ChakraCore JS engine
 		/// </summary>
 		~ChakraCoreJsEngine()
 		{
@@ -159,62 +162,38 @@ public ChakraCoreJsEngine(ChakraCoreSettings settings)
 
 		private void InvokeScript(Action action)
 		{
-			lock (_executionSynchronizer)
-			using (new JsScope(_jsContext))
+			_dispatcher.Invoke(() =>
 			{
-				try
-				{
-					action();
-				}
-				catch (OriginalJsException e)
+				using (new JsScope(_jsContext))
 				{
-					throw ConvertJsExceptionToJsRuntimeException(e);
+					try
+					{
+						action();
+					}
+					catch (OriginalJsException e)
+					{
+						throw ConvertJsExceptionToJsRuntimeException(e);
+					}
 				}
-			}
+			});
 		}
 
 		private T InvokeScript<T>(Func<T> func)
 		{
-			lock (_executionSynchronizer)
-			using (new JsScope(_jsContext))
-			{
-				try
-				{
-					return func();
-				}
-				catch (OriginalJsException e)
-				{
-					throw ConvertJsExceptionToJsRuntimeException(e);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Destroys object
-		/// </summary>
-		/// <param name="disposing">Flag, allowing destruction of
-		/// managed objects contained in fields of class</param>
-		private void Dispose(bool disposing)
-		{
-			if (_disposedFlag.Set())
+			return _dispatcher.Invoke(() =>
 			{
-				lock (_executionSynchronizer)
+				using (new JsScope(_jsContext))
 				{
-					_jsRuntime.Dispose();
-
-					if (_externalObjects != null)
+					try
 					{
-						_externalObjects.Clear();
+						return func();
 					}
-
-					if (_nativeFunctions != null)
+					catch (OriginalJsException e)
 					{
-						_nativeFunctions.Clear();
+						throw ConvertJsExceptionToJsRuntimeException(e);
 					}
-
-					_externalObjectFinalizeCallback = null;
 				}
-			}
+			});
 		}
 
 		#region Mapping
@@ -427,12 +406,9 @@ private void ExternalObjectFinalizeCallback(IntPtr data)
 				return;
 			}
 
-			lock (_executionSynchronizer)
+			if (_externalObjects != null)
 			{
-				if (_externalObjects != null)
-				{
-					_externalObjects.Remove(obj);
-				}
+				_externalObjects.Remove(obj);
 			}
 		}
 
@@ -1115,10 +1091,7 @@ protected override void InnerEmbedHostType(string itemName, Type type)
 
 		protected override void InnerCollectGarbage()
 		{
-			lock (_executionSynchronizer)
-			{
-				_jsRuntime.CollectGarbage();
-			}
+			_dispatcher.Invoke(() => _jsRuntime.CollectGarbage());
 		}
 
 		#endregion
@@ -1134,6 +1107,39 @@ public override void Dispose()
 			GC.SuppressFinalize(this);
 		}
 
+
+		/// <summary>
+		/// Destroys object
+		/// </summary>
+		/// <param name="disposing">Flag, allowing destruction of
+		/// managed objects contained in fields of class</param>
+		private void Dispose(bool disposing)
+		{
+			if (_disposedFlag.Set())
+			{
+				if (_dispatcher != null)
+				{
+					_dispatcher.Invoke(() => _jsRuntime.Dispose());
+					_dispatcher.Dispose();
+				}
+
+				if (disposing)
+				{
+					if (_externalObjects != null)
+					{
+						_externalObjects.Clear();
+					}
+
+					if (_nativeFunctions != null)
+					{
+						_nativeFunctions.Clear();
+					}
+
+					_externalObjectFinalizeCallback = null;
+				}
+			}
+		}
+
 		#endregion
 	}
 }