@midscene/core 1.15.2-beta-20261012123219.0 → 1.15.2
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/es/agent/action-readiness.mjs +6 -3
- package/dist/es/agent/action-readiness.mjs.map +1 -1
- package/dist/es/agent/agent.mjs +4 -2
- package/dist/es/agent/agent.mjs.map +1 -1
- package/dist/es/agent/execution-session.mjs.map +1 -1
- package/dist/es/agent/task-builder.mjs +35 -16
- package/dist/es/agent/task-builder.mjs.map +1 -1
- package/dist/es/agent/tasks.mjs +35 -12
- package/dist/es/agent/tasks.mjs.map +1 -1
- package/dist/es/agent/utils.mjs +1 -1
- package/dist/es/device/index.mjs +7 -6
- package/dist/es/device/index.mjs.map +1 -1
- package/dist/es/report-generator.mjs +30 -14
- package/dist/es/report-generator.mjs.map +1 -1
- package/dist/es/report-html-template.mjs +1 -1
- package/dist/es/report.mjs +121 -44
- package/dist/es/report.mjs.map +1 -1
- package/dist/es/service/index.mjs.map +1 -1
- package/dist/es/task-runner.mjs +22 -12
- package/dist/es/task-runner.mjs.map +1 -1
- package/dist/es/test-run-report.mjs.map +1 -1
- package/dist/es/test-runner/engine/case-runner.mjs +1 -1
- package/dist/es/test-runner/engine/case-runner.mjs.map +1 -1
- package/dist/es/test-runner/engine/document-runtime.mjs +42 -12
- package/dist/es/test-runner/engine/document-runtime.mjs.map +1 -1
- package/dist/es/test-runner/engine/execute-step.mjs +130 -12
- package/dist/es/test-runner/engine/execute-step.mjs.map +1 -1
- package/dist/es/test-runner/engine/index.mjs +1 -0
- package/dist/es/test-runner/engine/project-runtime.mjs +14 -5
- package/dist/es/test-runner/engine/project-runtime.mjs.map +1 -1
- package/dist/es/test-runner/engine/resource-operations.mjs +286 -35
- package/dist/es/test-runner/engine/resource-operations.mjs.map +1 -1
- package/dist/es/test-runner/engine/result-metadata.mjs +21 -0
- package/dist/es/test-runner/engine/result-metadata.mjs.map +1 -0
- package/dist/es/test-runner/engine/run-collected-case.mjs +30 -9
- package/dist/es/test-runner/engine/run-collected-case.mjs.map +1 -1
- package/dist/es/test-runner/engine/run-workflow-document.mjs +57 -10
- package/dist/es/test-runner/engine/run-workflow-document.mjs.map +1 -1
- package/dist/es/test-runner/errors.mjs +26 -13
- package/dist/es/test-runner/errors.mjs.map +1 -1
- package/dist/es/test-runner/execution-record.mjs +2 -0
- package/dist/es/test-runner/execution-record.mjs.map +1 -1
- package/dist/es/test-runner/index.mjs +3 -0
- package/dist/es/test-runner/reporting/agent-report.mjs +2 -7
- package/dist/es/test-runner/reporting/agent-report.mjs.map +1 -1
- package/dist/es/test-runner/reporting/merge-report.mjs +207 -6
- package/dist/es/test-runner/reporting/merge-report.mjs.map +1 -1
- package/dist/es/test-runner/reporting/metrics.mjs +77 -0
- package/dist/es/test-runner/reporting/metrics.mjs.map +1 -0
- package/dist/es/test-runner/reporting/sanitize.mjs +92 -16
- package/dist/es/test-runner/reporting/sanitize.mjs.map +1 -1
- package/dist/es/test-runner/reporting/test-plan.mjs +56 -0
- package/dist/es/test-runner/reporting/test-plan.mjs.map +1 -0
- package/dist/es/test-runner/reporting/test-run-report.mjs +208 -21
- package/dist/es/test-runner/reporting/test-run-report.mjs.map +1 -1
- package/dist/es/types.mjs.map +1 -1
- package/dist/es/utils.mjs +1 -1
- package/dist/es/yaml/legacy-yaml-runtime.mjs +3 -3
- package/dist/es/yaml/legacy-yaml-runtime.mjs.map +1 -1
- package/dist/lib/agent/action-readiness.js +6 -3
- package/dist/lib/agent/action-readiness.js.map +1 -1
- package/dist/lib/agent/agent.js +4 -2
- package/dist/lib/agent/agent.js.map +1 -1
- package/dist/lib/agent/execution-session.js.map +1 -1
- package/dist/lib/agent/task-builder.js +42 -23
- package/dist/lib/agent/task-builder.js.map +1 -1
- package/dist/lib/agent/tasks.js +35 -12
- package/dist/lib/agent/tasks.js.map +1 -1
- package/dist/lib/agent/utils.js +1 -1
- package/dist/lib/device/index.js +7 -6
- package/dist/lib/device/index.js.map +1 -1
- package/dist/lib/report-generator.js +30 -14
- package/dist/lib/report-generator.js.map +1 -1
- package/dist/lib/report-html-template.js +1 -1
- package/dist/lib/report.js +121 -44
- package/dist/lib/report.js.map +1 -1
- package/dist/lib/service/index.js.map +1 -1
- package/dist/lib/task-runner.js +22 -12
- package/dist/lib/task-runner.js.map +1 -1
- package/dist/lib/test-run-report.js.map +1 -1
- package/dist/lib/test-runner/engine/case-runner.js +1 -1
- package/dist/lib/test-runner/engine/case-runner.js.map +1 -1
- package/dist/lib/test-runner/engine/document-runtime.js +41 -11
- package/dist/lib/test-runner/engine/document-runtime.js.map +1 -1
- package/dist/lib/test-runner/engine/execute-step.js +131 -10
- package/dist/lib/test-runner/engine/execute-step.js.map +1 -1
- package/dist/lib/test-runner/engine/index.js +9 -2
- package/dist/lib/test-runner/engine/index.js.map +1 -1
- package/dist/lib/test-runner/engine/project-runtime.js +13 -4
- package/dist/lib/test-runner/engine/project-runtime.js.map +1 -1
- package/dist/lib/test-runner/engine/resource-operations.js +319 -38
- package/dist/lib/test-runner/engine/resource-operations.js.map +1 -1
- package/dist/lib/test-runner/engine/result-metadata.js +58 -0
- package/dist/lib/test-runner/engine/result-metadata.js.map +1 -0
- package/dist/lib/test-runner/engine/run-collected-case.js +29 -8
- package/dist/lib/test-runner/engine/run-collected-case.js.map +1 -1
- package/dist/lib/test-runner/engine/run-workflow-document.js +57 -10
- package/dist/lib/test-runner/engine/run-workflow-document.js.map +1 -1
- package/dist/lib/test-runner/errors.js +42 -23
- package/dist/lib/test-runner/errors.js.map +1 -1
- package/dist/lib/test-runner/execution-record.js +2 -0
- package/dist/lib/test-runner/execution-record.js.map +1 -1
- package/dist/lib/test-runner/index.js +88 -16
- package/dist/lib/test-runner/index.js.map +1 -1
- package/dist/lib/test-runner/node/index.js +2 -2
- package/dist/lib/test-runner/reporting/agent-report.js +2 -7
- package/dist/lib/test-runner/reporting/agent-report.js.map +1 -1
- package/dist/lib/test-runner/reporting/merge-report.js +207 -6
- package/dist/lib/test-runner/reporting/merge-report.js.map +1 -1
- package/dist/lib/test-runner/reporting/metrics.js +114 -0
- package/dist/lib/test-runner/reporting/metrics.js.map +1 -0
- package/dist/lib/test-runner/reporting/sanitize.js +94 -15
- package/dist/lib/test-runner/reporting/sanitize.js.map +1 -1
- package/dist/lib/test-runner/reporting/test-plan.js +90 -0
- package/dist/lib/test-runner/reporting/test-plan.js.map +1 -0
- package/dist/lib/test-runner/reporting/test-run-report.js +208 -21
- package/dist/lib/test-runner/reporting/test-run-report.js.map +1 -1
- package/dist/lib/types.js.map +1 -1
- package/dist/lib/utils.js +1 -1
- package/dist/lib/yaml/legacy-yaml-runtime.js +2 -2
- package/dist/lib/yaml/legacy-yaml-runtime.js.map +1 -1
- package/dist/types/agent/action-readiness.d.ts +1 -1
- package/dist/types/agent/action-readiness.d.ts.map +1 -1
- package/dist/types/agent/agent.d.ts +1 -1
- package/dist/types/agent/agent.d.ts.map +1 -1
- package/dist/types/agent/execution-session.d.ts +1 -1
- package/dist/types/agent/execution-session.d.ts.map +1 -1
- package/dist/types/agent/task-builder.d.ts +4 -2
- package/dist/types/agent/task-builder.d.ts.map +1 -1
- package/dist/types/agent/tasks.d.ts +3 -0
- package/dist/types/agent/tasks.d.ts.map +1 -1
- package/dist/types/device/index.d.ts +3 -3
- package/dist/types/device/index.d.ts.map +1 -1
- package/dist/types/report-generator.d.ts +4 -2
- package/dist/types/report-generator.d.ts.map +1 -1
- package/dist/types/report.d.ts.map +1 -1
- package/dist/types/service/index.d.ts +2 -2
- package/dist/types/service/index.d.ts.map +1 -1
- package/dist/types/task-runner.d.ts +1 -1
- package/dist/types/task-runner.d.ts.map +1 -1
- package/dist/types/test-run-report.d.ts +157 -8
- package/dist/types/test-run-report.d.ts.map +1 -1
- package/dist/types/test-runner/engine/document-runtime.d.ts.map +1 -1
- package/dist/types/test-runner/engine/execute-step.d.ts +1 -0
- package/dist/types/test-runner/engine/execute-step.d.ts.map +1 -1
- package/dist/types/test-runner/engine/index.d.ts +1 -0
- package/dist/types/test-runner/engine/index.d.ts.map +1 -1
- package/dist/types/test-runner/engine/project-runtime.d.ts.map +1 -1
- package/dist/types/test-runner/engine/resource-operations.d.ts +41 -3
- package/dist/types/test-runner/engine/resource-operations.d.ts.map +1 -1
- package/dist/types/test-runner/engine/result-metadata.d.ts +18 -0
- package/dist/types/test-runner/engine/result-metadata.d.ts.map +1 -0
- package/dist/types/test-runner/engine/run-collected-case.d.ts.map +1 -1
- package/dist/types/test-runner/engine/run-workflow-document.d.ts.map +1 -1
- package/dist/types/test-runner/engine/types.d.ts +47 -8
- package/dist/types/test-runner/engine/types.d.ts.map +1 -1
- package/dist/types/test-runner/errors.d.ts +7 -0
- package/dist/types/test-runner/errors.d.ts.map +1 -1
- package/dist/types/test-runner/execution-record.d.ts.map +1 -1
- package/dist/types/test-runner/index.d.ts +2 -0
- package/dist/types/test-runner/index.d.ts.map +1 -1
- package/dist/types/test-runner/node/types.d.ts +9 -1
- package/dist/types/test-runner/node/types.d.ts.map +1 -1
- package/dist/types/test-runner/parser/types.d.ts +5 -0
- package/dist/types/test-runner/parser/types.d.ts.map +1 -1
- package/dist/types/test-runner/reporting/agent-report.d.ts.map +1 -1
- package/dist/types/test-runner/reporting/merge-report.d.ts +1 -1
- package/dist/types/test-runner/reporting/merge-report.d.ts.map +1 -1
- package/dist/types/test-runner/reporting/metrics.d.ts +7 -0
- package/dist/types/test-runner/reporting/metrics.d.ts.map +1 -0
- package/dist/types/test-runner/reporting/sanitize.d.ts +1 -0
- package/dist/types/test-runner/reporting/sanitize.d.ts.map +1 -1
- package/dist/types/test-runner/reporting/test-plan.d.ts +8 -0
- package/dist/types/test-runner/reporting/test-plan.d.ts.map +1 -0
- package/dist/types/test-runner/reporting/test-run-report.d.ts.map +1 -1
- package/dist/types/test-runner/reporting/types.d.ts +6 -1
- package/dist/types/test-runner/reporting/types.d.ts.map +1 -1
- package/dist/types/types.d.ts +3 -1
- package/dist/types/types.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -24,29 +24,55 @@ var __webpack_require__ = {};
|
|
|
24
24
|
var __webpack_exports__ = {};
|
|
25
25
|
__webpack_require__.r(__webpack_exports__);
|
|
26
26
|
__webpack_require__.d(__webpack_exports__, {
|
|
27
|
-
|
|
27
|
+
getResourceCleanupSnapshot: ()=>getResourceCleanupSnapshot,
|
|
28
|
+
getPendingScopeOperations: ()=>getPendingScopeOperations,
|
|
29
|
+
setResourceOperationIdentity: ()=>setResourceOperationIdentity,
|
|
30
|
+
assertResourceAvailable: ()=>assertResourceAvailable,
|
|
31
|
+
admitResourceOperation: ()=>admitResourceOperation,
|
|
32
|
+
cleanupResources: ()=>cleanupResources,
|
|
33
|
+
ResourceAdmissionError: ()=>ResourceAdmissionError,
|
|
28
34
|
RESOURCE_CLEANUP_GRACE_MS: ()=>RESOURCE_CLEANUP_GRACE_MS,
|
|
29
35
|
linkResourceSignal: ()=>linkResourceSignal,
|
|
36
|
+
recordOperation: ()=>recordOperation,
|
|
30
37
|
ResourceCleanupDeferredError: ()=>ResourceCleanupDeferredError,
|
|
31
38
|
waitForResourceIdle: ()=>waitForResourceIdle,
|
|
32
39
|
recoverCancelledScopeResources: ()=>recoverCancelledScopeResources,
|
|
33
40
|
createResourceScope: ()=>createResourceScope,
|
|
41
|
+
retainResourceForScope: ()=>retainResourceForScope,
|
|
42
|
+
hasPendingResourceOperation: ()=>hasPendingResourceOperation,
|
|
34
43
|
trackResourceOperation: ()=>trackResourceOperation,
|
|
44
|
+
observeResourceOperations: ()=>observeResourceOperations,
|
|
35
45
|
cleanupScopeResources: ()=>cleanupScopeResources,
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
46
|
+
isResourceAdmissionError: ()=>isResourceAdmissionError,
|
|
47
|
+
getResourceCleanupCompletion: ()=>getResourceCleanupCompletion,
|
|
48
|
+
RESOURCE_RECOVERY_GRACE_MS: ()=>RESOURCE_RECOVERY_GRACE_MS
|
|
39
49
|
});
|
|
50
|
+
const logger_namespaceObject = require("@midscene/shared/logger");
|
|
51
|
+
const utils_namespaceObject = require("@midscene/shared/utils");
|
|
40
52
|
const external_errors_js_namespaceObject = require("../errors.js");
|
|
41
|
-
const
|
|
53
|
+
const sanitize_js_namespaceObject = require("../reporting/sanitize.js");
|
|
54
|
+
function _define_property(obj, key, value) {
|
|
55
|
+
if (key in obj) Object.defineProperty(obj, key, {
|
|
56
|
+
value: value,
|
|
57
|
+
enumerable: true,
|
|
58
|
+
configurable: true,
|
|
59
|
+
writable: true
|
|
60
|
+
});
|
|
61
|
+
else obj[key] = value;
|
|
62
|
+
return obj;
|
|
63
|
+
}
|
|
64
|
+
const admissionErrorKey = Symbol.for('@midscene/core/resource-admission-error');
|
|
65
|
+
const stateKey = Symbol.for('@midscene/core/resource-operations/v4');
|
|
42
66
|
const host = globalThis;
|
|
43
67
|
host[stateKey] ??= {
|
|
44
68
|
resources: new WeakMap(),
|
|
45
69
|
scopes: new WeakMap(),
|
|
46
70
|
parents: new WeakMap(),
|
|
47
|
-
cleanupOwners: new WeakMap()
|
|
71
|
+
cleanupOwners: new WeakMap(),
|
|
72
|
+
identities: new WeakMap(),
|
|
73
|
+
listeners: new WeakMap()
|
|
48
74
|
};
|
|
49
|
-
const { resources: resource_operations_resources, scopes, parents, cleanupOwners } = host[stateKey];
|
|
75
|
+
const { resources: resource_operations_resources, scopes, parents, cleanupOwners, identities, listeners } = host[stateKey];
|
|
50
76
|
const resourceHandle = (resource)=>{
|
|
51
77
|
let handle = resource_operations_resources.get(resource);
|
|
52
78
|
if (!handle) {
|
|
@@ -59,8 +85,50 @@ const resourceHandle = (resource)=>{
|
|
|
59
85
|
return handle;
|
|
60
86
|
};
|
|
61
87
|
const getResourceCleanupCompletion = (owner)=>resource_operations_resources.get(owner)?.cleanup;
|
|
88
|
+
function blockingReferences(blockers) {
|
|
89
|
+
const references = new Map();
|
|
90
|
+
const visited = new Set();
|
|
91
|
+
const visit = (record)=>{
|
|
92
|
+
if (visited.has(record)) return;
|
|
93
|
+
visited.add(record);
|
|
94
|
+
if (!record.settled) references.set(record.operationId, {
|
|
95
|
+
operationId: record.operationId,
|
|
96
|
+
...record.identity
|
|
97
|
+
});
|
|
98
|
+
for (const blocker of record.blockers ?? [])visit(blocker);
|
|
99
|
+
};
|
|
100
|
+
for (const blocker of blockers)visit(blocker);
|
|
101
|
+
return [
|
|
102
|
+
...references.values()
|
|
103
|
+
];
|
|
104
|
+
}
|
|
105
|
+
function getResourceCleanupSnapshot(owner) {
|
|
106
|
+
const state = resource_operations_resources.get(owner)?.cleanupState;
|
|
107
|
+
return freezeEvent({
|
|
108
|
+
capturedAt: new Date().toISOString(),
|
|
109
|
+
status: state?.status ?? 'not-required',
|
|
110
|
+
...state?.operationId ? {
|
|
111
|
+
operationId: state.operationId
|
|
112
|
+
} : {},
|
|
113
|
+
...state?.status === 'pending' ? {
|
|
114
|
+
blockingOperations: blockingReferences(state.blockers)
|
|
115
|
+
} : {},
|
|
116
|
+
...state?.error === void 0 ? {} : {
|
|
117
|
+
error: (0, sanitize_js_namespaceObject.sanitizeReportError)(state.error)
|
|
118
|
+
}
|
|
119
|
+
});
|
|
120
|
+
}
|
|
62
121
|
const RESOURCE_CLEANUP_GRACE_MS = 1000;
|
|
63
122
|
const RESOURCE_RECOVERY_GRACE_MS = 30000;
|
|
123
|
+
const RESOURCE_TEARDOWN_GRACE_MS = 10000;
|
|
124
|
+
function getPendingScopeOperations(signal) {
|
|
125
|
+
return freezeEvent(blockingReferences([
|
|
126
|
+
...scopes.get(signal)?.operations.keys() ?? []
|
|
127
|
+
].flatMap((resource)=>[
|
|
128
|
+
...resource_operations_resources.get(resource)?.operations.values() ?? []
|
|
129
|
+
])));
|
|
130
|
+
}
|
|
131
|
+
const hasPendingResourceOperation = (resource)=>(resource_operations_resources.get(resource)?.operations.size ?? 0) > 0;
|
|
64
132
|
function linkResourceSignal(signal, parent) {
|
|
65
133
|
if (parent && parent !== signal) parents.set(signal, parent);
|
|
66
134
|
}
|
|
@@ -105,23 +173,167 @@ function assertResourceAvailable(resource, exclusive = false, signal) {
|
|
|
105
173
|
code: 'RESOURCE_CLEANUP_PENDING'
|
|
106
174
|
});
|
|
107
175
|
const pending = resource_operations_resources.get(resource)?.operations;
|
|
108
|
-
if (exclusive && pending?.size
|
|
176
|
+
if (exclusive && pending?.size) throw new external_errors_js_namespaceObject.WorkflowError('The same Agent instance cannot execute overlapping Runner operations.', {
|
|
109
177
|
code: 'RESOURCE_OPERATION_PENDING'
|
|
110
178
|
});
|
|
111
|
-
if (pending &&
|
|
179
|
+
if (pending && [
|
|
112
180
|
...pending.values()
|
|
113
|
-
].some((
|
|
181
|
+
].some((operation)=>operation.signal.aborted)) throw new external_errors_js_namespaceObject.WorkflowError('Cannot reuse an Agent while an aborted YAML action or Runner operation is still running.', {
|
|
114
182
|
code: 'RESOURCE_OPERATION_PENDING'
|
|
115
183
|
});
|
|
116
184
|
return isOwnerCleanup;
|
|
117
185
|
}
|
|
186
|
+
function observeResourceOperations(signal, listener) {
|
|
187
|
+
const subscribers = listeners.get(signal) ?? new Set();
|
|
188
|
+
listeners.set(signal, subscribers);
|
|
189
|
+
subscribers.add(listener);
|
|
190
|
+
return ()=>{
|
|
191
|
+
subscribers.delete(listener);
|
|
192
|
+
if (!subscribers.size) listeners.delete(signal);
|
|
193
|
+
};
|
|
194
|
+
}
|
|
195
|
+
function setResourceOperationIdentity(signal, identity) {
|
|
196
|
+
identities.set(signal, Object.freeze({
|
|
197
|
+
...identity
|
|
198
|
+
}));
|
|
199
|
+
}
|
|
200
|
+
function freezeEvent(value) {
|
|
201
|
+
if ('object' == typeof value && null !== value && !Object.isFrozen(value)) {
|
|
202
|
+
for (const child of Object.values(value))freezeEvent(child);
|
|
203
|
+
Object.freeze(value);
|
|
204
|
+
}
|
|
205
|
+
return value;
|
|
206
|
+
}
|
|
207
|
+
function recordOperation(operation, signal, operationKind) {
|
|
208
|
+
const owners = [
|
|
209
|
+
...ownerSignals(signal)
|
|
210
|
+
];
|
|
211
|
+
const identity = owners.map((owner)=>identities.get(owner)).find(Boolean);
|
|
212
|
+
const record = {
|
|
213
|
+
signal,
|
|
214
|
+
operationId: (0, utils_namespaceObject.uuid)(),
|
|
215
|
+
identity
|
|
216
|
+
};
|
|
217
|
+
const subscribers = new Set(owners.flatMap((owner)=>[
|
|
218
|
+
...listeners.get(owner) ?? []
|
|
219
|
+
]));
|
|
220
|
+
let settled = false;
|
|
221
|
+
const emit = (event)=>{
|
|
222
|
+
const frozen = freezeEvent({
|
|
223
|
+
...identity,
|
|
224
|
+
operationId: record.operationId,
|
|
225
|
+
operationKind,
|
|
226
|
+
at: new Date().toISOString(),
|
|
227
|
+
...event
|
|
228
|
+
});
|
|
229
|
+
for (const subscriber of subscribers)try {
|
|
230
|
+
subscriber(frozen);
|
|
231
|
+
} catch (error) {
|
|
232
|
+
(0, logger_namespaceObject.getDebug)('runner:operations', {
|
|
233
|
+
console: true
|
|
234
|
+
})(`Operation observer failed: ${String(error)}`);
|
|
235
|
+
}
|
|
236
|
+
};
|
|
237
|
+
const abort = ()=>emit({
|
|
238
|
+
kind: 'cancel-requested',
|
|
239
|
+
error: (0, sanitize_js_namespaceObject.sanitizeReportError)(signal.reason)
|
|
240
|
+
});
|
|
241
|
+
emit({
|
|
242
|
+
kind: 'started'
|
|
243
|
+
});
|
|
244
|
+
if (signal.aborted) abort();
|
|
245
|
+
else signal.addEventListener('abort', abort, {
|
|
246
|
+
once: true
|
|
247
|
+
});
|
|
248
|
+
const finish = (status, error)=>{
|
|
249
|
+
settled = true;
|
|
250
|
+
record.settled = true;
|
|
251
|
+
signal.removeEventListener('abort', abort);
|
|
252
|
+
emit({
|
|
253
|
+
kind: 'settled',
|
|
254
|
+
status,
|
|
255
|
+
...'success' !== status ? {
|
|
256
|
+
error: (0, sanitize_js_namespaceObject.sanitizeReportError)(error)
|
|
257
|
+
} : {}
|
|
258
|
+
});
|
|
259
|
+
};
|
|
260
|
+
operation.then(()=>finish('success'), (error)=>finish(isResourceAdmissionError(error) ? 'not-run' : 'failed', error));
|
|
261
|
+
return {
|
|
262
|
+
record,
|
|
263
|
+
runnerReturned (status) {
|
|
264
|
+
emit({
|
|
265
|
+
kind: 'runner-returned',
|
|
266
|
+
status,
|
|
267
|
+
pending: !settled
|
|
268
|
+
});
|
|
269
|
+
},
|
|
270
|
+
cleanupDeferred (blockers) {
|
|
271
|
+
emit({
|
|
272
|
+
kind: 'cleanup-deferred',
|
|
273
|
+
blockingOperations: blockingReferences(blockers)
|
|
274
|
+
});
|
|
275
|
+
}
|
|
276
|
+
};
|
|
277
|
+
}
|
|
278
|
+
let _admissionErrorKey = admissionErrorKey;
|
|
279
|
+
class ResourceAdmissionError extends external_errors_js_namespaceObject.WorkflowError {
|
|
280
|
+
constructor(code, blockers){
|
|
281
|
+
super('The Agent is occupied by an unfinished operation or pending cleanup; this action was not started.', {
|
|
282
|
+
code,
|
|
283
|
+
details: {
|
|
284
|
+
blockingOperations: blockers.map(({ operationId, identity })=>({
|
|
285
|
+
operationId,
|
|
286
|
+
...identity
|
|
287
|
+
}))
|
|
288
|
+
}
|
|
289
|
+
}), _define_property(this, "blockedBy", void 0), _define_property(this, _admissionErrorKey, true);
|
|
290
|
+
this.blockedBy = blockers.find((blocker)=>blocker.identity?.stepId)?.identity?.stepId;
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
function isResourceAdmissionError(error) {
|
|
294
|
+
return 'object' == typeof error && null !== error && true === error[admissionErrorKey];
|
|
295
|
+
}
|
|
296
|
+
function admitResourceOperation(resource, signal, exclusive = true) {
|
|
297
|
+
let isCleanupOwner;
|
|
298
|
+
try {
|
|
299
|
+
isCleanupOwner = assertResourceAvailable(resource, exclusive, signal);
|
|
300
|
+
} catch (error) {
|
|
301
|
+
if (error instanceof external_errors_js_namespaceObject.WorkflowError && [
|
|
302
|
+
'RESOURCE_OPERATION_PENDING',
|
|
303
|
+
'RESOURCE_CLEANUP_PENDING'
|
|
304
|
+
].includes(error.code)) throw new ResourceAdmissionError(error.code, [
|
|
305
|
+
...resource_operations_resources.get(resource)?.operations.values() ?? [],
|
|
306
|
+
...[
|
|
307
|
+
...resource_operations_resources.get(resource)?.retiring ?? []
|
|
308
|
+
].flatMap((owner)=>[
|
|
309
|
+
...owner.blockers
|
|
310
|
+
])
|
|
311
|
+
]);
|
|
312
|
+
throw error;
|
|
313
|
+
}
|
|
314
|
+
return isCleanupOwner;
|
|
315
|
+
}
|
|
118
316
|
const retainForCleanup = (owner, resource)=>{
|
|
119
317
|
owner.resources.add(resource);
|
|
120
|
-
resourceHandle(resource)
|
|
318
|
+
const handle = resourceHandle(resource);
|
|
319
|
+
for (const operation of handle.operations.values())owner.blockers.add(operation);
|
|
320
|
+
handle.retiring.add(owner);
|
|
121
321
|
};
|
|
122
|
-
function
|
|
322
|
+
function retainResourceForScope(resource, signal) {
|
|
323
|
+
let retained = false;
|
|
324
|
+
for (const ownerSignal of ownerSignals(signal)){
|
|
325
|
+
const scope = scopes.get(ownerSignal);
|
|
326
|
+
if (!retained && scope?.resources) {
|
|
327
|
+
scope.resources.add(resource);
|
|
328
|
+
retained = true;
|
|
329
|
+
}
|
|
330
|
+
if (scope?.cleanupOwner) retainForCleanup(scope.cleanupOwner, resource);
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
function trackResourceOperation(resource, operation, signal, kind = 'resource', existingObservation) {
|
|
334
|
+
const observation = existingObservation ?? recordOperation(operation, signal, kind);
|
|
123
335
|
const active = resourceHandle(resource).operations;
|
|
124
|
-
active.set(operation,
|
|
336
|
+
active.set(operation, observation.record);
|
|
125
337
|
const ownerScopes = [];
|
|
126
338
|
let retainedByScope = false;
|
|
127
339
|
for (const ownerSignal of ownerSignals(signal)){
|
|
@@ -139,7 +351,10 @@ function trackResourceOperation(resource, operation, signal) {
|
|
|
139
351
|
retainedByScope = true;
|
|
140
352
|
}
|
|
141
353
|
const cleanupOwner = cleanupOwners.get(ownerSignal);
|
|
142
|
-
if (cleanupOwner)
|
|
354
|
+
if (cleanupOwner) {
|
|
355
|
+
cleanupOwner.blockers.add(observation.record);
|
|
356
|
+
retainForCleanup(cleanupOwner, resource);
|
|
357
|
+
}
|
|
143
358
|
}
|
|
144
359
|
const finish = ()=>{
|
|
145
360
|
active.delete(operation);
|
|
@@ -160,19 +375,24 @@ async function waitForResourceIdle(resource) {
|
|
|
160
375
|
}
|
|
161
376
|
async function recoverCancelledScopeResources(signal, graceMs = RESOURCE_RECOVERY_GRACE_MS) {
|
|
162
377
|
signal.throwIfAborted();
|
|
378
|
+
const startedAt = Date.now();
|
|
163
379
|
const pendingOperations = ()=>{
|
|
164
380
|
const pending = [];
|
|
165
|
-
for (const resource of scopes.get(signal)?.operations.keys() ?? [])for (const [operation,
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
signal
|
|
170
|
-
|
|
171
|
-
|
|
381
|
+
for (const resource of scopes.get(signal)?.operations.keys() ?? [])for (const [operation, tracked] of resource_operations_resources.get(resource)?.operations ?? []){
|
|
382
|
+
const ownerSignal = tracked.signal;
|
|
383
|
+
if (ownerSignal.aborted && [
|
|
384
|
+
...ownerSignals(ownerSignal)
|
|
385
|
+
].includes(signal)) pending.push({
|
|
386
|
+
operation,
|
|
387
|
+
signal: ownerSignal,
|
|
388
|
+
resource,
|
|
389
|
+
record: tracked
|
|
390
|
+
});
|
|
391
|
+
}
|
|
172
392
|
return pending;
|
|
173
393
|
};
|
|
174
394
|
let pending = pendingOperations();
|
|
175
|
-
if (!pending.length) return;
|
|
395
|
+
if (!pending.length) return 0;
|
|
176
396
|
let timer;
|
|
177
397
|
let onAbort;
|
|
178
398
|
const stopped = new Promise((_resolve, reject)=>{
|
|
@@ -180,14 +400,21 @@ async function recoverCancelledScopeResources(signal, graceMs = RESOURCE_RECOVER
|
|
|
180
400
|
signal.addEventListener('abort', onAbort, {
|
|
181
401
|
once: true
|
|
182
402
|
});
|
|
183
|
-
timer = setTimeout(()=>
|
|
403
|
+
timer = setTimeout(()=>{
|
|
404
|
+
const blockingOperations = blockingReferences(pending.map(({ record })=>record));
|
|
405
|
+
const blockedByStepId = blockingOperations.every(({ stepId })=>stepId === blockingOperations[0]?.stepId) ? blockingOperations[0]?.stepId : void 0;
|
|
406
|
+
reject(new external_errors_js_namespaceObject.WorkflowError(`The previous operation was still running after ${graceMs / 1000} s. Later steps were not started.`, {
|
|
184
407
|
code: 'RESOURCE_RECOVERY_TIMEOUT',
|
|
185
408
|
details: {
|
|
186
409
|
graceMs,
|
|
187
|
-
|
|
410
|
+
waitedMs: Date.now() - startedAt,
|
|
411
|
+
resourceCount: new Set(pending.map(({ resource })=>resource)).size,
|
|
412
|
+
blockingOperations,
|
|
413
|
+
blockedByStepId
|
|
188
414
|
},
|
|
189
415
|
cause: pending[0]?.signal.reason
|
|
190
|
-
}))
|
|
416
|
+
}));
|
|
417
|
+
}, graceMs);
|
|
191
418
|
});
|
|
192
419
|
try {
|
|
193
420
|
while(pending.length){
|
|
@@ -198,18 +425,23 @@ async function recoverCancelledScopeResources(signal, graceMs = RESOURCE_RECOVER
|
|
|
198
425
|
signal.throwIfAborted();
|
|
199
426
|
pending = pendingOperations();
|
|
200
427
|
}
|
|
428
|
+
return Date.now() - startedAt;
|
|
201
429
|
} finally{
|
|
202
430
|
clearTimeout(timer);
|
|
203
431
|
signal.removeEventListener('abort', onAbort);
|
|
204
432
|
}
|
|
205
433
|
}
|
|
206
434
|
class ResourceCleanupDeferredError extends external_errors_js_namespaceObject.WorkflowError {
|
|
207
|
-
constructor(graceMs, resourceCount){
|
|
208
|
-
super(
|
|
435
|
+
constructor(graceMs, resourceCount, blockers = []){
|
|
436
|
+
super(`Resource cleanup did not finish within ${graceMs}ms. Resources remain quarantined until cleanup settles.`, {
|
|
209
437
|
code: 'RESOURCE_CLEANUP_DEFERRED',
|
|
210
438
|
details: {
|
|
211
439
|
graceMs,
|
|
212
|
-
resourceCount
|
|
440
|
+
resourceCount,
|
|
441
|
+
blockingOperations: blockers.map(({ operationId, identity })=>({
|
|
442
|
+
operationId,
|
|
443
|
+
...identity
|
|
444
|
+
}))
|
|
213
445
|
}
|
|
214
446
|
});
|
|
215
447
|
}
|
|
@@ -217,25 +449,31 @@ class ResourceCleanupDeferredError extends external_errors_js_namespaceObject.Wo
|
|
|
217
449
|
async function runResourceCleanup(resources, cleanup, options, beforeCleanup) {
|
|
218
450
|
const owner = {
|
|
219
451
|
resources: new Set(),
|
|
452
|
+
blockers: new Set(),
|
|
220
453
|
signal: beforeCleanup?.signal
|
|
221
454
|
};
|
|
222
455
|
for (const resource of resources)retainForCleanup(owner, resource);
|
|
223
456
|
if (owner.signal) cleanupOwners.set(owner.signal, owner);
|
|
457
|
+
const ownerScope = options.signal ? scopes.get(options.signal) : void 0;
|
|
458
|
+
if (ownerScope) ownerScope.cleanupOwner = owner;
|
|
224
459
|
let defer;
|
|
225
460
|
const deferred = new Promise((resolve)=>{
|
|
226
461
|
defer = ()=>resolve({
|
|
227
462
|
deferred: true
|
|
228
463
|
});
|
|
229
464
|
});
|
|
230
|
-
|
|
465
|
+
let graceMs = options.graceMs ?? RESOURCE_CLEANUP_GRACE_MS;
|
|
466
|
+
let timer;
|
|
231
467
|
const drain = async ()=>{
|
|
232
|
-
|
|
233
|
-
...owner.resources
|
|
234
|
-
].filter((resource)=>resourceHandle(resource).operations.size);
|
|
235
|
-
if (!pending.length) return;
|
|
236
|
-
const timer = setTimeout(defer, graceMs);
|
|
468
|
+
timer = setTimeout(defer, graceMs);
|
|
237
469
|
try {
|
|
238
|
-
|
|
470
|
+
while(true){
|
|
471
|
+
const pending = [
|
|
472
|
+
...owner.resources
|
|
473
|
+
].filter((resource)=>resourceHandle(resource).operations.size);
|
|
474
|
+
if (!pending.length) return;
|
|
475
|
+
await Promise.all(pending.map(waitForResourceIdle));
|
|
476
|
+
}
|
|
239
477
|
} finally{
|
|
240
478
|
clearTimeout(timer);
|
|
241
479
|
}
|
|
@@ -244,17 +482,37 @@ async function runResourceCleanup(resources, cleanup, options, beforeCleanup) {
|
|
|
244
482
|
try {
|
|
245
483
|
if (beforeCleanup) await beforeCleanup.run(beforeCleanup.signal);
|
|
246
484
|
await drain();
|
|
485
|
+
graceMs = options.graceMs ?? RESOURCE_TEARDOWN_GRACE_MS;
|
|
486
|
+
timer = setTimeout(defer, graceMs);
|
|
247
487
|
return await cleanup();
|
|
248
488
|
} finally{
|
|
489
|
+
clearTimeout(timer);
|
|
249
490
|
if (owner.signal) cleanupOwners.delete(owner.signal);
|
|
491
|
+
if (ownerScope?.cleanupOwner === owner) ownerScope.cleanupOwner = void 0;
|
|
250
492
|
for (const resource of owner.resources){
|
|
251
493
|
const owners = resourceHandle(resource).retiring;
|
|
252
494
|
owners.delete(owner);
|
|
253
495
|
}
|
|
254
496
|
}
|
|
255
497
|
})();
|
|
498
|
+
const cleanupObservation = options.signal ? recordOperation(completion, options.signal, 'cleanup') : void 0;
|
|
256
499
|
const ownerKey = options.owner ?? beforeCleanup?.signal ?? resources[0];
|
|
257
|
-
|
|
500
|
+
const cleanupState = {
|
|
501
|
+
status: 'pending',
|
|
502
|
+
operationId: cleanupObservation?.record.operationId,
|
|
503
|
+
blockers: owner.blockers
|
|
504
|
+
};
|
|
505
|
+
if (cleanupObservation) cleanupObservation.record.blockers = owner.blockers;
|
|
506
|
+
if (ownerKey) {
|
|
507
|
+
resourceHandle(ownerKey).cleanup = completion;
|
|
508
|
+
resourceHandle(ownerKey).cleanupState = cleanupState;
|
|
509
|
+
}
|
|
510
|
+
completion.then(()=>{
|
|
511
|
+
cleanupState.status = 'completed';
|
|
512
|
+
}, (error)=>{
|
|
513
|
+
cleanupState.status = 'failed';
|
|
514
|
+
cleanupState.error = error;
|
|
515
|
+
});
|
|
258
516
|
const outcome = await Promise.race([
|
|
259
517
|
completion.then((value)=>({
|
|
260
518
|
value
|
|
@@ -262,13 +520,16 @@ async function runResourceCleanup(resources, cleanup, options, beforeCleanup) {
|
|
|
262
520
|
deferred
|
|
263
521
|
]);
|
|
264
522
|
if ('deferred' in outcome) {
|
|
523
|
+
cleanupObservation?.cleanupDeferred(owner.blockers);
|
|
265
524
|
completion.catch((error)=>{
|
|
266
525
|
try {
|
|
267
526
|
options.onDeferredError(error);
|
|
268
527
|
} catch {}
|
|
269
528
|
});
|
|
270
|
-
if (options.signal) trackResourceOperation({}, completion, options.signal);
|
|
271
|
-
throw new ResourceCleanupDeferredError(graceMs, owner.resources.size
|
|
529
|
+
if (options.signal) trackResourceOperation({}, completion, options.signal, 'cleanup', cleanupObservation);
|
|
530
|
+
throw new ResourceCleanupDeferredError(graceMs, owner.resources.size, [
|
|
531
|
+
...owner.blockers
|
|
532
|
+
]);
|
|
272
533
|
}
|
|
273
534
|
return outcome.value;
|
|
274
535
|
}
|
|
@@ -293,27 +554,47 @@ async function cleanupScopeResources(signal, cleanup, options) {
|
|
|
293
554
|
}
|
|
294
555
|
exports.RESOURCE_CLEANUP_GRACE_MS = __webpack_exports__.RESOURCE_CLEANUP_GRACE_MS;
|
|
295
556
|
exports.RESOURCE_RECOVERY_GRACE_MS = __webpack_exports__.RESOURCE_RECOVERY_GRACE_MS;
|
|
557
|
+
exports.ResourceAdmissionError = __webpack_exports__.ResourceAdmissionError;
|
|
296
558
|
exports.ResourceCleanupDeferredError = __webpack_exports__.ResourceCleanupDeferredError;
|
|
559
|
+
exports.admitResourceOperation = __webpack_exports__.admitResourceOperation;
|
|
297
560
|
exports.assertResourceAvailable = __webpack_exports__.assertResourceAvailable;
|
|
298
561
|
exports.cleanupResources = __webpack_exports__.cleanupResources;
|
|
299
562
|
exports.cleanupScopeResources = __webpack_exports__.cleanupScopeResources;
|
|
300
563
|
exports.createResourceScope = __webpack_exports__.createResourceScope;
|
|
564
|
+
exports.getPendingScopeOperations = __webpack_exports__.getPendingScopeOperations;
|
|
301
565
|
exports.getResourceCleanupCompletion = __webpack_exports__.getResourceCleanupCompletion;
|
|
566
|
+
exports.getResourceCleanupSnapshot = __webpack_exports__.getResourceCleanupSnapshot;
|
|
567
|
+
exports.hasPendingResourceOperation = __webpack_exports__.hasPendingResourceOperation;
|
|
568
|
+
exports.isResourceAdmissionError = __webpack_exports__.isResourceAdmissionError;
|
|
302
569
|
exports.linkResourceSignal = __webpack_exports__.linkResourceSignal;
|
|
570
|
+
exports.observeResourceOperations = __webpack_exports__.observeResourceOperations;
|
|
571
|
+
exports.recordOperation = __webpack_exports__.recordOperation;
|
|
303
572
|
exports.recoverCancelledScopeResources = __webpack_exports__.recoverCancelledScopeResources;
|
|
573
|
+
exports.retainResourceForScope = __webpack_exports__.retainResourceForScope;
|
|
574
|
+
exports.setResourceOperationIdentity = __webpack_exports__.setResourceOperationIdentity;
|
|
304
575
|
exports.trackResourceOperation = __webpack_exports__.trackResourceOperation;
|
|
305
576
|
exports.waitForResourceIdle = __webpack_exports__.waitForResourceIdle;
|
|
306
577
|
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
307
578
|
"RESOURCE_CLEANUP_GRACE_MS",
|
|
308
579
|
"RESOURCE_RECOVERY_GRACE_MS",
|
|
580
|
+
"ResourceAdmissionError",
|
|
309
581
|
"ResourceCleanupDeferredError",
|
|
582
|
+
"admitResourceOperation",
|
|
310
583
|
"assertResourceAvailable",
|
|
311
584
|
"cleanupResources",
|
|
312
585
|
"cleanupScopeResources",
|
|
313
586
|
"createResourceScope",
|
|
587
|
+
"getPendingScopeOperations",
|
|
314
588
|
"getResourceCleanupCompletion",
|
|
589
|
+
"getResourceCleanupSnapshot",
|
|
590
|
+
"hasPendingResourceOperation",
|
|
591
|
+
"isResourceAdmissionError",
|
|
315
592
|
"linkResourceSignal",
|
|
593
|
+
"observeResourceOperations",
|
|
594
|
+
"recordOperation",
|
|
316
595
|
"recoverCancelledScopeResources",
|
|
596
|
+
"retainResourceForScope",
|
|
597
|
+
"setResourceOperationIdentity",
|
|
317
598
|
"trackResourceOperation",
|
|
318
599
|
"waitForResourceIdle"
|
|
319
600
|
].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
|