@hominis/fireforge 0.36.0 → 0.37.0

package/dist/src/utils/process.js

@@ -3,6 +3,7 @@ import { spawn } from 'node:child_process';
 import { constants as osConstants } from 'node:os';
 import { StringDecoder } from 'node:string_decoder';
 import { ExecTimeoutError } from '../errors/base.js';
+import { killProcessTree, sweepProcessGroup } from './process-group.js';
 // 50 MB cap per stream to prevent OOM — large toolchain builds (e.g. Firefox, Chromium)
 // can easily blow past this, so we truncate rather than let the buffer grow unbounded.
 // Callers for whom truncation is unacceptable (e.g. the archive-safety preflight
@@ -115,12 +116,15 @@ export async function exec(command, args, options = {}) {
  */
 export async function execStream(command, args, options = {}) {
     return new Promise((resolve, reject) => {
+        const usesProcessGroup = options.processGroup === true && process.platform !== 'win32';
         const child = spawn(command, args, {
             cwd: options.cwd,
             env: { ...process.env, ...options.env },
             stdio: ['ignore', 'pipe', 'pipe'],
             signal: buildSignalFromTimeout(options.timeout),
+            detached: usesProcessGroup,
         });
+        const groupPid = usesProcessGroup ? child.pid : undefined;
         const stdoutDecoder = new StringDecoder('utf8');
         const stderrDecoder = new StringDecoder('utf8');
         child.stdout.on('data', (data) => {
@@ -133,11 +137,35 @@ export async function execStream(command, args, options = {}) {
             if (chunk.length > 0)
                 options.onStderr?.(chunk);
         });
+        // A detached group leader no longer receives the terminal's Ctrl+C, so
+        // the forwarder is mandatory (not just graceful-UX) when processGroup
+        // is set. Group-aware: kills route to the whole tree.
+        const forwarder = options.processGroup === true
+            ? installGracefulShutdownForwarder(child, 1500, (signal) => {
+                killProcessTree(child, signal, usesProcessGroup);
+            })
+            : undefined;
         child.on('error', (error) => {
+            // Abort/startup failure: make sure a partially-started tree does not
+            // outlive the dispatch (a mach dying at startup used to strand
+            // multiprocessing workers).
+            if (options.processGroup === true) {
+                killProcessTree(child, 'SIGKILL', usesProcessGroup);
+            }
+            forwarder?.dispose();
             reject(toExecRejection(error, command, args, options.timeout));
         });
         child.on('close', (code, signal) => {
-            resolve(exitCodeFromClose(code, signal));
+            forwarder?.dispose();
+            const finish = () => {
+                resolve(exitCodeFromClose(code, signal));
+            };
+            if (groupPid !== undefined) {
+                sweepProcessGroup(groupPid).then(finish, finish);
+            }
+            else {
+                finish();
+            }
         });
     });
 }
@@ -199,24 +227,42 @@ export async function waitForActiveChildShutdown(timeoutMs) {
  */
 export async function execInherit(command, args, options = {}) {
     return new Promise((resolve, reject) => {
+        const usesProcessGroup = options.processGroup === true && process.platform !== 'win32';
         const child = spawn(command, args, {
             cwd: options.cwd,
             env: { ...process.env, ...options.env },
             stdio: 'inherit',
             signal: buildSignalFromTimeout(options.timeout),
+            detached: usesProcessGroup,
         });
+        const groupPid = usesProcessGroup ? child.pid : undefined;
         const graceMs = options.shutdownGraceMs ?? 1500;
-        const { dispose } = installGracefulShutdownForwarder(child, graceMs);
+        const { dispose } = installGracefulShutdownForwarder(child, graceMs, options.processGroup === true
+            ? (signal) => {
+                killProcessTree(child, signal, usesProcessGroup);
+            }
+            : undefined);
         const closure = trackChildClosure();
         child.on('error', (error) => {
+            if (options.processGroup === true) {
+                killProcessTree(child, 'SIGKILL', usesProcessGroup);
+            }
             dispose();
             closure.settle();
             reject(toExecRejection(error, command, args, options.timeout));
         });
         child.on('close', (code, signal) => {
             dispose();
-            closure.settle();
-            resolve(exitCodeFromClose(code, signal));
+            const finish = () => {
+                closure.settle();
+                resolve(exitCodeFromClose(code, signal));
+            };
+            if (groupPid !== undefined) {
+                sweepProcessGroup(groupPid).then(finish, finish);
+            }
+            else {
+                finish();
+            }
         });
     });
 }
@@ -228,14 +274,21 @@ export async function execInherit(command, args, options = {}) {
  * `close` and `error` handlers so the process does not accumulate signal
  * listeners across repeated spawns.
  */
-function installGracefulShutdownForwarder(child, graceMs) {
+function installGracefulShutdownForwarder(child, graceMs, killTarget) {
     let graceTimer;
     const forwarded = new Set();
+    const sendKill = (signal) => {
+        if (killTarget) {
+            killTarget(signal);
+            return;
+        }
+        child.kill(signal);
+    };
     const escalate = () => {
         if (child.exitCode !== null || child.signalCode !== null)
             return;
         try {
-            child.kill('SIGKILL');
+            sendKill('SIGKILL');
         }
         catch {
             // Child is already gone — nothing to do.
@@ -249,7 +302,7 @@ function installGracefulShutdownForwarder(child, graceMs) {
         }
         forwarded.add(signal);
         try {
-            child.kill('SIGTERM');
+            sendKill('SIGTERM');
         }
         catch {
             // If the child can't accept SIGTERM (already dead), nothing to do.
@@ -286,34 +339,52 @@ function installGracefulShutdownForwarder(child, graceMs) {
  */
 export async function execInheritCapture(command, args, options = {}) {
     return new Promise((resolve, reject) => {
+        const usesProcessGroup = options.processGroup === true && process.platform !== 'win32';
         const child = spawn(command, args, {
             cwd: options.cwd,
             env: { ...process.env, ...options.env },
             stdio: ['inherit', 'pipe', 'pipe'],
             signal: buildSignalFromTimeout(options.timeout),
+            detached: usesProcessGroup,
         });
+        const groupPid = usesProcessGroup ? child.pid : undefined;
         const out = createStreamCollector(process.stdout);
         const err = createStreamCollector(process.stderr);
         child.stdout.on('data', out.onData);
         child.stderr.on('data', err.onData);
         const graceMs = options.shutdownGraceMs ?? 1500;
-        const { dispose } = installGracefulShutdownForwarder(child, graceMs);
+        const { dispose } = installGracefulShutdownForwarder(child, graceMs, options.processGroup === true
+            ? (signal) => {
+                killProcessTree(child, signal, usesProcessGroup);
+            }
+            : undefined);
         const closure = trackChildClosure();
         child.on('error', (error) => {
+            if (options.processGroup === true) {
+                killProcessTree(child, 'SIGKILL', usesProcessGroup);
+            }
             dispose();
             closure.settle();
             reject(toExecRejection(error, command, args, options.timeout));
         });
         child.on('close', (code, signal) => {
             dispose();
-            closure.settle();
-            resolve({
-                stdout: out.getText(),
-                stderr: err.getText(),
-                exitCode: exitCodeFromClose(code, signal),
-                stdoutTruncated: out.wasTruncated(),
-                stderrTruncated: err.wasTruncated(),
-            });
+            const finish = () => {
+                closure.settle();
+                resolve({
+                    stdout: out.getText(),
+                    stderr: err.getText(),
+                    exitCode: exitCodeFromClose(code, signal),
+                    stdoutTruncated: out.wasTruncated(),
+                    stderrTruncated: err.wasTruncated(),
+                });
+            };
+            if (groupPid !== undefined) {
+                sweepProcessGroup(groupPid).then(finish, finish);
+            }
+            else {
+                finish();
+            }
         });
     });
 }
@@ -371,34 +442,7 @@ export async function execSmokeRun(command, args, options) {
         let graceTimer;
         let signalGraceTimer;
         const signalChildGroup = (signal) => {
-            if (child.exitCode !== null || child.signalCode !== null)
-                return;
-            const targetPid = child.pid;
-            if (targetPid === undefined)
-                return;
-            try {
-                if (usesProcessGroup) {
-                    // Negative PID routes to the process group, killing the Python
-                    // wrapper, the firefox it forked, and every content process
-                    // that inherited the group.
-                    process.kill(-targetPid, signal);
-                }
-                else {
-                    // No process group on Windows — taskkill /T walks the descendant
-                    // tree instead. Always forced (/F): there is no SIGTERM analogue,
-                    // so the grace window only exists on POSIX.
-                    spawn('taskkill', ['/pid', String(targetPid), '/T', '/F'], {
-                        stdio: 'ignore',
-                    }).on('error', () => {
-                        // taskkill unavailable — nothing more we can do beyond the
-                        // direct-child kill below.
-                    });
-                    child.kill(signal);
-                }
-            }
-            catch {
-                // Already gone. Nothing to do.
-            }
+            killProcessTree(child, signal, usesProcessGroup);
         };
         const deadlineTimer = setTimeout(() => {
             timedOut = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hominis/fireforge",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "description": "FireForge — a build tool for customizing Firefox",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -73,7 +73,7 @@
     "eslint-plugin-simple-import-sort": "^13.0.0",
     "fast-check": "^4.6.0",
     "husky": "^9.1.7",
-    "knip": "6.23.0",
+    "knip": "6.25.0",
     "lint-staged": "^17.0.4",
     "prettier": "3.9.4",
     "tsx": "^4.7.0",