Update to Michael Russell's fork of VroomJs

Author: Daniel15

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/Daniel15/simple-nuget-server.git
 [submodule "lib/VroomJs"]
 	path = lib/VroomJs
-	url = https://github.com/fogzot/vroomjs.git
+	url = https://github.com/Daniel15/vroomjs.git

lib/VroomJs

@@ -11,7 +11,7 @@
 using System.Linq;
 using JavaScriptEngineSwitcher.Core;
 using Newtonsoft.Json;
-
+using VroomJs;
 using OriginalJsEngine = VroomJs.JsEngine;
 using OriginalJsException = VroomJs.JsException;
 
@@ -24,9 +24,16 @@ namespace React.JavaScriptEngine.VroomJs
 	public class VroomJsEngine : JsEngineBase
 	{
 		/// <summary>
-		/// The VroomJs engine
+		/// The VroomJs engine. One engine is shared for the whole app, and separate contexts are
+		/// used for each instance of this class.
 		/// </summary>
-		private readonly OriginalJsEngine _jsEngine;
+		private static readonly Lazy<OriginalJsEngine> _jsEngine = 
+			new Lazy<JsEngine>(() => new OriginalJsEngine());
+
+		/// <summary>
+		/// The V8 context
+		/// </summary>
+		private readonly JsContext _context;
 
 		/// <summary>
 		/// Name of JavaScript engine
@@ -44,14 +51,24 @@ public override string Version
 			get { return "86f8558d (Aug 17, 2013)"; }
 		}
 
+		/// <summary>
+		/// The VroomJs engine. One engine is shared for the whole app, and separate contexts are
+		/// used for each instance of this class.
+		/// </summary>
+		private OriginalJsEngine Engine
+		{
+			get { return _jsEngine.Value; }
+		}
+
 		/// <summary>
 		/// Constructs instance of adapter for VroomJs
 		/// </summary>
 		public VroomJsEngine()
 		{
 			try
 			{
-				_jsEngine = new OriginalJsEngine();
+				// We use one engine with multiple contexts
+				_context = Engine.CreateContext();
 			}
 			catch (Exception e)
 			{
@@ -78,10 +95,11 @@ private JsRuntimeException ConvertJavaScriptExceptionToJsRuntimeException(
 			OriginalJsException jsException	
 		)
 		{
-			dynamic nativeEx = jsException.NativeException;
-			return new JsRuntimeException(nativeEx.stack, Name, Version)
+			return new JsRuntimeException(jsException.Message, Name, Version)
 			{
-				Category = nativeEx.name,
+				Category = jsException.Type,
+				LineNumber = jsException.Line,
+				ColumnNumber = jsException.Column
 			};
 		}
 
@@ -94,7 +112,7 @@ protected override object InnerEvaluate(string expression)
 		{
 			try
 			{
-				return _jsEngine.Execute(expression);
+				return _context.Execute(expression);
 			}
 			catch (OriginalJsException ex)
 			{
@@ -121,7 +139,7 @@ protected override void InnerExecute(string code)
 		{
 			try
 			{
-				_jsEngine.Execute(code);
+				_context.Execute(code);
 			}
 			catch (OriginalJsException ex)
 			{
@@ -145,7 +163,7 @@ protected override object InnerCallFunction(string functionName, params object[]
 
 			try
 			{
-				return _jsEngine.Execute(code);
+				return _context.Execute(code);
 			}
 			catch (OriginalJsException ex)
 			{
@@ -185,7 +203,7 @@ protected override object InnerGetVariableValue(string variableName)
 		{
 			try
 			{
-				return _jsEngine.GetVariable(variableName);
+				return _context.GetVariable(variableName);
 			}
 			catch (OriginalJsException ex)
 			{
@@ -214,7 +232,7 @@ protected override void InnerSetVariableValue(string variableName, object value)
 		{
 			try
 			{
-				_jsEngine.SetVariable(variableName, value);
+				_context.SetVariable(variableName, value);
 			}
 			catch (OriginalJsException ex)
 			{
@@ -231,7 +249,7 @@ protected override void InnerRemoveVariable(string variableName)
 			var code = string.Format("{0} = undefined", variableName);
 			try
 			{
-				_jsEngine.Execute(code);
+				_context.Execute(code);
 			}
 			catch (OriginalJsException ex)
 			{
@@ -246,7 +264,7 @@ public override void Dispose()
 		{
 			if (!_disposed)
 			{
-				_jsEngine.Dispose();
+				_context.Dispose();
 				_disposed = true;
 			}
 		}

lib/VroomJs.dll

@@ -38,7 +38,7 @@ private static string GetMessage(string innerMessage)
 		{
 			return
 				"Failed to initialise VroomJs. This is most likely caused by the native library " +
-				"(libvroomjs.so) being out of date or your system lacking a compatible version of " +
+				"(libVroomJsNative.so) being out of date or your system lacking a compatible version of " +
 				"V8. Please run Mono with the `MONO_LOG_LEVEL=debug` environment variable for " +
 				"more debugging information. \n\n " +
 				"More details: " + innerMessage;

src/React.JavaScriptEngine.VroomJs/VroomJsEngine.cs

@@ -5,7 +5,7 @@ accomplished using the following shell commands:
 cd /usr/local/src/
 git clone https://github.com/v8/v8.git
 cd v8
-git checkout 3.15
+git checkout 3.17
 
 # Build V8
 make werror=no library=shared x64.release
@@ -18,8 +18,8 @@ git submodule update --init
 cd lib/VroomJs/libvroomjs/
 
 # Build libvroomjs
-g++ jsengine.cpp managedref.cpp bridge.cpp -o libvroomjs.so -shared -L /usr/local/src/v8/out/x64.release/lib.target/ -I /usr/local/src/v8/include/ -fPIC -Wl,--no-as-needed -lv8 -g
-cp libvroomjs.so /usr/local/lib/
+g++ jscontext.cpp jsengine.cpp managedref.cpp bridge.cpp jsscript.cpp -o libVroomJsNative.so -shared -L /usr/local/src/v8/out/x64.release/lib.target/ -I /usr/local/src/v8/include/ -fPIC -Wl,--no-as-needed -lv8
+cp libVroomJsNative.so /usr/local/lib/
 ldconfig
 
 If VroomJs fails to load, run Mono with the `MONO_LOG_LEVEL=debug` environment variable to get