@botiverse/oar 0.80.1 → 0.81.0
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/dist/runtimes/opencode/index.d.ts.map +1 -1
- package/dist/runtimes/opencode/index.js +8 -1
- package/dist/runtimes/opencode/index.js.map +1 -1
- package/dist/runtimes/opencode/shared-session.d.ts +7 -0
- package/dist/runtimes/opencode/shared-session.d.ts.map +1 -0
- package/dist/runtimes/opencode/shared-session.js +101 -0
- package/dist/runtimes/opencode/shared-session.js.map +1 -0
- package/dist/runtimes/opencode/sharing-admission.d.ts +4 -0
- package/dist/runtimes/opencode/sharing-admission.d.ts.map +1 -0
- package/dist/runtimes/opencode/sharing-admission.js +11 -0
- package/dist/runtimes/opencode/sharing-admission.js.map +1 -0
- package/dist/runtimes/opencode/sharing-diagnostics.d.ts +10 -0
- package/dist/runtimes/opencode/sharing-diagnostics.d.ts.map +1 -0
- package/dist/runtimes/opencode/sharing-diagnostics.js +33 -0
- package/dist/runtimes/opencode/sharing-diagnostics.js.map +1 -0
- package/dist/runtimes/qoder/daemon.d.ts.map +1 -1
- package/dist/runtimes/qoder/daemon.js +4 -1
- package/dist/runtimes/qoder/daemon.js.map +1 -1
- package/dist/runtimes/qoder/launch.d.ts.map +1 -1
- package/dist/runtimes/qoder/launch.js +1 -0
- package/dist/runtimes/qoder/launch.js.map +1 -1
- package/dist/runtimes/qwen/close.d.ts.map +1 -1
- package/dist/runtimes/qwen/close.js +1 -0
- package/dist/runtimes/qwen/close.js.map +1 -1
- package/dist/shared/acp/process.d.ts +7 -0
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +3 -0
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +10 -1
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/routing.d.ts +1 -0
- package/dist/shared/acp/routing.d.ts.map +1 -1
- package/dist/shared/acp/routing.js +1 -0
- package/dist/shared/acp/routing.js.map +1 -1
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +14 -0
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts +4 -0
- package/dist/shared/acp/shared-session.d.ts.map +1 -1
- package/dist/shared/acp/shared-session.js +47 -2
- package/dist/shared/acp/shared-session.js.map +1 -1
- package/dist/shared/acp/turns.d.ts +4 -0
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +30 -1
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/executable/process-cancellation.d.ts +12 -0
- package/dist/shared/executable/process-cancellation.d.ts.map +1 -0
- package/dist/shared/executable/process-cancellation.js +9 -0
- package/dist/shared/executable/process-cancellation.js.map +1 -0
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts +4 -1
- package/dist/shared/executable/process-cleanup-diagnostics.d.ts.map +1 -1
- package/dist/shared/executable/process-cleanup-diagnostics.js.map +1 -1
- package/dist/shared/executable/process-cleanup.d.ts +1 -0
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -1
- package/dist/shared/executable/process-cleanup.js +67 -13
- package/dist/shared/executable/process-cleanup.js.map +1 -1
- package/dist/shared/executable/process-shutdown.d.ts +4 -0
- package/dist/shared/executable/process-shutdown.d.ts.map +1 -1
- package/dist/shared/executable/process-shutdown.js +85 -22
- package/dist/shared/executable/process-shutdown.js.map +1 -1
- package/dist/shared/executable/process-table-async.d.ts +4 -3
- package/dist/shared/executable/process-table-async.d.ts.map +1 -1
- package/dist/shared/executable/process-table-async.js +13 -8
- package/dist/shared/executable/process-table-async.js.map +1 -1
- package/dist/shared/executable/process-table-budget.d.ts +6 -0
- package/dist/shared/executable/process-table-budget.d.ts.map +1 -0
- package/dist/shared/executable/process-table-budget.js +33 -0
- package/dist/shared/executable/process-table-budget.js.map +1 -0
- package/dist/shared/executable/process-table-command.d.ts +4 -1
- package/dist/shared/executable/process-table-command.d.ts.map +1 -1
- package/dist/shared/executable/process-table-command.js +15 -2
- package/dist/shared/executable/process-table-command.js.map +1 -1
- package/dist/shared/executable/process-table-preparation.d.ts +14 -0
- package/dist/shared/executable/process-table-preparation.d.ts.map +1 -0
- package/dist/shared/executable/process-table-preparation.js +19 -0
- package/dist/shared/executable/process-table-preparation.js.map +1 -0
- package/dist/shared/executable/process-tree.d.ts +5 -2
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +8 -3
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +10 -2
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +18 -2
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +84 -21
- package/dist/shared/stream-json/session.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { descendantsOf, killEntries, processTableFailure } from "./process-tree.js";
|
|
2
2
|
import { observeProcessTableAsync, processTableSource } from "./process-table-async.js";
|
|
3
|
+
import { observeProcessTableWithin } from "./process-table-budget.js";
|
|
3
4
|
export { appendCleanupFailure, cleanupFailureReason } from "./process-cleanup-diagnostics.js";
|
|
4
5
|
/** Capture before EOF, then revalidate identities before signalling descendants. */
|
|
5
6
|
export function processTreeCleanup(pid, alive = () => true) {
|
|
@@ -18,26 +19,85 @@ export function processTreeCleanup(pid, alive = () => true) {
|
|
|
18
19
|
observations.push({ ...result, phase });
|
|
19
20
|
return undefined;
|
|
20
21
|
}
|
|
21
|
-
if (phase === "before_eof" && (!alive() || !result.table.has(pid))) {
|
|
22
|
+
if ((phase === "before_eof" || phase === "before_cancel") && (!alive() || !result.table.has(pid))) {
|
|
22
23
|
observations.push({ ok: false, phase, source: result.source, elapsedMs: result.elapsedMs, reason: "missing_root" });
|
|
23
24
|
return undefined;
|
|
24
25
|
}
|
|
25
26
|
observations.push({ ok: true, phase, source: result.source, elapsedMs: result.elapsedMs, skipped: result.skipped });
|
|
26
|
-
return result.table;
|
|
27
|
+
return { table: result.table, source: result.source };
|
|
27
28
|
};
|
|
28
29
|
const read = async (phase) => {
|
|
29
30
|
try {
|
|
30
|
-
|
|
31
|
+
const result = processTableSource() === "windows"
|
|
32
|
+
? await observeProcessTableWithin(5000) : await observeProcessTableAsync();
|
|
33
|
+
return accept(result, phase);
|
|
31
34
|
}
|
|
32
35
|
catch (error) {
|
|
33
36
|
failed(error, phase);
|
|
34
37
|
return undefined;
|
|
35
38
|
}
|
|
36
39
|
};
|
|
40
|
+
const ownedEntries = ({ table, source }, includeLiveRoot = false) => {
|
|
41
|
+
const entries = new Map();
|
|
42
|
+
const currentRoot = table.get(pid);
|
|
43
|
+
const roots = [...descendants];
|
|
44
|
+
if (currentRoot !== undefined && (root === undefined ? includeLiveRoot && alive() : currentRoot.start === root.start)) {
|
|
45
|
+
roots.push(currentRoot);
|
|
46
|
+
}
|
|
47
|
+
for (const entry of roots) {
|
|
48
|
+
if (table.get(entry.pid)?.start !== entry.start) {
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
// Only the owned root's caller may stop the root itself. Captured tools
|
|
52
|
+
// can acquire new children after capture, even after root exit.
|
|
53
|
+
if (entry.pid !== pid) {
|
|
54
|
+
entries.set(entry.pid, entry);
|
|
55
|
+
}
|
|
56
|
+
for (const child of descendantsOf(table, entry.pid, source)) {
|
|
57
|
+
entries.set(child.pid, child);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
return [...entries.values()];
|
|
61
|
+
};
|
|
62
|
+
const remember = (snapshot) => {
|
|
63
|
+
captured = true;
|
|
64
|
+
root = snapshot.table.get(pid);
|
|
65
|
+
// Keep earlier cancellation's orphaned tools when their identity remains
|
|
66
|
+
// visible, and add this turn's newly started descendants. Never overwrite
|
|
67
|
+
// identity evidence with a reused PID's current owner.
|
|
68
|
+
const retained = descendants.filter(entry => snapshot.table.get(entry.pid)?.start === entry.start);
|
|
69
|
+
descendants = [...new Map([...retained, ...descendantsOf(snapshot.table, pid, snapshot.source)]
|
|
70
|
+
.map(entry => [entry.pid, entry])).values()];
|
|
71
|
+
};
|
|
37
72
|
return {
|
|
73
|
+
rememberCancellation(result) {
|
|
74
|
+
const snapshot = accept(result, "before_cancel");
|
|
75
|
+
if (snapshot === undefined) {
|
|
76
|
+
unverified = true;
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
remember(snapshot);
|
|
80
|
+
}
|
|
81
|
+
},
|
|
38
82
|
async capture() {
|
|
39
83
|
// At most two reads (one retry), both before EOF. A root that exited
|
|
40
84
|
// during a read cannot lend its possibly reused PID to a retry.
|
|
85
|
+
if (processTableSource() === "windows") {
|
|
86
|
+
const deadline = performance.now() + 5000;
|
|
87
|
+
let result = await observeProcessTableWithin(5000);
|
|
88
|
+
let table = accept(result, "before_eof");
|
|
89
|
+
const remaining = deadline - performance.now();
|
|
90
|
+
if (table === undefined && alive() && remaining > 0 && (result.ok || result.reason !== "timeout")) {
|
|
91
|
+
result = await observeProcessTableWithin(remaining);
|
|
92
|
+
table = accept(result, "before_eof");
|
|
93
|
+
}
|
|
94
|
+
if (table === undefined) {
|
|
95
|
+
unverified = true;
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
remember(table);
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
41
101
|
let table = await read("before_eof");
|
|
42
102
|
if (table === undefined && alive()) {
|
|
43
103
|
table = await read("before_eof");
|
|
@@ -46,9 +106,7 @@ export function processTreeCleanup(pid, alive = () => true) {
|
|
|
46
106
|
unverified = true;
|
|
47
107
|
return;
|
|
48
108
|
}
|
|
49
|
-
|
|
50
|
-
root = table.get(pid);
|
|
51
|
-
descendants = descendantsOf(table, pid);
|
|
109
|
+
remember(table);
|
|
52
110
|
},
|
|
53
111
|
async force(stopRoot) {
|
|
54
112
|
const table = await read("before_force");
|
|
@@ -59,9 +117,7 @@ export function processTreeCleanup(pid, alive = () => true) {
|
|
|
59
117
|
unverified = true;
|
|
60
118
|
return;
|
|
61
119
|
}
|
|
62
|
-
|
|
63
|
-
const now = root !== undefined && current?.start === root.start ? descendantsOf(table, pid) : [];
|
|
64
|
-
killEntries([...descendants, ...now], table);
|
|
120
|
+
killEntries(ownedEntries(table), table.table);
|
|
65
121
|
descendants = [];
|
|
66
122
|
},
|
|
67
123
|
async finish() {
|
|
@@ -73,7 +129,7 @@ export function processTreeCleanup(pid, alive = () => true) {
|
|
|
73
129
|
unverified = true;
|
|
74
130
|
}
|
|
75
131
|
else {
|
|
76
|
-
killEntries(
|
|
132
|
+
killEntries(ownedEntries(table), table.table);
|
|
77
133
|
}
|
|
78
134
|
descendants = [];
|
|
79
135
|
},
|
|
@@ -90,9 +146,7 @@ export function processTreeCleanup(pid, alive = () => true) {
|
|
|
90
146
|
unverified = true;
|
|
91
147
|
observations.push({ ok: false, phase: "before_eof", source: processTableSource(), elapsedMs: 0, reason: "missing_root" });
|
|
92
148
|
}
|
|
93
|
-
|
|
94
|
-
const now = current !== undefined && (root === undefined ? alive() : current.start === root.start) ? descendantsOf(table, pid) : [];
|
|
95
|
-
killEntries([...descendants, ...now], table);
|
|
149
|
+
killEntries(ownedEntries(table, true), table.table);
|
|
96
150
|
descendants = [];
|
|
97
151
|
return diagnostics();
|
|
98
152
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-cleanup.js","sources":["../../../src/shared/executable/process-cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"process-cleanup.js","sources":["../../../src/shared/executable/process-cleanup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ChildProcess } from "node:child_process";
|
|
2
2
|
import { type ProcessCleanupDiagnostics } from "./process-cleanup.js";
|
|
3
|
+
import { type CancellationObservation } from "./process-cancellation.js";
|
|
3
4
|
interface ShutdownOptions {
|
|
4
5
|
readonly killTree?: boolean;
|
|
5
6
|
readonly shutdown?: "stdin";
|
|
@@ -8,6 +9,9 @@ interface ShutdownOptions {
|
|
|
8
9
|
export declare function processShutdown(child: ChildProcess, options: ShutdownOptions): {
|
|
9
10
|
readonly finished: Promise<void>;
|
|
10
11
|
stop(): void;
|
|
12
|
+
prepare(): Promise<void>;
|
|
13
|
+
markNativeStop(): void;
|
|
14
|
+
observeCancellation(): Promise<CancellationObservation>;
|
|
11
15
|
nativeExited(): void;
|
|
12
16
|
stopping(): boolean;
|
|
13
17
|
diagnostics(): ProcessCleanupDiagnostics | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-shutdown.d.ts","sources":["../../../src/shared/executable/process-shutdown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAA4C,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"process-shutdown.d.ts","sources":["../../../src/shared/executable/process-shutdown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAA4C,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAA6B,KAAK,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAIpG,UAAU,eAAe;IAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAAE;AAEvF,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,GAAG;IAC9E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,IAAI,IAAI,CAAC;IACb,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,cAAc,IAAI,IAAI,CAAC;IACvB,mBAAmB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACxD,YAAY,IAAI,IAAI,CAAC;IACrB,QAAQ,IAAI,OAAO,CAAC;IACpB,WAAW,IAAI,yBAAyB,GAAG,SAAS,CAAC;IACrD,MAAM,IAAI,MAAM,GAAG,SAAS,CAAC;CAC9B,CAsHA"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import { processTreeCleanup, cleanupFailureReason } from "./process-cleanup.js";
|
|
2
|
+
import { observeBeforeCancellation } from "./process-cancellation.js";
|
|
2
3
|
import { trackPendingCleanup } from "./ownership.js";
|
|
3
4
|
import { killGraceMs, killProcessTree, signalProcessGroup } from "./process-signals.js";
|
|
4
5
|
/** The root's exit and asynchronous cleanup form one owned, awaited lifetime. */
|
|
5
6
|
export function processShutdown(child, options) {
|
|
6
7
|
let stopping = false;
|
|
7
8
|
let ended = false;
|
|
9
|
+
let stopAction = false;
|
|
10
|
+
const cancellations = new Set();
|
|
8
11
|
let phase = Promise.resolve();
|
|
9
12
|
let escalation = undefined;
|
|
10
13
|
let cleanup = undefined;
|
|
14
|
+
let capture = undefined;
|
|
11
15
|
let releaseCleanup = undefined;
|
|
12
16
|
const nativeExit = Promise.withResolvers();
|
|
13
17
|
const alive = () => !ended && child.exitCode === null && child.signalCode === null;
|
|
@@ -15,6 +19,7 @@ export function processShutdown(child, options) {
|
|
|
15
19
|
if (!alive()) {
|
|
16
20
|
return;
|
|
17
21
|
}
|
|
22
|
+
stopAction = true;
|
|
18
23
|
if (process.platform === "win32" && options.killTree === true) {
|
|
19
24
|
killProcessTree(child);
|
|
20
25
|
}
|
|
@@ -45,20 +50,54 @@ export function processShutdown(child, options) {
|
|
|
45
50
|
if (!alive()) {
|
|
46
51
|
return;
|
|
47
52
|
}
|
|
53
|
+
stopAction = true;
|
|
48
54
|
child.stdin?.end();
|
|
49
55
|
// Pi reenters shutdown on EOF plus SIGTERM and skips its native hooks.
|
|
50
56
|
if (options.shutdown !== "stdin") {
|
|
51
|
-
|
|
57
|
+
if (process.platform === "win32" && options.killTree === true) {
|
|
58
|
+
killProcessTree(child);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
signalProcessGroup(child, "SIGTERM");
|
|
62
|
+
}
|
|
52
63
|
}
|
|
53
64
|
escalation = setTimeout(() => { phase = force(); }, killGraceMs());
|
|
54
65
|
};
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
66
|
+
const ownedCleanup = () => {
|
|
67
|
+
if (cleanup === undefined) {
|
|
68
|
+
if (child.pid === undefined) {
|
|
69
|
+
throw new Error("Cannot observe an unspawned root");
|
|
70
|
+
}
|
|
71
|
+
const created = processTreeCleanup(child.pid, alive);
|
|
72
|
+
cleanup = created;
|
|
73
|
+
releaseCleanup = trackPendingCleanup((read) => created.finishSync(read));
|
|
58
74
|
}
|
|
59
|
-
|
|
60
|
-
|
|
75
|
+
return cleanup;
|
|
76
|
+
};
|
|
77
|
+
// Only call immediately before an intended stop: the snapshot is memoized
|
|
78
|
+
// and its cleanup stays registered until exit, even before stop() is called.
|
|
79
|
+
const prepare = async () => {
|
|
80
|
+
if (capture !== undefined) {
|
|
81
|
+
await capture;
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
if (!alive() || options.killTree !== true || child.pid === undefined) {
|
|
85
|
+
return;
|
|
61
86
|
}
|
|
87
|
+
const preparedCleanup = ownedCleanup();
|
|
88
|
+
capture = (async () => {
|
|
89
|
+
try {
|
|
90
|
+
await preparedCleanup.capture();
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
preparedCleanup.failed(error, "before_eof");
|
|
94
|
+
}
|
|
95
|
+
})();
|
|
96
|
+
phase = capture;
|
|
97
|
+
await capture;
|
|
98
|
+
};
|
|
99
|
+
const captureAndClose = async (prepared) => {
|
|
100
|
+
await prepared;
|
|
62
101
|
try {
|
|
63
102
|
close();
|
|
64
103
|
}
|
|
@@ -83,32 +122,56 @@ export function processShutdown(child, options) {
|
|
|
83
122
|
const finished = finish();
|
|
84
123
|
return {
|
|
85
124
|
finished,
|
|
125
|
+
prepare,
|
|
126
|
+
markNativeStop() { if (alive()) {
|
|
127
|
+
stopAction = true;
|
|
128
|
+
} },
|
|
129
|
+
async observeCancellation() {
|
|
130
|
+
if (options.killTree !== true || !alive() || child.pid === undefined) {
|
|
131
|
+
return { commit() { }, complete() { } };
|
|
132
|
+
}
|
|
133
|
+
const result = await observeBeforeCancellation();
|
|
134
|
+
const attempt = Symbol("native cancellation");
|
|
135
|
+
let committed = false, completed = false;
|
|
136
|
+
return {
|
|
137
|
+
commit() {
|
|
138
|
+
if (completed || committed || !alive() || stopping || options.killTree !== true || child.pid === undefined) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
committed = true;
|
|
142
|
+
ownedCleanup().rememberCancellation(result);
|
|
143
|
+
cancellations.add(attempt);
|
|
144
|
+
},
|
|
145
|
+
complete() { completed = true; cancellations.delete(attempt); },
|
|
146
|
+
};
|
|
147
|
+
},
|
|
86
148
|
stopping: () => stopping,
|
|
87
149
|
diagnostics: () => cleanup?.diagnostics(),
|
|
88
150
|
reason: () => cleanupFailureReason(cleanup?.diagnostics()),
|
|
89
|
-
nativeExited() {
|
|
151
|
+
nativeExited() {
|
|
152
|
+
ended = true;
|
|
153
|
+
clearTimeout(escalation);
|
|
154
|
+
if (!stopAction && cancellations.size === 0) {
|
|
155
|
+
// A pending observation does not turn a spontaneous exit into an OAR
|
|
156
|
+
// stop. Its orphan descendants remain the natural-exit limitation.
|
|
157
|
+
cleanup = undefined;
|
|
158
|
+
releaseCleanup?.();
|
|
159
|
+
}
|
|
160
|
+
nativeExit.resolve();
|
|
161
|
+
},
|
|
90
162
|
stop() {
|
|
91
163
|
if (!alive() || stopping) {
|
|
92
164
|
return;
|
|
93
165
|
}
|
|
94
166
|
stopping = true;
|
|
95
|
-
if (options.
|
|
96
|
-
child.stdin?.end();
|
|
97
|
-
killProcessTree(child);
|
|
98
|
-
escalation = setTimeout(() => { if (alive()) {
|
|
99
|
-
child.kill("SIGKILL");
|
|
100
|
-
} }, killGraceMs());
|
|
101
|
-
return;
|
|
102
|
-
}
|
|
103
|
-
if (options.killTree === true && child.pid !== undefined) {
|
|
104
|
-
cleanup = processTreeCleanup(child.pid, alive);
|
|
105
|
-
const ownedCleanup = cleanup;
|
|
106
|
-
releaseCleanup = trackPendingCleanup((read) => ownedCleanup.finishSync(read));
|
|
107
|
-
phase = captureAndClose();
|
|
108
|
-
}
|
|
109
|
-
else {
|
|
167
|
+
if (options.killTree !== true || child.pid === undefined) {
|
|
110
168
|
close();
|
|
169
|
+
return;
|
|
111
170
|
}
|
|
171
|
+
// Capture before EOF/taskkill too: an intermediate Windows parent may
|
|
172
|
+
// exit first, leaving tools outside taskkill's remaining parent chain.
|
|
173
|
+
const prepared = prepare();
|
|
174
|
+
phase = captureAndClose(prepared);
|
|
112
175
|
},
|
|
113
176
|
};
|
|
114
177
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-shutdown.js","sources":["../../../src/shared/executable/process-shutdown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAkC,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAIxF,iFAAiF;AACjF,MAAM,UAAU,eAAe,CAAC,KAAmB,EAAE,OAAwB;
|
|
1
|
+
{"version":3,"file":"process-shutdown.js","sources":["../../../src/shared/executable/process-shutdown.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { type ProcessTableObservation, type ProcessTableSource } from "./process-tree.js";
|
|
2
|
+
import { type ProcessTableReadOptions } from "./process-table-command.js";
|
|
2
3
|
export declare const processTableSource: () => ProcessTableSource;
|
|
3
4
|
/** One actual read, distinct from the callers waiting to join a new batch. */
|
|
4
|
-
export declare function observeProcessTableOnce(source: ProcessTableSource): Promise<ProcessTableObservation>;
|
|
5
|
-
type Reader = (source: ProcessTableSource) => Promise<ProcessTableObservation>;
|
|
5
|
+
export declare function observeProcessTableOnce(source: ProcessTableSource, options?: ProcessTableReadOptions): Promise<ProcessTableObservation>;
|
|
6
|
+
type Reader = (source: ProcessTableSource, options?: ProcessTableReadOptions) => Promise<ProcessTableObservation>;
|
|
6
7
|
/** Only requests made before a read starts may use it. No result is cached. */
|
|
7
8
|
export declare function batchProcessTableReads(read: Reader): Reader;
|
|
8
|
-
export declare function observeProcessTableAsync(source?: ProcessTableSource): Promise<ProcessTableObservation>;
|
|
9
|
+
export declare function observeProcessTableAsync(source?: ProcessTableSource, options?: ProcessTableReadOptions): Promise<ProcessTableObservation>;
|
|
9
10
|
export {};
|
|
10
11
|
//# sourceMappingURL=process-table-async.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-table-async.d.ts","sources":["../../../src/shared/executable/process-table-async.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2H,KAAK,uBAAuB,EAAyB,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"process-table-async.d.ts","sources":["../../../src/shared/executable/process-table-async.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2H,KAAK,uBAAuB,EAAyB,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC1O,OAAO,EAAuB,KAAK,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAG/F,eAAO,MAAM,kBAAkB,QAAO,kBAAiH,CAAC;AAuBxJ,8EAA8E;AAC9E,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAc7I;AAED,KAAK,MAAM,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,uBAAuB,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAOlH,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA4B3D;AAGD,wBAAsB,wBAAwB,CAAC,MAAM,GAAE,kBAAyC,EAAE,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAGrK"}
|
|
@@ -36,7 +36,7 @@ async function readProcfs() {
|
|
|
36
36
|
return { table, skipped };
|
|
37
37
|
}
|
|
38
38
|
/** One actual read, distinct from the callers waiting to join a new batch. */
|
|
39
|
-
export async function observeProcessTableOnce(source) {
|
|
39
|
+
export async function observeProcessTableOnce(source, options) {
|
|
40
40
|
const started = performance.now();
|
|
41
41
|
try {
|
|
42
42
|
let result = { table: new Map(), skipped: 0 };
|
|
@@ -44,11 +44,11 @@ export async function observeProcessTableOnce(source) {
|
|
|
44
44
|
result = await readProcfs();
|
|
45
45
|
}
|
|
46
46
|
else if (source === "ps") {
|
|
47
|
-
result = parseProcessPs(await processTableCommand("ps", ["-A", "-o", "pid=,ppid=,pgid=,lstart="], { ...process.env, LC_ALL: "C" }));
|
|
47
|
+
result = parseProcessPs(await processTableCommand("ps", ["-A", "-o", "pid=,ppid=,pgid=,lstart="], { ...process.env, LC_ALL: "C" }, options));
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
50
|
result = parseProcessWindows(await processTableCommand("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command",
|
|
51
|
-
"$ErrorActionPreference='Stop'; Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,@{Name='Started';Expression={if ($null -ne $_.CreationDate) { $_.CreationDate.ToUniversalTime().ToString('o') }}} | ConvertTo-Json -Compress"]));
|
|
51
|
+
"$ErrorActionPreference='Stop'; Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,@{Name='Started';Expression={if ($null -ne $_.CreationDate) { $_.CreationDate.ToUniversalTime().ToString('o') }}} | ConvertTo-Json -Compress"], undefined, options));
|
|
52
52
|
}
|
|
53
53
|
if (!result.table.has(process.pid)) {
|
|
54
54
|
throw new InvalidProcessTableError("missing_host");
|
|
@@ -62,9 +62,14 @@ export async function observeProcessTableOnce(source) {
|
|
|
62
62
|
/** Only requests made before a read starts may use it. No result is cached. */
|
|
63
63
|
export function batchProcessTableReads(read) {
|
|
64
64
|
const batches = new Map();
|
|
65
|
-
return async (source) => {
|
|
65
|
+
return async (source, options) => {
|
|
66
66
|
const previous = batches.get(source);
|
|
67
67
|
if (previous !== undefined && !previous.started) {
|
|
68
|
+
// A foreground caller promotes the whole not-yet-started batch. A
|
|
69
|
+
// background preparation can never remove a cleanup caller's handles.
|
|
70
|
+
if (options?.background !== true) {
|
|
71
|
+
previous.background = false;
|
|
72
|
+
}
|
|
68
73
|
return previous.result;
|
|
69
74
|
}
|
|
70
75
|
const observe = async () => {
|
|
@@ -77,7 +82,7 @@ export function batchProcessTableReads(read) {
|
|
|
77
82
|
batch.started = true;
|
|
78
83
|
const started = performance.now();
|
|
79
84
|
try {
|
|
80
|
-
return await read(source);
|
|
85
|
+
return await read(source, batch.background ? { background: true } : undefined);
|
|
81
86
|
}
|
|
82
87
|
catch (error) {
|
|
83
88
|
return processTableFailure(error, source, performance.now() - started);
|
|
@@ -90,15 +95,15 @@ export function batchProcessTableReads(read) {
|
|
|
90
95
|
};
|
|
91
96
|
// The observed promise is the same one callers await, with every read
|
|
92
97
|
// failure converted into metadata. There is no detached worker promise.
|
|
93
|
-
const batch = { started: false, result: observe() };
|
|
98
|
+
const batch = { started: false, background: options?.background === true, result: observe() };
|
|
94
99
|
batches.set(source, batch);
|
|
95
100
|
const result = await batch.result;
|
|
96
101
|
return result;
|
|
97
102
|
};
|
|
98
103
|
}
|
|
99
104
|
const observeBatched = batchProcessTableReads(observeProcessTableOnce);
|
|
100
|
-
export async function observeProcessTableAsync(source = processTableSource()) {
|
|
101
|
-
const result = await observeBatched(source);
|
|
105
|
+
export async function observeProcessTableAsync(source = processTableSource(), options) {
|
|
106
|
+
const result = await observeBatched(source, options);
|
|
102
107
|
return result;
|
|
103
108
|
}
|
|
104
109
|
//# sourceMappingURL=process-table-async.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-table-async.js","sources":["../../../src/shared/executable/process-table-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,wBAAwB,EAAE,cAAc,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,mBAAmB,EAAmG,MAAM,mBAAmB,CAAC;AAC1O,OAAO,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"process-table-async.js","sources":["../../../src/shared/executable/process-table-async.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type ProcessTableObservation, type ProcessTableSource } from "./process-tree.js";
|
|
2
|
+
import type { ProcessTableReadOptions } from "./process-table-command.js";
|
|
3
|
+
/** Caller budget includes the queue. A late shared query may serve another
|
|
4
|
+
* caller, but can never become this caller's identity evidence. */
|
|
5
|
+
export declare function observeProcessTableWithin(timeoutMs: number, source?: ProcessTableSource, options?: ProcessTableReadOptions): Promise<ProcessTableObservation>;
|
|
6
|
+
//# sourceMappingURL=process-table-budget.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-table-budget.d.ts","sources":["../../../src/shared/executable/process-table-budget.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,uBAAuB,EAAE,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC/G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAE1E;mEACmE;AACnE,wBAAsB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,kBAAyC,EAAE,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgBzL"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { observeProcessTableAsync, processTableSource } from "./process-table-async.js";
|
|
2
|
+
import { processTableFailure } from "./process-tree.js";
|
|
3
|
+
/** Caller budget includes the queue. A late shared query may serve another
|
|
4
|
+
* caller, but can never become this caller's identity evidence. */
|
|
5
|
+
export async function observeProcessTableWithin(timeoutMs, source = processTableSource(), options) {
|
|
6
|
+
const started = performance.now();
|
|
7
|
+
const timeout = () => ({ ok: false, source, reason: "timeout", timeoutMs, elapsedMs: performance.now() - started });
|
|
8
|
+
if (timeoutMs <= 0) {
|
|
9
|
+
return timeout();
|
|
10
|
+
}
|
|
11
|
+
const expired = Promise.withResolvers();
|
|
12
|
+
const timer = setTimeout(() => { expired.resolve(timeout()); }, timeoutMs);
|
|
13
|
+
if (options?.background === true) {
|
|
14
|
+
timer.unref();
|
|
15
|
+
}
|
|
16
|
+
try {
|
|
17
|
+
const read = (async () => {
|
|
18
|
+
try {
|
|
19
|
+
return await observeProcessTableAsync(source, options);
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
return processTableFailure(error, source, performance.now() - started);
|
|
23
|
+
}
|
|
24
|
+
})();
|
|
25
|
+
const result = await Promise.race([read, expired.promise]);
|
|
26
|
+
// A busy event loop may deliver the query before an overdue timer.
|
|
27
|
+
return performance.now() - started >= timeoutMs ? timeout() : result;
|
|
28
|
+
}
|
|
29
|
+
finally {
|
|
30
|
+
clearTimeout(timer);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=process-table-budget.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-table-budget.js","sources":["../../../src/shared/executable/process-table-budget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAyD,MAAM,mBAAmB,CAAC;AAG/G;mEACmE;AACnE,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,SAAiB,EAAE,MAAM,GAAuB,kBAAkB,EAAE,EAAE,OAAiC;IACrJ,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,OAAO,GAAG,GAA4B,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC7I,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QAAC,OAAO,OAAO,EAAE,CAAC;IAAC,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,EAA2B,CAAC;IACjE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAC3E,IAAI,OAAO,EAAE,UAAU,KAAK,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IAAC,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,KAAK,IAAsC,EAAE;YACzD,IAAI,CAAC;gBAAC,OAAO,MAAM,wBAAwB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAAC,CAAC;YAC/D,OAAO,KAAK,EAAE,CAAC;gBAAC,OAAO,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC;YAAC,CAAC;QAC3F,CAAC,CAAC,EAAE,CAAC;QACL,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,mEAAmE;QACnE,OAAO,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACvE,CAAC;YAAS,CAAC;QAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAAC,CAAC;AACpC,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
export declare const PROCESS_TABLE_TIMEOUT_MS = 5000;
|
|
2
|
+
export interface ProcessTableReadOptions {
|
|
3
|
+
readonly background?: boolean;
|
|
4
|
+
}
|
|
2
5
|
/** A query deadline includes pipe drain; a dead root cannot leave this read waiting on close. */
|
|
3
|
-
export declare function processTableCommand(command: string, args: readonly string[], env?: NodeJS.ProcessEnv): Promise<string>;
|
|
6
|
+
export declare function processTableCommand(command: string, args: readonly string[], env?: NodeJS.ProcessEnv, options?: ProcessTableReadOptions): Promise<string>;
|
|
4
7
|
//# sourceMappingURL=process-table-command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-table-command.d.ts","sources":["../../../src/shared/executable/process-table-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-table-command.d.ts","sources":["../../../src/shared/executable/process-table-command.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAE7C,MAAM,WAAW,uBAAuB;IAAG,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;CAAE;AAE3E,iGAAiG;AACjG,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoD/J"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
+
import { Socket } from "node:net";
|
|
2
3
|
import { trackOwnedProcess } from "./ownership.js";
|
|
3
4
|
export const PROCESS_TABLE_TIMEOUT_MS = 5000;
|
|
4
5
|
const MAX_OUTPUT = 16 * 1024 * 1024;
|
|
5
6
|
/** A query deadline includes pipe drain; a dead root cannot leave this read waiting on close. */
|
|
6
|
-
export async function processTableCommand(command, args, env) {
|
|
7
|
+
export async function processTableCommand(command, args, env, options) {
|
|
7
8
|
const output = await new Promise((resolve, reject) => {
|
|
8
9
|
// Node's piped-stdio overload excludes the missing pipes of a failed spawn.
|
|
9
10
|
const child = spawn(command, [...args], { env, windowsHide: true, stdio: ["ignore", "pipe", "ignore"] });
|
|
@@ -45,11 +46,17 @@ export async function processTableCommand(command, args, env) {
|
|
|
45
46
|
finish(Object.assign(new Error("Process table command failed"), { status: code, signal }));
|
|
46
47
|
}
|
|
47
48
|
});
|
|
49
|
+
if (options?.background === true) {
|
|
50
|
+
child.unref();
|
|
51
|
+
}
|
|
48
52
|
const stdout = child.stdout;
|
|
49
53
|
if (!stdout) {
|
|
50
54
|
// The native spawn error is queued first; retain its metadata when it
|
|
51
55
|
// arrives, while also settling a malformed spawn with no error event.
|
|
52
|
-
setImmediate(() => { finish(new Error("Process table query has no stdout")); });
|
|
56
|
+
const fallback = setImmediate(() => { finish(new Error("Process table query has no stdout")); });
|
|
57
|
+
if (options?.background === true) {
|
|
58
|
+
fallback.unref();
|
|
59
|
+
}
|
|
53
60
|
return;
|
|
54
61
|
}
|
|
55
62
|
stdout.on("data", (chunk) => {
|
|
@@ -63,6 +70,12 @@ export async function processTableCommand(command, args, env) {
|
|
|
63
70
|
});
|
|
64
71
|
stdout.once("error", finish);
|
|
65
72
|
deadline.timer = setTimeout(() => { finish(Object.assign(new Error("Process table query timed out"), { code: "ETIMEDOUT" })); }, PROCESS_TABLE_TIMEOUT_MS);
|
|
73
|
+
if (options?.background === true) {
|
|
74
|
+
deadline.timer.unref();
|
|
75
|
+
if (stdout instanceof Socket) {
|
|
76
|
+
stdout.unref();
|
|
77
|
+
}
|
|
78
|
+
}
|
|
66
79
|
});
|
|
67
80
|
return output;
|
|
68
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-table-command.js","sources":["../../../src/shared/executable/process-table-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,CAAC;AAC7C,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"process-table-command.js","sources":["../../../src/shared/executable/process-table-command.ts"],"names":[],"mappings":"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"}
|