@pnpm/exec.lifecycle 1100.1.1 → 1100.1.3

package/lib/index.d.ts

@@ -1,10 +1,11 @@
 import { runLifecycleHook, type RunLifecycleHookOptions } from './runLifecycleHook.js';
 import { runLifecycleHooksConcurrently, type RunLifecycleHooksConcurrentlyOptions } from './runLifecycleHooksConcurrently.js';
+import { killTrackedProcessTrees, type TrackableChildProcess, trackChildProcess } from './trackChildProcess.js';
 export declare function makeNodeRequireOption(modulePath: string, env?: Record<string, string | undefined>): {
     NODE_OPTIONS: string;
 };
 export declare function makeNodePackageMapOption(packageMapPath: string, env?: Record<string, string | undefined>): {
     NODE_OPTIONS: string;
 };
-export { runLifecycleHook, type RunLifecycleHookOptions, runLifecycleHooksConcurrently, type RunLifecycleHooksConcurrentlyOptions, };
+export { killTrackedProcessTrees, runLifecycleHook, type RunLifecycleHookOptions, runLifecycleHooksConcurrently, type RunLifecycleHooksConcurrentlyOptions, type TrackableChildProcess, trackChildProcess, };
 export declare function runPostinstallHooks(opts: RunLifecycleHookOptions): Promise<boolean>;

package/lib/index.js

@@ -1,6 +1,7 @@
 import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
 import { runLifecycleHook } from './runLifecycleHook.js';
 import { runLifecycleHooksConcurrently } from './runLifecycleHooksConcurrently.js';
+import { killTrackedProcessTrees, trackChildProcess } from './trackChildProcess.js';
 export function makeNodeRequireOption(modulePath, env) {
     let { NODE_OPTIONS } = env ?? process.env;
     NODE_OPTIONS = `${NODE_OPTIONS ?? process.env.NODE_OPTIONS ?? ''} --require=${quotePathIfNeeded(modulePath)}`.trim();
@@ -30,7 +31,7 @@ function removeNodePackageMapOption(nodeOptions) {
         .replace(/(?:^|\s)--experimental-package-map\s+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\S+)/g, '')
         .trim();
 }
