unify timeout codes

Author: nvuillam

lib/java-caller.js

@@ -106,6 +106,26 @@ class JavaCaller {
         let child;
         let timeoutId;
         let killedByTimeout = false;
+
+        const wasKilledByTimeout = (code, signal) => {
+            if (!runOptions.timeout) {
+                return false;
+            }
+            if (killedByTimeout) {
+                return true;
+            }
+            if (signal && signal === runOptions.killSignal) {
+                return true;
+            }
+            const signals = os.constants && os.constants.signals ? os.constants.signals : {};
+            if (typeof runOptions.killSignal === "string" && signals[runOptions.killSignal] && code === 128 + signals[runOptions.killSignal]) {
+                return true;
+            }
+            if (typeof runOptions.killSignal === "number" && code === 128 + runOptions.killSignal) {
+                return true;
+            }
+            return false;
+        };
         const prom = new Promise((resolve) => {
             // Spawn java command line
             debug(`Java command: ${javaExeToUse} ${javaArgs.join(" ")}`);
@@ -161,7 +181,7 @@ class JavaCaller {
                     clearTimeout(timeoutId);
                 }
 
-                if (killedByTimeout || (runOptions.timeout && signal === runOptions.killSignal)) {
+                if (wasKilledByTimeout(code, signal)) {
                     // 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.`;