In configuration settings of the Jint JS engine was added new property - DebuggerExceptionThrownCallback (default null)

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

@@ -23,7 +23,7 @@
     <Description>JavaScriptEngineSwitcher.Jint contains a `JintJsEngine` adapter (wrapper for the Jint).</Description>
     <PackageTags>$(PackageCommonTags);Jint</PackageTags>
     <PackageReleaseNotes>1. Jint was updated to version 4.8.0;
-2. In configuration settings of the Jint JS engine was added one new property - `CompileRegex` (default `false`).</PackageReleaseNotes>
+2. In configuration settings of the Jint JS engine was added two new properties: `CompileRegex` (default `false`) and `DebuggerExceptionThrownCallback` (default `null`).</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -10,11 +10,12 @@
 using IOriginalPrimitive = Jint.Native.IJsPrimitive;
 using OriginalCancellationConstraint = Jint.Constraints.CancellationConstraint;
 using OriginalDebuggerEventHandler = Jint.Runtime.Debugger.DebugHandler.DebugEventHandler;
+using OriginalDebuggerExceptionThrownEventHandler = Jint.Runtime.Debugger.DebugHandler.ExceptionThrownEventHandler;
 using OriginalDebuggerStatementHandlingMode = Jint.Runtime.Debugger.DebuggerStatementHandling;
 using OriginalEngine = Jint.Engine;
 using OriginalErrorPosition = Acornima.Position;
-using OriginalExecutionCanceledException = Jint.Runtime.ExecutionCanceledException;
 using OriginalException = Jint.JintException;
+using OriginalExecutionCanceledException = Jint.Runtime.ExecutionCanceledException;
 using OriginalJavaScriptException = Jint.Runtime.JavaScriptException;
 using OriginalMemoryLimitExceededException = Jint.Runtime.MemoryLimitExceededException;
 using OriginalObjectInstance = Jint.Native.Object.ObjectInstance;
@@ -90,6 +91,11 @@ public sealed class JintJsEngine : JsEngineBase
 		/// </summary>
 		private OriginalDebuggerEventHandler _debuggerStepCallback;
 
+		/// <summary>
+		/// Debugger exception thrown callback
+		/// </summary>
+		private OriginalDebuggerExceptionThrownEventHandler _debuggerExceptionThrownCallback;
+
 		/// <summary>
 		/// Flag for whether to allow run the script in strict mode
 		/// </summary>
@@ -125,6 +131,7 @@ public JintJsEngine(JintSettings settings)
 			JintSettings jintSettings = settings ?? new JintSettings();
 			_debuggerBreakCallback = jintSettings.DebuggerBreakCallback;
 			_debuggerStepCallback = jintSettings.DebuggerStepCallback;
+			_debuggerExceptionThrownCallback = jintSettings.DebuggerExceptionThrownCallback;
 			var debuggerStatementHandlingMode = Utils.GetEnumFromOtherEnum<JsDebuggerStatementHandlingMode, OriginalDebuggerStatementHandlingMode>(
 				jintSettings.DebuggerStatementHandlingMode);
 
@@ -175,6 +182,10 @@ public JintJsEngine(JintSettings settings)
 				{
 					_jsEngine.Debugger.Step += _debuggerStepCallback;
 				}
+				if (_debuggerExceptionThrownCallback is not null)
+				{
+					_jsEngine.Debugger.ExceptionThrown += _debuggerExceptionThrownCallback;
+				}
 				_strictMode = settings.StrictMode;
 			}
 			catch (Exception e)
@@ -709,6 +720,11 @@ public override void Dispose()
 				{
 					if (_jsEngine is not null)
 					{
+						if (_debuggerExceptionThrownCallback is not null)
+						{
+							_jsEngine.Debugger.ExceptionThrown -= _debuggerExceptionThrownCallback;
+						}
+
 						if (_debuggerStepCallback is not null)
 						{
 							_jsEngine.Debugger.Step -= _debuggerStepCallback;
@@ -723,6 +739,7 @@ public override void Dispose()
 						_jsEngine = null;
 					}
 
+					_debuggerExceptionThrownCallback = null;
 					_debuggerStepCallback = null;
 					_debuggerBreakCallback = null;
 					_cancellationConstraint = null;

src/JavaScriptEngineSwitcher.Jint/JintSettings.cs

@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 
 using OriginalDebuggerEventHandler = Jint.Runtime.Debugger.DebugHandler.DebugEventHandler;
+using OriginalDebuggerExceptionThrownEventHandler = Jint.Runtime.Debugger.DebugHandler.ExceptionThrownEventHandler;
 
 namespace JavaScriptEngineSwitcher.Jint
 {
@@ -56,6 +57,15 @@ public OriginalDebuggerEventHandler DebuggerBreakCallback
 			set;
 		}
 
+		/// <summary>
+		/// Gets or sets a debugger exception thrown callback
+		/// </summary>
+		public OriginalDebuggerExceptionThrownEventHandler DebuggerExceptionThrownCallback
+		{
+			get;
+			set;
+		}
+
 		/// <summary>
 		/// Gets or sets a handling mode for script <c>debugger</c> statements
 		/// </summary>
@@ -199,6 +209,7 @@ public JintSettings()
 			AllowReflection = false;
 			CompileRegex = false;
 			DebuggerBreakCallback = null;
+			DebuggerExceptionThrownCallback = null;
 			DebuggerStatementHandlingMode = JsDebuggerStatementHandlingMode.Ignore;
 			DebuggerStepCallback = null;
 			DisableEval = false;

src/JavaScriptEngineSwitcher.Jint/readme.txt

@@ -18,8 +18,9 @@
    RELEASE NOTES
    =============
    1. Jint was updated to version 4.8.0;
-   2. In configuration settings of the Jint JS engine was added one new property -
-      `CompileRegex` (default `false`).
+   2. In configuration settings of the Jint JS engine was added two new properties:
+      `CompileRegex` (default `false`) and `DebuggerExceptionThrownCallback`
+      (default `null`).
 
    =============
    DOCUMENTATION