@overkill-dev/run 0.0.79 → 0.0.81
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/bounded-json-frames.js +19 -0
- package/bounded-json-frames.js.map +1 -0
- package/engine/async-leak-diagnostics.js +2 -0
- package/engine/async-leak-diagnostics.js.map +1 -1
- package/engine/benchmark-result.d.ts +3 -0
- package/engine/benchmark-result.d.ts.map +1 -1
- package/engine/case-attempt-execution.js +11 -9
- package/engine/case-attempt-execution.js.map +1 -1
- package/engine/case-execution.d.ts.map +1 -1
- package/engine/case-execution.js +8 -3
- package/engine/case-execution.js.map +1 -1
- package/engine/resource-owner-observation.js +46 -5
- package/engine/resource-owner-observation.js.map +1 -1
- package/execution-termination.d.ts +2 -0
- package/execution-termination.d.ts.map +1 -0
- package/execution-termination.js +8 -0
- package/execution-termination.js.map +1 -0
- package/invocation-budget.d.ts +13 -0
- package/invocation-budget.d.ts.map +1 -0
- package/invocation-budget.js +35 -0
- package/invocation-budget.js.map +1 -0
- package/package.json +2 -1
- package/packages/resources/attachment-context.entry-point.js +2 -0
- package/packages/resources/attachment-context.entry-point.js.map +1 -1
- package/packages/run/run.entry-point.d.ts +2 -0
- package/packages/run/run.entry-point.d.ts.map +1 -1
- package/packages/run/run.entry-point.js +2 -0
- package/packages/run/run.entry-point.js.map +1 -1
- package/run/attachment-connection.js +3 -2
- package/run/attachment-connection.js.map +1 -1
- package/run/attachment-eligibility.js +12 -1
- package/run/attachment-eligibility.js.map +1 -1
- package/run/attachment-server.js +3 -2
- package/run/attachment-server.js.map +1 -1
- package/run/benchmark-definition-schema.js +13 -10
- package/run/benchmark-definition-schema.js.map +1 -1
- package/run/benchmark-placement.js +2 -1
- package/run/benchmark-placement.js.map +1 -1
- package/run/child-process-outbox.js +13 -5
- package/run/child-process-outbox.js.map +1 -1
- package/run/execution-session-child.js +9 -2
- package/run/execution-session-child.js.map +1 -1
- package/run/execution-session-collected.js +7 -1
- package/run/execution-session-collected.js.map +1 -1
- package/run/execution-session-environment.js +1 -1
- package/run/execution-session-environment.js.map +1 -1
- package/run/execution-session-host.js +17 -0
- package/run/execution-session-host.js.map +1 -1
- package/run/execution-session-lifecycle.js +15 -6
- package/run/execution-session-lifecycle.js.map +1 -1
- package/run/execution-session-observation.js +95 -0
- package/run/execution-session-observation.js.map +1 -0
- package/run/execution-session-ownership.js +23 -0
- package/run/execution-session-ownership.js.map +1 -0
- package/run/execution-session-process.js +26 -4
- package/run/execution-session-process.js.map +1 -1
- package/run/execution-session-schema.js +2 -0
- package/run/execution-session-schema.js.map +1 -1
- package/run/execution-session-supervised.js +21 -75
- package/run/execution-session-supervised.js.map +1 -1
- package/run/execution-session.js +37 -35
- package/run/execution-session.js.map +1 -1
- package/run/frozen-policy-validation.js +8 -2
- package/run/frozen-policy-validation.js.map +1 -1
- package/run/node-child-process-starters.js +2 -0
- package/run/node-child-process-starters.js.map +1 -1
- package/run/supervised-child-failure.js +9 -3
- package/run/supervised-child-failure.js.map +1 -1
- package/run/supervised-child-process.d.ts.map +1 -1
- package/run/supervised-child-process.js +2 -2
- package/run/supervised-child-process.js.map +1 -1
- package/run/supervised-child-transport.js +10 -5
- package/run/supervised-child-transport.js.map +1 -1
- package/run/supervised-child.entry-point.js +1 -0
- package/run/supervised-child.entry-point.js.map +1 -1
- package/run/supervised-child.js +3 -2
- package/run/supervised-child.js.map +1 -1
- package/run/supervised-protocol-schema.js +1 -1
- package/run/supervised-protocol-schema.js.map +1 -1
- package/run/supervised-protocol.js.map +1 -1
- package/run/supervised-run-process-policy.js +11 -0
- package/run/supervised-run-process-policy.js.map +1 -1
- package/run/supervised-run-runtime.js +1 -1
- package/run/supervised-run-runtime.js.map +1 -1
- package/software-bill-of-materials.cyclonedx.json +4 -4
- package/run/attachment-frames.js +0 -22
- package/run/attachment-frames.js.map +0 -1
|
@@ -1,9 +1,26 @@
|
|
|
1
1
|
import { fork } from 'node:child_process';
|
|
2
2
|
import { fileURLToPath } from 'node:url';
|
|
3
3
|
import { sanitizedChildEnvironment } from "./supervised-child-process.js";
|
|
4
|
-
import {
|
|
4
|
+
import { executionHostMessageSchema } from "./execution-session-schema.js";
|
|
5
5
|
import { executionSessionProcessArgument, executionSessionProcessUrl, readExecutionSessionEnvironment } from "./execution-session-process.entry-point.js";
|
|
6
|
-
|
|
6
|
+
async function deliverCheckpoint(message, delivery) {
|
|
7
|
+
try {
|
|
8
|
+
await delivery.observation.checkpoint(message.data);
|
|
9
|
+
}
|
|
10
|
+
catch (error) {
|
|
11
|
+
delivery.reject(error);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
function deliverHostMessage(message, delivery) {
|
|
15
|
+
const decoded = executionHostMessageSchema.parse(message);
|
|
16
|
+
if (decoded.kind === 'execution-checkpoint') {
|
|
17
|
+
delivery.pending.add(deliverCheckpoint(decoded, delivery));
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
delivery.resolve(decoded);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
function startFreshExecutionHost(command, signal) {
|
|
7
24
|
signal.throwIfAborted();
|
|
8
25
|
const child = fork(fileURLToPath(executionSessionProcessUrl), [executionSessionProcessArgument], {
|
|
9
26
|
cwd: command.policy.cwd,
|
|
@@ -19,15 +36,19 @@ export async function runFreshExecutionSession(command, transport, timeoutMillis
|
|
|
19
36
|
const closed = new Promise(function (resolve) {
|
|
20
37
|
child.once('close', resolve);
|
|
21
38
|
});
|
|
39
|
+
return { child, closed, pending: new Set() };
|
|
40
|
+
}
|
|
41
|
+
export async function runFreshExecutionSession(command, transport, timeoutMilliseconds, observation) {
|
|
42
|
+
const { child, closed, pending } = startFreshExecutionHost(command, observation.signal);
|
|
22
43
|
try {
|
|
23
44
|
return await new Promise(function (resolve, reject) {
|
|
24
45
|
child.once('error', reject);
|
|
25
46
|
child.once('exit', function (code, termination) {
|
|
26
47
|
reject(new Error(`Execution host exited without a result (${String(code)}, ${String(termination)}).`));
|
|
27
48
|
});
|
|
28
|
-
child.
|
|
49
|
+
child.on('message', function (message) {
|
|
29
50
|
try {
|
|
30
|
-
|
|
51
|
+
deliverHostMessage(message, { observation, pending, resolve, reject });
|
|
31
52
|
}
|
|
32
53
|
catch (error) {
|
|
33
54
|
reject(error instanceof Error
|
|
@@ -51,6 +72,7 @@ export async function runFreshExecutionSession(command, transport, timeoutMillis
|
|
|
51
72
|
finally {
|
|
52
73
|
child.kill('SIGKILL');
|
|
53
74
|
await closed;
|
|
75
|
+
await Promise.all(pending);
|
|
54
76
|
}
|
|
55
77
|
}
|
|
56
78
|
//# sourceMappingURL=execution-session-process.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-session-process.js","sourceRoot":"","sources":["../../../../source/run/execution-session-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"execution-session-process.js","sourceRoot":"","sources":["../../../../source/run/execution-session-process.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,8 @@ export const executionReplySchema = z.discriminatedUnion('kind', [
|
|
|
38
38
|
z.strictObject({ kind: z.literal('failure'), failure: runExecutionFailureSchema, data: z.json() }),
|
|
39
39
|
z.strictObject({ kind: z.literal('timeout'), data: z.json() })
|
|
40
40
|
]);
|
|
41
|
+
const executionCheckpointSchema = z.strictObject({ kind: z.literal('execution-checkpoint'), data: z.json() });
|
|
42
|
+
export const executionHostMessageSchema = z.union([executionReplySchema, executionCheckpointSchema]);
|
|
41
43
|
export const executionHostRequestSchema = z.strictObject({
|
|
42
44
|
policy: frozenMicrotestPolicySchema,
|
|
43
45
|
seed: z.strictObject({ value: z.bigint().nonnegative() }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-session-schema.js","sourceRoot":"","sources":["../../../../source/run/execution-session-schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execution-session-schema.js","sourceRoot":"","sources":["../../../../source/run/execution-session-schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,38 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { envelopeMessage } from "./child-process-protocol.js";
|
|
3
|
-
import { supervisedChildMessageSchema } from "./supervised-protocol-schema.js";
|
|
4
|
-
import { supervisedChildCorrelationId } from "./supervised-protocol.js";
|
|
1
|
+
import { InvocationDeadlineExceededError, isInvocationCancellation } from "../invocation-budget.js";
|
|
5
2
|
import { createRunOperations } from "./run-operations.js";
|
|
6
3
|
import { withExecutionSession } from "./execution-session-context.js";
|
|
4
|
+
import { createExecutionHostOwnership } from "./execution-session-ownership.js";
|
|
5
|
+
import { createExecutionDataObservation, observedReply, observeExecutionMessage } from "./execution-session-observation.js";
|
|
7
6
|
import { runExecutionFailure } from "./execution-failure.js";
|
|
8
|
-
function
|
|
9
|
-
const decoded = envelopeMessage(message, supervisedChildCorrelationId, supervisedChildMessageSchema);
|
|
10
|
-
if (decoded?.kind === 'result') {
|
|
11
|
-
observation.result.write(decoded.result);
|
|
12
|
-
}
|
|
13
|
-
if (decoded?.kind !== 'execution-data') {
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
|
-
if (observation.delivered.read()) {
|
|
17
|
-
throw new Error('Duplicate execution lifecycle data.');
|
|
18
|
-
}
|
|
19
|
-
observation.delivered.write(true);
|
|
20
|
-
observation.data.write(decoded.data);
|
|
21
|
-
}
|
|
22
|
-
function observeExecutionMessage(observation, message) {
|
|
23
|
-
try {
|
|
24
|
-
readExecutionData(observation, message);
|
|
25
|
-
}
|
|
26
|
-
catch (error) {
|
|
27
|
-
observation.failure.write(error instanceof Error ? error : new Error('Invalid execution lifecycle data.', { cause: error }));
|
|
28
|
-
observation.invalid.abort();
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
function observedDependencies(dependencies, observation) {
|
|
7
|
+
function observedDependencies(dependencies, observation, start) {
|
|
32
8
|
return {
|
|
33
9
|
...dependencies,
|
|
34
10
|
async startSupervisedChild(input) {
|
|
35
|
-
const child = await
|
|
11
|
+
const child = await start(input);
|
|
36
12
|
child.on('message', function (message) {
|
|
37
13
|
observeExecutionMessage(observation, message);
|
|
38
14
|
});
|
|
@@ -40,54 +16,24 @@ function observedDependencies(dependencies, observation) {
|
|
|
40
16
|
}
|
|
41
17
|
};
|
|
42
18
|
}
|
|
43
|
-
function
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
19
|
+
export async function runSupervisedExecutionSession(options, dependencies, call) {
|
|
20
|
+
const observation = createExecutionDataObservation();
|
|
21
|
+
const ownership = createExecutionHostOwnership(dependencies.startSupervisedChild, call.signal);
|
|
22
|
+
const operations = createRunOperations(observedDependencies(dependencies, observation, ownership.start), 'test');
|
|
23
|
+
const signal = AbortSignal.any([call.signal, observation.invalid.signal]);
|
|
24
|
+
try {
|
|
25
|
+
const result = await withExecutionSession(call.transport, async function () {
|
|
26
|
+
return await operations.run(options.command, { signal, timing: null });
|
|
27
|
+
});
|
|
28
|
+
return observedReply(result, call, observation);
|
|
48
29
|
}
|
|
49
|
-
|
|
50
|
-
.
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
})
|
|
54
|
-
.join('\n');
|
|
55
|
-
return {
|
|
56
|
-
kind: 'failure',
|
|
57
|
-
failure: runExecutionFailure(new Error(`Execution lifecycle data was not delivered. ${errors}`)),
|
|
58
|
-
data: null
|
|
59
|
-
};
|
|
60
|
-
}
|
|
61
|
-
function observedReply(result, call, observation) {
|
|
62
|
-
const failure = observation.failure.read();
|
|
63
|
-
if (failure !== null) {
|
|
64
|
-
return { kind: 'failure', failure: runExecutionFailure(failure), data: observation.data.read() };
|
|
30
|
+
catch (error) {
|
|
31
|
+
return signal.reason instanceof InvocationDeadlineExceededError && isInvocationCancellation(error, signal)
|
|
32
|
+
? { kind: 'timeout', data: observation.data.read() }
|
|
33
|
+
: { kind: 'failure', failure: runExecutionFailure(error), data: observation.data.read() };
|
|
65
34
|
}
|
|
66
|
-
|
|
67
|
-
|
|
35
|
+
finally {
|
|
36
|
+
await ownership.dispose();
|
|
68
37
|
}
|
|
69
|
-
const completed = observation.result.read();
|
|
70
|
-
const selected = completed === null ? result : {
|
|
71
|
-
...result,
|
|
72
|
-
bySuite: completed.bySuite,
|
|
73
|
-
planStatus: completed.planStatus,
|
|
74
|
-
summary: { ...result.summary, planned: completed.summary.planned }
|
|
75
|
-
};
|
|
76
|
-
return { kind: 'result', result: selected, data: observation.data.read(), deadlineExceeded: false };
|
|
77
|
-
}
|
|
78
|
-
export async function runSupervisedExecutionSession(options, dependencies, call) {
|
|
79
|
-
const observation = {
|
|
80
|
-
data: createStoredValue(null),
|
|
81
|
-
delivered: createStoredValue(false),
|
|
82
|
-
failure: createStoredValue(null),
|
|
83
|
-
invalid: new AbortController(),
|
|
84
|
-
result: createStoredValue(null)
|
|
85
|
-
};
|
|
86
|
-
const operations = createRunOperations(observedDependencies(dependencies, observation), 'test');
|
|
87
|
-
const signal = AbortSignal.any([call.signal, observation.invalid.signal]);
|
|
88
|
-
const result = await withExecutionSession(call.transport, async function () {
|
|
89
|
-
return await operations.run(options.command, { signal, timing: null });
|
|
90
|
-
});
|
|
91
|
-
return observedReply(result, call, observation);
|
|
92
38
|
}
|
|
93
39
|
//# sourceMappingURL=execution-session-supervised.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-session-supervised.js","sourceRoot":"","sources":["../../../../source/run/execution-session-supervised.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"execution-session-supervised.js","sourceRoot":"","sources":["../../../../source/run/execution-session-supervised.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACpG,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EACH,8BAA8B,EAC9B,aAAa,EACb,uBAAuB,EAE1B,MAAM,oCAAoC,CAAC;AAI5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,SAAS,oBAAoB,CACzB,YAAyC,EACzC,WAAqC,EACrC,KAA0D;IAE1D,OAAO;QACH,GAAG,YAAY;QACf,KAAK,CAAC,oBAAoB,CAAC,KAAK;YAC5B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;YACjC,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,OAAgB;gBAC1C,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACjB,CAAC;KACJ,CAAC;AACN,CAAC;AACD,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAC/C,OAAmC,EACnC,YAAyC,EACzC,IAA0B;IAE1B,MAAM,WAAW,GAAG,8BAA8B,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,4BAA4B,CAAC,YAAY,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/F,MAAM,UAAU,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,YAAY,EAAE,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;IACjH,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAE,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAE,CAAC,CAAC;IAC5E,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACrC,IAAI,CAAC,SAAS,EACd,KAAK;YACD,OAAO,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC,CACJ,CAAC;QACF,OAAO,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC,MAAM,YAAY,+BAA+B,IAAI,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC;YACtG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE;YACpD,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;IAClG,CAAC;YAAS,CAAC;QACP,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;AACL,CAAC"}
|
package/run/execution-session.js
CHANGED
|
@@ -1,55 +1,49 @@
|
|
|
1
|
-
import { setTimeout as scheduleDeadline, clearTimeout as cancelDeadline } from 'node:timers';
|
|
2
1
|
import { createStoredValue } from "../stored-value.js";
|
|
2
|
+
import { createInvocationBudget, InvocationDeadlineExceededError, isInvocationCancellation } from "../invocation-budget.js";
|
|
3
3
|
import { runExecutionFailure } from "./execution-failure.js";
|
|
4
4
|
import { executionTransportSchema, normalizeExecutionSessionOptions } from "./execution-session-schema.js";
|
|
5
5
|
async function initializeExecutionEnvironment(options, dependencies) {
|
|
6
6
|
const { createExecutionSessionEnvironment } = await import("./execution-session-environment.js");
|
|
7
7
|
return createExecutionSessionEnvironment(options, dependencies);
|
|
8
8
|
}
|
|
9
|
-
function deadlineCancelledReply(reply, signal
|
|
10
|
-
return reply.kind === 'failure' &&
|
|
11
|
-
reply.failure.
|
|
9
|
+
function deadlineCancelledReply(reply, signal) {
|
|
10
|
+
return reply.kind === 'failure' && signal.reason instanceof InvocationDeadlineExceededError &&
|
|
11
|
+
isInvocationCancellation(reply.failure.cause, signal);
|
|
12
12
|
}
|
|
13
13
|
async function completeInvocation(environment, execution) {
|
|
14
|
-
const { invocation,
|
|
14
|
+
const { invocation, budget, lifecycle, data } = execution;
|
|
15
|
+
const { signal } = budget;
|
|
15
16
|
signal.throwIfAborted();
|
|
16
17
|
const transport = executionTransportSchema.parse({ lifecycle, data: structuredClone(invocation.data) });
|
|
17
18
|
const initialized = await environment;
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
signal.throwIfAborted();
|
|
20
|
+
const reply = await initialized.execute({
|
|
21
|
+
transport,
|
|
22
|
+
timeoutMilliseconds: budget.remainingMilliseconds(),
|
|
23
|
+
signal,
|
|
24
|
+
async checkpoint(snapshot) {
|
|
25
|
+
data.write(structuredClone(snapshot));
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
if (deadlineCancelledReply(reply, signal)) {
|
|
20
29
|
return { kind: 'timeout', data: reply.data };
|
|
21
30
|
}
|
|
22
|
-
return reply.kind === 'result' ? { ...reply, deadlineExceeded: reply.deadlineExceeded || expired() } : reply;
|
|
23
|
-
}
|
|
24
|
-
function cancelledDeadline(error, signal, expired) {
|
|
25
|
-
return expired && (error === signal.reason || error instanceof Error && error.cause === signal.reason);
|
|
31
|
+
return reply.kind === 'result' ? { ...reply, deadlineExceeded: reply.deadlineExceeded || budget.expired() } : reply;
|
|
26
32
|
}
|
|
27
|
-
async function executeInvocation(environment, invocation,
|
|
28
|
-
const
|
|
29
|
-
const signal = AbortSignal.any([
|
|
30
|
-
disposed,
|
|
31
|
-
cancellation.signal,
|
|
32
|
-
...invocation.signal === null ? [] : [invocation.signal]
|
|
33
|
-
]);
|
|
34
|
-
const expired = createStoredValue(false);
|
|
35
|
-
const started = performance.now();
|
|
36
|
-
const deadlineExpired = function () {
|
|
37
|
-
return expired.read() || performance.now() - started >= invocation.timeoutMilliseconds;
|
|
38
|
-
};
|
|
39
|
-
const timer = scheduleDeadline(function cancelExpiredInvocation() {
|
|
40
|
-
expired.write(true);
|
|
41
|
-
cancellation.abort();
|
|
42
|
-
}, invocation.timeoutMilliseconds);
|
|
33
|
+
async function executeInvocation(environment, invocation, budget, lifecycle) {
|
|
34
|
+
const data = createStoredValue(null);
|
|
43
35
|
try {
|
|
44
|
-
return await completeInvocation(environment, { invocation,
|
|
36
|
+
return await completeInvocation(environment, { invocation, budget, lifecycle, data });
|
|
45
37
|
}
|
|
46
38
|
catch (error) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
39
|
+
const timedOut = budget.signal.reason instanceof InvocationDeadlineExceededError &&
|
|
40
|
+
isInvocationCancellation(error, budget.signal);
|
|
41
|
+
return timedOut
|
|
42
|
+
? { kind: 'timeout', data: data.read() }
|
|
43
|
+
: { kind: 'failure', failure: runExecutionFailure(error), data: data.read() };
|
|
50
44
|
}
|
|
51
45
|
finally {
|
|
52
|
-
|
|
46
|
+
budget.dispose();
|
|
53
47
|
}
|
|
54
48
|
}
|
|
55
49
|
function assertSessionAdmission(disposed, active) {
|
|
@@ -70,6 +64,11 @@ export function createExecutionSession(supplied, dependencies) {
|
|
|
70
64
|
const environment = createStoredValue(null);
|
|
71
65
|
const disposed = new AbortController();
|
|
72
66
|
const active = createStoredValue(null);
|
|
67
|
+
async function initializedEnvironment() {
|
|
68
|
+
const initialized = environment.read() ?? initializeExecutionEnvironment(options, dependencies);
|
|
69
|
+
environment.write(initialized);
|
|
70
|
+
return initialized;
|
|
71
|
+
}
|
|
73
72
|
return {
|
|
74
73
|
environmentLifetime: executionLifetime(options),
|
|
75
74
|
async run(invocation) {
|
|
@@ -77,9 +76,12 @@ export function createExecutionSession(supplied, dependencies) {
|
|
|
77
76
|
if (!Number.isFinite(invocation.timeoutMilliseconds) || invocation.timeoutMilliseconds <= 0) {
|
|
78
77
|
return { kind: 'timeout', data: null };
|
|
79
78
|
}
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
const signal = AbortSignal.any([
|
|
80
|
+
disposed.signal,
|
|
81
|
+
...invocation.signal === null ? [] : [invocation.signal]
|
|
82
|
+
]);
|
|
83
|
+
const budget = createInvocationBudget(invocation.timeoutMilliseconds, signal, dependencies.wallClock);
|
|
84
|
+
const running = executeInvocation(initializedEnvironment(), invocation, budget, options.lifecycle);
|
|
83
85
|
active.write(running);
|
|
84
86
|
try {
|
|
85
87
|
return await running;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-session.js","sourceRoot":"","sources":["../../../../source/run/execution-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"execution-session.js","sourceRoot":"","sources":["../../../../source/run/execution-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { isDeepStrictEqual } from 'node:util';
|
|
2
|
-
import { loadConfig } from "../packages/run/config.entry-point.js";
|
|
2
|
+
import { ConfigError, loadConfig } from "../packages/run/config.entry-point.js";
|
|
3
|
+
import { runExecutionFailure } from "./execution-failure.js";
|
|
4
|
+
import { currentExecutionSession } from "./execution-session-context.js";
|
|
3
5
|
import { freezeRunPolicy } from "./freeze-run-policy.js";
|
|
4
6
|
import { policyBaselineCommand } from "./frozen-run-policy.js";
|
|
5
7
|
import { resolveProcessUsagePolicy, resolveRunScheduling, resolveTimingCollection } from "./run-profile-facts.js";
|
|
@@ -60,7 +62,11 @@ async function reevaluatePolicy(policy, dependencies) {
|
|
|
60
62
|
}, dependencies);
|
|
61
63
|
}
|
|
62
64
|
catch (error) {
|
|
63
|
-
throw new RunResolutionError(`Frozen policy revalidation failed: ${revalidationFailure(error)}`, {
|
|
65
|
+
throw new RunResolutionError(`Frozen policy revalidation failed: ${revalidationFailure(error)}`, {
|
|
66
|
+
cause: currentExecutionSession() !== null && error instanceof ConfigError
|
|
67
|
+
? { kind: 'configuration-loading', failure: runExecutionFailure(error) }
|
|
68
|
+
: error
|
|
69
|
+
}, 'invalid-request');
|
|
64
70
|
}
|
|
65
71
|
}
|
|
66
72
|
export async function validateFrozenPolicySource(policy, dependencies) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frozen-policy-validation.js","sourceRoot":"","sources":["../../../../source/run/frozen-policy-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"frozen-policy-validation.js","sourceRoot":"","sources":["../../../../source/run/frozen-policy-validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { fork } from 'node:child_process';
|
|
2
2
|
import { dirname } from 'node:path';
|
|
3
3
|
import { fileURLToPath } from 'node:url';
|
|
4
|
+
import { currentExecutionSession } from "./execution-session-context.js";
|
|
4
5
|
import { childProcessEntryPointUrl } from "./child-process.entry-point.js";
|
|
5
6
|
import { runFileSystem } from "./node-run-dependencies.entry-point.js";
|
|
6
7
|
import { createSupervisedChildProcessStarter } from "./supervised-child-process.js";
|
|
@@ -12,6 +13,7 @@ function forkSupervisedChildProcess(modulePath, childArguments, options) {
|
|
|
12
13
|
cwd: options.cwd,
|
|
13
14
|
env: options.env,
|
|
14
15
|
execArgv: Array.from(options.execArgv),
|
|
16
|
+
serialization: currentExecutionSession() === null ? 'json' : 'advanced',
|
|
15
17
|
stdio: Array.from(options.stdio)
|
|
16
18
|
});
|
|
17
19
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-child-process-starters.js","sourceRoot":"","sources":["../../../../source/run/node-child-process-starters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACH,yBAAyB,EAC5B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACH,aAAa,EAChB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACH,mCAAmC,EAEtC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACH,kCAAkC,EACrC,MAAM,uCAAuC,CAAC;AAE/C,MAAM,sBAAsB,GAAG,aAAa,CAAC,yBAAyB,CAAC,CAAC;AACxE,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC;AASlE,SAAS,0BAA0B,CAC/B,UAAkB,EAClB,cAAiC,EACjC,OAAyB;IAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;QACvD,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;KACnC,CAAC,CAAC;IAEH,OAAO;QACH,cAAc;YACV,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YACxB,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YACxB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBAClB,KAAK,CAAC,UAAU,EAAE,CAAC;YACvB,CAAC;QACL,CAAC;QACD,IAAI,QAAQ;YACR,OAAO,KAAK,CAAC,QAAQ,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,MAAM;YACP,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QACD,EAAE,CAAC,GAAG,YAAY;YACd,MAAM,CAAE,KAAK,EAAE,QAAQ,CAAE,GAAG,YAAY,CAAC;YAEzC,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;gBACpB,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC;YAED,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,GAAG;YACH,OAAO,KAAK,CAAC,GAAG,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,OAAO;YACR,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,UAAU;YACV,OAAO,KAAK,CAAC,UAAU,CAAC;QAC5B,CAAC;QACD,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,MAAM,EAAE,KAAK,CAAC,MAAM;KACvB,CAAC;AACN,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,mCAAmC,CAAC;IACpE,gBAAgB;IAChB,sBAAsB;IACtB,IAAI,EAAE,0BAA0B;IAChC,QAAQ,EAAE,aAAa,CAAC,QAAQ;CACnC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,kCAAkC,CAAC;IAClE,sBAAsB;IACtB,IAAI,EAAE,0BAA0B;CACnC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"node-child-process-starters.js","sourceRoot":"","sources":["../../../../source/run/node-child-process-starters.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { crashError } from "./supervised-run-process-policy.js";
|
|
2
|
-
export function recordChildProtocolFailure(state, reason, observedAtMicroseconds,
|
|
2
|
+
export function recordChildProtocolFailure(state, reason, observedAtMicroseconds, interruption) {
|
|
3
3
|
const activeAttempts = Array.from(state.activeCases.values(), function affectedAttempt(active) {
|
|
4
4
|
return { attempt: active.attempt, case: active.id, work: active.workId };
|
|
5
5
|
});
|
|
@@ -7,10 +7,16 @@ export function recordChildProtocolFailure(state, reason, observedAtMicroseconds
|
|
|
7
7
|
attributedTo: null,
|
|
8
8
|
attributedToAttempt: null,
|
|
9
9
|
attributedToWork: null,
|
|
10
|
-
cause: {
|
|
10
|
+
cause: {
|
|
11
|
+
activeAttempts,
|
|
12
|
+
capability: 'child-process',
|
|
13
|
+
reason,
|
|
14
|
+
strictness: 'observed',
|
|
15
|
+
...interruption.termination === 'cancelled' ? { termination: 'cancelled' } : {}
|
|
16
|
+
},
|
|
11
17
|
diagnostics: [{ label: 'strictness', value: 'observed' }],
|
|
12
18
|
message: reason,
|
|
13
|
-
subtype: restricted ? 'runtime-policy' : 'crash'
|
|
19
|
+
subtype: interruption.restricted ? 'runtime-policy' : 'crash'
|
|
14
20
|
});
|
|
15
21
|
state.recordTerminalActiveCases('crashed', observedAtMicroseconds);
|
|
16
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervised-child-failure.js","sourceRoot":"","sources":["../../../../source/run/supervised-child-failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"supervised-child-failure.js","sourceRoot":"","sources":["../../../../source/run/supervised-child-failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAQhE,MAAM,UAAU,0BAA0B,CACtC,KAAyB,EACzB,MAAc,EACd,sBAA8B,EAC9B,YAAkC;IAElC,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,SAAS,eAAe,CAAC,MAAM;QACzF,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,iBAAiB,CAAC;QACpB,YAAY,EAAE,IAAI;QAClB,mBAAmB,EAAE,IAAI;QACzB,gBAAgB,EAAE,IAAI;QACtB,KAAK,EAAE;YACH,cAAc;YACd,UAAU,EAAE,eAAe;YAC3B,MAAM;YACN,UAAU,EAAE,UAAU;YACtB,GAAG,YAAY,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE;SAClF;QACD,WAAW,EAAE,CAAE,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,CAAE;QAC3D,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO;KAChE,CAAC,CAAC;IACH,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,wBAAwB,CACpC,KAA6B,EAC7B,KAAyB,EACzB,sBAA8B;IAE9B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAExC,KAAK,CAAC,iBAAiB,CAAC;QACpB,GAAG,UAAU,CACT,KAAK,EACL,6EAA6E,IAAI,aAAa,MAAM,IAAI,CAC3G;QACD,WAAW,EAAE,CAAE,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAE;KAC3F,CAAC,CAAC;IACH,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervised-child-process.d.ts","sourceRoot":"","sources":["../../../../source/run/supervised-child-process.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEE,kCAAkC,EAAE,MAAM,kCAAkC,CAAC;AAE3F,OAAO,KAAK,EAAE,aAAsC,EAAE,MAAM,gBAAgB,CAAC;MAQvE,MAAM,uBAAuB,GAAG;IAClC,QAAQ,CAAC,WAAW,EAAE;QAClB,QAAQ,CAAC,0BAA0B,EAAE,GAAG,CAAC;QACzC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;KACrC,CAAC;IACF,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CACjC,CAAC;AAEF,KAAK,4BAA4B,GAAG;IAChC,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,IAAI,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,KAAK,mCAAmC,GAAG;IACvC,QAAQ,EAAE,KAAK,IAAI,MAAM,4BAA4B,GAAG,SAAS;QAC7D,KAAK;QACL,4BAA4B,CAAC,KAAK,CAAC;KACtC;CACJ,CAAC,MAAM,4BAA4B,CAAC,CAAC;AAEtC,KAAK,4BAA4B,GAAG;IAChC,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,KAAK,OAAO,CAAC;CAClF,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC;IAC9C,QAAQ,CAAC,EAAE,EAAE,CAAC,GAAG,YAAY,EAAE,mCAAmC,KAAK,OAAO,CAAC;IAC/E,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,OAAO,CAAC;IACvE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI,CAAC;IACrD,QAAQ,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI,CAAC;CACxD,CAAC;AAEF,wBAAgB,IAAI,CAAC,KAAK,EAAE,sBAAsB,GAAG,IAAI,CAKxD;KAEW,eAKP,
|
|
1
|
+
{"version":3,"file":"supervised-child-process.d.ts","sourceRoot":"","sources":["../../../../source/run/supervised-child-process.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEE,kCAAkC,EAAE,MAAM,kCAAkC,CAAC;AAE3F,OAAO,KAAK,EAAE,aAAsC,EAAE,MAAM,gBAAgB,CAAC;MAQvE,MAAM,uBAAuB,GAAG;IAClC,QAAQ,CAAC,WAAW,EAAE;QAClB,QAAQ,CAAC,0BAA0B,EAAE,GAAG,CAAC;QACzC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;KACrC,CAAC;IACF,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CACjC,CAAC;AAEF,KAAK,4BAA4B,GAAG;IAChC,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,IAAI,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,KAAK,mCAAmC,GAAG;IACvC,QAAQ,EAAE,KAAK,IAAI,MAAM,4BAA4B,GAAG,SAAS;QAC7D,KAAK;QACL,4BAA4B,CAAC,KAAK,CAAC;KACtC;CACJ,CAAC,MAAM,4BAA4B,CAAC,CAAC;AAEtC,KAAK,4BAA4B,GAAG;IAChC,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,KAAK,OAAO,CAAC;CAClF,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC;IAC9C,QAAQ,CAAC,EAAE,EAAE,CAAC,GAAG,YAAY,EAAE,mCAAmC,KAAK,OAAO,CAAC;IAC/E,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,OAAO,CAAC;IACvE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI,CAAC;IACrD,QAAQ,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI,CAAC;CACxD,CAAC;AAEF,wBAAgB,IAAI,CAAC,KAAK,EAAE,sBAAsB,GAAG,IAAI,CAKxD;KAEW,eAKP,YAoD2B,GAAG;IAC/B,QAAQ,CAAC,sBAAsB,EAAE;QAC7B,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;KACzC,CAAC;IACF,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,GAAG,IAAI,CAAC;IAClD,QAAQ,CAAC,oBAAoB,EAAE,kCAAkC,CAAC;IAClE,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;CACtC,CAAC;MASI,MAAM,6BAAyC,GAGlC,QAGJ,EAAE,eACR,YAK+B,KACnC,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAOrC,MAAM,CAAqC,EAGtC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { dirname, join } from 'node:path';
|
|
2
2
|
import { startChildShutdown } from "./child-process-shutdown.js";
|
|
3
3
|
import { childRoleArgument, supervisedChildRole } from "./child-process-roles.js";
|
|
4
|
-
import {
|
|
4
|
+
import { hardTimeoutError } from "./supervised-run-process-policy.js";
|
|
5
5
|
import { remainingHardTimeoutMilliseconds } from "./supervised-run-state.js";
|
|
6
6
|
export function kill(child) {
|
|
7
7
|
startChildShutdown(child);
|
|
@@ -29,7 +29,7 @@ export function createSupervisedHardTimeout(runtime) {
|
|
|
29
29
|
}
|
|
30
30
|
hardTimeout = runtime.dependencies.wallClock.setTimeout(function killHardTimedOutChild() {
|
|
31
31
|
runtime.terminalFailure.write(true);
|
|
32
|
-
runtime.state.recordRunnerError(
|
|
32
|
+
runtime.state.recordRunnerError(hardTimeoutError(runtime.state, runtime.resolvedRun.facts.execution.timeoutPolicy.hardMilliseconds));
|
|
33
33
|
runtime.state.recordTerminalActiveCases('crashed', Number(runtime.dependencies.wallClock.currentMonotonicMicroseconds));
|
|
34
34
|
kill(runtime.child);
|
|
35
35
|
}, remainingMilliseconds);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervised-child-process.js","sourceRoot":"","sources":["../../../../source/run/supervised-child-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAElF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"supervised-child-process.js","sourceRoot":"","sources":["../../../../source/run/supervised-child-process.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,18 +9,18 @@ function successfulChildExit(child) {
|
|
|
9
9
|
}
|
|
10
10
|
function createSupervisedObserver(transport) {
|
|
11
11
|
const observations = { reportedFailure: false, boundaryFailure: false };
|
|
12
|
-
function recordFailure(reason, restricted) {
|
|
12
|
+
function recordFailure(reason, restricted, termination) {
|
|
13
13
|
if (!observations.boundaryFailure) {
|
|
14
14
|
transport.terminalFailure.write(true);
|
|
15
15
|
observations.boundaryFailure = true;
|
|
16
|
-
recordChildProtocolFailure(transport.state, reason, Number(transport.wallClock.currentMonotonicMicroseconds), restricted);
|
|
16
|
+
recordChildProtocolFailure(transport.state, reason, Number(transport.wallClock.currentMonotonicMicroseconds), { restricted, termination });
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
function fail(reason, restricted) {
|
|
20
20
|
if (observations.boundaryFailure) {
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
|
-
recordFailure(reason, restricted);
|
|
23
|
+
recordFailure(reason, restricted, 'transport');
|
|
24
24
|
kill(transport.child);
|
|
25
25
|
transport.interrupted();
|
|
26
26
|
}
|
|
@@ -79,8 +79,13 @@ function createSupervisedObserver(transport) {
|
|
|
79
79
|
}
|
|
80
80
|
return {
|
|
81
81
|
fail,
|
|
82
|
+
cancel(reason) {
|
|
83
|
+
recordFailure(reason, false, 'cancelled');
|
|
84
|
+
kill(transport.child);
|
|
85
|
+
transport.interrupted();
|
|
86
|
+
},
|
|
82
87
|
timeout() {
|
|
83
|
-
recordFailure('Supervised child shutdown exceeded one second.', false);
|
|
88
|
+
recordFailure('Supervised child shutdown exceeded one second.', false, 'transport');
|
|
84
89
|
transport.interrupted();
|
|
85
90
|
},
|
|
86
91
|
receive(message) {
|
|
@@ -119,7 +124,7 @@ export function observeSupervisedTransport(transport) {
|
|
|
119
124
|
transport.finished();
|
|
120
125
|
});
|
|
121
126
|
return function interruptSupervisedRun(reason) {
|
|
122
|
-
observer.
|
|
127
|
+
observer.cancel(reason);
|
|
123
128
|
};
|
|
124
129
|
}
|
|
125
130
|
export function sendSupervisedCommand(child, command) {
|