Merge branch 'main' into henrymercer/no-cache-nightlies

lib/util.js

@@ -457,7 +457,9 @@ async function bundleDb(config, language, codeql, dbName) {
 }
 exports.bundleDb = bundleDb;
 async function delay(milliseconds) {
-    return new Promise((resolve) => setTimeout(resolve, milliseconds));
+    // Immediately `unref` the timer such that it only prevents the process from exiting if the
+    // surrounding promise is being awaited.
+    return new Promise((resolve) => setTimeout(resolve, milliseconds).unref());
 }
 exports.delay = delay;
 function isGoodVersion(versionSpec) {
@@ -634,20 +636,19 @@ async function withTimeout(timeoutMs, promise, onTimeout) {
         finished = true;
         return result;
     };
-    const timeout = new Promise((resolve) => {
-        setTimeout(() => {
-            if (!finished) {
-                // Workaround: While the promise racing below will allow the main code
-                // to continue, the process won't normally exit until the asynchronous
-                // task in the background has finished. We set this variable to force
-                // an exit at the end of our code when `checkForTimeout` is called.
-                hadTimeout = true;
-                onTimeout();
-            }
-            resolve(undefined);
-        }, timeoutMs);
-    });
-    return await Promise.race([mainTask(), timeout]);
+    const timeoutTask = async () => {
+        await delay(timeoutMs);
+        if (!finished) {
+            // Workaround: While the promise racing below will allow the main code
+            // to continue, the process won't normally exit until the asynchronous
+            // task in the background has finished. We set this variable to force
+            // an exit at the end of our code when `checkForTimeout` is called.
+            hadTimeout = true;
+            onTimeout();
+        }
+        return undefined;
+    };
+    return await Promise.race([mainTask(), timeoutTask()]);
 }
 exports.withTimeout = withTimeout;
 /**