Reduced a number of delegate-wrappers

Author: Taritsyn

NuGet/MsieJavaScriptEngine.nuspec

@@ -12,7 +12,8 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee), Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host) and jsrt-dotnet (http://github.com/robpaveza/jsrt-dotnet).</description>
 		<summary>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
-		<releaseNotes>Now during the rethrowing of exceptions are preserved the full call stack trace.</releaseNotes>
+		<releaseNotes>1. Now during the rethrowing of exceptions are preserved the full call stack trace;
+2. Reduced a number of delegate-wrappers.</releaseNotes>
 		<copyright>Copyright (c) 2012-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>

NuGet/readme.txt

@@ -21,7 +21,9 @@
    =============
    RELEASE NOTES
    =============
-   Now during the rethrowing of exceptions are preserved the full call stack trace.
+   1. Now during the rethrowing of exceptions are preserved the full call stack
+      trace;
+   2. Reduced a number of delegate-wrappers.
 
    ============
    PROJECT SITE

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

@@ -330,56 +330,6 @@ private void ThrowError()
 			}
 		}
 
-		private void InvokeScript(Action action)
-		{
-			_dispatcher.Invoke(() =>
-			{
-				try
-				{
-					action();
-				}
-				catch (ActiveScriptException e)
-				{
-					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
-				}
-				catch (TargetInvocationException e)
-				{
-					var activeScriptException = e.InnerException as ActiveScriptException;
-					if (activeScriptException != null)
-					{
-						throw ConvertActiveScriptExceptionToJsRuntimeException(activeScriptException);
-					}
-
-					throw;
-				}
-			});
-		}
-
-		private T InvokeScript<T>(Func<T> func)
-		{
-			return _dispatcher.Invoke(() =>
-			{
-				try
-				{
-					return func();
-				}
-				catch (ActiveScriptException e)
-				{
-					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
-				}
-				catch (TargetInvocationException e)
-				{
-					var activeScriptException = e.InnerException as ActiveScriptException;
-					if (activeScriptException != null)
-					{
-						throw ConvertActiveScriptExceptionToJsRuntimeException(activeScriptException);
-					}
-
-					throw;
-				}
-			});
-		}
-
 		/// <summary>
 		/// Executes a script text
 		/// </summary>
@@ -516,35 +466,33 @@ private void InnerSetVariableValue(string variableName, object value)
 			}
 		}
 
-		private void EmbedHostItem(string itemName, object value)
+		private void InnerEmbedHostItem(string itemName, object value)
 		{
-			InvokeScript(() =>
+			object oldValue = null;
+			if (_hostItems.ContainsKey(itemName))
 			{
-				object oldValue = null;
-				if (_hostItems.ContainsKey(itemName))
-				{
-					oldValue = _hostItems[itemName];
-				}
-				_hostItems[itemName] = value;
+				oldValue = _hostItems[itemName];
+			}
+			_hostItems[itemName] = value;
 
-				try
+			try
+			{
+				_activeScriptWrapper.AddNamedItem(itemName, ScriptItemFlags.IsVisible | ScriptItemFlags.GlobalMembers);
+			}
+			catch
+			{
+				if (oldValue != null)
 				{
-					_activeScriptWrapper.AddNamedItem(itemName, ScriptItemFlags.IsVisible | ScriptItemFlags.GlobalMembers);
+					_hostItems[itemName] = oldValue;
 				}
-				catch (Exception)
+				else
 				{
-					if (oldValue != null)
-					{
-						_hostItems[itemName] = oldValue;
-					}
-					else
-					{
-						_hostItems.Remove(itemName);
-					}
-
-					throw;
+					_hostItems.Remove(itemName);
 				}
-			});
+
+				ThrowError();
+				throw;
+			}
 		}
 
 		/// <summary>
