@hominis/fireforge 0.14.0 → 0.15.1

package/dist/src/utils/process.js

@@ -108,6 +108,15 @@ export async function execStream(command, args, options = {}) {
 }
 /**
  * Executes a command and inherits stdio (shows output directly).
+ *
+ * Graceful shutdown: when the FireForge process receives SIGINT/SIGTERM, the
+ * signal is forwarded to the child as SIGTERM and a short grace timer (default
+ * 1500ms) runs before escalating to SIGKILL. A second matching signal during
+ * the grace period triggers an immediate SIGKILL — matching the usual
+ * "hit Ctrl-C again to force-quit" UX. Without this, Firefox's AsyncShutdown
+ * / profileBeforeChange blockers (which flush in-memory state to disk) can be
+ * racing the OS child-exit path, losing the last few seconds of edits.
+ *
  * @param command - Command to execute
  * @param args - Command arguments
  * @param options - Execution options
@@ -121,14 +130,74 @@ export async function execInherit(command, args, options = {}) {
             stdio: 'inherit',
             signal: buildSignalFromTimeout(options.timeout),
         });
+        const graceMs = options.shutdownGraceMs ?? 1500;
+        const { dispose } = installGracefulShutdownForwarder(child, graceMs);
         child.on('error', (error) => {
+            dispose();
             reject(error);
         });
         child.on('close', (code, signal) => {
+            dispose();
             resolve(exitCodeFromClose(code, signal));
         });
     });
 }
+/**
+ * Wires parent-process SIGINT/SIGTERM to a child: first signal → child.kill
+ * (SIGTERM) + grace timer; second matching signal → immediate SIGKILL; grace
+ * timer expiry → SIGKILL. Returns a `dispose()` that clears the listeners and
+ * any outstanding timer. Callers must invoke `dispose()` from both the child's
+ * `close` and `error` handlers so the process does not accumulate signal
+ * listeners across repeated spawns.
+ */
+function installGracefulShutdownForwarder(child, graceMs) {
+    let graceTimer;
+    const forwarded = new Set();
+    const escalate = () => {
+        if (child.exitCode !== null || child.signalCode !== null)
+            return;
+        try {
+            child.kill('SIGKILL');
+        }
+        catch {
+            // Child is already gone — nothing to do.
+        }
+    };
+    const handleSignal = (signal) => {
+        if (forwarded.has(signal)) {
+            // Second receipt of the same signal while still running: escalate now.
+            escalate();
+            return;
+        }
+        forwarded.add(signal);
+        try {
+            child.kill('SIGTERM');
+        }
+        catch {
+            // If the child can't accept SIGTERM (already dead), nothing to do.
+            return;
+        }
+        graceTimer = setTimeout(escalate, graceMs);
+        graceTimer.unref();
+    };
+    const onSigint = () => {
+        handleSignal('SIGINT');
+    };
+    const onSigterm = () => {
+        handleSignal('SIGTERM');
+    };
+    process.on('SIGINT', onSigint);
+    process.on('SIGTERM', onSigterm);
+    const dispose = () => {
+        process.off('SIGINT', onSigint);
+        process.off('SIGTERM', onSigterm);
+        if (graceTimer) {
+            clearTimeout(graceTimer);
+            graceTimer = undefined;
+        }
+    };
+    return { dispose };
+}
 /**
  * Executes a command while inheriting stdin, streaming stdout/stderr live,
  * and capturing the emitted output for diagnostics.
@@ -149,10 +218,14 @@ export async function execInheritCapture(command, args, options = {}) {
         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);
         child.on('error', (error) => {
+            dispose();
             reject(error);
         });
         child.on('close', (code, signal) => {
+            dispose();
             resolve({
                 stdout: out.getText(),
                 stderr: err.getText(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hominis/fireforge",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "FireForge — a build tool for customizing Firefox",
   "type": "module",
   "main": "./dist/src/index.js",