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

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

@@ -14,7 +14,7 @@
 		<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;Jint</PackageTags>
 		<PackageReleaseNotes>1. Jint was updated to version 3.0.0 Beta 1598;
 2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3;
-3. In configuration settings of the Jint JS engine was added one new property - `MemoryLimit` (default `0`).</PackageReleaseNotes>
+3. In configuration settings of the Jint JS engine was added two new properties: `MemoryLimit` (default `0`) and `RegexTimeoutInterval` (default `null`).</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -90,16 +90,22 @@ public JintJsEngine(JintSettings settings)
 
 			try
 			{
-				_jsEngine = new OriginalEngine(c => c
-					.AllowDebuggerStatement(jintSettings.AllowDebuggerStatement)
-					.DebugMode(jintSettings.EnableDebugging)
-					.LimitMemory(jintSettings.MemoryLimit)
-					.LimitRecursion(jintSettings.MaxRecursionDepth)
-					.LocalTimeZone(jintSettings.LocalTimeZone ?? TimeZoneInfo.Local)
-					.MaxStatements(jintSettings.MaxStatements)
-					.Strict(jintSettings.StrictMode)
-					.TimeoutInterval(jintSettings.TimeoutInterval)
-				);
+				_jsEngine = new OriginalEngine(options => {
+					options
+						.AllowDebuggerStatement(jintSettings.AllowDebuggerStatement)
+						.DebugMode(jintSettings.EnableDebugging)
+						.LimitMemory(jintSettings.MemoryLimit)
+						.LimitRecursion(jintSettings.MaxRecursionDepth)
+						.LocalTimeZone(jintSettings.LocalTimeZone ?? TimeZoneInfo.Local)
+						.MaxStatements(jintSettings.MaxStatements)
+						.Strict(jintSettings.StrictMode)
+						.TimeoutInterval(jintSettings.TimeoutInterval)
+						;
+					if (jintSettings.RegexTimeoutInterval.HasValue)
+					{
+						options.RegexTimeoutInterval(jintSettings.RegexTimeoutInterval.Value);
+					}
+				});
 			}
 			catch (Exception e)
 			{

src/JavaScriptEngineSwitcher.Jint/JintSettings.cs

@@ -64,6 +64,17 @@ public long MemoryLimit
 			set;
 		}
 
+		/// <summary>
+		/// Gets or sets a timeout interval for regular expressions.
+		/// If the value of this property is null, then the value of regular expression
+		/// timeout interval are taken from the <see cref="TimeoutInterval"/> property.
+		/// </summary>
+		public TimeSpan? RegexTimeoutInterval
+		{
+			get;
+			set;
+		}
+
 		/// <summary>
 		/// Gets or sets a flag for whether to allow run the script in strict mode
 		/// </summary>
@@ -104,6 +115,7 @@ public JintSettings()
 			MaxRecursionDepth = -1;
 			MaxStatements = 0;
 			MemoryLimit = 0;
+			RegexTimeoutInterval = null;
 			StrictMode = false;
 			TimeoutInterval = TimeSpan.Zero;
 		}

src/JavaScriptEngineSwitcher.Jint/readme.txt

@@ -19,8 +19,8 @@
    =============
    1. Jint was updated to version 3.0.0 Beta 1598;
    2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3;
-   3. In configuration settings of the Jint JS engine was added one new property -
-      `MemoryLimit` (default `0`).
+   3. In configuration settings of the Jint JS engine was added two new properties:
+      `MemoryLimit` (default `0`) and `RegexTimeoutInterval` (default `null`).
 
    =============
    DOCUMENTATION

test/JavaScriptEngineSwitcher.Tests/Jint/CommonTests.cs

@@ -352,6 +352,49 @@ public void MappingTimeoutErrorDuringExecutionOfCodeIsCorrect()
 			Assert.Empty(exception.CallStack);
 		}
 
+		[Fact]
+		public void MappingTimeoutErrorDuringRegexHangingIsCorrect()
+		{
+			// Arrange
+			const string input = @"var regexp = /^(\w+\s?)*$/,
+	str = 'An input string that takes a long time or even makes this regular expression to hang!'
+	;
+
+// Will take a very long time
+regexp.test(str);";
+
+			JsTimeoutException exception = null;
+
+			// Act
+			using (var jsEngine = new JintJsEngine(
+				new JintSettings
+				{
+					RegexTimeoutInterval = TimeSpan.FromMilliseconds(25)
+				}
+			))
+			{
+				try
+				{
+					jsEngine.Execute(input, "regexp-hanging.js");
+				}
+				catch (JsTimeoutException e)
+				{
+					exception = e;
+				}
+			}
+
+			// Assert
+			Assert.NotNull(exception);
+			Assert.Equal("Timeout error", exception.Category);
+			Assert.Equal("Script execution exceeded timeout.", exception.Description);
+			Assert.Empty(exception.Type);
+			Assert.Empty(exception.DocumentName);
+			Assert.Equal(0, exception.LineNumber);
+			Assert.Equal(0, exception.ColumnNumber);
+			Assert.Empty(exception.SourceFragment);
+			Assert.Empty(exception.CallStack);
+		}
+
 		#endregion
 
 		#region Generation of error messages