@n8n/engine 0.17.0 → 0.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/action-token.d.ts +7 -0
- package/dist/auth/action-token.js +30 -0
- package/dist/auth/action-token.js.map +1 -0
- package/dist/auth/authenticate.d.ts +2 -1
- package/dist/auth/authenticate.js +3 -2
- package/dist/auth/authenticate.js.map +1 -1
- package/dist/auth/identity-token.d.ts +3 -5
- package/dist/auth/identity-token.js +17 -38
- package/dist/auth/identity-token.js.map +1 -1
- package/dist/auth/index.d.ts +3 -1
- package/dist/auth/index.js +7 -5
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/shared-secret-token.d.ts +12 -0
- package/dist/auth/shared-secret-token.js +44 -0
- package/dist/auth/shared-secret-token.js.map +1 -0
- package/dist/build.tsbuildinfo +1 -1
- package/dist/common/index.d.ts +1 -0
- package/dist/common/index.js +3 -1
- package/dist/common/index.js.map +1 -1
- package/dist/common/json.schema.d.ts +3 -0
- package/dist/common/json.schema.js +13 -0
- package/dist/common/json.schema.js.map +1 -0
- package/dist/database/create-stores.d.ts +2 -0
- package/dist/database/create-stores.js +6 -2
- package/dist/database/create-stores.js.map +1 -1
- package/dist/database/entities/workflow-execution.entity.d.ts +0 -1
- package/dist/database/entities/workflow-execution.entity.js +0 -11
- package/dist/database/entities/workflow-execution.entity.js.map +1 -1
- package/dist/database/entities/workflow-step-execution.entity.d.ts +1 -2
- package/dist/database/entities/workflow-step-execution.entity.js.map +1 -1
- package/dist/database/index.d.ts +1 -0
- package/dist/database/index.js +3 -1
- package/dist/database/index.js.map +1 -1
- package/dist/database/typeorm-execution-store.d.ts +1 -3
- package/dist/database/typeorm-execution-store.js +0 -1
- package/dist/database/typeorm-execution-store.js.map +1 -1
- package/dist/database/typeorm-execution-view-store.d.ts +10 -0
- package/dist/database/typeorm-execution-view-store.js +49 -0
- package/dist/database/typeorm-execution-view-store.js.map +1 -0
- package/dist/database/typeorm-step-store.d.ts +3 -2
- package/dist/database/typeorm-step-store.js +6 -1
- package/dist/database/typeorm-step-store.js.map +1 -1
- package/dist/dependencies/external-dependencies.d.ts +3 -0
- package/dist/execution/batch-step.d.ts +8 -0
- package/dist/execution/batch-step.js +28 -0
- package/dist/execution/batch-step.js.map +1 -0
- package/dist/execution/completion.js.map +1 -1
- package/dist/execution/execution-query.service.d.ts +7 -0
- package/dist/execution/execution-query.service.js +17 -0
- package/dist/execution/execution-query.service.js.map +1 -0
- package/dist/execution/execution-start-handler.d.ts +3 -1
- package/dist/execution/execution-start-handler.js +10 -1
- package/dist/execution/execution-start-handler.js.map +1 -1
- package/dist/execution/execution-store.d.ts +2 -3
- package/dist/execution/execution-store.js.map +1 -1
- package/dist/execution/execution-view-store.d.ts +26 -0
- package/dist/execution/execution-view-store.js +3 -0
- package/dist/execution/execution-view-store.js.map +1 -0
- package/dist/execution/execution.types.d.ts +6 -0
- package/dist/execution/execution.types.js.map +1 -1
- package/dist/execution/index.d.ts +4 -2
- package/dist/execution/index.js +3 -1
- package/dist/execution/index.js.map +1 -1
- package/dist/execution/loop-ledger.d.ts +2 -2
- package/dist/execution/loop-ledger.js +4 -3
- package/dist/execution/loop-ledger.js.map +1 -1
- package/dist/execution/settlement.js.map +1 -1
- package/dist/execution/start-execution.service.d.ts +1 -0
- package/dist/execution/start-execution.service.js +5 -3
- package/dist/execution/start-execution.service.js.map +1 -1
- package/dist/execution/step-ready-handler.d.ts +4 -1
- package/dist/execution/step-ready-handler.js +37 -3
- package/dist/execution/step-ready-handler.js.map +1 -1
- package/dist/execution/step-settled-handler.d.ts +3 -1
- package/dist/execution/step-settled-handler.js +25 -7
- package/dist/execution/step-settled-handler.js.map +1 -1
- package/dist/execution/step-store.d.ts +2 -9
- package/dist/execution/step-store.js.map +1 -1
- package/dist/execution/store-loop-reader.d.ts +4 -0
- package/dist/execution/store-loop-reader.js +48 -0
- package/dist/execution/store-loop-reader.js.map +1 -0
- package/dist/graph/index.d.ts +2 -1
- package/dist/graph/index.js +3 -1
- package/dist/graph/index.js.map +1 -1
- package/dist/graph/loops.d.ts +1 -1
- package/dist/graph/loops.js +11 -0
- package/dist/graph/loops.js.map +1 -1
- package/dist/graph/validate-executable-graph.js +4 -3
- package/dist/graph/validate-executable-graph.js.map +1 -1
- package/dist/graph/workflow-graph.d.ts +4 -0
- package/dist/graph/workflow-graph.js +7 -0
- package/dist/graph/workflow-graph.js.map +1 -1
- package/dist/index.d.ts +9 -5
- package/dist/index.js +13 -1
- package/dist/index.js.map +1 -1
- package/dist/lifecycle-events/batching-lifecycle-event-publisher.d.ts +26 -0
- package/dist/lifecycle-events/batching-lifecycle-event-publisher.js +121 -0
- package/dist/lifecycle-events/batching-lifecycle-event-publisher.js.map +1 -0
- package/dist/lifecycle-events/index.d.ts +6 -0
- package/dist/lifecycle-events/index.js +15 -0
- package/dist/lifecycle-events/index.js.map +1 -0
- package/dist/lifecycle-events/lifecycle-event-publisher.d.ts +6 -0
- package/dist/lifecycle-events/lifecycle-event-publisher.js +8 -0
- package/dist/lifecycle-events/lifecycle-event-publisher.js.map +1 -0
- package/dist/lifecycle-events/lifecycle-event.schema.d.ts +339 -0
- package/dist/lifecycle-events/lifecycle-event.schema.js +39 -0
- package/dist/lifecycle-events/lifecycle-event.schema.js.map +1 -0
- package/dist/lifecycle-events/lifecycle-event.types.d.ts +4 -0
- package/dist/lifecycle-events/lifecycle-event.types.js +3 -0
- package/dist/lifecycle-events/lifecycle-event.types.js.map +1 -0
- package/dist/logging/console-logger.d.ts +2 -0
- package/dist/logging/console-logger.js +18 -0
- package/dist/logging/console-logger.js.map +1 -0
- package/dist/logging/index.d.ts +2 -0
- package/dist/logging/index.js +6 -0
- package/dist/logging/index.js.map +1 -0
- package/dist/logging/logger.types.d.ts +6 -0
- package/dist/logging/logger.types.js +3 -0
- package/dist/logging/logger.types.js.map +1 -0
- package/dist/queue/in-memory-work-queue.d.ts +3 -0
- package/dist/queue/in-memory-work-queue.js +7 -2
- package/dist/queue/in-memory-work-queue.js.map +1 -1
- package/dist/runtime/create-engine-runtime.d.ts +3 -1
- package/dist/runtime/create-engine-runtime.js +19 -7
- package/dist/runtime/create-engine-runtime.js.map +1 -1
- package/dist/serve.js +7 -4
- package/dist/serve.js.map +1 -1
- package/dist/server/api.types.d.ts +25 -0
- package/dist/server/api.types.js +3 -0
- package/dist/server/api.types.js.map +1 -0
- package/dist/server/create-engine-server.d.ts +9 -1
- package/dist/server/create-engine-server.js +3 -3
- package/dist/server/create-engine-server.js.map +1 -1
- package/dist/server/index.d.ts +2 -0
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes/workflow-executions.d.ts +2 -2
- package/dist/server/routes/workflow-executions.handlers.d.ts +4 -0
- package/dist/server/routes/workflow-executions.handlers.js +68 -0
- package/dist/server/routes/workflow-executions.handlers.js.map +1 -0
- package/dist/server/routes/workflow-executions.js +10 -13
- package/dist/server/routes/workflow-executions.js.map +1 -1
- package/dist/testing/start-engine-server.d.ts +2 -3
- package/dist/testing/start-engine-server.js +2 -2
- package/dist/testing/start-engine-server.js.map +1 -1
- package/package.json +10 -9
package/dist/execution/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.StepWorker = exports.StepReadyHandler = exports.StepSettledHandler = exports.OrchestrationWorker = exports.ExecutionStartHandler = exports.StepNotFoundError = exports.ExecutionNotFoundError = exports.stepKeyId = exports.StartExecutionService = void 0;
|
|
3
|
+
exports.StepWorker = exports.StepReadyHandler = exports.StepSettledHandler = exports.OrchestrationWorker = exports.ExecutionQueryService = exports.ExecutionStartHandler = exports.StepNotFoundError = exports.ExecutionNotFoundError = exports.stepKeyId = exports.StartExecutionService = void 0;
|
|
4
4
|
var start_execution_service_1 = require("./start-execution.service");
|
|
5
5
|
Object.defineProperty(exports, "StartExecutionService", { enumerable: true, get: function () { return start_execution_service_1.StartExecutionService; } });
|
|
6
6
|
var execution_types_1 = require("./execution.types");
|
|
@@ -11,6 +11,8 @@ var step_store_1 = require("./step-store");
|
|
|
11
11
|
Object.defineProperty(exports, "StepNotFoundError", { enumerable: true, get: function () { return step_store_1.StepNotFoundError; } });
|
|
12
12
|
var execution_start_handler_1 = require("./execution-start-handler");
|
|
13
13
|
Object.defineProperty(exports, "ExecutionStartHandler", { enumerable: true, get: function () { return execution_start_handler_1.ExecutionStartHandler; } });
|
|
14
|
+
var execution_query_service_1 = require("./execution-query.service");
|
|
15
|
+
Object.defineProperty(exports, "ExecutionQueryService", { enumerable: true, get: function () { return execution_query_service_1.ExecutionQueryService; } });
|
|
14
16
|
var orchestration_worker_1 = require("./orchestration-worker");
|
|
15
17
|
Object.defineProperty(exports, "OrchestrationWorker", { enumerable: true, get: function () { return orchestration_worker_1.OrchestrationWorker; } });
|
|
16
18
|
var step_settled_handler_1 = require("./step-settled-handler");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/execution/index.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAAzD,gIAAA,qBAAqB,OAAA;AAK9B,qDAA8C;AAArC,4GAAA,SAAS,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/execution/index.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAAzD,gIAAA,qBAAqB,OAAA;AAK9B,qDAA8C;AAArC,4GAAA,SAAS,OAAA;AAWlB,qDAA2D;AAAlD,yHAAA,sBAAsB,OAAA;AAG/B,2CAAiD;AAAxC,+GAAA,iBAAiB,OAAA;AAE1B,qEAAkE;AAAzD,gIAAA,qBAAqB,OAAA;AAC9B,qEAAkE;AAAzD,gIAAA,qBAAqB,OAAA;AAC9B,+DAA6D;AAApD,2HAAA,mBAAmB,OAAA;AAC5B,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,2DAAwD;AAA/C,sHAAA,gBAAgB,OAAA;AACzB,6CAA2C;AAAlC,yGAAA,UAAU,OAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { WorkflowGraph, WorkflowLoop } from '../graph';
|
|
2
|
-
import { type StepStatus } from './execution.types';
|
|
3
2
|
import type { StepStore, StepSummary } from './step-store';
|
|
4
|
-
export declare
|
|
3
|
+
export declare const DONE_SLOT = 0;
|
|
4
|
+
export declare const LOOP_SLOT = 1;
|
|
5
5
|
export declare function isTerminalStep(step: StepSummary): boolean;
|
|
6
6
|
export declare function exitSourcesInto(graph: WorkflowGraph, loops: WorkflowLoop[], targetNodeIds: string[]): string[];
|
|
7
7
|
export declare function loadTerminalIterations(stepStore: StepStore, executionId: string, batchNodeIds: string[]): Promise<Map<string, number>>;
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.LOOP_SLOT = exports.DONE_SLOT = void 0;
|
|
4
4
|
exports.isTerminalStep = isTerminalStep;
|
|
5
5
|
exports.exitSourcesInto = exitSourcesInto;
|
|
6
6
|
exports.loadTerminalIterations = loadTerminalIterations;
|
|
7
7
|
const execution_types_1 = require("./execution.types");
|
|
8
8
|
const iteration_mapping_1 = require("./iteration-mapping");
|
|
9
|
-
|
|
9
|
+
exports.DONE_SLOT = 0;
|
|
10
|
+
exports.LOOP_SLOT = 1;
|
|
10
11
|
function endsLoop(status, loopSlotFilled) {
|
|
11
12
|
return (0, execution_types_1.isSettledStatus)(status) && !loopSlotFilled;
|
|
12
13
|
}
|
|
13
14
|
function isTerminalStep(step) {
|
|
14
|
-
return endsLoop(step.status, Boolean(step.filledOutputSlots[LOOP_SLOT]));
|
|
15
|
+
return endsLoop(step.status, Boolean(step.filledOutputSlots[exports.LOOP_SLOT]));
|
|
15
16
|
}
|
|
16
17
|
function exitSourcesInto(graph, loops, targetNodeIds) {
|
|
17
18
|
if (loops.length === 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop-ledger.js","sourceRoot":"","sources":["../../src/execution/loop-ledger.ts"],"names":[],"mappings":";;;;;;AACA,uDAAqE;AACrE,2DAAmD;
|
|
1
|
+
{"version":3,"file":"loop-ledger.js","sourceRoot":"","sources":["../../src/execution/loop-ledger.ts"],"names":[],"mappings":";;;;;;AACA,uDAAqE;AACrE,2DAAmD;AAItC,QAAA,SAAS,GAAG,CAAC,CAAC;AACd,QAAA,SAAS,GAAG,CAAC,CAAC;AAU3B,SAAS,QAAQ,CAAC,MAAkB,EAAE,cAAuB;IAC5D,OAAO,IAAA,iCAAe,EAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;AACnD,CAAC;AAED,wBAA+B,IAAiB;IAC/C,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAA,SAAS,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC;AAQD,yBACC,KAAoB,EACpB,KAAqB,EACrB,aAAuB;IAEvB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAA,gCAAY,EAAC,IAAI,EAAE,KAAK,CAAC,KAAK,MAAM;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1F,CAAC;IACD,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;AACrB,CAAC;AAUM,KAAK,iCACX,SAAoB,EACpB,WAAmB,EACnB,YAAsB;IAEtB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC;IAEhD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAElF,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACrD,KAAK,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1D,IAAI,cAAc,CAAC,IAAI,CAAC;YAAE,kBAAkB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC3B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settlement.js","sourceRoot":"","sources":["../../src/execution/settlement.ts"],"names":[],"mappings":";;;;AACA,uDAA6F;AAC7F,2DAAyF;AACzF,+CAA+C;AA+D/C,0BACC,KAAoB,EACpB,KAAqB,EACrB,OAAgB,EAChB,KAAqC,EACrC,kBAAuC;IAEvC,MAAM,SAAS,GAAuB,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAClE,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC;QAC1E,CAAC,CAAC,KAAK,CAAC,IAAA,2BAAS,EAAC,OAAO,CAAC,CAAC;QAC3B,CAAC,CAAC,SAAS,CAAC;IACb,MAAM,OAAO,GAAG,IAAI,GAAG,EAAa,CAAC;IACrC,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjF,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,IAAA,gCAAY,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAI,SAAS,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC;YAAE,SAAS;QAEnE,MAAM,MAAM,GAAG,IAAA,6BAAS,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,IAAA,2BAAS,EAAC,MAAM,CAAC,CAAC;QAGnC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,SAAS;QACvD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEtB,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;QAC7E,IAAI,IAAI,KAAK,QAAQ;YAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACjD,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAGD,SAAS,gBAAgB,CAAC,SAAoB,EAAE,SAAsB;IACrE,OAAO,IAAA,4BAAc,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,KAAK,MAAM,CAAC;AAChF,CAAC;
|
|
1
|
+
{"version":3,"file":"settlement.js","sourceRoot":"","sources":["../../src/execution/settlement.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,9 @@ class StartExecutionService {
|
|
|
20
20
|
if (!decision.accept) {
|
|
21
21
|
throw new admittance_1.AdmittanceRejectedError(decision.reason);
|
|
22
22
|
}
|
|
23
|
-
const {
|
|
23
|
+
const { executionId } = request;
|
|
24
|
+
await this.executionStore.createExecution({
|
|
25
|
+
id: executionId,
|
|
24
26
|
workflowId: request.workflowId,
|
|
25
27
|
status: 'queued',
|
|
26
28
|
mode: request.mode ?? 'production',
|
|
@@ -29,9 +31,9 @@ class StartExecutionService {
|
|
|
29
31
|
});
|
|
30
32
|
await this.workQueue.publish({
|
|
31
33
|
type: 'execution:enqueued',
|
|
32
|
-
executionId
|
|
34
|
+
executionId,
|
|
33
35
|
});
|
|
34
|
-
return { executionId
|
|
36
|
+
return { executionId };
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
39
|
exports.StartExecutionService = StartExecutionService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start-execution.service.js","sourceRoot":"","sources":["../../src/execution/start-execution.service.ts"],"names":[],"mappings":";;;AAAA,8CAAgF;AAChF,oCAAuE;
|
|
1
|
+
{"version":3,"file":"start-execution.service.js","sourceRoot":"","sources":["../../src/execution/start-execution.service.ts"],"names":[],"mappings":";;;AAAA,8CAAgF;AAChF,oCAAuE;AAsBvE;IAEmB,UAAU;IACV,cAAc;IACd,SAAS;IACT,aAAa;IAJ/B,YACkB,UAA6B,EAC7B,cAA8B,EAC9B,SAA0C,EAC1C,aAAa,GAAmC,+BAAuB;0BAHvE,UAAU;8BACV,cAAc;yBACd,SAAS;6BACT,aAAa;IAC5B,CAAC;IAEJ,KAAK,CAAC,KAAK,CAAC,OAA8B;QAGzC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAElC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM,IAAI,oCAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;QAID,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAEhC,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;YACzC,EAAE,EAAE,WAAW;YACf,UAAU,EAAE,OAAO,CAAC,UAAU;YAE9B,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,YAAY;YAClC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,IAAI;SAC9C,CAAC,CAAC;QAKH,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YAC5B,IAAI,EAAE,oBAAoB;YAC1B,WAAW;SACX,CAAC,CAAC;QAEH,OAAO,EAAE,WAAW,EAAE,CAAC;IACxB,CAAC;CACD"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ExternalDependencies } from '../dependencies';
|
|
2
2
|
import { type GraphEdge, type WorkflowLoop } from '../graph';
|
|
3
|
+
import type { LifecycleEventPublisher } from '../lifecycle-events';
|
|
3
4
|
import type { OrchestrationMessage, StepReadyEvent, WorkQueue } from '../queue';
|
|
4
5
|
import type { ExecutionStore } from './execution-store';
|
|
5
6
|
import { type StepKey } from './execution.types';
|
|
@@ -9,9 +10,11 @@ export declare class StepReadyHandler {
|
|
|
9
10
|
private readonly stepStore;
|
|
10
11
|
private readonly orchestrationQueue;
|
|
11
12
|
private readonly dependencies;
|
|
12
|
-
|
|
13
|
+
private readonly lifecycleEventPublisher;
|
|
14
|
+
constructor(executionStore: ExecutionStore, stepStore: StepStore, orchestrationQueue: WorkQueue<OrchestrationMessage>, dependencies: ExternalDependencies, lifecycleEventPublisher: LifecycleEventPublisher);
|
|
13
15
|
handle(event: StepReadyEvent): Promise<void>;
|
|
14
16
|
private runStep;
|
|
17
|
+
private runBatchNode;
|
|
15
18
|
private gatherInputs;
|
|
16
19
|
private executorFor;
|
|
17
20
|
}
|
|
@@ -4,20 +4,24 @@ exports.StepReadyHandler = void 0;
|
|
|
4
4
|
exports.resolveInputReads = resolveInputReads;
|
|
5
5
|
const common_1 = require("../common");
|
|
6
6
|
const graph_1 = require("../graph");
|
|
7
|
+
const batch_step_1 = require("./batch-step");
|
|
7
8
|
const execution_types_1 = require("./execution.types");
|
|
8
9
|
const iteration_mapping_1 = require("./iteration-mapping");
|
|
9
10
|
const loop_ledger_1 = require("./loop-ledger");
|
|
11
|
+
const store_loop_reader_1 = require("./store-loop-reader");
|
|
10
12
|
const validate_step_context_1 = require("./validate-step-context");
|
|
11
13
|
class StepReadyHandler {
|
|
12
14
|
executionStore;
|
|
13
15
|
stepStore;
|
|
14
16
|
orchestrationQueue;
|
|
15
17
|
dependencies;
|
|
16
|
-
|
|
18
|
+
lifecycleEventPublisher;
|
|
19
|
+
constructor(executionStore, stepStore, orchestrationQueue, dependencies, lifecycleEventPublisher) {
|
|
17
20
|
this.executionStore = executionStore;
|
|
18
21
|
this.stepStore = stepStore;
|
|
19
22
|
this.orchestrationQueue = orchestrationQueue;
|
|
20
23
|
this.dependencies = dependencies;
|
|
24
|
+
this.lifecycleEventPublisher = lifecycleEventPublisher;
|
|
21
25
|
}
|
|
22
26
|
async handle(event) {
|
|
23
27
|
const step = await this.stepStore.claimStep(event.stepId);
|
|
@@ -25,16 +29,19 @@ class StepReadyHandler {
|
|
|
25
29
|
return;
|
|
26
30
|
const execution = await this.executionStore.loadExecution(event.executionId);
|
|
27
31
|
const node = (0, validate_step_context_1.validateStepContext)(step, execution);
|
|
28
|
-
const executor = this.executorFor(step, node);
|
|
32
|
+
const executor = node.type === 'batch' ? undefined : this.executorFor(step, node);
|
|
29
33
|
if (execution.status !== 'running') {
|
|
30
34
|
return;
|
|
31
35
|
}
|
|
36
|
+
this.lifecycleEventPublisher.publish({ type: 'step:started', ...stepEventFields(step, node) });
|
|
32
37
|
const inputs = await this.gatherInputs(execution, step);
|
|
33
38
|
let run;
|
|
34
39
|
try {
|
|
35
40
|
run = {
|
|
36
41
|
ok: true,
|
|
37
|
-
outputs:
|
|
42
|
+
outputs: executor
|
|
43
|
+
? await this.runStep(step, execution, node, inputs, executor)
|
|
44
|
+
: await this.runBatchNode(step, execution, node),
|
|
38
45
|
};
|
|
39
46
|
}
|
|
40
47
|
catch (error) {
|
|
@@ -45,6 +52,9 @@ class StepReadyHandler {
|
|
|
45
52
|
: await this.stepStore.failStep(event.stepId, toStepError(run.error));
|
|
46
53
|
if (!recorded)
|
|
47
54
|
return;
|
|
55
|
+
this.lifecycleEventPublisher.publish(run.ok
|
|
56
|
+
? { type: 'step:completed', ...stepEventFields(step, node), outputs: run.outputs }
|
|
57
|
+
: { type: 'step:failed', ...stepEventFields(step, node) });
|
|
48
58
|
await this.orchestrationQueue.publish({
|
|
49
59
|
type: 'step:settled',
|
|
50
60
|
executionId: event.executionId,
|
|
@@ -60,10 +70,24 @@ class StepReadyHandler {
|
|
|
60
70
|
stepId: step.id,
|
|
61
71
|
workflowId: execution.workflowId,
|
|
62
72
|
mode: execution.mode,
|
|
73
|
+
iteration: step.iteration,
|
|
63
74
|
},
|
|
64
75
|
});
|
|
65
76
|
return outputs;
|
|
66
77
|
}
|
|
78
|
+
async runBatchNode(step, execution, node) {
|
|
79
|
+
if (!(0, graph_1.isBatchStepConfig)(node.config)) {
|
|
80
|
+
throw new common_1.UnexpectedError(`step ${step.id} runs batch node ${step.nodeId}, whose config has no whole batch size of at least 1`);
|
|
81
|
+
}
|
|
82
|
+
const loops = (0, graph_1.deriveLoops)(execution.graph);
|
|
83
|
+
const loop = loops.find((l) => l.batchNodeId === step.nodeId);
|
|
84
|
+
if (!loop) {
|
|
85
|
+
throw new common_1.UnexpectedError(`step ${step.id} runs batch node ${step.nodeId}, which heads no loop in the execution graph`);
|
|
86
|
+
}
|
|
87
|
+
const terminalIterations = await (0, loop_ledger_1.loadTerminalIterations)(this.stepStore, execution.id, (0, loop_ledger_1.exitSourcesInto)(execution.graph, loops, [step.nodeId]));
|
|
88
|
+
const reader = (0, store_loop_reader_1.createStoreLoopReader)(this.stepStore, execution.id, loops, loop, terminalIterations);
|
|
89
|
+
return await (0, batch_step_1.runBatchStep)(node.config, step.iteration, reader);
|
|
90
|
+
}
|
|
67
91
|
async gatherInputs(execution, step) {
|
|
68
92
|
const incomingEdges = execution.graph.edges.filter((edge) => edge.to === step.nodeId);
|
|
69
93
|
if (incomingEdges.length === 0) {
|
|
@@ -123,6 +147,16 @@ function readEdgeValue(edge, source, step, rows) {
|
|
|
123
147
|
return null;
|
|
124
148
|
return row.outputs?.[edge.outputIndex] ?? null;
|
|
125
149
|
}
|
|
150
|
+
function stepEventFields(step, node) {
|
|
151
|
+
return {
|
|
152
|
+
executionId: step.executionId,
|
|
153
|
+
stepId: step.id,
|
|
154
|
+
nodeId: step.nodeId,
|
|
155
|
+
nodeName: node.name,
|
|
156
|
+
iteration: step.iteration,
|
|
157
|
+
at: new Date().toISOString(),
|
|
158
|
+
};
|
|
159
|
+
}
|
|
126
160
|
function toStepError(error) {
|
|
127
161
|
if (error instanceof Error) {
|
|
128
162
|
return { name: error.name, message: error.message, stack: error.stack };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-ready-handler.js","sourceRoot":"","sources":["../../src/execution/step-ready-handler.ts"],"names":[],"mappings":";;;;AAAA,sCAAgF;AAEhF,
|
|
1
|
+
{"version":3,"file":"step-ready-handler.js","sourceRoot":"","sources":["../../src/execution/step-ready-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { LifecycleEventPublisher } from '../lifecycle-events';
|
|
1
2
|
import type { OrchestrationMessage, StepMessage, StepSettledEvent, WorkQueue } from '../queue';
|
|
2
3
|
import type { ExecutionStore } from './execution-store';
|
|
3
4
|
import type { StepStore } from './step-store';
|
|
@@ -6,7 +7,8 @@ export declare class StepSettledHandler {
|
|
|
6
7
|
private readonly stepStore;
|
|
7
8
|
private readonly stepQueue;
|
|
8
9
|
private readonly orchestrationQueue;
|
|
9
|
-
|
|
10
|
+
private readonly lifecycleEventPublisher;
|
|
11
|
+
constructor(executionStore: ExecutionStore, stepStore: StepStore, stepQueue: WorkQueue<StepMessage>, orchestrationQueue: WorkQueue<OrchestrationMessage>, lifecycleEventPublisher: LifecycleEventPublisher);
|
|
10
12
|
handle(event: StepSettledEvent): Promise<void>;
|
|
11
13
|
private failExecution;
|
|
12
14
|
private planSuccessors;
|
|
@@ -13,11 +13,13 @@ class StepSettledHandler {
|
|
|
13
13
|
stepStore;
|
|
14
14
|
stepQueue;
|
|
15
15
|
orchestrationQueue;
|
|
16
|
-
|
|
16
|
+
lifecycleEventPublisher;
|
|
17
|
+
constructor(executionStore, stepStore, stepQueue, orchestrationQueue, lifecycleEventPublisher) {
|
|
17
18
|
this.executionStore = executionStore;
|
|
18
19
|
this.stepStore = stepStore;
|
|
19
20
|
this.stepQueue = stepQueue;
|
|
20
21
|
this.orchestrationQueue = orchestrationQueue;
|
|
22
|
+
this.lifecycleEventPublisher = lifecycleEventPublisher;
|
|
21
23
|
}
|
|
22
24
|
async handle(event) {
|
|
23
25
|
const [step, execution] = await Promise.all([
|
|
@@ -26,7 +28,7 @@ class StepSettledHandler {
|
|
|
26
28
|
]);
|
|
27
29
|
(0, validate_step_context_1.validateStepContext)(step, execution);
|
|
28
30
|
if (step.status === 'failed') {
|
|
29
|
-
await this.failExecution(execution
|
|
31
|
+
await this.failExecution(execution);
|
|
30
32
|
return;
|
|
31
33
|
}
|
|
32
34
|
if (execution.status !== 'running')
|
|
@@ -34,7 +36,7 @@ class StepSettledHandler {
|
|
|
34
36
|
let queued = 0;
|
|
35
37
|
if (step.status === 'completed' || step.status === 'skipped') {
|
|
36
38
|
if (await this.stepStore.hasFailedSteps(execution.id)) {
|
|
37
|
-
await this.failExecution(execution
|
|
39
|
+
await this.failExecution(execution);
|
|
38
40
|
return;
|
|
39
41
|
}
|
|
40
42
|
queued = await this.planSuccessors(execution, step);
|
|
@@ -43,9 +45,17 @@ class StepSettledHandler {
|
|
|
43
45
|
return;
|
|
44
46
|
await this.finishExecutionIfDone(execution);
|
|
45
47
|
}
|
|
46
|
-
async failExecution(
|
|
47
|
-
await this.executionStore.finishExecution(
|
|
48
|
-
|
|
48
|
+
async failExecution(execution) {
|
|
49
|
+
const finished = await this.executionStore.finishExecution(execution.id, 'failed');
|
|
50
|
+
if (finished) {
|
|
51
|
+
this.lifecycleEventPublisher.publish({
|
|
52
|
+
type: 'execution:failed',
|
|
53
|
+
executionId: execution.id,
|
|
54
|
+
workflowId: execution.workflowId,
|
|
55
|
+
at: new Date().toISOString(),
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
await this.stepStore.cancelQueuedSteps(execution.id);
|
|
49
59
|
}
|
|
50
60
|
async planSuccessors(execution, step) {
|
|
51
61
|
const loops = (0, graph_1.deriveLoops)(execution.graph);
|
|
@@ -87,7 +97,15 @@ class StepSettledHandler {
|
|
|
87
97
|
if (settled < expected)
|
|
88
98
|
return;
|
|
89
99
|
const failed = await this.stepStore.hasFailedSteps(execution.id);
|
|
90
|
-
await this.executionStore.finishExecution(execution.id, failed ? 'failed' : 'completed');
|
|
100
|
+
const finished = await this.executionStore.finishExecution(execution.id, failed ? 'failed' : 'completed');
|
|
101
|
+
if (finished) {
|
|
102
|
+
this.lifecycleEventPublisher.publish({
|
|
103
|
+
type: failed ? 'execution:failed' : 'execution:completed',
|
|
104
|
+
executionId: execution.id,
|
|
105
|
+
workflowId: execution.workflowId,
|
|
106
|
+
at: new Date().toISOString(),
|
|
107
|
+
});
|
|
108
|
+
}
|
|
91
109
|
}
|
|
92
110
|
reachableNodeIds(execution) {
|
|
93
111
|
const trigger = (0, graph_1.findTriggerNode)(execution.graph);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-settled-handler.js","sourceRoot":"","sources":["../../src/execution/step-settled-handler.ts"],"names":[],"mappings":";;;AAAA,sCAA4C;AAC5C,oCAAmG;
|
|
1
|
+
{"version":3,"file":"step-settled-handler.js","sourceRoot":"","sources":["../../src/execution/step-settled-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { StepKey, StepKeyId, StepSlots, StepStatus } from './execution.types';
|
|
1
|
+
import type { StepError, StepKey, StepKeyId, StepSlots, StepStatus } from './execution.types';
|
|
3
2
|
export type NewStepRecord = {
|
|
4
3
|
nodeId: string;
|
|
5
4
|
iteration: number;
|
|
@@ -10,12 +9,6 @@ export type NewStepRecord = {
|
|
|
10
9
|
status: Extract<StepStatus, 'completed'>;
|
|
11
10
|
outputs: StepSlots;
|
|
12
11
|
});
|
|
13
|
-
export interface StepError {
|
|
14
|
-
name: string;
|
|
15
|
-
message: string;
|
|
16
|
-
stack?: string;
|
|
17
|
-
details?: JsonValue;
|
|
18
|
-
}
|
|
19
12
|
export interface StepRecord {
|
|
20
13
|
id: string;
|
|
21
14
|
executionId: string;
|
|
@@ -23,7 +16,6 @@ export interface StepRecord {
|
|
|
23
16
|
iteration: number;
|
|
24
17
|
status: StepStatus;
|
|
25
18
|
outputs: StepSlots | null;
|
|
26
|
-
error: StepError | null;
|
|
27
19
|
}
|
|
28
20
|
export interface StepSummary {
|
|
29
21
|
id: string;
|
|
@@ -48,6 +40,7 @@ export interface StepStore {
|
|
|
48
40
|
loadStepsByKeys(executionId: string, keys: StepKey[]): Promise<Record<StepKeyId, StepRecord>>;
|
|
49
41
|
loadStepSummariesByKeys(executionId: string, keys: StepKey[]): Promise<Record<StepKeyId, StepSummary>>;
|
|
50
42
|
loadLatestStepSummaries(executionId: string, nodeIds: string[]): Promise<Record<string, StepSummary>>;
|
|
43
|
+
loadAllSteps(executionId: string): Promise<StepRecord[]>;
|
|
51
44
|
countSettledSteps(executionId: string): Promise<number>;
|
|
52
45
|
hasFailedSteps(executionId: string): Promise<boolean>;
|
|
53
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-store.js","sourceRoot":"","sources":["../../src/execution/step-store.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"step-store.js","sourceRoot":"","sources":["../../src/execution/step-store.ts"],"names":[],"mappings":";;;AA8CA,uBAA+B,SAAQ,KAAK;IACtB,MAAM;IAA3B,YAAqB,MAAc;QAClC,KAAK,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAC;sBADf,MAAM;QAE1B,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IACjC,CAAC;CACD"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { WorkflowLoop } from '../graph';
|
|
2
|
+
import type { LoopReader } from './batch-step';
|
|
3
|
+
import type { StepStore } from './step-store';
|
|
4
|
+
export declare function createStoreLoopReader(stepStore: StepStore, executionId: string, loops: WorkflowLoop[], loop: WorkflowLoop, terminalIterations: Map<string, number>): LoopReader;
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createStoreLoopReader = createStoreLoopReader;
|
|
4
|
+
const common_1 = require("../common");
|
|
5
|
+
const execution_types_1 = require("./execution.types");
|
|
6
|
+
const iteration_mapping_1 = require("./iteration-mapping");
|
|
7
|
+
function createStoreLoopReader(stepStore, executionId, loops, loop, terminalIterations) {
|
|
8
|
+
if (loop.entryEdges.length > 1 || loop.backEdges.length > 1) {
|
|
9
|
+
throw new common_1.UnexpectedError(`batch node ${loop.batchNodeId} has ${loop.entryEdges.length} entry edges and ${loop.backEdges.length} back-edges; validated loops have at most one of each`);
|
|
10
|
+
}
|
|
11
|
+
const [entryEdge] = loop.entryEdges;
|
|
12
|
+
const [backEdge] = loop.backEdges;
|
|
13
|
+
return {
|
|
14
|
+
async readOriginalItems() {
|
|
15
|
+
if (!entryEdge)
|
|
16
|
+
return null;
|
|
17
|
+
const source = (0, iteration_mapping_1.sourceRow)(entryEdge, (0, iteration_mapping_1.classifyEdge)(entryEdge, loops), { nodeId: loop.batchNodeId, iteration: 0 }, terminalIterations.get(entryEdge.from));
|
|
18
|
+
if (source.kind !== 'row') {
|
|
19
|
+
throw new common_1.UnexpectedError(`batch node ${loop.batchNodeId} reads ${entryEdge.from}, which has no step to read`);
|
|
20
|
+
}
|
|
21
|
+
const steps = await stepStore.loadStepsByKeys(executionId, [source.key]);
|
|
22
|
+
const step = steps[(0, execution_types_1.stepKeyId)(source.key)];
|
|
23
|
+
if (!step) {
|
|
24
|
+
throw new common_1.UnexpectedError(`batch node ${loop.batchNodeId} reads ${entryEdge.from} at iteration ${source.key.iteration}, which has no step`);
|
|
25
|
+
}
|
|
26
|
+
return step.outputs?.[entryEdge.outputIndex] ?? null;
|
|
27
|
+
},
|
|
28
|
+
async readArrivals(iteration) {
|
|
29
|
+
if (!backEdge)
|
|
30
|
+
return [];
|
|
31
|
+
if (iteration === 0)
|
|
32
|
+
return [];
|
|
33
|
+
const keys = Array.from({ length: iteration }, (_, index) => ({
|
|
34
|
+
nodeId: backEdge.from,
|
|
35
|
+
iteration: index,
|
|
36
|
+
}));
|
|
37
|
+
const steps = await stepStore.loadStepsByKeys(executionId, keys);
|
|
38
|
+
return keys.map((key) => {
|
|
39
|
+
const step = steps[(0, execution_types_1.stepKeyId)(key)];
|
|
40
|
+
if (!step) {
|
|
41
|
+
throw new common_1.UnexpectedError(`batch node ${loop.batchNodeId} reads ${backEdge.from} at iteration ${key.iteration}, which has no step`);
|
|
42
|
+
}
|
|
43
|
+
return step.outputs?.[backEdge.outputIndex] ?? null;
|
|
44
|
+
});
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=store-loop-reader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"store-loop-reader.js","sourceRoot":"","sources":["../../src/execution/store-loop-reader.ts"],"names":[],"mappings":"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"}
|
package/dist/graph/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export
|
|
1
|
+
export { isBatchStepConfig } from './workflow-graph';
|
|
2
|
+
export type { BatchStepConfig, GraphEdge, GraphNode, StepConfig, StepType, WorkflowGraph, } from './workflow-graph';
|
|
2
3
|
export { findTriggerNode, getDescendantNodeIds, getPredecessorNodeIds, getSuccessorNodeIds, } from './workflow-graph-queries';
|
|
3
4
|
export { GraphValidationError } from './graph-validation.error';
|
|
4
5
|
export { MAX_SLOT_INDEX, validateExecutableGraph } from './validate-executable-graph';
|
package/dist/graph/index.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.validateLoops = exports.deriveLoops = exports.validateExecutableGraph = exports.MAX_SLOT_INDEX = exports.GraphValidationError = exports.getSuccessorNodeIds = exports.getPredecessorNodeIds = exports.getDescendantNodeIds = exports.findTriggerNode = void 0;
|
|
3
|
+
exports.validateLoops = exports.deriveLoops = exports.validateExecutableGraph = exports.MAX_SLOT_INDEX = exports.GraphValidationError = exports.getSuccessorNodeIds = exports.getPredecessorNodeIds = exports.getDescendantNodeIds = exports.findTriggerNode = exports.isBatchStepConfig = void 0;
|
|
4
|
+
var workflow_graph_1 = require("./workflow-graph");
|
|
5
|
+
Object.defineProperty(exports, "isBatchStepConfig", { enumerable: true, get: function () { return workflow_graph_1.isBatchStepConfig; } });
|
|
4
6
|
var workflow_graph_queries_1 = require("./workflow-graph-queries");
|
|
5
7
|
Object.defineProperty(exports, "findTriggerNode", { enumerable: true, get: function () { return workflow_graph_queries_1.findTriggerNode; } });
|
|
6
8
|
Object.defineProperty(exports, "getDescendantNodeIds", { enumerable: true, get: function () { return workflow_graph_queries_1.getDescendantNodeIds; } });
|
package/dist/graph/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/graph/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/graph/index.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAA5C,mHAAA,iBAAiB,OAAA;AAS1B,mEAKkC;AAJjC,yHAAA,eAAe,OAAA;AACf,8HAAA,oBAAoB,OAAA;AACpB,+HAAA,qBAAqB,OAAA;AACrB,6HAAA,mBAAmB,OAAA;AAEpB,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA;AAC7B,yEAAsF;AAA7E,2HAAA,cAAc,OAAA;AAAE,oIAAA,uBAAuB,OAAA;AAChD,iCAAqD;AAA5C,oGAAA,WAAW,OAAA;AAAE,sGAAA,aAAa,OAAA"}
|
package/dist/graph/loops.d.ts
CHANGED
package/dist/graph/loops.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.deriveLoops = deriveLoops;
|
|
|
4
4
|
exports.validateLoops = validateLoops;
|
|
5
5
|
const common_1 = require("../common");
|
|
6
6
|
const graph_validation_error_1 = require("./graph-validation.error");
|
|
7
|
+
const workflow_graph_1 = require("./workflow-graph");
|
|
7
8
|
function deriveLoops(graph) {
|
|
8
9
|
const backEdgeTargets = [...new Set(graph.edges.filter((e) => e.isBackEdge).map((e) => e.to))];
|
|
9
10
|
if (backEdgeTargets.length === 0)
|
|
@@ -98,6 +99,7 @@ function validateLoops(graph) {
|
|
|
98
99
|
}
|
|
99
100
|
}
|
|
100
101
|
const batchNodeIds = new Set(graph.nodes.filter((node) => node.type === 'batch').map((node) => node.id));
|
|
102
|
+
const triggerNodeIds = new Set(graph.nodes.filter((node) => node.type === 'trigger').map((node) => node.id));
|
|
101
103
|
const loops = deriveLoops(graph);
|
|
102
104
|
const loopsByBatchNode = new Map(loops.map((loop) => [loop.batchNodeId, loop]));
|
|
103
105
|
for (const batchNodeId of batchNodeIds) {
|
|
@@ -110,6 +112,15 @@ function validateLoops(graph) {
|
|
|
110
112
|
if (!batchNodeIds.has(batchNodeId)) {
|
|
111
113
|
throw new graph_validation_error_1.GraphValidationError(`Node ${name(batchNodeId)} has a back-edge returning to it but is not a batch node`);
|
|
112
114
|
}
|
|
115
|
+
const batchNode = graph.nodes.find((node) => node.id === batchNodeId);
|
|
116
|
+
if (!(0, workflow_graph_1.isBatchStepConfig)(batchNode?.config)) {
|
|
117
|
+
throw new graph_validation_error_1.GraphValidationError(`Batch node ${name(batchNodeId)} has no batch size, and it must be a whole number of at least 1`);
|
|
118
|
+
}
|
|
119
|
+
for (const memberId of memberIds) {
|
|
120
|
+
if (triggerNodeIds.has(memberId)) {
|
|
121
|
+
throw new graph_validation_error_1.GraphValidationError(`Trigger ${name(memberId)} is inside the loop of ${name(batchNodeId)}, so that loop could never start`);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
113
124
|
for (const memberId of memberIds) {
|
|
114
125
|
if (memberId !== batchNodeId && batchNodeIds.has(memberId)) {
|
|
115
126
|
throw new common_1.UnimplementedError(`Batch node ${name(memberId)} sits inside the loop of ${name(batchNodeId)}; nested loops are not supported yet`);
|
package/dist/graph/loops.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loops.js","sourceRoot":"","sources":["../../src/graph/loops.ts"],"names":[],"mappings":";;;;AAAA,sCAA+C;AAC/C,qEAAgE;
|
|
1
|
+
{"version":3,"file":"loops.js","sourceRoot":"","sources":["../../src/graph/loops.ts"],"names":[],"mappings":"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"}
|