-export { runLifecycleHook, runLifecycleHooksConcurrently, };
+export { killTrackedProcessTrees, runLifecycleHook, runLifecycleHooksConcurrently, trackChildProcess, };
 export async function runPostinstallHooks(opts) {
     const pkg = await safeReadPackageJsonFromDir(opts.pkgRoot);
     if (pkg == null)

package/lib/trackChildProcess.d.ts

@@ -0,0 +1,23 @@
+export interface TrackableChildProcess {
+    pid?: number;
+    once: (event: 'close' | 'error', listener: () => void) => unknown;
+}
+/**
+ * Registers a child process spawned for a user command so that
+ * killTrackedProcessTrees() can terminate its process tree if pnpm exits
+ * while the command is still running.
+ */
+export declare function trackChildProcess(child: TrackableChildProcess): void;
+/**
+ * Kills the process trees of the still-running child processes registered
+ * with trackChildProcess(). Best-effort: children that exited concurrently
+ * are skipped silently.
+ *
+ * On Windows the tree is killed with `taskkill /T`, which terminates every
+ * descendant of a known PID without enumerating the system process list (an
+ * enumeration needs `wmic` or PowerShell there and can take tens of seconds).
+ * On POSIX only the tracked child itself is signalled; descendants are
+ * expected to be handled by the caller (the error handler enumerates them
+ * cheaply with one `ps` call).
+ */
+export declare function killTrackedProcessTrees(): Promise<void>;

package/lib/trackChildProcess.js

@@ -0,0 +1,72 @@
+import { spawn } from 'node:child_process';
+import path from 'node:path';
+const trackedChildPids = new Set();
+/**
+ * Registers a child process spawned for a user command so that
+ * killTrackedProcessTrees() can terminate its process tree if pnpm exits
+ * while the command is still running.
+ */
+export function trackChildProcess(child) {
+    const pid = child.pid;
+    if (pid == null)
+        return;
+    trackedChildPids.add(pid);
+    const untrack = () => {
+        trackedChildPids.delete(pid);
+    };
+    child.once('close', untrack);
+    child.once('error', untrack);
+}
+/**
+ * Kills the process trees of the still-running child processes registered
+ * with trackChildProcess(). Best-effort: children that exited concurrently
+ * are skipped silently.
+ *
+ * On Windows the tree is killed with `taskkill /T`, which terminates every
+ * descendant of a known PID without enumerating the system process list (an
+ * enumeration needs `wmic` or PowerShell there and can take tens of seconds).
+ * On POSIX only the tracked child itself is signalled; descendants are
+ * expected to be handled by the caller (the error handler enumerates them
+ * cheaply with one `ps` call).
+ */
+export async function killTrackedProcessTrees() {
+    await Promise.all(Array.from(trackedChildPids, killProcessTree));
+}
+async function killProcessTree(pid) {
+    if (process.platform === 'win32') {
+        // Resolve taskkill to its absolute System32 location so a taskkill.exe
+        // planted in the current directory or on PATH can't be run in its place
+        // during error cleanup. `process.env` is case-insensitive on Windows, so
+        // `SystemRoot` also matches the SYSTEMROOT/systemroot spellings.
+        const taskkillPath = path.join(process.env.SystemRoot ?? process.env.windir ?? 'C:\\Windows', 'System32', 'taskkill.exe');
+        await new Promise((resolve) => {
+            const taskkill = spawn(taskkillPath, ['/pid', pid.toString(), '/T', '/F'], { stdio: 'ignore', windowsHide: true });
+            // pnpm is on its error-exit path and must not hang, so the wait is
+            // bounded by a timer that resolves even if taskkill never emits 'exit'
+            // or 'error' (and reaps a stuck taskkill). The kill is best-effort
+            // either way. The timer is unref'd so it can't keep the process alive.
+            const timer = setTimeout(() => {
+                taskkill.kill();
+                resolve();
+            }, 10_000);
+            timer.unref();
+            const done = () => {
+                clearTimeout(timer);
+                resolve();
+            };
+            // A non-zero exit code (128 when the process is already gone, 1 when
+            // access is denied) is deliberately ignored.
+            taskkill.once('error', done);
+            taskkill.once('exit', done);
+        });
+    }
+    else {
+        try {
+            process.kill(pid);
+        }
+        catch {
+            // the process exited before it could be signalled
+        }
+    }
+}
+//# sourceMappingURL=trackChildProcess.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exec.lifecycle",
-  "version": "1100.1.1",
+  "version": "1100.1.3",
   "description": "Package lifecycle hook runner",
   "keywords": [
     "pnpm",
@@ -29,34 +29,34 @@
     "!*.map"
   ],
   "dependencies": {
+    "@pnpm/bins.linker": "1100.0.17",
+    "@pnpm/core-loggers": "1100.2.2",
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/fetching.directory-fetcher": "1100.0.20",
     "@pnpm/npm-lifecycle": "^1100.0.0",
+    "@pnpm/pkg-manifest.reader": "1100.0.10",
+    "@pnpm/store.cafs-types": "1100.0.1",
+    "@pnpm/store.controller-types": "1100.1.8",
+    "@pnpm/types": "1101.4.0",
     "chalk": "^5.6.2",
     "is-windows": "^1.0.2",
     "path-exists": "^5.0.0",
     "run-groups": "^5.0.0",
-    "shlex": "^3.0.0",
-    "@pnpm/bins.linker": "1100.0.16",
-    "@pnpm/error": "1100.0.1",
-    "@pnpm/core-loggers": "1100.2.1",
-    "@pnpm/store.cafs-types": "1100.0.1",
-    "@pnpm/pkg-manifest.reader": "1100.0.9",
-    "@pnpm/store.controller-types": "1100.1.6",
-    "@pnpm/fetching.directory-fetcher": "1100.0.18",
-    "@pnpm/types": "1101.3.2"
+    "shlex": "^3.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@types/is-windows": "^1.0.2",
-    "@zkochan/rimraf": "^4.0.0",
-    "load-json-file": "^7.0.1",
+    "@pnpm/exec.lifecycle": "1100.1.3",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/exec.lifecycle": "1100.1.1",
-    "@pnpm/test-ipc-server": "1100.0.0",
+    "@pnpm/prepare": "1100.0.19",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/prepare": "1100.0.17"
+    "@pnpm/test-ipc-server": "1100.0.0",
+    "@types/is-windows": "^1.0.2",
+    "@zkochan/rimraf": "^4.0.0",
+    "load-json-file": "^7.0.1"
   },
   "engines": {
     "node": ">=22.13"