Handle cross-platform timeout

Author: nvuillam

lib/java-caller.js

@@ -100,10 +100,12 @@ class JavaCaller {
 
         const javaExeToUse = this.javaExecutableFromNodeJavaCaller ?? javaExe;
         const classPathStr = this.buildClasspathStr();
-        const javaArgs = this.buildArguments(classPathStr, (userArguments || []).concat(this.commandJavaArgs));
+        const javaArgs = this.buildArguments(classPathStr, (userArguments || []).concat(this.commandJavaArgs), runOptions.windowsVerbatimArguments);
         let stdout = "";
         let stderr = "";
         let child;
+        let timeoutId;
+        let killedByTimeout = false;
         const prom = new Promise((resolve) => {
             // Spawn java command line
             debug(`Java command: ${javaExeToUse} ${javaArgs.join(" ")}`);
@@ -122,6 +124,19 @@ class JavaCaller {
             }
             child = spawn(javaExeToUse, javaArgs, spawnOptions);
 
+            if (runOptions.timeout) {
+                timeoutId = setTimeout(() => {
+                    if (!child.killed) {
+                        killedByTimeout = true;
+                        try {
+                            child.kill(runOptions.killSignal);
+                        } catch (err) {
+                            stderr += `Failed to kill process after ${runOptions.timeout}ms: ${err.message}`;
+                        }
+                    }
+                }, runOptions.timeout);
+            }
+
             // Gather stdout and stderr if they must be returned
             if (spawnOptions.stdio === "pipe") {
                 child.stdout.setEncoding(`${runOptions.stdoutEncoding}`);
@@ -142,20 +157,20 @@ class JavaCaller {
 
             // Catch status code
             child.on("close", (code, signal) => {
-                console.log({code, signal});
-                
-                if (runOptions.timeout && signal === runOptions.killSignal) {
-                    // Process was _likely_ terminated because of a timeout
-                    // There is no way to determine if a timeout occurred or if another process sent killSignal
-                    // See https://github.com/nodejs/node/issues/51561
+                if (timeoutId) {
+                    clearTimeout(timeoutId);
+                }
+
+                if (killedByTimeout || (runOptions.timeout && signal === runOptions.killSignal)) {
+                    // Process was terminated because of the timeout, either via our fallback timer or the built-in spawn timeout
                     this.status = 666;
                     stderr += `Process timed out with ${runOptions.killSignal} after ${runOptions.timeout}ms.`;
                 } else {
                     this.status = code;
                 }
 
-                 resolve();
-             });
+                resolve();
+            });
 
             // Detach from main process in case detached === true
             if (runOptions.detached) {