In JavaScriptEngineSwitcher.V8 improved implementation of the CallFunction method

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.nuspec

@@ -17,7 +17,7 @@ This package does not contain the native ClearScript and V8 assemblies. Therefor
  * JavaScriptEngineSwitcher.V8.Native.win-x86
  * JavaScriptEngineSwitcher.V8.Native.win-x64</description>
 		<summary>JavaScriptEngineSwitcher.V8 contains adapter `V8JsEngine` (wrapper for the Microsoft ClearScript.V8 version 5.4.10).</summary>
-		<releaseNotes>Microsoft ClearScript.V8 was updated to version 5.4.10.</releaseNotes>
+		<releaseNotes>Improved implementation of the `CallFunction` method.</releaseNotes>
 		<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript V8 ClearScript</tags>

NuGet/JavaScriptEngineSwitcher.V8/readme.txt

@@ -25,7 +25,7 @@
    =============
    RELEASE NOTES
    =============
-   Microsoft ClearScript.V8 was updated to version 5.4.10.
+   Improved implementation of the `CallFunction` method.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.V8/V8JsEngine.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Reflection;
-#if NET45
-using System.Runtime.ExceptionServices;
-#endif
 using System.Text.RegularExpressions;
 
 using Microsoft.ClearScript.V8;
@@ -44,11 +41,6 @@ public sealed class V8JsEngine : JsEngineBase
 		/// </summary>
 		private static OriginalUndefined _originalUndefinedValue;
 
-		/// <summary>
-		/// Information about <code>InvokeMethod</code> method of <see cref="V8ScriptItem"/> class
-		/// </summary>
-		private static MethodInfo _v8ScriptItemInvokeMethodInfo;
-
 		/// <summary>
 		/// Regular expression for working with the string representation of error
 		/// </summary>
@@ -69,7 +61,6 @@ static V8JsEngine()
 		{
 			AssemblyResolver.Initialize();
 			LoadUndefinedValue();
-			LoadWinScriptItemInvokeMethodInfo();
 		}
 
 		/// <summary>
@@ -144,36 +135,6 @@ private static void LoadUndefinedValue()
 			}
 		}
 
-		/// <summary>
-		/// Loads a `InvokeMethod` method information of `Microsoft.ClearScript.V8.V8ScriptItem` type
-		/// </summary>
-		private static void LoadWinScriptItemInvokeMethodInfo()
-		{
-			const string typeName = "Microsoft.ClearScript.V8.V8ScriptItem";
-			const string methodName = "InvokeMethod";
-
-			Assembly clearScriptAssembly = typeof(V8ScriptEngine).Assembly;
-			Type v8ScriptItemType = clearScriptAssembly.GetType(typeName);
-			MethodInfo v8ScriptItemInvokeMethodInfo = null;
-
-			if (v8ScriptItemType != null)
-			{
-				v8ScriptItemInvokeMethodInfo = v8ScriptItemType.GetMethod(methodName,
-					BindingFlags.Instance | BindingFlags.Public);
-			}
-
-			if (v8ScriptItemInvokeMethodInfo != null)
-			{
-				_v8ScriptItemInvokeMethodInfo = v8ScriptItemInvokeMethodInfo;
-			}
-			else
-			{
-				throw new JsEngineLoadException(
-					string.Format(Strings.Runtime_MethodInfoNotLoaded, typeName, methodName),
-						EngineName, EngineVersion);
-			}
-		}
-
 		#region Mapping
 
 		/// <summary>
@@ -329,43 +290,15 @@ protected override object InnerCallFunction(string functionName, params object[]
 			{
 				try
 				{
-					object obj = _jsEngine.Script;
-					result = _v8ScriptItemInvokeMethodInfo.Invoke(obj, new object[] { functionName, processedArgs });
+					result = _jsEngine.Invoke(functionName, processedArgs);
 				}
-				catch (TargetInvocationException e)
+				catch (OriginalScriptEngineException e)
+				{
+					throw ConvertScriptEngineExceptionToHostException(e);
+				}
+				catch (OriginalScriptInterruptedException e)
 				{
-					Exception innerException = e.InnerException;
-					if (innerException != null)
-					{
-						if (innerException is IOriginalScriptEngineException)
-						{
-							var scriptEngineException = innerException as OriginalScriptEngineException;
-							if (scriptEngineException != null)
-							{
-								throw ConvertScriptEngineExceptionToHostException(scriptEngineException);
-							}
-
-							var scriptInterruptedException =
-								innerException as OriginalScriptInterruptedException;
-							if (scriptInterruptedException != null)
-							{
-								throw ConvertScriptInterruptedExceptionToHostException(
-									scriptInterruptedException);
-							}
-						}
-#if NET45
-
-						ExceptionDispatchInfo.Capture(innerException).Throw();
-#elif NET40
-
-						innerException.PreserveStackTrace();
-						throw innerException;
-#else
-#error No implementation for this target
-#endif
-					}
-
-					throw;
+					throw ConvertScriptInterruptedExceptionToHostException(e);
 				}
 			}