@@ -614,30 +562,52 @@ public override string Mode
 
 		public override object Evaluate(string expression, string documentName)
 		{
-			object result = InvokeScript(() => InnerExecute(expression, documentName, true));
+			object result = _dispatcher.Invoke(() =>
+			{
+				try
+				{
+					return InnerExecute(expression, documentName, true);
+				}
+				catch (ActiveScriptException e)
+				{
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
+				}
+			});
+
 			result = MapToHostType(result);
 
 			return result;
 		}
 
 		public override void Execute(string code, string documentName)
 		{
-			InvokeScript(() =>
+			_dispatcher.Invoke(() =>
 			{
-				InnerExecute(code, documentName, false);
+				try
+				{
+					InnerExecute(code, documentName, false);
+				}
+				catch (ActiveScriptException e)
+				{
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
+				}
 			});
 		}
 
 		public override object CallFunction(string functionName, params object[] args)
 		{
 			object[] processedArgs = MapToScriptType(args);
 
-			object result = InvokeScript(() =>
+			object result = _dispatcher.Invoke(() =>
 			{
 				try
 				{
 					return InnerCallFunction(functionName, processedArgs);
 				}
+				catch (ActiveScriptException e)
+				{
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
+				}
 				catch (MissingMemberException)
 				{
 					throw new JsRuntimeException(
@@ -652,7 +622,7 @@ public override object CallFunction(string functionName, params object[] args)
 
 		public override bool HasVariable(string variableName)
 		{
-			bool result = InvokeScript(() =>
+			bool result = _dispatcher.Invoke(() =>
 			{
 				bool variableExist;
 
@@ -661,6 +631,10 @@ public override bool HasVariable(string variableName)
 					object variableValue = InnerGetVariableValue(variableName);
 					variableExist = variableValue != null;
 				}
+				catch (ActiveScriptException e)
+				{
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
+				}
 				catch (MissingMemberException)
 				{
 					variableExist = false;
@@ -674,12 +648,16 @@ public override bool HasVariable(string variableName)
 
 		public override object GetVariableValue(string variableName)
 		{
-			object result = InvokeScript(() =>
+			object result = _dispatcher.Invoke(() =>
 			{
 				try
 				{
 					return InnerGetVariableValue(variableName);
 				}
+				catch (ActiveScriptException e)
+				{
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
+				}
 				catch (MissingMemberException)
 				{
 					throw new JsRuntimeException(
@@ -695,32 +673,72 @@ public override object GetVariableValue(string variableName)
 		public override void SetVariableValue(string variableName, object value)
 		{
 			object processedValue = MapToScriptType(value);
-			InvokeScript(() => InnerSetVariableValue(variableName, processedValue));
+
+			_dispatcher.Invoke(() =>
+			{
+				try
+				{
+					InnerSetVariableValue(variableName, processedValue);
+				}
+				catch (ActiveScriptException e)
+				{
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
+				}
+			});
 		}
 
 		public override void RemoveVariable(string variableName)
 		{
-			InvokeScript(() =>
+			_dispatcher.Invoke(() =>
 			{
-				InnerSetVariableValue(variableName, null);
+				try
+				{
+					InnerSetVariableValue(variableName, null);
 
-				if (_hostItems.ContainsKey(variableName))
+					if (_hostItems.ContainsKey(variableName))
+					{
+						_hostItems.Remove(variableName);
+					}
+				}
+				catch (ActiveScriptException e)
 				{
-					_hostItems.Remove(variableName);
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
 				}
 			});
 		}
 
 		public override void EmbedHostObject(string itemName, object value)
 		{
 			object processedValue = MapToScriptType(value);
-			EmbedHostItem(itemName, processedValue);
+
+			_dispatcher.Invoke(() =>
+			{
+				try
+				{
+					InnerEmbedHostItem(itemName, processedValue);
+				}
+				catch (ActiveScriptException e)
+				{
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
+				}
+			});
 		}
 
 		public override void EmbedHostType(string itemName, Type type)
 		{
 			var typeValue = new HostType(type, _engineMode);
-			EmbedHostItem(itemName, typeValue);
+
+			_dispatcher.Invoke(() =>
+			{
+				try
+				{
+					InnerEmbedHostItem(itemName, typeValue);
+				}
+				catch (ActiveScriptException e)
+				{
+					throw ConvertActiveScriptExceptionToJsRuntimeException(e);
+				}
+			});
 		}
 
 		public override void CollectGarbage()