@botiverse/oar 0.80.2 → 0.82.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 +102 -0
- package/dist/runtimes/opencode/shared-session.js.map +1 -0
- package/dist/runtimes/opencode/sharing-admission.d.ts +6 -0
- package/dist/runtimes/opencode/sharing-admission.d.ts.map +1 -0
- package/dist/runtimes/opencode/sharing-admission.js +17 -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 +1 -0
- package/dist/runtimes/qoder/daemon.js.map +1 -1
- package/dist/shared/acp/process.d.ts +3 -0
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +1 -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 +7 -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 +41 -5
- package/dist/shared/executable/process-cleanup.js.map +1 -1
- package/dist/shared/executable/process-shutdown.d.ts +2 -0
- package/dist/shared/executable/process-shutdown.d.ts.map +1 -1
- package/dist/shared/executable/process-shutdown.js +36 -6
- 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.d.ts +3 -0
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +16 -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,4 +1,5 @@
|
|
|
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. */
|
|
@@ -6,6 +7,7 @@ export function processShutdown(child, options) {
|
|
|
6
7
|
let stopping = false;
|
|
7
8
|
let ended = false;
|
|
8
9
|
let stopAction = false;
|
|
10
|
+
const cancellations = new Set();
|
|
9
11
|
let phase = Promise.resolve();
|
|
10
12
|
let escalation = undefined;
|
|
11
13
|
let cleanup = undefined;
|
|
@@ -61,6 +63,17 @@ export function processShutdown(child, options) {
|
|
|
61
63
|
}
|
|
62
64
|
escalation = setTimeout(() => { phase = force(); }, killGraceMs());
|
|
63
65
|
};
|
|
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));
|
|
74
|
+
}
|
|
75
|
+
return cleanup;
|
|
76
|
+
};
|
|
64
77
|
// Only call immediately before an intended stop: the snapshot is memoized
|
|
65
78
|
// and its cleanup stays registered until exit, even before stop() is called.
|
|
66
79
|
const prepare = async () => {
|
|
@@ -71,15 +84,13 @@ export function processShutdown(child, options) {
|
|
|
71
84
|
if (!alive() || options.killTree !== true || child.pid === undefined) {
|
|
72
85
|
return;
|
|
73
86
|
}
|
|
74
|
-
const
|
|
75
|
-
cleanup = ownedCleanup;
|
|
76
|
-
releaseCleanup = trackPendingCleanup((read) => ownedCleanup.finishSync(read));
|
|
87
|
+
const preparedCleanup = ownedCleanup();
|
|
77
88
|
capture = (async () => {
|
|
78
89
|
try {
|
|
79
|
-
await
|
|
90
|
+
await preparedCleanup.capture();
|
|
80
91
|
}
|
|
81
92
|
catch (error) {
|
|
82
|
-
|
|
93
|
+
preparedCleanup.failed(error, "before_eof");
|
|
83
94
|
}
|
|
84
95
|
})();
|
|
85
96
|
phase = capture;
|
|
@@ -115,13 +126,32 @@ export function processShutdown(child, options) {
|
|
|
115
126
|
markNativeStop() { if (alive()) {
|
|
116
127
|
stopAction = true;
|
|
117
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
|
+
},
|
|
118
148
|
stopping: () => stopping,
|
|
119
149
|
diagnostics: () => cleanup?.diagnostics(),
|
|
120
150
|
reason: () => cleanupFailureReason(cleanup?.diagnostics()),
|
|
121
151
|
nativeExited() {
|
|
122
152
|
ended = true;
|
|
123
153
|
clearTimeout(escalation);
|
|
124
|
-
if (!stopAction) {
|
|
154
|
+
if (!stopAction && cancellations.size === 0) {
|
|
125
155
|
// A pending observation does not turn a spontaneous exit into an OAR
|
|
126
156
|
// stop. Its orphan descendants remain the natural-exit limitation.
|
|
127
157
|
cleanup = undefined;
|
|
@@ -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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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { ProcessTableFailure } from "./process-tree.js";
|
|
2
|
+
export type ProcessTablePreparation = {
|
|
3
|
+
readonly status: "pending";
|
|
4
|
+
} | ProcessTableFailure | {
|
|
5
|
+
readonly ok: true;
|
|
6
|
+
readonly source: "windows";
|
|
7
|
+
readonly elapsedMs: number;
|
|
8
|
+
readonly skipped: number;
|
|
9
|
+
};
|
|
10
|
+
/** Once per host, after a Windows tree-owning child successfully spawns.
|
|
11
|
+
* Use the regular serial reader, retain metadata only, and never retry. */
|
|
12
|
+
export declare function prepareProcessTable(): void;
|
|
13
|
+
export declare function processTablePreparation(): ProcessTablePreparation | undefined;
|
|
14
|
+
//# sourceMappingURL=process-table-preparation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-table-preparation.d.ts","sources":["../../../src/shared/executable/process-table-preparation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAA;CAAE,GAChE,mBAAmB,GACnB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAI5G;2EAC2E;AAC3E,wBAAgB,mBAAmB,IAAI,IAAI,CAS1C;AAED,wBAAgB,uBAAuB,IAAI,uBAAuB,GAAG,SAAS,CAAkE"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { processTableSource } from "./process-table-async.js";
|
|
2
|
+
import { observeProcessTableWithin } from "./process-table-budget.js";
|
|
3
|
+
let preparation = null;
|
|
4
|
+
/** Once per host, after a Windows tree-owning child successfully spawns.
|
|
5
|
+
* Use the regular serial reader, retain metadata only, and never retry. */
|
|
6
|
+
export function prepareProcessTable() {
|
|
7
|
+
if (processTableSource() !== "windows" || preparation !== null) {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
preparation = { status: "pending" };
|
|
11
|
+
void (async () => {
|
|
12
|
+
const result = await observeProcessTableWithin(5000, "windows", { background: true });
|
|
13
|
+
preparation = result.ok
|
|
14
|
+
? { ok: true, source: "windows", elapsedMs: result.elapsedMs, skipped: result.skipped }
|
|
15
|
+
: result;
|
|
16
|
+
})();
|
|
17
|
+
}
|
|
18
|
+
export function processTablePreparation() { return preparation === null ? undefined : { ...preparation }; }
|
|
19
|
+
//# sourceMappingURL=process-table-preparation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-table-preparation.js","sources":["../../../src/shared/executable/process-table-preparation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAOtE,IAAI,WAAW,GAAmC,IAAI,CAAC;AAEvD;2EAC2E;AAC3E,MAAM,UAAU,mBAAmB;IACjC,IAAI,kBAAkB,EAAE,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO;IAAC,CAAC;IAC3E,WAAW,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IACpC,KAAK,CAAC,KAAK,IAAmB,EAAE;QAC9B,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QACtF,WAAW,GAAG,MAAM,CAAC,EAAE;YACrB,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;YACvF,CAAC,CAAC,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,CAAC;AACP,CAAC;AAED,MAAM,UAAU,uBAAuB,KAA0C,OAAO,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Duplex, type Readable, type Writable } from "node:stream";
|
|
2
2
|
import { type ProcessDiagnostics } from "./diagnostics.js";
|
|
3
3
|
import { treeResourcesReader } from "./process-resources.js";
|
|
4
|
+
import type { CancellationObservation } from "./process-cancellation.js";
|
|
4
5
|
export { trackOwnedProcess } from "./ownership.js";
|
|
5
6
|
export { killGraceMs, KILL_GRACE_MS, killProcessTree, signalProcessGroup, OWN_PROCESS_GROUP } from "./process-signals.js";
|
|
6
7
|
export interface LineProcessOptions {
|
|
@@ -51,6 +52,8 @@ export interface LineProcess {
|
|
|
51
52
|
prepareShutdown(): Promise<void>;
|
|
52
53
|
/** Record the actual native stop attempt, immediately before sending cancel/close. */
|
|
53
54
|
markNativeStop(): void;
|
|
55
|
+
/** Stage one fresh, bounded observation before a reusable turn cancellation. */
|
|
56
|
+
observeCancellation(): Promise<CancellationObservation>;
|
|
54
57
|
write(text: string): void;
|
|
55
58
|
/** Complete UTF-8 lines, independent of stdout byte-chunk boundaries. */
|
|
56
59
|
onLine(handler: (line: string) => void): void;
|
|
@@ -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":"AAEA,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;AAC7D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAMzE,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;;;;;;;;;;OAUG;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,gGAAgG;IAChG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,sFAAsF;IACtF,cAAc,IAAI,IAAI,CAAC;IACvB,gFAAgF;IAChF,mBAAmB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACxD,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,CA0Hb"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* oxlint-disable import/max-dependencies -- This process owner composes spawn, streams, diagnostics, observation and shutdown. */
|
|
1
2
|
import spawn from "cross-spawn";
|
|
2
3
|
import { Duplex } from "node:stream";
|
|
3
4
|
import { StringDecoder } from "node:string_decoder";
|
|
@@ -7,6 +8,7 @@ import { treeResourcesReader } from "./process-resources.js";
|
|
|
7
8
|
import { processShutdown } from "./process-shutdown.js";
|
|
8
9
|
import { OWN_PROCESS_GROUP } from "./process-signals.js";
|
|
9
10
|
import { windowsSpawnTarget } from "./windows-shim.js";
|
|
11
|
+
import { prepareProcessTable, processTablePreparation } from "./process-table-preparation.js";
|
|
10
12
|
export { trackOwnedProcess } from "./ownership.js";
|
|
11
13
|
export { killGraceMs, KILL_GRACE_MS, killProcessTree, signalProcessGroup, OWN_PROCESS_GROUP } from "./process-signals.js";
|
|
12
14
|
/**
|
|
@@ -48,17 +50,26 @@ export function spawnLineProcess(command, args, options = {}) {
|
|
|
48
50
|
let exitCode = null;
|
|
49
51
|
let exitSignal = null;
|
|
50
52
|
let spawnError = undefined;
|
|
53
|
+
let preparationAfterCleanup = undefined;
|
|
51
54
|
const shutdown = processShutdown(child, options);
|
|
52
55
|
const { promise: spawned, resolve: spawnOk, reject: spawnFailed } = Promise.withResolvers();
|
|
53
56
|
const exited = (async () => {
|
|
54
57
|
await shutdown.finished;
|
|
58
|
+
if (shutdown.diagnostics() !== undefined) {
|
|
59
|
+
preparationAfterCleanup = processTablePreparation();
|
|
60
|
+
}
|
|
55
61
|
finalized = true;
|
|
56
62
|
for (const handler of exitHandlers) {
|
|
57
63
|
handler(exitCode, shutdown.reason());
|
|
58
64
|
}
|
|
59
65
|
return exitCode;
|
|
60
66
|
})();
|
|
61
|
-
child.once("spawn",
|
|
67
|
+
child.once("spawn", () => {
|
|
68
|
+
spawnOk();
|
|
69
|
+
if (options.killTree === true) {
|
|
70
|
+
prepareProcessTable();
|
|
71
|
+
}
|
|
72
|
+
});
|
|
62
73
|
const end = (code, signal = null) => {
|
|
63
74
|
if (ended) {
|
|
64
75
|
return;
|
|
@@ -100,12 +111,15 @@ export function spawnLineProcess(command, args, options = {}) {
|
|
|
100
111
|
stopping: () => shutdown.stopping(),
|
|
101
112
|
prepareShutdown: async () => { await shutdown.prepare(); },
|
|
102
113
|
markNativeStop: () => { shutdown.markNativeStop(); },
|
|
114
|
+
observeCancellation: async () => { const observation = await shutdown.observeCancellation(); return observation; },
|
|
103
115
|
...(child.stdio[3] instanceof Duplex ? { extraPipe: child.stdio[3] } : {}),
|
|
104
116
|
diagnostics: () => {
|
|
105
117
|
const cleanup = shutdown.diagnostics();
|
|
106
118
|
return { exitCode, signal: exitSignal, stderr: stderr.text(),
|
|
107
119
|
...(spawnError === undefined ? {} : { error: spawnError }),
|
|
108
|
-
...(cleanup === undefined ? {} : { cleanup
|
|
120
|
+
...(cleanup === undefined ? {} : { cleanup: { ...cleanup,
|
|
121
|
+
...(preparationAfterCleanup === undefined ? {} : { preparation: { ...preparationAfterCleanup } }),
|
|
122
|
+
} }),
|
|
109
123
|
};
|
|
110
124
|
},
|
|
111
125
|
// Stop accepting writes immediately, including while capture awaits EOF.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,MAAM,EAAgC,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAA2B,MAAM,kBAAkB,CAAC;AAChH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"process.js","sources":["../../../src/shared/executable/process.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAKtG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/stream-json/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAKtG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,EAA4B,KAAK,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAY7D,sGAAsG;AACtG,wBAAsB,iBAAiB,CAAC,CAAC,SAAS,yBAAyB,EACzE,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACnC,OAAO,CAAC,OAAO,CAAC,CA2QlB"}
|