@ai-ecoverse/slicc-shared-web 1.10.2 → 1.10.3

package/README.md

@@ -99,8 +99,8 @@ Why it works the way it does:
 ## Cleanup
 
 `close()` stops Chrome and removes its profile. It asks Chrome to close, waits up to 10 s for the exit, sends `SIGKILL`, waits up to 5 s more and then moves on with a warning, so a browser that ignores `Browser.close` or a missed exit never hangs teardown. A test process that ends without `close()` still leaves nothing running:
-- on `exit` and on `SIGINT`, `SIGTERM` or `SIGHUP`, the harness kills every browser it started in that process with `SIGKILL` and removes its profile and crash dump directory, then re-raises the signal so the process ends the way it would have;
-- when the test process dies of `SIGKILL`, no handler runs. A watchdog, a `sh` that reads a pipe from the test process, then gets end of file and kills Chrome with `SIGKILL` at once. Chrome also shuts itself down when the CDP pipe closes, but that can take seconds. Only the profile stays behind;
+- on `exit` and on `SIGINT`, `SIGTERM` or `SIGHUP`, the harness kills every browser it started in that process, with all its helper processes (Chrome runs in its own process group), with `SIGKILL` and removes its profile and crash dump directory, then re-raises the signal so the process ends the way it would have;
+- when the test process dies of `SIGKILL`, no handler runs. A watchdog, a `sh` in its own process group that reads a pipe from the test process, then gets end of file and kills Chrome's process group with `SIGKILL` at once. Chrome also shuts itself down when the CDP pipe closes, but that can take seconds. Only the profile stays behind;
 - the first `launch()` in a process removes every `slicc-harness-*` directory in `$TMPDIR` that is older than a day, or older than a minute and no running process uses as its `--user-data-dir`. It never kills a process.
 
 ## Crash dumps

package/harness/chrome.mjs

@@ -74,6 +74,7 @@ export async function start(
 ) {
   const child = spawn(executable, args, {
     env,
+    detached: true,
     stdio: ['ignore', 'ignore', 'pipe', 'pipe', 'pipe'],
   });
   const stderr = lines(child.stderr);
@@ -111,7 +112,7 @@ export async function stop(cdp, child, waits = WAITS) {
   await bounded(cdp.send('Browser.close').catch(ignore), 'Browser.close', waits.close);
   cdp.close();
   if (gone() || (await bounded(exited, 'exit', waits.exit)) !== TIMED_OUT || gone()) return;
-  child.kill('SIGKILL');
+  kill(child);
   if (gone() || (await bounded(exited, 'exit after SIGKILL', waits.kill)) !== TIMED_OUT) return;
   if (!gone()) console.warn(`chrome: pid ${child.pid} still runs after SIGKILL, moving on`);
 }
@@ -123,15 +124,27 @@ export const GRACE = 60 * 1000;
 const signals = ['SIGINT', 'SIGTERM', 'SIGHUP'];
 const running = new Set();
 
-function kill(child) {
+export function kill(child) {
+  if (child.pid > 0 && child.spawnargs?.length) {
+    try {
+      process.kill(-child.pid, 'SIGKILL');
+    } catch {}
+  }
   if (child.exitCode === null && child.signalCode === null) child.kill('SIGKILL');
 }
 
-function reap() {
-  for (const { children, paths } of running) {
-    for (const child of children) kill(child);
+function remove(entries) {
+  for (const { paths } of entries) {
     for (const path of paths) rmSync(path, { recursive: true, force: true });
   }
+}
+
+function reap() {
+  const entries = [...running];
+  for (const { children } of entries) children.forEach(kill);
+  remove(entries);
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 200);
+  remove(entries);
   running.clear();
   unhook();
 }
@@ -152,7 +165,8 @@ function unhook() {
 }
 
 export function watchdog(pid) {
-  const dog = spawn('sh', ['-c', 'read -r _; kill -9 "$0" 2>/dev/null', String(pid)], {
+  const dog = spawn('sh', ['-c', 'read -r _; kill -9 -"$0" "$0" 2>/dev/null', String(pid)], {
+    detached: true,
     stdio: ['pipe', 'ignore', 'ignore'],
   });
   dog.on('error', ignore);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/slicc-shared-web",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "Shared Renovate, Biome, TypeScript, lefthook and GitHub Actions configuration, plus the CDP integration-test harness, for SLICC's web repos",
   "type": "module",
   "license": "Apache-2.0",