qunitx-cli 0.22.1 → 0.22.3

package/dist/cli.js

@@ -2037,6 +2037,27 @@ var init_open_output_in_browser = __esm({
   }
 });
 
+// lib/utils/close-with-grace.ts
+function closeWithGrace(closes, graceMs = CLEANUP_GRACE_MS) {
+  return new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      process.stderr.write(`# qunitx: cleanup timed out after ${graceMs} ms \u2014 exiting anyway
+`);
+      resolve();
+    }, graceMs);
+    Promise.allSettled(closes).then(() => {
+      clearTimeout(timer);
+      resolve();
+    });
+  });
+}
+var CLEANUP_GRACE_MS;
+var init_close_with_grace = __esm({
+  "lib/utils/close-with-grace.ts"() {
+    CLEANUP_GRACE_MS = 1e4;
+  }
+});
+
 // lib/utils/time-counter.ts
 function timeCounter() {
   const startTime = /* @__PURE__ */ new Date();
@@ -2273,11 +2294,11 @@ async function runTestsInBrowser(config, cachedContent = {}, connections, target
       }
       if (!config.watch) {
         await flushConsoleHandlers(config._pendingConsoleHandlers);
-        await Promise.all([
-          connections.server && connections.server.close(),
-          connections.browser && connections.browser.close()
+        await closeWithGrace([
+          connections.server?.close(),
+          connections.browser?.close(),
+          shutdownPrelaunch()
         ]);
-        await shutdownPrelaunch();
         return process.exit(config.COUNTER.failCount > 0 ? 1 : 0);
       }
     }
@@ -2593,11 +2614,11 @@ async function failOnNonWatchMode(watchMode = false, connections = {}, groupMode
       throw new Error("Browser test run failed");
     }
     await flushConsoleHandlers(pendingHandlers);
-    await Promise.all([
-      connections.server && connections.server.close(),
-      connections.browser && connections.browser.close()
+    await closeWithGrace([
+      connections.server?.close(),
+      connections.browser?.close(),
+      shutdownPrelaunch()
     ]);
-    await shutdownPrelaunch();
     process.exit(1);
   }
 }
@@ -2612,6 +2633,7 @@ var init_tests_in_browser = __esm({
   "lib/commands/run/tests-in-browser.ts"() {
     init_color();
     init_chrome_prelaunch();
+    init_close_with_grace();
     init_time_counter();
     init_run_user_module();
     init_display_final_result();
@@ -3068,7 +3090,7 @@ async function run(config) {
     config.webServer = connections.server;
     setupKeyboardEvents(config, cachedContent, connections);
     process.once("SIGTERM", () => {
-      connections.server.close().finally(() => process.exit(EXIT_CODE_SIGTERM));
+      closeWithGrace([connections.server.close()]).finally(() => process.exit(EXIT_CODE_SIGTERM));
     });
     const isHeadedWatchMode = config.open === true && config.watch;
     if (config.open && !isHeadedWatchMode) {
@@ -3080,10 +3102,7 @@ async function run(config) {
     try {
       await runTestsInBrowser(config, cachedContent, connections);
     } catch (error) {
-      await Promise.all([
-        connections.server && connections.server.close(),
-        connections.browser && connections.browser.close()
-      ]);
+      await closeWithGrace([connections.server?.close(), connections.browser?.close()]);
       throw error;
     }
     if (isHeadedWatchMode && (cachedContent._buildError || cachedContent._noTestsWarning)) {
@@ -3224,18 +3243,9 @@ async function run(config) {
             await runTestsInBrowser(groupConfig, groupCachedContents[i], connections);
           } finally {
             await flushConsoleHandlers(groupConfig._pendingConsoleHandlers);
-            await Promise.all([
-              !sharedServer && connections.server?.close(),
-              connections.page && // Unref'd: the keepAlive interval above holds the event loop open, so this
-              // timer still fires if page.close() hangs, without preventing process exit later.
-              Promise.race([
-                connections.page.close(),
-                new Promise((resolve) => {
-                  const pageCloseTimeoutId = setTimeout(resolve, PAGE_CLOSE_GRACE_MS);
-                  pageCloseTimeoutId.unref();
-                })
-              ]).catch(() => {
-              })
+            await closeWithGrace([
+              sharedServer ? void 0 : connections.server?.close(),
+              connections.page?.close()
             ]);
           }
         })();
@@ -3273,7 +3283,7 @@ async function run(config) {
     exitTimer.unref();
     process.stdout.write("\n", async () => {
       clearTimeout(exitTimer);
-      await Promise.all([
+      await closeWithGrace([
         sharedServer?.close().catch(
           (err) => config.debug && process.stderr.write(`# [qunitx] server.close: ${err.message}
 `)
@@ -3281,9 +3291,9 @@ async function run(config) {
         browser.close().catch(
           (err) => config.debug && process.stderr.write(`# [qunitx] browser.close: ${err.message}
 `)
-        )
+        ),
+        shutdownPrelaunch()
       ]);
-      await shutdownPrelaunch();
       clearInterval(keepAlive);
       process.exit(exitCode);
     });
@@ -3419,7 +3429,7 @@ function resolveQunitxRoot(projectRoot) {
   if (!match) throw new Error(`Could not derive qunitx root from ${mainEntry}`);
   return match[1];
 }
-var WATCH_NAV_TIMEOUT_MS, PAGE_CLOSE_GRACE_MS, STDOUT_FLUSH_GRACE_MS, KEEP_ALIVE_INTERVAL_MS, EXIT_CODE_SIGTERM;
+var WATCH_NAV_TIMEOUT_MS, STDOUT_FLUSH_GRACE_MS, KEEP_ALIVE_INTERVAL_MS, EXIT_CODE_SIGTERM;
 var init_run = __esm({
   "lib/commands/run.ts"() {
     init_browser();
@@ -3439,8 +3449,8 @@ var init_run = __esm({
     init_display_final_result();
     init_read_template();
     init_html();
+    init_close_with_grace();
     WATCH_NAV_TIMEOUT_MS = 5e3;
-    PAGE_CLOSE_GRACE_MS = 1e4;
     STDOUT_FLUSH_GRACE_MS = 5e3;
     KEEP_ALIVE_INTERVAL_MS = 1e4;
     EXIT_CODE_SIGTERM = 128 + 15;
@@ -3458,7 +3468,7 @@ init_color();
 var package_default = {
   name: "qunitx-cli",
   type: "module",
-  version: "0.22.1",
+  version: "0.22.3",
   description: "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   author: "Izel Nakri",
   license: "MIT",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qunitx-cli",
   "type": "module",
-  "version": "0.22.1",
+  "version": "0.22.3",
   "description": "Browser runner for QUnitx: run your qunitx tests in google-chrome",
   "author": "Izel Nakri",
   "license": "MIT",