@overkill-dev/run 0.0.47 → 0.0.49
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/engine/async-leak-diagnostics.d.ts +9 -2
- package/engine/async-leak-diagnostics.d.ts.map +1 -1
- package/engine/async-leak-diagnostics.js +6 -4
- package/engine/async-leak-diagnostics.js.map +1 -1
- package/engine/case-execution.d.ts +1 -0
- package/engine/case-execution.d.ts.map +1 -1
- package/engine/case-execution.js +5 -3
- package/engine/case-execution.js.map +1 -1
- package/engine/execution-async-leak-policy.d.ts.map +1 -1
- package/engine/execution-async-leak-policy.js +16 -3
- package/engine/execution-async-leak-policy.js.map +1 -1
- package/engine/execution-options.d.ts +2 -1
- package/engine/execution-options.d.ts.map +1 -1
- package/engine/execution-resource-budget-breach.d.ts +17 -0
- package/engine/execution-resource-budget-breach.d.ts.map +1 -0
- package/engine/execution-resource-budget-breach.js +30 -0
- package/engine/execution-resource-budget-breach.js.map +1 -0
- package/engine/execution-resource-budget-tracking.js.map +1 -1
- package/engine/execution-resource-tracked-cases.js +17 -12
- package/engine/execution-resource-tracked-cases.js.map +1 -1
- package/engine/execution-result.js +10 -5
- package/engine/execution-result.js.map +1 -1
- package/engine/execution-supervision.d.ts +1 -6
- package/engine/execution-supervision.d.ts.map +1 -1
- package/engine/execution-supervision.js +25 -39
- package/engine/execution-supervision.js.map +1 -1
- package/engine/execution-test-plan-cases.js +214 -0
- package/engine/execution-test-plan-cases.js.map +1 -0
- package/engine/execution-test-plan-resource-usage.js +14 -0
- package/engine/execution-test-plan-resource-usage.js.map +1 -0
- package/engine/execution.d.ts.map +1 -1
- package/engine/execution.js +11 -245
- package/engine/execution.js.map +1 -1
- package/engine/identity.d.ts +19 -0
- package/engine/identity.d.ts.map +1 -1
- package/engine/identity.js +47 -0
- package/engine/identity.js.map +1 -1
- package/engine/reporter-dispatcher.d.ts +1 -0
- package/engine/reporter-dispatcher.d.ts.map +1 -1
- package/engine/reporter-dispatcher.js +54 -19
- package/engine/reporter-dispatcher.js.map +1 -1
- package/engine/reporter-error-delivery-tracking.js +12 -1
- package/engine/reporter-error-delivery-tracking.js.map +1 -1
- package/engine/reporter-event-queue.js +32 -0
- package/engine/reporter-event-queue.js.map +1 -1
- package/engine/reporter-managed-output.js +24 -3
- package/engine/reporter-managed-output.js.map +1 -1
- package/engine/reporter-output-scope.js +60 -0
- package/engine/reporter-output-scope.js.map +1 -0
- package/engine/reporter.d.ts +4 -1
- package/engine/reporter.d.ts.map +1 -1
- package/engine/reporter.js.map +1 -1
- package/engine/run-result.d.ts +7 -2
- package/engine/run-result.d.ts.map +1 -1
- package/engine/run-result.js +18 -1
- package/engine/run-result.js.map +1 -1
- package/engine/runner-error-reporting.js +29 -0
- package/engine/runner-error-reporting.js.map +1 -0
- package/engine/test-body-resource-attachment.d.ts +13 -1
- package/engine/test-body-resource-attachment.d.ts.map +1 -1
- package/engine/test-body-resource-attachment.js +43 -17
- package/engine/test-body-resource-attachment.js.map +1 -1
- package/engine/test-plan.d.ts +2 -1
- package/engine/test-plan.d.ts.map +1 -1
- package/engine/test-plan.js +9 -5
- package/engine/test-plan.js.map +1 -1
- package/package.json +5 -3
- package/packages/engine/engine.entry-point.d.ts +2 -2
- package/packages/engine/engine.entry-point.d.ts.map +1 -1
- package/packages/run/run.entry-point.d.ts +2 -1
- package/packages/run/run.entry-point.d.ts.map +1 -1
- package/readme.md +5 -1
- package/reporters/line-reporter.js +2 -1
- package/reporters/line-reporter.js.map +1 -1
- package/resources/resource-definition-shape.d.ts +53 -0
- package/resources/resource-definition-shape.d.ts.map +1 -0
- package/resources/resources.d.ts +53 -79
- package/resources/resources.d.ts.map +1 -1
- package/resources/resources.js +6 -0
- package/resources/resources.js.map +1 -1
- package/resources/runtime-definition.d.ts +23 -0
- package/resources/runtime-definition.d.ts.map +1 -0
- package/resources/runtime-definition.js +1 -0
- package/resources/runtime-definition.js.map +1 -0
- package/resources/runtime-matrix-definition.d.ts +53 -0
- package/resources/runtime-matrix-definition.d.ts.map +1 -0
- package/resources/runtime-matrix-definition.js +7 -0
- package/resources/runtime-matrix-definition.js.map +1 -0
- package/run/capability-policy-snapshots.d.ts +33 -0
- package/run/capability-policy-snapshots.d.ts.map +1 -0
- package/run/capability-policy-snapshots.js +88 -0
- package/run/capability-policy-snapshots.js.map +1 -0
- package/run/capability-policy.js +30 -97
- package/run/capability-policy.js.map +1 -1
- package/run/collected-run-plan.js +16 -7
- package/run/collected-run-plan.js.map +1 -1
- package/run/command-line-command.d.ts +0 -1
- package/run/command-line-command.d.ts.map +1 -1
- package/run/command-line-command.js +40 -20
- package/run/command-line-command.js.map +1 -1
- package/run/command-line-runner.d.ts.map +1 -1
- package/run/command-line-runner.js +2 -2
- package/run/command-line-runner.js.map +1 -1
- package/run/node-host-readers.js +1 -1
- package/run/node-host-readers.js.map +1 -1
- package/run/resource-lifecycle-composition.d.ts +6 -5
- package/run/resource-lifecycle-composition.d.ts.map +1 -1
- package/run/resource-lifecycle-composition.js +126 -12
- package/run/resource-lifecycle-composition.js.map +1 -1
- package/run/resource-lifecycle-state.d.ts +1 -0
- package/run/resource-lifecycle-state.d.ts.map +1 -1
- package/run/resource-lifecycle-state.js.map +1 -1
- package/run/resource-lifecycle.js +18 -7
- package/run/resource-lifecycle.js.map +1 -1
- package/run/run-collected-resolution.js +6 -0
- package/run/run-collected-resolution.js.map +1 -1
- package/run/run-collection-error-result.js +39 -20
- package/run/run-collection-error-result.js.map +1 -1
- package/run/run-config-schema.d.ts +3 -0
- package/run/run-config-schema.d.ts.map +1 -1
- package/run/run-config-schema.js +5 -0
- package/run/run-config-schema.js.map +1 -1
- package/run/run-config.d.ts.map +1 -1
- package/run/run-config.js +8 -0
- package/run/run-config.js.map +1 -1
- package/run/run-errors.d.ts.map +1 -1
- package/run/run-errors.js +1 -0
- package/run/run-errors.js.map +1 -1
- package/run/run-facts.js +8 -4
- package/run/run-facts.js.map +1 -1
- package/run/run-orchestrator-dependencies.d.ts +1 -1
- package/run/run-orchestrator-dependencies.d.ts.map +1 -1
- package/run/run-support.js +7 -0
- package/run/run-support.js.map +1 -1
- package/run/run-test-plan.js +3 -2
- package/run/run-test-plan.js.map +1 -1
- package/run/run-types.d.ts +9 -15
- package/run/run-types.d.ts.map +1 -1
- package/run/run-types.js.map +1 -1
- package/run/run.js +4 -2
- package/run/run.js.map +1 -1
- package/run/runtime-matrix-expansion.js +142 -0
- package/run/runtime-matrix-expansion.js.map +1 -0
- package/run/supervised-child-process.d.ts +1 -1
- package/run/supervised-child-process.d.ts.map +1 -1
- package/run/supervised-child.js +13 -11
- package/run/supervised-child.js.map +1 -1
- package/run/supervised-protocol.js +9 -0
- package/run/supervised-protocol.js.map +1 -1
- package/run/supervised-run-resource-policy.js +14 -1
- package/run/supervised-run-resource-policy.js.map +1 -1
- package/run/supervised-run-runtime.js +42 -23
- package/run/supervised-run-runtime.js.map +1 -1
- package/run/supervised-run-state.d.ts +2 -1
- package/run/supervised-run-state.d.ts.map +1 -1
- package/run/supervised-run-state.js +9 -2
- package/run/supervised-run-state.js.map +1 -1
- package/run/supervised-run.js +6 -2
- package/run/supervised-run.js.map +1 -1
- package/run/work-unit-identity.js +64 -0
- package/run/work-unit-identity.js.map +1 -0
- package/run/work-unit-planning.js +53 -82
- package/run/work-unit-planning.js.map +1 -1
- package/run/work-unit-resource-constraints.js +44 -15
- package/run/work-unit-resource-constraints.js.map +1 -1
- package/run/worker-pool-collection.js +1 -0
- package/run/worker-pool-collection.js.map +1 -1
- package/run/worker-pool-execution.js +5 -4
- package/run/worker-pool-execution.js.map +1 -1
- package/run/worker-pool-lanes.js +45 -76
- package/run/worker-pool-lanes.js.map +1 -1
- package/run/worker-pool-lifecycle-lanes.js +169 -0
- package/run/worker-pool-lifecycle-lanes.js.map +1 -0
- package/run/worker-pool-results.js +8 -19
- package/run/worker-pool-results.js.map +1 -1
- package/run/worker-pool-worker-plan.js +8 -12
- package/run/worker-pool-worker-plan.js.map +1 -1
- package/sbom.cdx.json +9 -9
- package/run/capability-policy.d.ts +0 -47
- package/run/capability-policy.d.ts.map +0 -1
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { emptyWorkUnitResourceConstraints } from "./run-types.js";
|
|
2
|
+
const mixedLifecycleCount = 2;
|
|
3
|
+
export const freshWorkerLifecycle = 'fresh-worker-per-unit';
|
|
4
|
+
export const reuseWorkerLifecycle = 'reuse';
|
|
5
|
+
export const workerLifecycles = [reuseWorkerLifecycle, freshWorkerLifecycle];
|
|
6
|
+
export function lifecycleCount(units, workerLifecycle) {
|
|
7
|
+
return units
|
|
8
|
+
.filter(function hasWorkerLifecycle(unit) {
|
|
9
|
+
return unit.workerLifecycle === workerLifecycle;
|
|
10
|
+
})
|
|
11
|
+
.length;
|
|
12
|
+
}
|
|
13
|
+
export function selectedCaseCount(unit) {
|
|
14
|
+
return unit.work.length;
|
|
15
|
+
}
|
|
16
|
+
export function caseCountPlacementLoad(unit) {
|
|
17
|
+
return selectedCaseCount(unit) +
|
|
18
|
+
unit.resourceConstraints.capacityWeight -
|
|
19
|
+
emptyWorkUnitResourceConstraints.capacityWeight;
|
|
20
|
+
}
|
|
21
|
+
function lifecycleLoad(units, workerLifecycle, unitLoad) {
|
|
22
|
+
return units
|
|
23
|
+
.filter(function hasWorkerLifecycle(unit) {
|
|
24
|
+
return unit.workerLifecycle === workerLifecycle;
|
|
25
|
+
})
|
|
26
|
+
.reduce(function sumUnitLoad(total, unit) {
|
|
27
|
+
return total + unitLoad(unit);
|
|
28
|
+
}, 0);
|
|
29
|
+
}
|
|
30
|
+
function firstUnitWorkerLifecycle(units) {
|
|
31
|
+
return units.reduce(function keepFirstLifecycle(firstLifecycle, unit, index) {
|
|
32
|
+
return index === 0 ? unit.workerLifecycle : firstLifecycle;
|
|
33
|
+
}, reuseWorkerLifecycle);
|
|
34
|
+
}
|
|
35
|
+
function proportionalExtraLaneLifecycle(units, remainingLanes, tiedLifecycle) {
|
|
36
|
+
const freshUnits = lifecycleCount(units, freshWorkerLifecycle);
|
|
37
|
+
const reuseUnits = lifecycleCount(units, reuseWorkerLifecycle);
|
|
38
|
+
const totalUnits = freshUnits + reuseUnits;
|
|
39
|
+
const freshRemainder = remainingLanes * freshUnits / totalUnits % 1;
|
|
40
|
+
const reuseRemainder = remainingLanes * reuseUnits / totalUnits % 1;
|
|
41
|
+
if (freshRemainder !== reuseRemainder) {
|
|
42
|
+
return freshRemainder > reuseRemainder ? freshWorkerLifecycle : reuseWorkerLifecycle;
|
|
43
|
+
}
|
|
44
|
+
return tiedLifecycle;
|
|
45
|
+
}
|
|
46
|
+
function mixedLifecycleBaseLaneCounts(units, totalLaneCount) {
|
|
47
|
+
const freshUnits = lifecycleCount(units, freshWorkerLifecycle);
|
|
48
|
+
const reuseUnits = lifecycleCount(units, reuseWorkerLifecycle);
|
|
49
|
+
const remainingLanes = totalLaneCount - mixedLifecycleCount;
|
|
50
|
+
const unitCount = freshUnits + reuseUnits;
|
|
51
|
+
return {
|
|
52
|
+
freshLanes: 1 + Math.floor(remainingLanes * freshUnits / unitCount),
|
|
53
|
+
remainingLanes,
|
|
54
|
+
reuseLanes: 1 + Math.floor(remainingLanes * reuseUnits / unitCount)
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
function mixedLifecycleLaneCounts(units, totalLaneCount) {
|
|
58
|
+
let { freshLanes, remainingLanes, reuseLanes } = mixedLifecycleBaseLaneCounts(units, totalLaneCount);
|
|
59
|
+
if (freshLanes + reuseLanes < totalLaneCount) {
|
|
60
|
+
const targetLifecycle = proportionalExtraLaneLifecycle(units, remainingLanes, firstUnitWorkerLifecycle(units));
|
|
61
|
+
if (targetLifecycle === freshWorkerLifecycle) {
|
|
62
|
+
freshLanes += 1;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
reuseLanes += 1;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return new Map([
|
|
69
|
+
[freshWorkerLifecycle, freshLanes],
|
|
70
|
+
[reuseWorkerLifecycle, reuseLanes]
|
|
71
|
+
]);
|
|
72
|
+
}
|
|
73
|
+
function stableLifecycleLaneCounts(units, totalLaneCount) {
|
|
74
|
+
if (lifecycleCount(units, freshWorkerLifecycle) === 0) {
|
|
75
|
+
return new Map([[reuseWorkerLifecycle, totalLaneCount]]);
|
|
76
|
+
}
|
|
77
|
+
if (lifecycleCount(units, reuseWorkerLifecycle) === 0) {
|
|
78
|
+
return new Map([[freshWorkerLifecycle, totalLaneCount]]);
|
|
79
|
+
}
|
|
80
|
+
return mixedLifecycleLaneCounts(units, totalLaneCount);
|
|
81
|
+
}
|
|
82
|
+
function caseCountBalancedLifecycleLaneAllocation(units, freshUnits, reuseUnits) {
|
|
83
|
+
return {
|
|
84
|
+
freshLoad: lifecycleLoad(units, freshWorkerLifecycle, caseCountPlacementLoad),
|
|
85
|
+
freshUnitCount: freshUnits,
|
|
86
|
+
reuseLoad: lifecycleLoad(units, reuseWorkerLifecycle, caseCountPlacementLoad),
|
|
87
|
+
reuseUnitCount: reuseUnits,
|
|
88
|
+
tiedLifecycle: firstUnitWorkerLifecycle(units)
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
function initialLifecycleLanes() {
|
|
92
|
+
return {
|
|
93
|
+
freshLaneCount: 1,
|
|
94
|
+
reuseLaneCount: 1
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
function lifecycleLaneCount(lanes, workerLifecycle) {
|
|
98
|
+
return workerLifecycle === freshWorkerLifecycle ? lanes.freshLaneCount : lanes.reuseLaneCount;
|
|
99
|
+
}
|
|
100
|
+
function lifecycleUnitCount(allocation, workerLifecycle) {
|
|
101
|
+
return workerLifecycle === freshWorkerLifecycle ? allocation.freshUnitCount : allocation.reuseUnitCount;
|
|
102
|
+
}
|
|
103
|
+
function lifecyclePlacementLoad(allocation, workerLifecycle) {
|
|
104
|
+
return workerLifecycle === freshWorkerLifecycle ? allocation.freshLoad : allocation.reuseLoad;
|
|
105
|
+
}
|
|
106
|
+
function assignedLifecycleLaneCount(lanes) {
|
|
107
|
+
return lanes.freshLaneCount + lanes.reuseLaneCount;
|
|
108
|
+
}
|
|
109
|
+
function lifecycleHasUnitCapacity(allocation, lanes, workerLifecycle) {
|
|
110
|
+
return lifecycleLaneCount(lanes, workerLifecycle) < lifecycleUnitCount(allocation, workerLifecycle);
|
|
111
|
+
}
|
|
112
|
+
function lifecycleAverageLoad(allocation, lanes, workerLifecycle) {
|
|
113
|
+
return lifecyclePlacementLoad(allocation, workerLifecycle) / lifecycleLaneCount(lanes, workerLifecycle);
|
|
114
|
+
}
|
|
115
|
+
function compareTiedLifecycle(allocation, left) {
|
|
116
|
+
return left === allocation.tiedLifecycle ? -1 : 1;
|
|
117
|
+
}
|
|
118
|
+
function compareLifecycleCandidate(allocation, lanes, left, right) {
|
|
119
|
+
const loadDifference = lifecycleAverageLoad(allocation, lanes, right) -
|
|
120
|
+
lifecycleAverageLoad(allocation, lanes, left);
|
|
121
|
+
return loadDifference === 0 ? compareTiedLifecycle(allocation, left) : loadDifference;
|
|
122
|
+
}
|
|
123
|
+
function nextLifecycleWithCapacity(allocation, lanes) {
|
|
124
|
+
return workerLifecycles
|
|
125
|
+
.filter(function hasUnitCapacity(workerLifecycle) {
|
|
126
|
+
return lifecycleHasUnitCapacity(allocation, lanes, workerLifecycle);
|
|
127
|
+
})
|
|
128
|
+
.toSorted(function compareLifecycleLoad(left, right) {
|
|
129
|
+
return compareLifecycleCandidate(allocation, lanes, left, right);
|
|
130
|
+
})[0] ?? null;
|
|
131
|
+
}
|
|
132
|
+
function lifecycleWithAdditionalLane(lanes, workerLifecycle) {
|
|
133
|
+
return workerLifecycle === freshWorkerLifecycle
|
|
134
|
+
? { ...lanes, freshLaneCount: lanes.freshLaneCount + 1 }
|
|
135
|
+
: { ...lanes, reuseLaneCount: lanes.reuseLaneCount + 1 };
|
|
136
|
+
}
|
|
137
|
+
function allocateCaseCountBalancedLifecycleLanes(allocation, totalLaneCount) {
|
|
138
|
+
let lanes = initialLifecycleLanes();
|
|
139
|
+
while (assignedLifecycleLaneCount(lanes) < totalLaneCount) {
|
|
140
|
+
const target = nextLifecycleWithCapacity(allocation, lanes);
|
|
141
|
+
if (target === null) {
|
|
142
|
+
return lanes;
|
|
143
|
+
}
|
|
144
|
+
lanes = lifecycleWithAdditionalLane(lanes, target);
|
|
145
|
+
}
|
|
146
|
+
return lanes;
|
|
147
|
+
}
|
|
148
|
+
function caseCountBalancedLifecycleLaneCounts(units, totalLaneCount) {
|
|
149
|
+
const freshUnits = lifecycleCount(units, freshWorkerLifecycle);
|
|
150
|
+
const reuseUnits = lifecycleCount(units, reuseWorkerLifecycle);
|
|
151
|
+
if (freshUnits === 0) {
|
|
152
|
+
return new Map([[reuseWorkerLifecycle, totalLaneCount]]);
|
|
153
|
+
}
|
|
154
|
+
if (reuseUnits === 0) {
|
|
155
|
+
return new Map([[freshWorkerLifecycle, totalLaneCount]]);
|
|
156
|
+
}
|
|
157
|
+
const allocation = caseCountBalancedLifecycleLaneAllocation(units, freshUnits, reuseUnits);
|
|
158
|
+
const lanes = allocateCaseCountBalancedLifecycleLanes(allocation, totalLaneCount);
|
|
159
|
+
return new Map([
|
|
160
|
+
[freshWorkerLifecycle, lanes.freshLaneCount],
|
|
161
|
+
[reuseWorkerLifecycle, lanes.reuseLaneCount]
|
|
162
|
+
]);
|
|
163
|
+
}
|
|
164
|
+
export function lifecycleLaneCounts(units, totalLaneCount, assignmentPolicy) {
|
|
165
|
+
return assignmentPolicy === 'case-count-balanced'
|
|
166
|
+
? caseCountBalancedLifecycleLaneCounts(units, totalLaneCount)
|
|
167
|
+
: stableLifecycleLaneCounts(units, totalLaneCount);
|
|
168
|
+
}
|
|
169
|
+
//# sourceMappingURL=worker-pool-lifecycle-lanes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-pool-lifecycle-lanes.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-lifecycle-lanes.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gCAAgC,EAInC,MAAM,gBAAgB,CAAC;AAExB,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAM,CAAC,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AAC5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC;AAC5C,MAAM,CAAC,MAAM,gBAAgB,GAAkC,CAAE,oBAAoB,EAAE,oBAAoB,CAAE,CAAC;AAoB9G,MAAM,UAAU,cAAc,CAAC,KAA0B,EAAE,eAAmC;IAC1F,OAAO,KAAK;SACP,MAAM,CAAC,SAAS,kBAAkB,CAAC,IAAI;QACpC,OAAO,IAAI,CAAC,eAAe,KAAK,eAAe,CAAC;IACpD,CAAC,CAAC;SACD,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAc;IAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAc;IACjD,OAAO,iBAAiB,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,mBAAmB,CAAC,cAAc;QACvC,gCAAgC,CAAC,cAAc,CAAC;AACxD,CAAC;AAED,SAAS,aAAa,CAClB,KAA0B,EAC1B,eAAmC,EACnC,QAAkB;IAElB,OAAO,KAAK;SACP,MAAM,CAAC,SAAS,kBAAkB,CAAC,IAAI;QACpC,OAAO,IAAI,CAAC,eAAe,KAAK,eAAe,CAAC;IACpD,CAAC,CAAC;SACD,MAAM,CAAC,SAAS,WAAW,CAAC,KAAK,EAAE,IAAI;QACpC,OAAO,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,EAAE,CAAC,CAAC,CAAC;AACd,CAAC;AAED,SAAS,wBAAwB,CAAC,KAA0B;IACxD,OAAO,KAAK,CAAC,MAAM,CAAqB,SAAS,kBAAkB,CAAC,cAAc,EAAE,IAAI,EAAE,KAAK;QAC3F,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC;IAC/D,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,8BAA8B,CACnC,KAA0B,EAC1B,cAAsB,EACtB,aAAiC;IAEjC,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,UAAU,GAAG,UAAU,CAAC;IAC3C,MAAM,cAAc,GAAG,cAAc,GAAG,UAAU,GAAG,UAAU,GAAG,CAAC,CAAC;IACpE,MAAM,cAAc,GAAG,cAAc,GAAG,UAAU,GAAG,UAAU,GAAG,CAAC,CAAC;IAEpE,IAAI,cAAc,KAAK,cAAc,EAAE,CAAC;QACpC,OAAO,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACzF,CAAC;IAED,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,SAAS,4BAA4B,CACjC,KAA0B,EAC1B,cAAsB;IAEtB,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAC/D,MAAM,cAAc,GAAG,cAAc,GAAG,mBAAmB,CAAC;IAC5D,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC;IAE1C,OAAO;QACH,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;QACnE,cAAc;QACd,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;KACtE,CAAC;AACN,CAAC;AAED,SAAS,wBAAwB,CAC7B,KAA0B,EAC1B,cAAsB;IAEtB,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,4BAA4B,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAErG,IAAI,UAAU,GAAG,UAAU,GAAG,cAAc,EAAE,CAAC;QAC3C,MAAM,eAAe,GAAG,8BAA8B,CAAC,KAAK,EAAE,cAAc,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC;QAE/G,IAAI,eAAe,KAAK,oBAAoB,EAAE,CAAC;YAC3C,UAAU,IAAI,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACJ,UAAU,IAAI,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;IAED,OAAO,IAAI,GAAG,CAAC;QACX,CAAE,oBAAoB,EAAE,UAAU,CAAE;QACpC,CAAE,oBAAoB,EAAE,UAAU,CAAE;KACvC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAC9B,KAA0B,EAC1B,cAAsB;IAEtB,IAAI,cAAc,CAAC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,GAAG,CAAC,CAAE,CAAE,oBAAoB,EAAE,cAAc,CAAE,CAAE,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,GAAG,CAAC,CAAE,CAAE,oBAAoB,EAAE,cAAc,CAAE,CAAE,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,wBAAwB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,wCAAwC,CAC7C,KAA0B,EAC1B,UAAkB,EAClB,UAAkB;IAElB,OAAO;QACH,SAAS,EAAE,aAAa,CAAC,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,CAAC;QAC7E,cAAc,EAAE,UAAU;QAC1B,SAAS,EAAE,aAAa,CAAC,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,CAAC;QAC7E,cAAc,EAAE,UAAU;QAC1B,aAAa,EAAE,wBAAwB,CAAC,KAAK,CAAC;KACjD,CAAC;AACN,CAAC;AAED,SAAS,qBAAqB;IAC1B,OAAO;QACH,cAAc,EAAE,CAAC;QACjB,cAAc,EAAE,CAAC;KACpB,CAAC;AACN,CAAC;AAED,SAAS,kBAAkB,CAAC,KAA6B,EAAE,eAAmC;IAC1F,OAAO,eAAe,KAAK,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC;AAClG,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAmC,EAAE,eAAmC;IAChG,OAAO,eAAe,KAAK,oBAAoB,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC;AAC5G,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAmC,EAAE,eAAmC;IACpG,OAAO,eAAe,KAAK,oBAAoB,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;AAClG,CAAC;AAED,SAAS,0BAA0B,CAAC,KAA6B;IAC7D,OAAO,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC;AACvD,CAAC;AAED,SAAS,wBAAwB,CAC7B,UAAmC,EACnC,KAA6B,EAC7B,eAAmC;IAEnC,OAAO,kBAAkB,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,kBAAkB,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;AACxG,CAAC;AAED,SAAS,oBAAoB,CACzB,UAAmC,EACnC,KAA6B,EAC7B,eAAmC;IAEnC,OAAO,sBAAsB,CAAC,UAAU,EAAE,eAAe,CAAC,GAAG,kBAAkB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;AAC5G,CAAC;AAED,SAAS,oBAAoB,CACzB,UAAmC,EACnC,IAAwB;IAExB,OAAO,IAAI,KAAK,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,yBAAyB,CAC9B,UAAmC,EACnC,KAA6B,EAC7B,IAAwB,EACxB,KAAyB;IAEzB,MAAM,cAAc,GAAG,oBAAoB,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC;QACjE,oBAAoB,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAElD,OAAO,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;AAC1F,CAAC;AAED,SAAS,yBAAyB,CAC9B,UAAmC,EACnC,KAA6B;IAE7B,OAAO,gBAAgB;SAClB,MAAM,CAAC,SAAS,eAAe,CAAC,eAAe;QAC5C,OAAO,wBAAwB,CAAC,UAAU,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;IACxE,CAAC,CAAC;SACD,QAAQ,CAAC,SAAS,oBAAoB,CAAC,IAAI,EAAE,KAAK;QAC/C,OAAO,yBAAyB,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACtB,CAAC;AAED,SAAS,2BAA2B,CAChC,KAA6B,EAC7B,eAAmC;IAEnC,OAAO,eAAe,KAAK,oBAAoB;QAC3C,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,GAAG,CAAC,EAAE;QACxD,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;AACjE,CAAC;AAED,SAAS,uCAAuC,CAC5C,UAAmC,EACnC,cAAsB;IAEtB,IAAI,KAAK,GAAG,qBAAqB,EAAE,CAAC;IAEpC,OAAO,0BAA0B,CAAC,KAAK,CAAC,GAAG,cAAc,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,yBAAyB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAE5D,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,KAAK,GAAG,2BAA2B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,oCAAoC,CACzC,KAA0B,EAC1B,cAAsB;IAEtB,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IAE/D,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,IAAI,GAAG,CAAC,CAAE,CAAE,oBAAoB,EAAE,cAAc,CAAE,CAAE,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,IAAI,GAAG,CAAC,CAAE,CAAE,oBAAoB,EAAE,cAAc,CAAE,CAAE,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,UAAU,GAAG,wCAAwC,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAC3F,MAAM,KAAK,GAAG,uCAAuC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAElF,OAAO,IAAI,GAAG,CAAC;QACX,CAAE,oBAAoB,EAAE,KAAK,CAAC,cAAc,CAAE;QAC9C,CAAE,oBAAoB,EAAE,KAAK,CAAC,cAAc,CAAE;KACjD,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,KAA0B,EAC1B,cAAsB,EACtB,gBAA+C;IAE/C,OAAO,gBAAgB,KAAK,qBAAqB;QAC7C,CAAC,CAAC,oCAAoC,CAAC,KAAK,EAAE,cAAc,CAAC;QAC7D,CAAC,CAAC,yBAAyB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AAC3D,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { workIdentityKey } from "../engine/identity.js";
|
|
2
|
+
import { appendRunnerErrors } from "../engine/execution-result.js";
|
|
2
3
|
import { collectedRunCaseEntries, createRunResultFromCollectedPlan } from "./collected-run-plan.js";
|
|
3
4
|
import { createReporterDelivery } from "./supervised-run-runtime.js";
|
|
4
5
|
import { workerPoolCollectedPlan } from "./worker-pool-runtime.js";
|
|
@@ -26,10 +27,10 @@ function allTaskErrors(runtime, completedTaskRuns) {
|
|
|
26
27
|
}
|
|
27
28
|
function orderedPerTest(collectedPlan, perTest) {
|
|
28
29
|
const results = new Map(perTest.map(function toEntry(result) {
|
|
29
|
-
return [
|
|
30
|
+
return [workIdentityKey(result.workId), result];
|
|
30
31
|
}));
|
|
31
32
|
return collectedRunCaseEntries(collectedPlan).flatMap(function toResult(entry) {
|
|
32
|
-
const result = results.get(
|
|
33
|
+
const result = results.get(workIdentityKey(entry.workId));
|
|
33
34
|
return result === undefined ? [] : [result];
|
|
34
35
|
});
|
|
35
36
|
}
|
|
@@ -47,16 +48,10 @@ function finishPoolResourceUsage(runtime) {
|
|
|
47
48
|
}
|
|
48
49
|
async function reportFinalResult(result, runtime) {
|
|
49
50
|
const runEndErrors = await runtime.reporterDelivery.reportEvent({ kind: 'run-end', result });
|
|
50
|
-
const resultForFinalReporting =
|
|
51
|
-
...result,
|
|
52
|
-
runnerErrors: [...result.runnerErrors, ...runEndErrors]
|
|
53
|
-
};
|
|
51
|
+
const resultForFinalReporting = appendRunnerErrors(result, runEndErrors);
|
|
54
52
|
const finalReporterErrors = await runtime.reporterDelivery.reportResult(resultForFinalReporting);
|
|
55
53
|
const disposeErrors = await runtime.reporterDelivery.disposeReporters();
|
|
56
|
-
return
|
|
57
|
-
...resultForFinalReporting,
|
|
58
|
-
runnerErrors: [...resultForFinalReporting.runnerErrors, ...finalReporterErrors, ...disposeErrors]
|
|
59
|
-
};
|
|
54
|
+
return appendRunnerErrors(resultForFinalReporting, [...finalReporterErrors, ...disposeErrors]);
|
|
60
55
|
}
|
|
61
56
|
export async function finishWorkerPoolRun(runtime, completedTaskRuns, startedAtMilliseconds) {
|
|
62
57
|
await runtime.reporterEvents.wait();
|
|
@@ -84,15 +79,9 @@ export async function createEmptyWorkerPoolResult(resolvedRun, dependencies, col
|
|
|
84
79
|
wallClock: dependencies.wallClock
|
|
85
80
|
}), collectionRunState.artifacts());
|
|
86
81
|
const runEndErrors = await reporterDelivery.reportEvent({ kind: 'run-end', result });
|
|
87
|
-
const resultForFinalReporting =
|
|
88
|
-
...result,
|
|
89
|
-
runnerErrors: [...result.runnerErrors, ...runEndErrors]
|
|
90
|
-
};
|
|
82
|
+
const resultForFinalReporting = appendRunnerErrors(result, runEndErrors);
|
|
91
83
|
const finalReporterErrors = await reporterDelivery.reportResult(resultForFinalReporting);
|
|
92
84
|
const disposeErrors = await reporterDelivery.disposeReporters();
|
|
93
|
-
return
|
|
94
|
-
...resultForFinalReporting,
|
|
95
|
-
runnerErrors: [...resultForFinalReporting.runnerErrors, ...finalReporterErrors, ...disposeErrors]
|
|
96
|
-
};
|
|
85
|
+
return appendRunnerErrors(resultForFinalReporting, [...finalReporterErrors, ...disposeErrors]);
|
|
97
86
|
}
|
|
98
87
|
//# sourceMappingURL=worker-pool-results.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-results.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-results.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-pool-results.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-results.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { workIdentityKey } from "../engine/identity.js";
|
|
2
2
|
import { collectedRunPlanFromTestPlan, createRunResultFromCollectedPlan } from "./collected-run-plan.js";
|
|
3
3
|
import { defaultRunEngine } from "./default-run-engine.js";
|
|
4
4
|
import { loadRunEngineModule, loadRunTestModules, runDiscovery } from "./node-run-dependencies.entry-point.js";
|
|
@@ -28,28 +28,24 @@ export function sendCollectedPlan(collectedPlan) {
|
|
|
28
28
|
runnerErrors: collectedPlan.runnerErrors
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
|
-
export function
|
|
31
|
+
export function selectedAssignedWork(testPlan, assignedWork) {
|
|
32
32
|
const casesByIdentity = new Map(testPlan.cases.map(function toCaseEntry(testCase) {
|
|
33
|
-
return [
|
|
33
|
+
return [workIdentityKey(testCase.workId), testCase];
|
|
34
34
|
}));
|
|
35
|
-
const cases =
|
|
36
|
-
const matchedCase = casesByIdentity.get(
|
|
35
|
+
const cases = assignedWork.flatMap(function toAssignedCase(work) {
|
|
36
|
+
const matchedCase = casesByIdentity.get(workIdentityKey(work));
|
|
37
37
|
return matchedCase === undefined ? [] : [matchedCase];
|
|
38
38
|
});
|
|
39
39
|
const firstCase = cases[0];
|
|
40
|
-
if (firstCase === undefined || cases.length !==
|
|
41
|
-
throw new Error('Worker-pool test plan did not match assigned
|
|
40
|
+
if (firstCase === undefined || cases.length !== assignedWork.length) {
|
|
41
|
+
throw new Error('Worker-pool test plan did not match assigned work identities.');
|
|
42
42
|
}
|
|
43
43
|
return {
|
|
44
44
|
...testPlan,
|
|
45
45
|
cases: [firstCase, ...cases.slice(1)]
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
|
-
|
|
49
|
-
return selectedAssignedCases(testPlan, assignedWork.map(function toCaseId(work) {
|
|
50
|
-
return work.case;
|
|
51
|
-
}));
|
|
52
|
-
}
|
|
48
|
+
|
|
53
49
|
export function createEmptyAssignmentResult(testPlan, wallClock, startedAtMilliseconds) {
|
|
54
50
|
return {
|
|
55
51
|
result: createRunResultFromCollectedPlan(collectedRunPlanFromTestPlan(testPlan), [], [], {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool-worker-plan.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker-plan.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"worker-pool-worker-plan.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker-plan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,eAAe,EAA4B,MAAM,uBAAuB,CAAC;AAGvG,OAAO,EACH,4BAA4B,EAC5B,gCAAgC,EACnC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACH,mBAAmB,EACnB,kBAAkB,EAClB,YAAY,EACf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAcvD,KAAK,UAAU,cAAc,CAAC,OAA0B;IACpD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;AAC3G,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,OAA0B;IAC9D,OAAO,MAAM,iBAAiB,CAAC;QAC3B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;QAC/C,MAAM,EAAE,MAAM,cAAc,CAAC,OAAO,CAAC;QACrC,kBAAkB;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,UAAU,EAAE,OAAO,CAAC,UAAU;KACjC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA0B;IAC5D,OAAO;QACH,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,MAAM,wBAAwB,CAAC,OAAO,CAAC;KACpD,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,aAA0C;IACxE,OAAO;QACH,aAAa,EAAE,4BAA4B,CAAC,aAAa,CAAC,QAAQ,CAAC;QACnE,YAAY,EAAE,aAAa,CAAC,YAAY;KAC3C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAkB,EAAE,YAA0B;IAC/E,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,WAAW,CAAC,QAAQ;QAC5E,OAAO,CAAE,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAE,CAAC;IAC1D,CAAC,CAAC,CAAC,CAAC;IACJ,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,cAAc,CAAC,IAAI;QAC3D,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/D,OAAO,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,WAAW,CAAE,CAAC;IAC5D,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAE3B,IAAI,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACrF,CAAC;IAED,OAAO;QACH,GAAG,QAAQ;QACX,KAAK,EAAE,CAAE,SAAS,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE;KAC1C,CAAC;AACN,CAAC;;MAMK,UAAU,2BAA2B,CACvC,QAAkB,EAClB,SAA6C,EAC7C,qBAA6B;IAE7B,OAAO;QACH,MAAM,EAAE,gCAAgC,CACpC,4BAA4B,CAAC,QAAQ,CAAC,EACtC,EAAE,EACF,EAAE,EACF;YACI,aAAa,EAAE,IAAI;YACnB,WAAW,EAAE,qBAAqB;YAClC,SAAS;SACZ,CACJ;KACJ,CAAC;AACN,CAAC"}
|
package/sbom.cdx.json
CHANGED
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"component": {
|
|
17
17
|
"type": "library",
|
|
18
18
|
"name": "@overkill-dev/run",
|
|
19
|
-
"version": "0.0.
|
|
20
|
-
"bom-ref": "pkg:npm/@overkill-dev/run@0.0.
|
|
21
|
-
"purl": "pkg:npm/@overkill-dev/run@0.0.
|
|
19
|
+
"version": "0.0.49",
|
|
20
|
+
"bom-ref": "pkg:npm/@overkill-dev/run@0.0.49",
|
|
21
|
+
"purl": "pkg:npm/@overkill-dev/run@0.0.49"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -116,15 +116,15 @@
|
|
|
116
116
|
{
|
|
117
117
|
"type": "library",
|
|
118
118
|
"name": "tinypool",
|
|
119
|
-
"version": "2.
|
|
120
|
-
"bom-ref": "pkg:npm/tinypool@2.
|
|
119
|
+
"version": "2.2.0",
|
|
120
|
+
"bom-ref": "pkg:npm/tinypool@2.2.0",
|
|
121
121
|
"scope": "required",
|
|
122
122
|
"licenses": [
|
|
123
123
|
{
|
|
124
124
|
"expression": "MIT"
|
|
125
125
|
}
|
|
126
126
|
],
|
|
127
|
-
"purl": "pkg:npm/tinypool@2.
|
|
127
|
+
"purl": "pkg:npm/tinypool@2.2.0"
|
|
128
128
|
},
|
|
129
129
|
{
|
|
130
130
|
"type": "library",
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
"ref": "pkg:npm/@enormora/wall-clock@0.0.3"
|
|
159
159
|
},
|
|
160
160
|
{
|
|
161
|
-
"ref": "pkg:npm/@overkill-dev/run@0.0.
|
|
161
|
+
"ref": "pkg:npm/@overkill-dev/run@0.0.49",
|
|
162
162
|
"dependsOn": [
|
|
163
163
|
"pkg:npm/@enormora/wall-clock@0.0.3",
|
|
164
164
|
"pkg:npm/@schema-hub/zod-error-formatter@0.0.16",
|
|
@@ -167,7 +167,7 @@
|
|
|
167
167
|
"pkg:npm/figures@6.1.0",
|
|
168
168
|
"pkg:npm/pure-rand@8.4.2",
|
|
169
169
|
"pkg:npm/string-width@8.2.2",
|
|
170
|
-
"pkg:npm/tinypool@2.
|
|
170
|
+
"pkg:npm/tinypool@2.2.0",
|
|
171
171
|
"pkg:npm/yoctocolors@2.2.0",
|
|
172
172
|
"pkg:npm/zod@4.6.5"
|
|
173
173
|
]
|
|
@@ -191,7 +191,7 @@
|
|
|
191
191
|
"ref": "pkg:npm/string-width@8.2.2"
|
|
192
192
|
},
|
|
193
193
|
{
|
|
194
|
-
"ref": "pkg:npm/tinypool@2.
|
|
194
|
+
"ref": "pkg:npm/tinypool@2.2.0"
|
|
195
195
|
},
|
|
196
196
|
{
|
|
197
197
|
"ref": "pkg:npm/yoctocolors@2.2.0"
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
import type { TestRuntimePolicy } from '../engine/case-execution.ts';
|
|
2
|
-
export type RuntimeCapabilityPolicy = TestRuntimePolicy & {
|
|
3
|
-
readonly recordViolation: (capability: RuntimePolicyCapability, message: string, strictness: RuntimePolicyStrictness) => void;
|
|
4
|
-
};
|
|
5
|
-
export type RuntimeCapabilityPolicyEnvironment = Readonly<Record<string, string | undefined>>;
|
|
6
|
-
declare const runtimePolicyCapabilities: {
|
|
7
|
-
readonly childProcess: "child-process";
|
|
8
|
-
readonly console: "console";
|
|
9
|
-
readonly cryptoRandom: "crypto-random";
|
|
10
|
-
readonly dynamicModuleLoad: "dynamic-module-load";
|
|
11
|
-
readonly fileRead: "fs-read";
|
|
12
|
-
readonly fileWrite: "fs-write";
|
|
13
|
-
readonly inspector: "inspector";
|
|
14
|
-
readonly network: "net";
|
|
15
|
-
readonly openSslStore: "openssl-store";
|
|
16
|
-
readonly processEnvironment: "process-env";
|
|
17
|
-
readonly processExecute: "process-execute";
|
|
18
|
-
readonly rawStderr: "raw-stderr";
|
|
19
|
-
readonly rawStdout: "raw-stdout";
|
|
20
|
-
readonly timer: "timer";
|
|
21
|
-
readonly wasi: "wasi";
|
|
22
|
-
readonly webLocks: "web-locks";
|
|
23
|
-
readonly worker: "worker";
|
|
24
|
-
};
|
|
25
|
-
type RuntimePolicyCapability = typeof runtimePolicyCapabilities[keyof typeof runtimePolicyCapabilities];
|
|
26
|
-
type RuntimePolicyStrictness = 'blocked' | 'observed';
|
|
27
|
-
type CapabilityPolicyOptions = {
|
|
28
|
-
readonly dependencies: RuntimeCapabilityPolicyDependencies;
|
|
29
|
-
readonly observedStderr: boolean;
|
|
30
|
-
readonly observedStdout: boolean;
|
|
31
|
-
};
|
|
32
|
-
export type WebStorageLike = {
|
|
33
|
-
readonly length: number;
|
|
34
|
-
readonly getItem: (key: string) => string | null;
|
|
35
|
-
readonly key: (index: number) => string | null;
|
|
36
|
-
};
|
|
37
|
-
export type RuntimeCapabilityPolicyDependencies = {
|
|
38
|
-
readonly installIpcRestriction: (record: (message: string) => void) => () => void;
|
|
39
|
-
readonly installProcessExecutionRestriction: (record: (message: string) => void) => () => void;
|
|
40
|
-
readonly readEnvironment: () => RuntimeCapabilityPolicyEnvironment;
|
|
41
|
-
readonly readStorage: (name: 'localStorage' | 'sessionStorage') => WebStorageLike | null;
|
|
42
|
-
};
|
|
43
|
-
export declare function isRuntimeCapabilityPolicyEnvironment(value: unknown): value is RuntimeCapabilityPolicyEnvironment;
|
|
44
|
-
export declare function isWebStorageLike(value: unknown): value is WebStorageLike;
|
|
45
|
-
export declare function createRuntimeCapabilityPolicy(options: CapabilityPolicyOptions): RuntimeCapabilityPolicy;
|
|
46
|
-
export {};
|
|
47
|
-
//# sourceMappingURL=capability-policy.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"capability-policy.d.ts","sourceRoot":"","sources":["../../../../source/run/capability-policy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG;IACtD,QAAQ,CAAC,eAAe,EAAE,CACtB,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,uBAAuB,KAClC,IAAI,CAAC;CACb,CAAC;AACF,MAAM,MAAM,kCAAkC,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;AAE9F,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;CAkBrB,CAAC;AAEX,KAAK,uBAAuB,GAAG,OAAO,yBAAyB,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAC;AAGxG,KAAK,uBAAuB,GAAG,SAAS,GAAG,UAAU,CAAC;AAEtD,KAAK,uBAAuB,GAAG;IAC3B,QAAQ,CAAC,YAAY,EAAE,mCAAmC,CAAC;IAC3D,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CACpC,CAAC;AAiBF,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACjD,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAC9C,QAAQ,CAAC,qBAAqB,EAAE,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IAClF,QAAQ,CAAC,kCAAkC,EAAE,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IAC/F,QAAQ,CAAC,eAAe,EAAE,MAAM,kCAAkC,CAAC;IACnE,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,KAAK,cAAc,GAAG,IAAI,CAAC;CAC5F,CAAC;AA6GF,wBAAgB,oCAAoC,CAChD,KAAK,EAAE,OAAO,GACf,KAAK,IAAI,kCAAkC,CAM7C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,cAAc,CAYxE;AAoSD,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,uBAAuB,GAAG,uBAAuB,CAoFvG"}
|