In JavaScriptEngineSwitcher.Vroom fixed a minor errors

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.nuspec

@@ -14,6 +14,7 @@
 
 For correct working of the VroomJs on Windows require the Visual C++ Redistributable for Visual Studio 2012 and Microsoft Visual C++ 2015 Redistributable.</description>
 		<summary>JavaScriptEngineSwitcher.Vroom contains adapter `VroomJsEngine` (wrapper for the VroomJs version 1.2.3 with support of V8 version 3.17.16.2).</summary>
+		<releaseNotes>Fixed a minor errors.</releaseNotes>
 		<copyright>Copyright (c) 2013-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript VroomJs V8</tags>

NuGet/JavaScriptEngineSwitcher.Vroom/readme.txt

@@ -5,7 +5,7 @@
 
    --------------------------------------------------------------------------------
 
-      Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru
+      Copyright (c) 2013-2018 Andrey Taritsyn - http://www.taritsyn.ru
 
 
    ===========
@@ -22,7 +22,7 @@
    =============
    RELEASE NOTES
    =============
-   Added support of .NET Core 1.0.4.
+   Fixed a minor errors.
 
    ====================
    POST-INSTALL ACTIONS

src/JavaScriptEngineSwitcher.Vroom/VroomJsEngine.cs

@@ -51,6 +51,16 @@ public sealed class VroomJsEngine : JsEngineBase
 		/// </summary>
 		private readonly Dictionary<string, object> _hostItems = new Dictionary<string, object>();
 
+		/// <summary>
+		/// Synchronizer of JS engine initialization
+		/// </summary>
+		private static readonly object _initializationSynchronizer = new object();
+
+		/// <summary>
+		/// Flag indicating whether the JS engine is initialized
+		/// </summary>
+		private static bool _initialized;
+
 		/// <summary>
 		/// Unique document name manager
 		/// </summary>
@@ -82,17 +92,6 @@ public override bool SupportsGarbageCollection
 		}
 
 
-		/// <summary>
-		/// Static constructor
-		/// </summary>
-		static VroomJsEngine()
-		{
-			if (Utils.IsWindows())
-			{
-				OriginalAssemblyLoader.EnsureLoaded();
-			}
-		}
-
 		/// <summary>
 		/// Constructs an instance of adapter for the Vroom JS engine
 		/// (cross-platform bridge to the V8 JS engine)
@@ -108,23 +107,66 @@ public VroomJsEngine()
 		/// <param name="settings">Settings of the Vroom JS engine</param>
 		public VroomJsEngine(VroomSettings settings)
 		{
+			Initialize();
+
 			VroomSettings vroomSettings = settings ?? new VroomSettings();
 
 			try
 			{
-				_jsEngine = new OriginalJsEngine(vroomSettings.MaxYoungSpaceSize,
-					vroomSettings.MaxOldSpaceSize);
+				_jsEngine = new OriginalJsEngine(vroomSettings.MaxYoungSpaceSize, vroomSettings.MaxOldSpaceSize);
 				_jsContext = _jsEngine.CreateContext();
 			}
 			catch (Exception e)
 			{
 				throw new JsEngineLoadException(
-					string.Format(CoreStrings.Runtime_JsEngineNotLoaded,
-						EngineName, e.Message), EngineName, EngineVersion, e);
+					string.Format(CoreStrings.Runtime_JsEngineNotLoaded, EngineName, e.Message),
+					EngineName, EngineVersion, e);
+			}
+			finally
+			{
+				if (_jsContext == null)
+				{
+					Dispose();
+				}
 			}
 		}
 
 
+		/// <summary>
+		/// Initializes a JS engine
+		/// </summary>
+		private static void Initialize()
+		{
+			if (_initialized)
+			{
+				return;
+			}
+
+			lock (_initializationSynchronizer)
+			{
+				if (_initialized)
+				{
+					return;
+				}
+
+				if (Utils.IsWindows())
+				{
+					try
+					{
+						OriginalAssemblyLoader.EnsureLoaded();
+					}
+					catch (Exception e)
+					{
+						throw new JsEngineLoadException(
+							string.Format(CoreStrings.Runtime_JsEngineNotLoaded, EngineName, e.Message),
+							EngineName, EngineVersion, e);
+					}
+				}
+
+				_initialized = true;
+			}
+		}
+
 		/// <summary>
 		/// Makes a mapping from the host type to a Vroom type
 		/// </summary>
@@ -235,17 +277,14 @@ protected override void InnerExecute(string code, string documentName)
 
 		protected override object InnerCallFunction(string functionName, params object[] args)
 		{
-			string serializedArguments = string.Empty;
+			string functionCallExpression;
 			int argumentCount = args.Length;
 
-			if (argumentCount == 1)
+			if (argumentCount > 0)
 			{
-				object value = args[0];
-				serializedArguments = SimplisticJsSerializer.Serialize(value);
-			}
-			else if (argumentCount > 1)
-			{
-				var serializedArgumentsBuilder = new StringBuilder();
+				var functionCallBuilder = new StringBuilder();
+				functionCallBuilder.Append(functionName);
+				functionCallBuilder.Append("(");
 
 				for (int argumentIndex = 0; argumentIndex < argumentCount; argumentIndex++)
 				{
@@ -254,15 +293,22 @@ protected override object InnerCallFunction(string functionName, params object[]
 
 					if (argumentIndex > 0)
 					{
-						serializedArgumentsBuilder.Append(", ");
+						functionCallBuilder.Append(", ");
 					}
-					serializedArgumentsBuilder.Append(serializedValue);
+					functionCallBuilder.Append(serializedValue);
 				}
 
-				serializedArguments = serializedArgumentsBuilder.ToString();
+				functionCallBuilder.Append(");");
+
+				functionCallExpression = functionCallBuilder.ToString();
+				functionCallBuilder.Clear();
+			}
+			else
+			{
+				functionCallExpression = string.Format("{0}();", functionName);
 			}
 
-			object result = Evaluate(string.Format("{0}({1});", functionName, serializedArguments));
+			object result = Evaluate(functionCallExpression);
 
 			return result;
 		}