WebClient.setJavaScriptTimeout(timeout) stops most JavaScript immediately fixed

rbri · rbri · commit 07cfcfc170fa · 2025-11-04T16:00:13.000+01:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,12 @@
 
     <body>
         <release version="4.19.0" date="November xx, 2025" description="Chrome/Edge 142, Bugfixes">
+            <action type="update" dev="rbri">
+                JavaScript timeout messages slightly improved.
+            </action>
+            <action type="fix" dev="rbri" issue="#1057">
+                WebClient.setJavaScriptTimeout(timeout) stops most JavaScript immediately. This is a regression compared to version 4.18.0.
+            </action>
             <action type="update" dev="rbri">
                 neko: improve spec conformance of comment end detection
             </action>
@@ -2846,7 +2852,7 @@
         <release version="3.0.0" date="March 19, 2023" description="htmlunit.org, Chrome/Edge 110, Firefox 110, HTML parser improved, Bugfixes">
             <action type="update" dev="rbri">
                 INCOMPATIBLE CHANGE: Value processing for input controls changed; typing now ONLY changes the value
-                but not the value attribute. As consequence all calls to setValueAttribute(..) hve to be replaced by setValue() or type().
+                but not the value attribute. As consequence all calls to setValueAttribute(..) have to be replaced by setValue() or type().
             </action>
             <action type="update" dev="rbri">
                 INCOMPATIBLE CHANGE: HtmlButton.getAttribute() now returns the plain attribute value also for 'type' attribute
diff --git a/src/main/java/org/htmlunit/javascript/HtmlUnitContextFactory.java b/src/main/java/org/htmlunit/javascript/HtmlUnitContextFactory.java
@@ -298,6 +298,19 @@ protected Object doTopCall(final Callable callable,
         return super.doTopCall(callable, cx, scope, thisObj, args);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Object doTopCall(final Script script,
+            final Context cx, final Scriptable scope,
+            final Scriptable thisObj) {
+
+        final TimeoutContext tcx = (TimeoutContext) cx;
+        tcx.startClock();
+        return super.doTopCall(script, cx, scope, thisObj);
+    }
+
     /**
      * Same as {@link ContextFactory}{@link #call(ContextAction)} but with handling
      * of some exceptions.
diff --git a/src/main/java/org/htmlunit/javascript/TimeoutError.java b/src/main/java/org/htmlunit/javascript/TimeoutError.java
@@ -26,7 +26,7 @@ public class TimeoutError extends Error {
 
     TimeoutError(final long allowedTime, final long executionTime) {
         super("Javascript execution takes too long (allowed: " + allowedTime
-                + ", already elapsed: " + executionTime + ")");
+                + "ms, already elapsed: " + executionTime + "ms)");
         allowedTime_ = allowedTime;
         executionTime_ = executionTime;
     }
diff --git a/src/test/java/org/htmlunit/WebClientTest.java b/src/test/java/org/htmlunit/WebClientTest.java
@@ -54,6 +54,7 @@
 import org.htmlunit.util.NameValuePair;
 import org.htmlunit.util.UrlUtils;
 import org.htmlunit.xml.XmlPage;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -1700,8 +1701,6 @@ public void javaScriptTimeout() throws Exception {
         client.setJavaScriptTimeout(timeout);
 
         try {
-            client.getOptions().setThrowExceptionOnScriptError(false);
-
             final String content = DOCTYPE_HTML + "<html><body><script>while(1) {}</script></body></html>";
             final MockWebConnection webConnection = new MockWebConnection();
             webConnection.setDefaultResponse(content);
@@ -1727,7 +1726,19 @@ public void run() {
                 runner.interrupt();
                 fail("Script was still running after timeout");
             }
-            assertNull(exceptions[0]);
+
+            Assertions.assertTrue(exceptions[0] instanceof RuntimeException, exceptions[0].getMessage());
+            final Throwable cause = exceptions[0].getCause();
+            String msg = cause.getMessage();
+            Assertions.assertTrue(cause.getMessage().startsWith(
+                    "Javascript execution takes too long (allowed: 2000ms, already elapsed: "), cause.getMessage());
+
+            msg = msg.substring(msg.indexOf("already elapsed: ") + 17);
+            msg = msg.substring(0, msg.indexOf("ms"));
+            final long execTime = Long.parseLong(msg);
+
+            Assertions.assertTrue(execTime >= timeout, "execTime: " + execTime);
+            Assertions.assertTrue(execTime < (timeout + 2), "execTime: " + execTime);
         }
         finally {
             client.setJavaScriptTimeout(oldTimeout);
diff --git a/src/test/java/org/htmlunit/javascript/JavaScriptEngineTest.java b/src/test/java/org/htmlunit/javascript/JavaScriptEngineTest.java
@@ -52,6 +52,7 @@
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.util.NameValuePair;
 import org.htmlunit.util.UrlUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -799,8 +800,6 @@ public void timeout() throws Exception {
         client.setJavaScriptTimeout(timeout);
 
         try {
-            client.getOptions().setThrowExceptionOnScriptError(false);
-
             final String content = DOCTYPE_HTML + "<html><body><script>while(1) {}</script></body></html>";
             final MockWebConnection webConnection = new MockWebConnection();
             webConnection.setDefaultResponse(content);
@@ -826,7 +825,19 @@ public void run() {
                 runner.interrupt();
                 fail("Script was still running after timeout");
             }
-            assertNull(exceptions[0]);
+
+            Assertions.assertTrue(exceptions[0] instanceof RuntimeException, exceptions[0].getMessage());
+            final Throwable cause = exceptions[0].getCause();
+            String msg = cause.getMessage();
+            Assertions.assertTrue(cause.getMessage().startsWith(
+                    "Javascript execution takes too long (allowed: 2000ms, already elapsed: "), cause.getMessage());
+
+            msg = msg.substring(msg.indexOf("already elapsed: ") + 17);
+            msg = msg.substring(0, msg.indexOf("ms"));
+            final long execTime = Long.parseLong(msg);
+
+            Assertions.assertTrue(execTime >= timeout, "execTime: " + execTime);
+            Assertions.assertTrue(execTime < (timeout + 2), "execTime: " + execTime);
         }
         finally {
             client.setJavaScriptTimeout(oldTimeout);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class TimeoutError extends Error {`
`26`	`26`
`27`	`27`	`TimeoutError(final long allowedTime, final long executionTime) {`
`28`	`28`	`super("Javascript execution takes too long (allowed: " + allowedTime`
`29`		`- + ", already elapsed: " + executionTime + ")");`
	`29`	`+ + "ms, already elapsed: " + executionTime + "ms)");`
`30`	`30`	`allowedTime_ = allowedTime;`
`31`	`31`	`executionTime_ = executionTime;`
`32`	`32`	`}`