@botiverse/oar 0.79.0 → 0.80.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -3
- package/dist/contracts/install.d.ts +16 -10
- package/dist/contracts/install.d.ts.map +1 -1
- package/dist/contracts/records.d.ts +2 -2
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/contracts/session-unavailable-error.d.ts +6 -4
- package/dist/contracts/session-unavailable-error.d.ts.map +1 -1
- package/dist/contracts/session-unavailable-error.js +4 -2
- package/dist/contracts/session-unavailable-error.js.map +1 -1
- package/dist/runtimes/claude/context-breakdown.js +2 -2
- package/dist/runtimes/claude/context-breakdown.js.map +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +11 -10
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +3 -1
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +2 -2
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/qoder/daemon.js +1 -1
- package/dist/runtimes/qoder/daemon.js.map +1 -1
- package/dist/runtimes/qoder/session.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.js +2 -1
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/dist/runtimes/qwen/session.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.js +3 -1
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/acp/client-app.d.ts +17 -4
- package/dist/shared/acp/client-app.d.ts.map +1 -1
- package/dist/shared/acp/client-app.js +35 -12
- package/dist/shared/acp/client-app.js.map +1 -1
- package/dist/shared/acp/initialize.d.ts +6 -0
- package/dist/shared/acp/initialize.d.ts.map +1 -0
- package/dist/shared/acp/initialize.js +30 -0
- package/dist/shared/acp/initialize.js.map +1 -0
- package/dist/shared/acp/input.d.ts +8 -0
- package/dist/shared/acp/input.d.ts.map +1 -0
- package/dist/shared/acp/input.js +76 -0
- package/dist/shared/acp/input.js.map +1 -0
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +19 -2
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/profile.d.ts +2 -0
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js +8 -24
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/protocol-error.d.ts +5 -0
- package/dist/shared/acp/protocol-error.d.ts.map +1 -0
- package/dist/shared/acp/protocol-error.js +6 -0
- package/dist/shared/acp/protocol-error.js.map +1 -0
- package/dist/shared/acp/records.d.ts +10 -8
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +24 -11
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/routing.d.ts +59 -0
- package/dist/shared/acp/routing.d.ts.map +1 -0
- package/dist/shared/acp/routing.js +374 -0
- package/dist/shared/acp/routing.js.map +1 -0
- package/dist/shared/acp/session.d.ts +28 -2
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +163 -106
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts +27 -0
- package/dist/shared/acp/shared-session.d.ts.map +1 -0
- package/dist/shared/acp/shared-session.js +171 -0
- package/dist/shared/acp/shared-session.js.map +1 -0
- package/dist/shared/acp/shared-wire.d.ts +9 -0
- package/dist/shared/acp/shared-wire.d.ts.map +1 -0
- package/dist/shared/acp/shared-wire.js +113 -0
- package/dist/shared/acp/shared-wire.js.map +1 -0
- package/dist/shared/acp/turns.d.ts +4 -3
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +11 -4
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/credential-redactor.d.ts +2 -0
- package/dist/shared/credential-redactor.d.ts.map +1 -1
- package/dist/shared/credential-redactor.js +1 -0
- package/dist/shared/credential-redactor.js.map +1 -1
- package/dist/shared/executable/diagnostics.d.ts +17 -0
- package/dist/shared/executable/diagnostics.d.ts.map +1 -1
- package/dist/shared/executable/diagnostics.js +11 -0
- package/dist/shared/executable/diagnostics.js.map +1 -1
- package/dist/shared/executable/ownership.d.ts +4 -0
- package/dist/shared/executable/ownership.d.ts.map +1 -1
- package/dist/shared/executable/ownership.js +44 -5
- package/dist/shared/executable/ownership.js.map +1 -1
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts +21 -0
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts.map +1 -0
- package/dist/shared/executable/process-cleanup-diagnostics.js +22 -0
- package/dist/shared/executable/process-cleanup-diagnostics.js.map +1 -0
- package/dist/shared/executable/process-cleanup.d.ts +13 -0
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -0
- package/dist/shared/executable/process-cleanup.js +103 -0
- package/dist/shared/executable/process-cleanup.js.map +1 -0
- package/dist/shared/executable/process-shutdown.d.ts +17 -0
- package/dist/shared/executable/process-shutdown.d.ts.map +1 -0
- package/dist/shared/executable/process-shutdown.js +115 -0
- package/dist/shared/executable/process-shutdown.js.map +1 -0
- package/dist/shared/executable/process-signals.d.ts +43 -0
- package/dist/shared/executable/process-signals.d.ts.map +1 -0
- package/dist/shared/executable/process-signals.js +74 -0
- package/dist/shared/executable/process-signals.js.map +1 -0
- package/dist/shared/executable/process-table-async.d.ts +10 -0
- package/dist/shared/executable/process-table-async.d.ts.map +1 -0
- package/dist/shared/executable/process-table-async.js +104 -0
- package/dist/shared/executable/process-table-async.js.map +1 -0
- package/dist/shared/executable/process-table-command.d.ts +4 -0
- package/dist/shared/executable/process-table-command.d.ts.map +1 -0
- package/dist/shared/executable/process-table-command.js +69 -0
- package/dist/shared/executable/process-table-command.js.map +1 -0
- package/dist/shared/executable/process-tree.d.ts +37 -2
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +123 -21
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +7 -45
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +27 -143
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +16 -2
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/install-npm.d.ts.map +1 -1
- package/dist/shared/install-npm.js +31 -4
- package/dist/shared/install-npm.js.map +1 -1
- package/dist/shared/install.d.ts +1 -1
- package/dist/shared/install.js +1 -1
- package/dist/shared/process-pool.d.ts +5 -1
- package/dist/shared/process-pool.d.ts.map +1 -1
- package/dist/shared/process-pool.js +11 -8
- package/dist/shared/process-pool.js.map +1 -1
- package/dist/shared/process-session.d.ts.map +1 -1
- package/dist/shared/process-session.js +2 -1
- package/dist/shared/process-session.js.map +1 -1
- package/dist/shared/session-credentials.d.ts +2 -2
- package/dist/shared/session-credentials.d.ts.map +1 -1
- package/dist/shared/session-credentials.js +21 -18
- package/dist/shared/session-credentials.js.map +1 -1
- package/dist/shared/session-kernel.d.ts +2 -0
- package/dist/shared/session-kernel.d.ts.map +1 -1
- package/dist/shared/session-kernel.js +1 -1
- package/dist/shared/session-kernel.js.map +1 -1
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +10 -3
- package/dist/shared/stream-json/session.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,11 +7,46 @@ export interface ProcessEntry {
|
|
|
7
7
|
}
|
|
8
8
|
/** The process table at one moment, by pid. */
|
|
9
9
|
export type ProcessTable = ReadonlyMap<number, ProcessEntry>;
|
|
10
|
+
export interface ProcessTableRead {
|
|
11
|
+
readonly table: ProcessTable;
|
|
12
|
+
/** Entries omitted because access or a start identity was unavailable. */
|
|
13
|
+
readonly skipped: number;
|
|
14
|
+
}
|
|
15
|
+
export type ProcessTableSource = "procfs" | "ps" | "windows";
|
|
16
|
+
export type ProcessTableFailureReason = "timeout" | "command_failed" | "spawn_failed" | "read_failed" | "invalid_output" | "missing_host" | "missing_root";
|
|
17
|
+
/** No command output, process names, arguments or environment values are retained. */
|
|
18
|
+
export interface ProcessTableFailure {
|
|
19
|
+
readonly ok: false;
|
|
20
|
+
readonly source: ProcessTableSource;
|
|
21
|
+
readonly elapsedMs: number;
|
|
22
|
+
readonly reason: ProcessTableFailureReason;
|
|
23
|
+
readonly code?: string;
|
|
24
|
+
readonly exitCode?: number;
|
|
25
|
+
readonly signal?: string;
|
|
26
|
+
readonly timeoutMs?: number;
|
|
27
|
+
}
|
|
28
|
+
export type ProcessTableObservation = ProcessTableFailure | (ProcessTableRead & {
|
|
29
|
+
readonly ok: true;
|
|
30
|
+
readonly source: ProcessTableSource;
|
|
31
|
+
readonly elapsedMs: number;
|
|
32
|
+
});
|
|
33
|
+
export declare class InvalidProcessTableError extends Error {
|
|
34
|
+
readonly reason: "invalid_output" | "missing_host";
|
|
35
|
+
constructor(reason?: "invalid_output" | "missing_host");
|
|
36
|
+
}
|
|
37
|
+
export declare function parseProcessStat(pid: number, stat: string): ProcessEntry;
|
|
38
|
+
export declare function parseProcessPs(output: string): ProcessTableRead;
|
|
39
|
+
export declare function parseProcessWindows(output: string): ProcessTableRead;
|
|
10
40
|
/**
|
|
11
41
|
* The process table now (synchronous: the host's `exit` hook reads it too).
|
|
12
|
-
*
|
|
42
|
+
* A failed observation is distinct from a valid table with no descendants.
|
|
43
|
+
* The host must appear in a usable table, including its group on POSIX.
|
|
13
44
|
*/
|
|
14
|
-
export declare function
|
|
45
|
+
export declare function observeProcessTable(source?: ProcessTableSource): ProcessTableObservation;
|
|
46
|
+
/** Only bounded metadata leaves a failed process-table observation. */
|
|
47
|
+
export declare function processTableFailure(error: unknown, source: ProcessTableSource, elapsedMs: number): ProcessTableFailure;
|
|
48
|
+
/** Convenience for probes that require a usable observation. Never returns an empty fallback. */
|
|
49
|
+
export declare function readProcessTable(source?: ProcessTableSource): ProcessTable;
|
|
15
50
|
/** Every process below `pid` in `table`: its children, theirs, and so on. */
|
|
16
51
|
export declare function descendantsOf(table: ProcessTable, pid: number): ProcessEntry[];
|
|
17
52
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-tree.d.ts","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"AAeA,0FAA0F;AAC1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,+CAA+C;AAC/C,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"process-tree.d.ts","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"AAeA,0FAA0F;AAC1F,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,+CAA+C;AAC/C,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAE7D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,0EAA0E;IAC1E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC;AAC7D,MAAM,MAAM,yBAAyB,GAAG,SAAS,GAAG,gBAAgB,GAAG,cAAc,GAAG,aAAa,GAAG,gBAAgB,GAAG,cAAc,GAAG,cAAc,CAAC;AAC3J,sFAAsF;AACtF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AACD,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,GAAG,CAAC,gBAAgB,GAAG;IAC9E,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC,CAAC;AAEH,qBAAa,wBAAyB,SAAQ,KAAK;IACrC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,GAAG,cAAc;IAA9D,YAAqB,MAAM,GAAE,gBAAgB,GAAG,cAAiC,EAA4D;CAC9I;AAgBD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAOxE;AAiCD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAW/D;AAWD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAgBpE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,GAAE,kBAAgH,GAAG,uBAAuB,CASrL;AAED,uEAAuE;AACvE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,mBAAmB,CAkBtH;AAED,iGAAiG;AACjG,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,YAAY,CAI1E;AAED,6EAA6E;AAC7E,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,YAAY,EAAE,CAuB9E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CA6BtF"}
|
|
@@ -1,31 +1,64 @@
|
|
|
1
1
|
import { execFileSync } from "node:child_process";
|
|
2
2
|
import { readdirSync, readFileSync } from "node:fs";
|
|
3
3
|
import { asRecord } from "../json.js";
|
|
4
|
+
export class InvalidProcessTableError extends Error {
|
|
5
|
+
reason;
|
|
6
|
+
constructor(reason = "invalid_output") {
|
|
7
|
+
super(reason);
|
|
8
|
+
this.reason = reason;
|
|
9
|
+
this.name = "InvalidProcessTableError";
|
|
10
|
+
}
|
|
11
|
+
}
|
|
4
12
|
/** `/proc/<pid>/stat`'s ppid, pgrp and starttime (clock ticks since boot); null once the process is gone. */
|
|
5
13
|
function readStat(pid) {
|
|
6
14
|
let stat = "";
|
|
7
15
|
try {
|
|
8
16
|
stat = readFileSync(`/proc/${String(pid)}/stat`, "utf8");
|
|
9
17
|
}
|
|
10
|
-
catch {
|
|
11
|
-
|
|
18
|
+
catch (error) {
|
|
19
|
+
// Processes can disappear during enumeration. The caller separately
|
|
20
|
+
// counts permission-denied entries; other read errors fail the table.
|
|
21
|
+
if (error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ESRCH")) {
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
24
|
+
throw error;
|
|
12
25
|
}
|
|
26
|
+
return parseProcessStat(pid, stat);
|
|
27
|
+
}
|
|
28
|
+
export function parseProcessStat(pid, stat) {
|
|
13
29
|
// Field 2, the command name, is parenthesized and may itself hold spaces
|
|
14
30
|
// and parentheses; the fields after its last ")" start at field 3 (state).
|
|
15
31
|
const fields = stat.slice(stat.lastIndexOf(")") + 2).split(" ");
|
|
16
32
|
const [ppid, pgid, start] = [Number(fields[1]), Number(fields[2]), fields[19]];
|
|
17
|
-
|
|
33
|
+
if (!Number.isInteger(ppid) || !Number.isInteger(pgid) || start === undefined || !/^\d+$/u.test(start)) {
|
|
34
|
+
throw new InvalidProcessTableError();
|
|
35
|
+
}
|
|
36
|
+
return { pid, ppid, pgid, start };
|
|
18
37
|
}
|
|
19
38
|
/** Linux: every process's stat. */
|
|
20
39
|
function readProcfs() {
|
|
21
40
|
const table = new Map();
|
|
41
|
+
let skipped = 0;
|
|
22
42
|
for (const name of readdirSync("/proc")) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
43
|
+
try {
|
|
44
|
+
const entry = /^\d+$/u.test(name) ? readStat(Number(name)) : null;
|
|
45
|
+
if (entry !== null) {
|
|
46
|
+
table.set(entry.pid, entry);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
// hidepid can deny other users' stat files without hiding our tree.
|
|
51
|
+
// Never signal these entries, but keep the count visible to cleanup.
|
|
52
|
+
const code = asRecord(error)?.code;
|
|
53
|
+
if (code === "EACCES" || code === "EPERM") {
|
|
54
|
+
skipped += 1;
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
throw error;
|
|
58
|
+
}
|
|
26
59
|
}
|
|
27
60
|
}
|
|
28
|
-
return table;
|
|
61
|
+
return { table, skipped };
|
|
29
62
|
}
|
|
30
63
|
/** Other POSIX systems (macOS): one `ps` run; `lstart` is the start time to the second. */
|
|
31
64
|
function readPs() {
|
|
@@ -36,50 +69,116 @@ function readPs() {
|
|
|
36
69
|
timeout: 5000,
|
|
37
70
|
maxBuffer: 16 * 1024 * 1024,
|
|
38
71
|
});
|
|
72
|
+
return parseProcessPs(output);
|
|
73
|
+
}
|
|
74
|
+
export function parseProcessPs(output) {
|
|
39
75
|
const table = new Map();
|
|
40
76
|
for (const line of output.split("\n")) {
|
|
77
|
+
if (line.trim() === "") {
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
41
80
|
const match = /^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\S.*?)\s*$/u.exec(line);
|
|
42
81
|
if (match !== null) {
|
|
43
82
|
const pid = Number(match[1]);
|
|
44
83
|
table.set(pid, { pid, ppid: Number(match[2]), pgid: Number(match[3]), start: match[4] ?? "" });
|
|
45
84
|
}
|
|
85
|
+
else {
|
|
86
|
+
throw new InvalidProcessTableError();
|
|
87
|
+
}
|
|
46
88
|
}
|
|
47
|
-
return table;
|
|
89
|
+
return { table, skipped: 0 };
|
|
48
90
|
}
|
|
49
91
|
/** Windows has no process groups; creation time distinguishes reused PIDs. */
|
|
50
92
|
function readWindows() {
|
|
51
93
|
const output = execFileSync("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command",
|
|
52
|
-
"Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,@{Name='Started';Expression={$_.CreationDate.ToUniversalTime().ToString('o')}} | ConvertTo-Json -Compress"], {
|
|
94
|
+
"$ErrorActionPreference='Stop'; Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,@{Name='Started';Expression={if ($null -ne $_.CreationDate) { $_.CreationDate.ToUniversalTime().ToString('o') }}} | ConvertTo-Json -Compress"], {
|
|
53
95
|
encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5000, maxBuffer: 16 * 1024 * 1024,
|
|
54
96
|
});
|
|
97
|
+
return parseProcessWindows(output);
|
|
98
|
+
}
|
|
99
|
+
export function parseProcessWindows(output) {
|
|
55
100
|
const values = JSON.parse(output);
|
|
56
101
|
const table = new Map();
|
|
102
|
+
let skipped = 0;
|
|
57
103
|
for (const value of Array.isArray(values) ? values : [values]) {
|
|
58
|
-
if (typeof value !== "object" || value === null) {
|
|
59
|
-
continue;
|
|
60
|
-
}
|
|
61
104
|
const entry = asRecord(value);
|
|
62
|
-
if (entry === null)
|
|
105
|
+
if (entry === null || typeof entry.ProcessId !== "number" || !Number.isInteger(entry.ProcessId) || entry.ProcessId < 0
|
|
106
|
+
|| typeof entry.ParentProcessId !== "number" || !Number.isInteger(entry.ParentProcessId) || entry.ParentProcessId < 0) {
|
|
107
|
+
throw new InvalidProcessTableError();
|
|
108
|
+
}
|
|
109
|
+
// Non-admin hosts may not see protected processes' creation times.
|
|
110
|
+
// Omit identities we cannot revalidate, without rejecting readable peers.
|
|
111
|
+
if (entry.Started === undefined || entry.Started === null || entry.Started === "") {
|
|
112
|
+
skipped += 1;
|
|
63
113
|
continue;
|
|
64
114
|
}
|
|
65
|
-
if (typeof entry.
|
|
66
|
-
|
|
115
|
+
if (typeof entry.Started !== "string") {
|
|
116
|
+
throw new InvalidProcessTableError();
|
|
117
|
+
}
|
|
118
|
+
if (entry.ProcessId === 0 || entry.ProcessId === 4) {
|
|
119
|
+
skipped += 1;
|
|
120
|
+
continue;
|
|
67
121
|
}
|
|
122
|
+
table.set(entry.ProcessId, { pid: entry.ProcessId, ppid: entry.ParentProcessId, pgid: 0, start: entry.Started });
|
|
68
123
|
}
|
|
69
|
-
return table;
|
|
124
|
+
return { table, skipped };
|
|
70
125
|
}
|
|
71
126
|
/**
|
|
72
127
|
* The process table now (synchronous: the host's `exit` hook reads it too).
|
|
73
|
-
*
|
|
128
|
+
* A failed observation is distinct from a valid table with no descendants.
|
|
129
|
+
* The host must appear in a usable table, including its group on POSIX.
|
|
74
130
|
*/
|
|
75
|
-
export function
|
|
131
|
+
export function observeProcessTable(source = process.platform === "linux" ? "procfs" : (process.platform === "win32" ? "windows" : "ps")) {
|
|
132
|
+
const started = performance.now();
|
|
76
133
|
try {
|
|
77
|
-
|
|
134
|
+
const result = source === "procfs" ? readProcfs() : (source === "windows" ? readWindows() : readPs());
|
|
135
|
+
if (!result.table.has(process.pid)) {
|
|
136
|
+
throw new InvalidProcessTableError("missing_host");
|
|
137
|
+
}
|
|
138
|
+
return { ok: true, source, elapsedMs: performance.now() - started, ...result };
|
|
78
139
|
}
|
|
79
|
-
catch {
|
|
80
|
-
return
|
|
140
|
+
catch (error) {
|
|
141
|
+
return processTableFailure(error, source, performance.now() - started);
|
|
81
142
|
}
|
|
82
143
|
}
|
|
144
|
+
/** Only bounded metadata leaves a failed process-table observation. */
|
|
145
|
+
export function processTableFailure(error, source, elapsedMs) {
|
|
146
|
+
const native = asRecord(error);
|
|
147
|
+
// Node's execFileSync error can embed stdout and the whole command.
|
|
148
|
+
// Preserve its identifying fields, never its message or output.
|
|
149
|
+
const code = typeof native?.code === "string" && /^[A-Z][A-Z0-9_]{0,63}$/u.test(native.code) ? native.code : undefined;
|
|
150
|
+
const exitCode = typeof native?.status === "number" ? native.status : (typeof native?.code === "number" ? native.code : undefined);
|
|
151
|
+
const signal = typeof native?.signal === "string" && /^SIG[A-Z0-9]{1,16}$/u.test(native.signal) ? native.signal : undefined;
|
|
152
|
+
let reason = "read_failed";
|
|
153
|
+
if (code === "ETIMEDOUT") {
|
|
154
|
+
reason = "timeout";
|
|
155
|
+
}
|
|
156
|
+
else if (error instanceof InvalidProcessTableError) {
|
|
157
|
+
reason = error.reason;
|
|
158
|
+
}
|
|
159
|
+
else if (error instanceof SyntaxError) {
|
|
160
|
+
reason = "invalid_output";
|
|
161
|
+
}
|
|
162
|
+
else if (exitCode !== undefined) {
|
|
163
|
+
reason = "command_failed";
|
|
164
|
+
}
|
|
165
|
+
else if (code === "ENOENT" || code === "EACCES" && source !== "procfs") {
|
|
166
|
+
reason = "spawn_failed";
|
|
167
|
+
}
|
|
168
|
+
return {
|
|
169
|
+
ok: false, source, elapsedMs, reason,
|
|
170
|
+
...(code === undefined ? {} : { code }), ...(exitCode === undefined ? {} : { exitCode }),
|
|
171
|
+
...(signal === undefined ? {} : { signal }), ...(reason === "timeout" ? { timeoutMs: 5000 } : {}),
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
/** Convenience for probes that require a usable observation. Never returns an empty fallback. */
|
|
175
|
+
export function readProcessTable(source) {
|
|
176
|
+
const result = observeProcessTable(source);
|
|
177
|
+
if (result.ok) {
|
|
178
|
+
return result.table;
|
|
179
|
+
}
|
|
180
|
+
throw new Error(`Process table ${result.source}: ${result.reason}${result.code === undefined ? "" : ` (${result.code})`} after ${result.elapsedMs.toFixed(0)} ms`, { cause: result });
|
|
181
|
+
}
|
|
83
182
|
/** Every process below `pid` in `table`: its children, theirs, and so on. */
|
|
84
183
|
export function descendantsOf(table, pid) {
|
|
85
184
|
const children = new Map();
|
|
@@ -114,6 +213,9 @@ export function descendantsOf(table, pid) {
|
|
|
114
213
|
*/
|
|
115
214
|
export function killEntries(entries, table) {
|
|
116
215
|
const hostGroup = table.get(process.pid)?.pgid;
|
|
216
|
+
if (hostGroup === undefined) {
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
117
219
|
const groups = new Set();
|
|
118
220
|
const pids = new Set();
|
|
119
221
|
for (const entry of entries) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-tree.js","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"process-tree.js","sources":["../../../src/shared/executable/process-tree.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { type ChildProcess } from "node:child_process";
|
|
2
1
|
import { Duplex, type Readable, type Writable } from "node:stream";
|
|
3
2
|
import { type ProcessDiagnostics } from "./diagnostics.js";
|
|
4
3
|
import { treeResourcesReader } from "./process-resources.js";
|
|
5
4
|
export { trackOwnedProcess } from "./ownership.js";
|
|
5
|
+
export { killGraceMs, KILL_GRACE_MS, killProcessTree, signalProcessGroup, OWN_PROCESS_GROUP } from "./process-signals.js";
|
|
6
6
|
export interface LineProcessOptions {
|
|
7
7
|
readonly cwd?: string;
|
|
8
8
|
readonly env?: NodeJS.ProcessEnv;
|
|
@@ -14,7 +14,7 @@ export interface LineProcessOptions {
|
|
|
14
14
|
readonly inheritStderr?: boolean;
|
|
15
15
|
/**
|
|
16
16
|
* `kill()` ends the child's whole process tree. On Windows
|
|
17
|
-
* (
|
|
17
|
+
* (killProcessTree) that is more than the direct child, which for an
|
|
18
18
|
* npm `.cmd` shim is only `cmd.exe`. On POSIX, where the child's process
|
|
19
19
|
* group is always signalled, it adds the descendants that left the group
|
|
20
20
|
* (process-tree.ts): SIGTERM still goes to the group alone, so the child
|
|
@@ -28,49 +28,14 @@ export interface LineProcessOptions {
|
|
|
28
28
|
/** Open a private bidirectional pipe at child fd 3, separate from stdout. */
|
|
29
29
|
readonly extraPipe?: boolean;
|
|
30
30
|
}
|
|
31
|
-
/**
|
|
32
|
-
* How long a process asked to stop (SIGTERM) gets before it is killed outright
|
|
33
|
-
* (SIGKILL): the bound that keeps `kill()` followed by `await exited` from
|
|
34
|
-
* hanging on a process that ignores the request. Generous on purpose: claude
|
|
35
|
-
* answers SIGTERM with a shutdown of its own that runs its SessionEnd hooks
|
|
36
|
-
* and force-exits after max(5 s, hook budget + 5 s), 15 s while writes are
|
|
37
|
-
* still pending (2.1.283; the hook budget defaults to 1.5 s), and cutting that
|
|
38
|
-
* short kills the hooks with it. Observed exits take 0.6-2.3 s.
|
|
39
|
-
*/
|
|
40
|
-
export declare const KILL_GRACE_MS = 10000;
|
|
41
|
-
/**
|
|
42
|
-
* The grace period in force: `OAR_KILL_GRACE_MS` when it holds a nonnegative
|
|
43
|
-
* number of milliseconds (a host whose runtimes need longer, e.g. claude with
|
|
44
|
-
* slow SessionEnd hooks, or that wants a faster teardown), else `KILL_GRACE_MS`.
|
|
45
|
-
*/
|
|
46
|
-
export declare function killGraceMs(env?: NodeJS.ProcessEnv): number;
|
|
47
|
-
/**
|
|
48
|
-
* POSIX children are spawned detached, which makes each the leader of its own
|
|
49
|
-
* process group, so one signal to the negative pid reaches every process it
|
|
50
|
-
* started (shells, dev servers, MCP servers), not only the child itself.
|
|
51
|
-
* Detaching changes neither stdio nor exit tracking: the pipes stay connected
|
|
52
|
-
* and the child is never unref'd, so the host still observes its exit. It does
|
|
53
|
-
* take the child out of the terminal's job control: Ctrl-C (SIGINT) and SIGHUP
|
|
54
|
-
* reach the host only, so a host that wants them to stop its runtimes
|
|
55
|
-
* disposes its sessions on them. Windows has no process groups, and a
|
|
56
|
-
* detached child there gets its own console, so it stays attached.
|
|
57
|
-
*/
|
|
58
|
-
export declare const OWN_PROCESS_GROUP: boolean;
|
|
59
|
-
/**
|
|
60
|
-
* Send `signal` to a child spawned with `detached: OWN_PROCESS_GROUP` and to
|
|
61
|
-
* everything in its process group. Falls back to the child alone where there
|
|
62
|
-
* are no groups (Windows) or the group is gone (the child left it; ESRCH).
|
|
63
|
-
* A reaped child's pid can be reused, so call this only while the child, or a
|
|
64
|
-
* process it started, can still be alive.
|
|
65
|
-
*/
|
|
66
|
-
export declare function signalProcessGroup(child: ChildProcess, signal: NodeJS.Signals): void;
|
|
67
31
|
/** A long-lived child whose raw streams can also be observed line-by-line. */
|
|
68
32
|
export interface LineProcess {
|
|
69
33
|
/** Resolves once the OS process exists; rejects when it cannot be spawned. */
|
|
70
34
|
readonly spawned: Promise<void>;
|
|
71
35
|
/**
|
|
72
36
|
* Resolves when the process is truly gone and its state has been released.
|
|
73
|
-
* After `kill()`, it
|
|
37
|
+
* After `kill()`, it includes bounded observations around the SIGKILL
|
|
38
|
+
* escalation and any asynchronous descendant cleanup after native exit.
|
|
74
39
|
*/
|
|
75
40
|
readonly exited: Promise<number | null>;
|
|
76
41
|
readonly stdin: Writable;
|
|
@@ -79,11 +44,13 @@ export interface LineProcess {
|
|
|
79
44
|
readonly extraPipe?: Duplex;
|
|
80
45
|
/** Native status and the last 8 KiB of stderr observed so far. */
|
|
81
46
|
diagnostics(): ProcessDiagnostics;
|
|
47
|
+
/** True immediately when kill begins, before asynchronous capture or EOF. */
|
|
48
|
+
stopping(): boolean;
|
|
82
49
|
write(text: string): void;
|
|
83
50
|
/** Complete UTF-8 lines, independent of stdout byte-chunk boundaries. */
|
|
84
51
|
onLine(handler: (line: string) => void): void;
|
|
85
52
|
/** Fires exactly once, for exit or spawn-level error alike. */
|
|
86
|
-
onExit(handler: (code: number | null) => void): void;
|
|
53
|
+
onExit(handler: (code: number | null, reason?: string) => void): void;
|
|
87
54
|
/**
|
|
88
55
|
* Stop the process and everything it started: close stdin, SIGTERM its
|
|
89
56
|
* process group (unless shutdown is stdin), and SIGKILL the group if the child is still running once
|
|
@@ -96,11 +63,6 @@ export interface LineProcess {
|
|
|
96
63
|
/** The child's memory with its group and descendants (process-resources.ts); null once it has exited. */
|
|
97
64
|
readonly resources: ReturnType<typeof treeResourcesReader>;
|
|
98
65
|
}
|
|
99
|
-
/**
|
|
100
|
-
* Windows taskkill /T /F ends the child and its descendants, falling back to
|
|
101
|
-
* the child alone when the walk fails. An exited child's pid may already be reused.
|
|
102
|
-
*/
|
|
103
|
-
export declare function killProcessTree(child: ChildProcess): void;
|
|
104
66
|
/**
|
|
105
67
|
* Spawn through cross-spawn. On Windows a `.cmd`/`.bat` shim is first
|
|
106
68
|
* resolved to its native target or an explicitly escaped cmd.exe invocation.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.d.ts","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process.d.ts","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAuD,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEhH,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAK7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC1H,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC;;;;;;;;;OASG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,6EAA6E;IAC7E,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC9B;AACD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,WAAW,IAAI,kBAAkB,CAAC;IAClC,6EAA6E;IAC7E,QAAQ,IAAI,OAAO,CAAC;IACpB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,yEAAyE;IACzE,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9C,+DAA+D;IAC/D,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IACtE;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,CAAC;IACb,yGAAyG;IACzG,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CAC5D;AACD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CAgHb"}
|
|
@@ -1,84 +1,14 @@
|
|
|
1
|
-
import { execFile } from "node:child_process";
|
|
2
1
|
import spawn from "cross-spawn";
|
|
3
2
|
import { Duplex } from "node:stream";
|
|
4
3
|
import { StringDecoder } from "node:string_decoder";
|
|
5
4
|
import { nativeError, spawnChecked, spawnFailure, StderrTail } from "./diagnostics.js";
|
|
6
5
|
import { trackOwnedProcess } from "./ownership.js";
|
|
7
6
|
import { treeResourcesReader } from "./process-resources.js";
|
|
8
|
-
import {
|
|
7
|
+
import { processShutdown } from "./process-shutdown.js";
|
|
8
|
+
import { OWN_PROCESS_GROUP } from "./process-signals.js";
|
|
9
9
|
import { windowsSpawnTarget } from "./windows-shim.js";
|
|
10
10
|
export { trackOwnedProcess } from "./ownership.js";
|
|
11
|
-
|
|
12
|
-
* How long a process asked to stop (SIGTERM) gets before it is killed outright
|
|
13
|
-
* (SIGKILL): the bound that keeps `kill()` followed by `await exited` from
|
|
14
|
-
* hanging on a process that ignores the request. Generous on purpose: claude
|
|
15
|
-
* answers SIGTERM with a shutdown of its own that runs its SessionEnd hooks
|
|
16
|
-
* and force-exits after max(5 s, hook budget + 5 s), 15 s while writes are
|
|
17
|
-
* still pending (2.1.283; the hook budget defaults to 1.5 s), and cutting that
|
|
18
|
-
* short kills the hooks with it. Observed exits take 0.6-2.3 s.
|
|
19
|
-
*/
|
|
20
|
-
export const KILL_GRACE_MS = 10_000;
|
|
21
|
-
/**
|
|
22
|
-
* The grace period in force: `OAR_KILL_GRACE_MS` when it holds a nonnegative
|
|
23
|
-
* number of milliseconds (a host whose runtimes need longer, e.g. claude with
|
|
24
|
-
* slow SessionEnd hooks, or that wants a faster teardown), else `KILL_GRACE_MS`.
|
|
25
|
-
*/
|
|
26
|
-
export function killGraceMs(env = process.env) {
|
|
27
|
-
const configured = env.OAR_KILL_GRACE_MS?.trim() ?? "";
|
|
28
|
-
const value = Number(configured);
|
|
29
|
-
return configured.length > 0 && Number.isFinite(value) && value >= 0 ? value : KILL_GRACE_MS;
|
|
30
|
-
}
|
|
31
|
-
/**
|
|
32
|
-
* POSIX children are spawned detached, which makes each the leader of its own
|
|
33
|
-
* process group, so one signal to the negative pid reaches every process it
|
|
34
|
-
* started (shells, dev servers, MCP servers), not only the child itself.
|
|
35
|
-
* Detaching changes neither stdio nor exit tracking: the pipes stay connected
|
|
36
|
-
* and the child is never unref'd, so the host still observes its exit. It does
|
|
37
|
-
* take the child out of the terminal's job control: Ctrl-C (SIGINT) and SIGHUP
|
|
38
|
-
* reach the host only, so a host that wants them to stop its runtimes
|
|
39
|
-
* disposes its sessions on them. Windows has no process groups, and a
|
|
40
|
-
* detached child there gets its own console, so it stays attached.
|
|
41
|
-
*/
|
|
42
|
-
export const OWN_PROCESS_GROUP = process.platform !== "win32";
|
|
43
|
-
/**
|
|
44
|
-
* Send `signal` to a child spawned with `detached: OWN_PROCESS_GROUP` and to
|
|
45
|
-
* everything in its process group. Falls back to the child alone where there
|
|
46
|
-
* are no groups (Windows) or the group is gone (the child left it; ESRCH).
|
|
47
|
-
* A reaped child's pid can be reused, so call this only while the child, or a
|
|
48
|
-
* process it started, can still be alive.
|
|
49
|
-
*/
|
|
50
|
-
export function signalProcessGroup(child, signal) {
|
|
51
|
-
if (OWN_PROCESS_GROUP && child.pid !== undefined) {
|
|
52
|
-
try {
|
|
53
|
-
process.kill(-child.pid, signal);
|
|
54
|
-
return;
|
|
55
|
-
}
|
|
56
|
-
catch {
|
|
57
|
-
// Nobody is left in the group; the child itself may still be alive in
|
|
58
|
-
// a group of its own making, so it is signalled directly below.
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
child.kill(signal);
|
|
62
|
-
}
|
|
63
|
-
/**
|
|
64
|
-
* Windows taskkill /T /F ends the child and its descendants, falling back to
|
|
65
|
-
* the child alone when the walk fails. An exited child's pid may already be reused.
|
|
66
|
-
*/
|
|
67
|
-
export function killProcessTree(child) {
|
|
68
|
-
if (child.exitCode !== null || child.signalCode !== null) {
|
|
69
|
-
return;
|
|
70
|
-
}
|
|
71
|
-
if (child.pid === undefined) {
|
|
72
|
-
child.kill();
|
|
73
|
-
return;
|
|
74
|
-
}
|
|
75
|
-
const killer = execFile("taskkill", ["/pid", String(child.pid), "/T", "/F"], { windowsHide: true }, (error) => {
|
|
76
|
-
if (error !== null) {
|
|
77
|
-
child.kill();
|
|
78
|
-
}
|
|
79
|
-
});
|
|
80
|
-
trackOwnedProcess(killer);
|
|
81
|
-
}
|
|
11
|
+
export { killGraceMs, KILL_GRACE_MS, killProcessTree, signalProcessGroup, OWN_PROCESS_GROUP } from "./process-signals.js";
|
|
82
12
|
/**
|
|
83
13
|
* Spawn through cross-spawn. On Windows a `.cmd`/`.bat` shim is first
|
|
84
14
|
* resolved to its native target or an explicitly escaped cmd.exe invocation.
|
|
@@ -114,15 +44,20 @@ export function spawnLineProcess(command, args, options = {}) {
|
|
|
114
44
|
let buffer = "";
|
|
115
45
|
let readingLines = false;
|
|
116
46
|
let ended = false;
|
|
47
|
+
let finalized = false;
|
|
117
48
|
let exitCode = null;
|
|
118
49
|
let exitSignal = null;
|
|
119
50
|
let spawnError = undefined;
|
|
120
|
-
|
|
121
|
-
// `killTree`: the child's descendants when kill() began, until they
|
|
122
|
-
// have had their SIGKILL.
|
|
123
|
-
let descendants = [];
|
|
51
|
+
const shutdown = processShutdown(child, options);
|
|
124
52
|
const { promise: spawned, resolve: spawnOk, reject: spawnFailed } = Promise.withResolvers();
|
|
125
|
-
const
|
|
53
|
+
const exited = (async () => {
|
|
54
|
+
await shutdown.finished;
|
|
55
|
+
finalized = true;
|
|
56
|
+
for (const handler of exitHandlers) {
|
|
57
|
+
handler(exitCode, shutdown.reason());
|
|
58
|
+
}
|
|
59
|
+
return exitCode;
|
|
60
|
+
})();
|
|
126
61
|
child.once("spawn", spawnOk);
|
|
127
62
|
const end = (code, signal = null) => {
|
|
128
63
|
if (ended) {
|
|
@@ -131,19 +66,7 @@ export function spawnLineProcess(command, args, options = {}) {
|
|
|
131
66
|
ended = true;
|
|
132
67
|
exitCode = code;
|
|
133
68
|
exitSignal = signal;
|
|
134
|
-
|
|
135
|
-
clearTimeout(escalation);
|
|
136
|
-
}
|
|
137
|
-
if (descendants.length > 0) {
|
|
138
|
-
// The child stopped before its SIGKILL: what it left running of its
|
|
139
|
-
// tree now belongs to nobody, and goes before the exit is reported.
|
|
140
|
-
killEntries(descendants, readProcessTable());
|
|
141
|
-
descendants = [];
|
|
142
|
-
}
|
|
143
|
-
for (const handler of exitHandlers) {
|
|
144
|
-
handler(code);
|
|
145
|
-
}
|
|
146
|
-
exitDone(code);
|
|
69
|
+
shutdown.nativeExited();
|
|
147
70
|
};
|
|
148
71
|
child.on("exit", end);
|
|
149
72
|
child.on("error", (error) => {
|
|
@@ -174,13 +97,17 @@ export function spawnLineProcess(command, args, options = {}) {
|
|
|
174
97
|
exited,
|
|
175
98
|
stdin,
|
|
176
99
|
stdout,
|
|
100
|
+
stopping: () => shutdown.stopping(),
|
|
177
101
|
...(child.stdio[3] instanceof Duplex ? { extraPipe: child.stdio[3] } : {}),
|
|
178
|
-
diagnostics: () =>
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
102
|
+
diagnostics: () => {
|
|
103
|
+
const cleanup = shutdown.diagnostics();
|
|
104
|
+
return { exitCode, signal: exitSignal, stderr: stderr.text(),
|
|
105
|
+
...(spawnError === undefined ? {} : { error: spawnError }),
|
|
106
|
+
...(cleanup === undefined ? {} : { cleanup }),
|
|
107
|
+
};
|
|
108
|
+
},
|
|
109
|
+
// Stop accepting writes immediately, including while capture awaits EOF.
|
|
110
|
+
write: (text) => { if (!shutdown.stopping() && !ended && !stdin.writableEnded && !stdin.destroyed) {
|
|
184
111
|
stdin.write(text);
|
|
185
112
|
} },
|
|
186
113
|
onLine(handler) {
|
|
@@ -191,9 +118,9 @@ export function spawnLineProcess(command, args, options = {}) {
|
|
|
191
118
|
}
|
|
192
119
|
},
|
|
193
120
|
onExit(handler) {
|
|
194
|
-
if (
|
|
121
|
+
if (finalized) {
|
|
195
122
|
queueMicrotask(() => {
|
|
196
|
-
handler(exitCode);
|
|
123
|
+
handler(exitCode, shutdown.reason());
|
|
197
124
|
});
|
|
198
125
|
}
|
|
199
126
|
else {
|
|
@@ -201,50 +128,7 @@ export function spawnLineProcess(command, args, options = {}) {
|
|
|
201
128
|
}
|
|
202
129
|
},
|
|
203
130
|
resources: treeResourcesReader(child, () => ended),
|
|
204
|
-
kill() {
|
|
205
|
-
if (ended || escalation !== null) {
|
|
206
|
-
return;
|
|
207
|
-
}
|
|
208
|
-
if (options.shutdown !== "stdin" && options.killTree === true && process.platform === "win32") {
|
|
209
|
-
stdin.end();
|
|
210
|
-
killProcessTree(child);
|
|
211
|
-
escalation = setTimeout(() => {
|
|
212
|
-
child.kill("SIGKILL");
|
|
213
|
-
}, killGraceMs());
|
|
214
|
-
return;
|
|
215
|
-
}
|
|
216
|
-
const { pid } = child;
|
|
217
|
-
const tree = options.killTree === true && pid !== undefined;
|
|
218
|
-
if (tree) {
|
|
219
|
-
// Read while the child runs: once it is gone, what left its group is
|
|
220
|
-
// re-parented and no longer found below it.
|
|
221
|
-
descendants = descendantsOf(readProcessTable(), pid);
|
|
222
|
-
}
|
|
223
|
-
stdin.end();
|
|
224
|
-
// Pi RPC reenters shutdown on EOF plus SIGTERM and skips its hooks.
|
|
225
|
-
// Its caller selects EOF alone, with the same bounded escalation.
|
|
226
|
-
if (options.shutdown !== "stdin") {
|
|
227
|
-
signalProcessGroup(child, "SIGTERM");
|
|
228
|
-
}
|
|
229
|
-
// Exit clears this deadline; otherwise force-end the remaining tree.
|
|
230
|
-
escalation = setTimeout(() => {
|
|
231
|
-
if (!tree) {
|
|
232
|
-
signalProcessGroup(child, "SIGKILL");
|
|
233
|
-
return;
|
|
234
|
-
}
|
|
235
|
-
// Read again first: the child may have started more since.
|
|
236
|
-
const table = readProcessTable();
|
|
237
|
-
const now = descendantsOf(table, pid);
|
|
238
|
-
if (process.platform === "win32") {
|
|
239
|
-
killProcessTree(child);
|
|
240
|
-
}
|
|
241
|
-
else {
|
|
242
|
-
signalProcessGroup(child, "SIGKILL");
|
|
243
|
-
}
|
|
244
|
-
killEntries([...descendants, ...now], table);
|
|
245
|
-
descendants = [];
|
|
246
|
-
}, killGraceMs());
|
|
247
|
-
},
|
|
131
|
+
kill: () => { shutdown.stop(); },
|
|
248
132
|
};
|
|
249
133
|
}
|
|
250
134
|
//# sourceMappingURL=process.js.map
|