@n8n/engine 0.21.2 → 0.23.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/README.md +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/database/entities/workflow-execution.entity.d.ts +2 -0
- package/dist/database/entities/workflow-execution.entity.js +6 -1
- package/dist/database/entities/workflow-execution.entity.js.map +1 -1
- package/dist/database/entities/workflow-step-execution.entity.d.ts +4 -1
- package/dist/database/entities/workflow-step-execution.entity.js +20 -1
- package/dist/database/entities/workflow-step-execution.entity.js.map +1 -1
- package/dist/database/migrations/1778529600000-CreateWorkflowExecution.js +6 -2
- package/dist/database/migrations/1778529600000-CreateWorkflowExecution.js.map +1 -1
- package/dist/database/migrations/1784890100000-CreateWorkflowStepExecution.js +30 -1
- package/dist/database/migrations/1784890100000-CreateWorkflowStepExecution.js.map +1 -1
- package/dist/database/typeorm-execution-store.d.ts +9 -3
- package/dist/database/typeorm-execution-store.js +36 -2
- package/dist/database/typeorm-execution-store.js.map +1 -1
- package/dist/database/typeorm-execution-view-store.js +6 -2
- package/dist/database/typeorm-execution-view-store.js.map +1 -1
- package/dist/database/typeorm-step-store.d.ts +8 -3
- package/dist/database/typeorm-step-store.js +45 -3
- package/dist/database/typeorm-step-store.js.map +1 -1
- package/dist/dependencies/external-dependencies.d.ts +16 -3
- package/dist/dependencies/index.d.ts +1 -1
- package/dist/execution/cancel-execution.service.d.ts +17 -0
- package/dist/execution/cancel-execution.service.js +40 -0
- package/dist/execution/cancel-execution.service.js.map +1 -0
- package/dist/execution/execution-file-cleanup.d.ts +8 -0
- package/dist/execution/execution-file-cleanup.js +30 -0
- package/dist/execution/execution-file-cleanup.js.map +1 -0
- package/dist/execution/execution-start-handler.js +1 -0
- package/dist/execution/execution-start-handler.js.map +1 -1
- package/dist/execution/execution-store.d.ts +12 -2
- package/dist/execution/execution-store.js.map +1 -1
- package/dist/execution/execution-view-store.d.ts +3 -1
- package/dist/execution/execution.types.d.ts +21 -3
- package/dist/execution/execution.types.js +11 -1
- package/dist/execution/execution.types.js.map +1 -1
- package/dist/execution/index.d.ts +6 -2
- package/dist/execution/index.js +9 -1
- package/dist/execution/index.js.map +1 -1
- package/dist/execution/start-execution.service.d.ts +2 -0
- package/dist/execution/start-execution.service.js +1 -0
- 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 +68 -17
- package/dist/execution/step-ready-handler.js.map +1 -1
- package/dist/execution/step-settled-handler.d.ts +3 -3
- package/dist/execution/step-settled-handler.js +15 -12
- package/dist/execution/step-settled-handler.js.map +1 -1
- package/dist/execution/step-store.d.ts +13 -2
- package/dist/execution/step-store.js.map +1 -1
- package/dist/execution/wait-sweeper.d.ts +23 -0
- package/dist/execution/wait-sweeper.js +91 -0
- package/dist/execution/wait-sweeper.js.map +1 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.js +6 -4
- package/dist/index.js.map +1 -1
- package/dist/lifecycle-events/lifecycle-event.schema.d.ts +48 -0
- package/dist/lifecycle-events/lifecycle-event.schema.js +2 -0
- package/dist/lifecycle-events/lifecycle-event.schema.js.map +1 -1
- package/dist/response-channel/create-response-emitter.d.ts +6 -0
- package/dist/response-channel/create-response-emitter.js +22 -0
- package/dist/response-channel/create-response-emitter.js.map +1 -0
- package/dist/response-channel/execution-response-sender.d.ts +7 -0
- package/dist/response-channel/execution-response-sender.js +9 -0
- package/dist/response-channel/execution-response-sender.js.map +1 -0
- package/dist/response-channel/execution-response.schema.d.ts +127 -8
- package/dist/response-channel/execution-response.schema.js +44 -6
- package/dist/response-channel/execution-response.schema.js.map +1 -1
- package/dist/response-channel/execution-response.types.d.ts +19 -1
- package/dist/response-channel/execution-response.types.js +6 -0
- package/dist/response-channel/execution-response.types.js.map +1 -1
- package/dist/response-channel/index.d.ts +6 -6
- package/dist/response-channel/index.js +9 -7
- package/dist/response-channel/index.js.map +1 -1
- package/dist/runtime/create-engine-runtime.d.ts +4 -3
- package/dist/runtime/create-engine-runtime.js +7 -3
- package/dist/runtime/create-engine-runtime.js.map +1 -1
- package/dist/serve.js +1 -1
- package/dist/serve.js.map +1 -1
- package/dist/server/api.types.d.ts +6 -0
- package/dist/server/create-engine-server.d.ts +2 -1
- package/dist/server/create-engine-server.js.map +1 -1
- package/dist/server/index.d.ts +1 -1
- package/dist/server/routes/workflow-executions.handlers.d.ts +2 -1
- package/dist/server/routes/workflow-executions.handlers.js +43 -2
- package/dist/server/routes/workflow-executions.handlers.js.map +1 -1
- package/dist/server/routes/workflow-executions.js +4 -1
- package/dist/server/routes/workflow-executions.js.map +1 -1
- package/package.json +13 -8
- package/dist/response-channel/execution-response-channel.d.ts +0 -12
- package/dist/response-channel/execution-response-channel.js +0 -53
- package/dist/response-channel/execution-response-channel.js.map +0 -1
- package/dist/response-channel/in-memory-transport.d.ts +0 -7
- package/dist/response-channel/in-memory-transport.js +0 -19
- package/dist/response-channel/in-memory-transport.js.map +0 -1
- package/dist/response-channel/response-transport.d.ts +0 -7
- package/dist/response-channel/response-transport.js +0 -9
- package/dist/response-channel/response-transport.js.map +0 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { CallerContext, ExecutionMode, ExecutionStatus, TriggerOutputs, WorkflowDocument } from '../../execution/execution.types';
|
|
2
2
|
import type { WorkflowGraph } from '../../graph';
|
|
3
|
+
import type { ResponseExpectation } from '../../response-channel';
|
|
3
4
|
export declare class WorkflowExecution {
|
|
4
5
|
id: string;
|
|
5
6
|
workflowId: string;
|
|
@@ -9,6 +10,7 @@ export declare class WorkflowExecution {
|
|
|
9
10
|
workflow: WorkflowDocument;
|
|
10
11
|
triggerOutputs: TriggerOutputs | null;
|
|
11
12
|
callerContext: CallerContext;
|
|
13
|
+
responseExpectation: ResponseExpectation;
|
|
12
14
|
createdAt: Date;
|
|
13
15
|
updatedAt: Date;
|
|
14
16
|
finishedAt: Date | null;
|
|
@@ -20,6 +20,7 @@ let WorkflowExecution = class WorkflowExecution {
|
|
|
20
20
|
workflow;
|
|
21
21
|
triggerOutputs;
|
|
22
22
|
callerContext;
|
|
23
|
+
responseExpectation;
|
|
23
24
|
createdAt;
|
|
24
25
|
updatedAt;
|
|
25
26
|
finishedAt;
|
|
@@ -54,9 +55,13 @@ __decorate([
|
|
|
54
55
|
__metadata("design:type", Object)
|
|
55
56
|
], WorkflowExecution.prototype, "triggerOutputs", void 0);
|
|
56
57
|
__decorate([
|
|
57
|
-
(0, typeorm_1.Column)('jsonb', { name: 'caller_context'
|
|
58
|
+
(0, typeorm_1.Column)('jsonb', { name: 'caller_context' }),
|
|
58
59
|
__metadata("design:type", Object)
|
|
59
60
|
], WorkflowExecution.prototype, "callerContext", void 0);
|
|
61
|
+
__decorate([
|
|
62
|
+
(0, typeorm_1.Column)('jsonb', { name: 'response_expectation' }),
|
|
63
|
+
__metadata("design:type", Object)
|
|
64
|
+
], WorkflowExecution.prototype, "responseExpectation", void 0);
|
|
60
65
|
__decorate([
|
|
61
66
|
(0, typeorm_1.CreateDateColumn)({ name: 'created_at', type: 'timestamptz', precision: 3 }),
|
|
62
67
|
__metadata("design:type", Date)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-execution.entity.js","sourceRoot":"","sources":["../../../src/database/entities/workflow-execution.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAOsB;
|
|
1
|
+
{"version":3,"file":"workflow-execution.entity.js","sourceRoot":"","sources":["../../../src/database/entities/workflow-execution.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAOsB;AAef,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAE7B,EAAE,CAAU;IAGZ,UAAU,CAAU;IAGpB,MAAM,CAAmB;IAGzB,IAAI,CAAiB;IAGrB,KAAK,CAAiB;IAItB,QAAQ,CAAoB;IAG5B,cAAc,CAAyB;IAIvC,aAAa,CAAiB;IAI9B,mBAAmB,CAAuB;IAG1C,SAAS,CAAQ;IAGjB,SAAS,CAAQ;IAGjB,UAAU,CAAe;CACzB,CAAA;;AArCA;IADC,IAAA,uBAAa,EAAC,MAAM,CAAC;;6CACV;AAGZ;IADC,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;;qDACvB;AAGpB;IADC,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;iDACT;AAGzB;IADC,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;+CACb;AAGrB;IADC,IAAA,gBAAM,EAAC,OAAO,CAAC;;gDACM;AAItB;IADC,IAAA,gBAAM,EAAC,OAAO,CAAC;;mDACY;AAG5B;IADC,IAAA,gBAAM,EAAC,OAAO,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACtB;AAIvC;IADC,IAAA,gBAAM,EAAC,OAAO,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;;wDACd;AAI9B;IADC,IAAA,gBAAM,EAAC,OAAO,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;;8DACR;AAG1C;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;8BAChE,IAAI;oDAAC;AAGjB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;8BAChE,IAAI;oDAAC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;;qDAC1D;4BAtCb,iBAAiB;IAH7B,IAAA,gBAAM,EAAC,oBAAoB,CAAC;IAC5B,IAAA,eAAK,EAAC,oCAAoC,EAAE,CAAC,YAAY,CAAC,CAAC;IAC3D,IAAA,eAAK,EAAC,+BAA+B,EAAE,CAAC,QAAQ,CAAC,CAAC;GACtC,iBAAiB,CAuC7B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { StepError, StepSlots, StepStatus } from '../../execution/execution.types';
|
|
1
|
+
import type { StepError, ResumeCause, StepSlots, StepStatus, WaitDeclaration } from '../../execution/execution.types';
|
|
2
2
|
export declare class WorkflowStepExecution {
|
|
3
3
|
id: string;
|
|
4
4
|
executionId: string;
|
|
@@ -7,6 +7,9 @@ export declare class WorkflowStepExecution {
|
|
|
7
7
|
status: StepStatus;
|
|
8
8
|
outputs: StepSlots | null;
|
|
9
9
|
error: StepError | null;
|
|
10
|
+
waitDeclaration: WaitDeclaration | null;
|
|
11
|
+
waitTill: Date | null;
|
|
12
|
+
resumeCause: ResumeCause | null;
|
|
10
13
|
createdAt: Date;
|
|
11
14
|
updatedAt: Date;
|
|
12
15
|
setId(): void;
|
|
@@ -20,6 +20,9 @@ let WorkflowStepExecution = class WorkflowStepExecution {
|
|
|
20
20
|
status;
|
|
21
21
|
outputs;
|
|
22
22
|
error;
|
|
23
|
+
waitDeclaration;
|
|
24
|
+
waitTill;
|
|
25
|
+
resumeCause;
|
|
23
26
|
createdAt;
|
|
24
27
|
updatedAt;
|
|
25
28
|
setId() {
|
|
@@ -56,6 +59,18 @@ __decorate([
|
|
|
56
59
|
(0, typeorm_1.Column)('jsonb', { nullable: true }),
|
|
57
60
|
__metadata("design:type", Object)
|
|
58
61
|
], WorkflowStepExecution.prototype, "error", void 0);
|
|
62
|
+
__decorate([
|
|
63
|
+
(0, typeorm_1.Column)('jsonb', { name: 'wait_declaration', nullable: true }),
|
|
64
|
+
__metadata("design:type", Object)
|
|
65
|
+
], WorkflowStepExecution.prototype, "waitDeclaration", void 0);
|
|
66
|
+
__decorate([
|
|
67
|
+
(0, typeorm_1.Column)({ name: 'wait_till', type: 'timestamptz', precision: 3, nullable: true }),
|
|
68
|
+
__metadata("design:type", Object)
|
|
69
|
+
], WorkflowStepExecution.prototype, "waitTill", void 0);
|
|
70
|
+
__decorate([
|
|
71
|
+
(0, typeorm_1.Column)('jsonb', { name: 'resume_cause', nullable: true }),
|
|
72
|
+
__metadata("design:type", Object)
|
|
73
|
+
], WorkflowStepExecution.prototype, "resumeCause", void 0);
|
|
59
74
|
__decorate([
|
|
60
75
|
(0, typeorm_1.CreateDateColumn)({ name: 'created_at', type: 'timestamptz', precision: 3 }),
|
|
61
76
|
__metadata("design:type", Date)
|
|
@@ -73,6 +88,10 @@ __decorate([
|
|
|
73
88
|
exports.WorkflowStepExecution = WorkflowStepExecution = __decorate([
|
|
74
89
|
(0, typeorm_1.Entity)('workflow_step_execution'),
|
|
75
90
|
(0, typeorm_1.Index)('uniq_workflow_step_execution_execution_id_node_id_iteration', ['executionId', 'nodeId', 'iteration'], { unique: true }),
|
|
76
|
-
(0, typeorm_1.Index)('idx_workflow_step_execution_failed', ['executionId'], { where: "status = 'failed'" })
|
|
91
|
+
(0, typeorm_1.Index)('idx_workflow_step_execution_failed', ['executionId'], { where: "status = 'failed'" }),
|
|
92
|
+
(0, typeorm_1.Index)('idx_workflow_step_execution_wait_till', ['waitTill'], { where: "status = 'waiting'" }),
|
|
93
|
+
(0, typeorm_1.Index)('idx_workflow_step_execution_unsettled', ['executionId', 'status'], {
|
|
94
|
+
where: "status IN ('queued', 'running', 'waiting')",
|
|
95
|
+
})
|
|
77
96
|
], WorkflowStepExecution);
|
|
78
97
|
//# sourceMappingURL=workflow-step-execution.entity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-step-execution.entity.js","sourceRoot":"","sources":["../../../src/database/entities/workflow-step-execution.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAQsB;
|
|
1
|
+
{"version":3,"file":"workflow-step-execution.entity.js","sourceRoot":"","sources":["../../../src/database/entities/workflow-step-execution.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAQsB;AAStB,gDAA4C;AAarC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAEjC,EAAE,CAAU;IAGZ,WAAW,CAAU;IAGrB,MAAM,CAAU;IAGhB,SAAS,CAAU;IAGnB,MAAM,CAAc;IAGpB,OAAO,CAAoB;IAG3B,KAAK,CAAoB;IAQzB,eAAe,CAA0B;IAOzC,QAAQ,CAAe;IASvB,WAAW,CAAsB;IAGjC,SAAS,CAAQ;IAGjB,SAAS,CAAQ;IAGjB,KAAK;QACJ,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,GAAG,IAAA,wBAAU,GAAE,CAAC;IACtC,CAAC;CACD,CAAA;;AAtDA;IADC,IAAA,uBAAa,EAAC,MAAM,CAAC;;iDACV;AAGZ;IADC,IAAA,gBAAM,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;;0DACpB;AAGrB;IADC,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;qDACvB;AAGhB;IADC,IAAA,gBAAM,EAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;wDACX;AAGnB;IADC,IAAA,gBAAM,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;qDACd;AAGpB;IADC,IAAA,gBAAM,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACT;AAG3B;IADC,IAAA,gBAAM,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACX;AAQzB;IADC,IAAA,gBAAM,EAAC,OAAO,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8DACrB;AAOzC;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDAC1D;AASvB;IADC,IAAA,gBAAM,EAAC,OAAO,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACzB;AAGjC;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;8BAChE,IAAI;wDAAC;AAGjB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;8BAChE,IAAI;wDAAC;AAGjB;IADC,IAAA,sBAAY,GAAE;;;;kDAGd;gCAvDW,qBAAqB;IAXjC,IAAA,gBAAM,EAAC,yBAAyB,CAAC;IACjC,IAAA,eAAK,EACL,6DAA6D,EAC7D,CAAC,aAAa,EAAE,QAAQ,EAAE,WAAW,CAAC,EACtC,EAAE,MAAM,EAAE,IAAI,EAAE,CAChB;IACA,IAAA,eAAK,EAAC,oCAAoC,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC5F,IAAA,eAAK,EAAC,uCAAuC,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAC7F,IAAA,eAAK,EAAC,uCAAuC,EAAE,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE;QAC1E,KAAK,EAAE,4CAA4C;KACnD,CAAC;GACW,qBAAqB,CAwDjC"}
|
|
@@ -18,9 +18,13 @@ class CreateWorkflowExecution1778529600000 {
|
|
|
18
18
|
{
|
|
19
19
|
name: 'caller_context',
|
|
20
20
|
type: 'jsonb',
|
|
21
|
-
default: "'{}'",
|
|
22
21
|
comment: 'Supplied by the caller at start (user, project, host mode). The engine stores and forwards it to step executors without reading it. Not the engine-internal per-request context.',
|
|
23
22
|
},
|
|
23
|
+
{
|
|
24
|
+
name: 'response_expectation',
|
|
25
|
+
type: 'jsonb',
|
|
26
|
+
comment: 'What kind of a response the caller expects (none, runEnd, stepResponse or stream)',
|
|
27
|
+
},
|
|
24
28
|
{
|
|
25
29
|
name: 'created_at',
|
|
26
30
|
type: 'timestamptz',
|
|
@@ -38,7 +42,7 @@ class CreateWorkflowExecution1778529600000 {
|
|
|
38
42
|
checks: [
|
|
39
43
|
{
|
|
40
44
|
name: 'chk_workflow_execution_status',
|
|
41
|
-
expression: "status IN ('queued', 'running', 'completed', 'failed', 'cancelled')",
|
|
45
|
+
expression: "status IN ('queued', 'running', 'waiting', 'completed', 'failed', 'cancelled')",
|
|
42
46
|
},
|
|
43
47
|
],
|
|
44
48
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1778529600000-CreateWorkflowExecution.js","sourceRoot":"","sources":["../../../src/database/migrations/1778529600000-CreateWorkflowExecution.ts"],"names":[],"mappings":";;;AAAA,0CAAiD;AAGjD,MAAM,KAAK,GAAG,oBAAoB,CAAC;AAEnC;IACC,KAAK,CAAC,EAAE,CAAC,WAAwB;QAChC,MAAM,WAAW,CAAC,WAAW,CAC5B,IAAI,eAAK,CAAC;YACT,IAAI,EAAE,KAAK;YACX,OAAO,EAAE;gBACR,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;gBAC7C,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;gBACxC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;gBACjD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;gBAC/C,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE;gBAChC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;gBACnC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;gBAC5D;oBACC,IAAI,EAAE,gBAAgB;oBACtB,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"1778529600000-CreateWorkflowExecution.js","sourceRoot":"","sources":["../../../src/database/migrations/1778529600000-CreateWorkflowExecution.ts"],"names":[],"mappings":";;;AAAA,0CAAiD;AAGjD,MAAM,KAAK,GAAG,oBAAoB,CAAC;AAEnC;IACC,KAAK,CAAC,EAAE,CAAC,WAAwB;QAChC,MAAM,WAAW,CAAC,WAAW,CAC5B,IAAI,eAAK,CAAC;YACT,IAAI,EAAE,KAAK;YACX,OAAO,EAAE;gBACR,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;gBAC7C,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;gBACxC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;gBACjD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;gBAC/C,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE;gBAChC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE;gBACnC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;gBAC5D;oBACC,IAAI,EAAE,gBAAgB;oBACtB,IAAI,EAAE,OAAO;oBACb,OAAO,EACN,kLAAkL;iBACnL;gBACD;oBACC,IAAI,EAAE,sBAAsB;oBAC5B,IAAI,EAAE,OAAO;oBACb,OAAO,EACN,mFAAmF;iBACpF;gBACD;oBACC,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,CAAC;oBACZ,OAAO,EAAE,sBAAsB;iBAC/B;gBACD;oBACC,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,CAAC;oBACZ,OAAO,EAAE,sBAAsB;iBAC/B;gBACD,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE;aAC5E;YACD,MAAM,EAAE;gBACP;oBACC,IAAI,EAAE,+BAA+B;oBACrC,UAAU,EACT,gFAAgF;iBACjF;aACD;SACD,CAAC,CACF,CAAC;QAEF,MAAM,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE;YACtC,IAAI,oBAAU,CAAC,EAAE,IAAI,EAAE,oCAAoC,EAAE,WAAW,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5F,IAAI,oBAAU,CAAC,EAAE,IAAI,EAAE,+BAA+B,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;SAClF,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,WAAwB;QAClC,MAAM,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CACD"}
|
|
@@ -30,6 +30,25 @@ class CreateWorkflowStepExecution1784890100000 {
|
|
|
30
30
|
isNullable: true,
|
|
31
31
|
comment: 'Name and message of the error that failed this step.',
|
|
32
32
|
},
|
|
33
|
+
{
|
|
34
|
+
name: 'wait_declaration',
|
|
35
|
+
type: 'jsonb',
|
|
36
|
+
isNullable: true,
|
|
37
|
+
comment: 'What the step waits for, as its executor declared it. The engine reads three things: the deadline, the outputs the step emits when that deadline fires, and whether a request may end the wait. It does not read what the wait is for: a webhook, a form and an approval all look the same to it.',
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
name: 'wait_till',
|
|
41
|
+
type: 'timestamptz',
|
|
42
|
+
precision: 3,
|
|
43
|
+
isNullable: true,
|
|
44
|
+
comment: "The wait's deadline, lifted out of `wait_declaration` so the sweep can index it.",
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
name: 'resume_cause',
|
|
48
|
+
type: 'jsonb',
|
|
49
|
+
isNullable: true,
|
|
50
|
+
comment: "What ended the step's wait, recorded when it is resumed: a deadline, or a request. A request carries the outputs the node's resume path produced where the request arrived. The engine emits them and runs no node code.",
|
|
51
|
+
},
|
|
33
52
|
{
|
|
34
53
|
name: 'created_at',
|
|
35
54
|
type: 'timestamptz',
|
|
@@ -54,6 +73,16 @@ class CreateWorkflowStepExecution1784890100000 {
|
|
|
54
73
|
columnNames: ['execution_id'],
|
|
55
74
|
where: "status = 'failed'",
|
|
56
75
|
},
|
|
76
|
+
{
|
|
77
|
+
name: 'idx_workflow_step_execution_wait_till',
|
|
78
|
+
columnNames: ['wait_till'],
|
|
79
|
+
where: "status = 'waiting'",
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
name: 'idx_workflow_step_execution_unsettled',
|
|
83
|
+
columnNames: ['execution_id', 'status'],
|
|
84
|
+
where: "status IN ('queued', 'running', 'waiting')",
|
|
85
|
+
},
|
|
57
86
|
],
|
|
58
87
|
foreignKeys: [
|
|
59
88
|
{
|
|
@@ -66,7 +95,7 @@ class CreateWorkflowStepExecution1784890100000 {
|
|
|
66
95
|
checks: [
|
|
67
96
|
{
|
|
68
97
|
name: 'chk_workflow_step_execution_status',
|
|
69
|
-
expression: "status IN ('queued', 'running', 'completed', 'failed', 'skipped', 'cancelled')",
|
|
98
|
+
expression: "status IN ('queued', 'running', 'waiting', 'completed', 'failed', 'skipped', 'cancelled')",
|
|
70
99
|
},
|
|
71
100
|
],
|
|
72
101
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1784890100000-CreateWorkflowStepExecution.js","sourceRoot":"","sources":["../../../src/database/migrations/1784890100000-CreateWorkflowStepExecution.ts"],"names":[],"mappings":";;;AAAA,0CAAqC;AAGrC,MAAM,KAAK,GAAG,yBAAyB,CAAC;AAExC;IACC,KAAK,CAAC,EAAE,CAAC,WAAwB;QAChC,MAAM,WAAW,CAAC,WAAW,CAC5B,IAAI,eAAK,CAAC;YACT,IAAI,EAAE,KAAK;YACX,OAAO,EAAE;gBACR,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;gBAC7C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE;gBACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;gBACpC;oBACC,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,KAAK;oBACX,OAAO,EAAE,CAAC;oBACV,OAAO,EAAE,mEAAmE;iBAC5E;gBACD,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;gBACjD;oBACC,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,OAAO;oBACb,UAAU,EAAE,IAAI;oBAChB,OAAO,EACN,4GAA4G;iBAC7G;gBACD;oBACC,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,OAAO;oBACb,UAAU,EAAE,IAAI;oBAChB,OAAO,EAAE,sDAAsD;iBAC/D;gBACD;oBACC,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,CAAC;oBACZ,OAAO,EAAE,sBAAsB;iBAC/B;gBACD;oBACC,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,CAAC;oBACZ,OAAO,EAAE,sBAAsB;iBAC/B;aACD;YACD,OAAO,EAAE;gBAIR;oBACC,IAAI,EAAE,6DAA6D;oBACnE,WAAW,EAAE,CAAC,cAAc,EAAE,SAAS,EAAE,WAAW,CAAC;oBACrD,QAAQ,EAAE,IAAI;iBACd;gBAGD;oBACC,IAAI,EAAE,oCAAoC;oBAC1C,WAAW,EAAE,CAAC,cAAc,CAAC;oBAC7B,KAAK,EAAE,mBAAmB;iBAC1B;aACD;YACD,WAAW,EAAE;gBACZ;oBACC,WAAW,EAAE,CAAC,cAAc,CAAC;oBAC7B,mBAAmB,EAAE,oBAAoB;oBACzC,qBAAqB,EAAE,CAAC,IAAI,CAAC;oBAC7B,QAAQ,EAAE,SAAS;iBACnB;aACD;YACD,MAAM,EAAE;gBACP;oBACC,IAAI,EAAE,oCAAoC;oBAC1C,UAAU,EACT,
|
|
1
|
+
{"version":3,"file":"1784890100000-CreateWorkflowStepExecution.js","sourceRoot":"","sources":["../../../src/database/migrations/1784890100000-CreateWorkflowStepExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,18 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type Repository } from '@n8n/typeorm';
|
|
2
2
|
import type { WorkflowExecution } from './entities';
|
|
3
3
|
import { type ExecutionRecord, type ExecutionStore, type NewExecutionRecord } from '../execution/execution-store';
|
|
4
|
-
import type
|
|
4
|
+
import { type ExecutionStatus } from '../execution/execution.types';
|
|
5
5
|
export declare class TypeOrmExecutionStore implements ExecutionStore {
|
|
6
6
|
private readonly repo;
|
|
7
7
|
constructor(repo: Repository<WorkflowExecution>);
|
|
8
8
|
createExecution(record: NewExecutionRecord): Promise<void>;
|
|
9
9
|
loadExecution(id: string): Promise<ExecutionRecord>;
|
|
10
10
|
transitionStatus(id: string, from: ExecutionStatus, to: ExecutionStatus): Promise<boolean>;
|
|
11
|
-
finishExecution(id: string, status: 'completed' | 'failed'): Promise<
|
|
11
|
+
finishExecution(id: string, status: 'completed' | 'failed'): Promise<{
|
|
12
|
+
finishedAt: Date;
|
|
13
|
+
} | null>;
|
|
14
|
+
cancelExecution(id: string): Promise<{
|
|
15
|
+
finishedAt: Date;
|
|
16
|
+
} | null>;
|
|
17
|
+
refreshLiveStatus(id: string): Promise<void>;
|
|
12
18
|
}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TypeOrmExecutionStore = void 0;
|
|
4
|
+
const typeorm_1 = require("@n8n/typeorm");
|
|
4
5
|
const execution_store_1 = require("../execution/execution-store");
|
|
6
|
+
const execution_types_1 = require("../execution/execution.types");
|
|
5
7
|
class TypeOrmExecutionStore {
|
|
6
8
|
repo;
|
|
7
9
|
constructor(repo) {
|
|
@@ -21,6 +23,8 @@ class TypeOrmExecutionStore {
|
|
|
21
23
|
.addSelect('execution.graph', 'graph')
|
|
22
24
|
.addSelect('execution.trigger_outputs', 'triggerOutputs')
|
|
23
25
|
.addSelect('execution.caller_context', 'callerContext')
|
|
26
|
+
.addSelect('execution.response_expectation', 'responseExpectation')
|
|
27
|
+
.addSelect('execution.finished_at', 'finishedAt')
|
|
24
28
|
.where('execution.id = :id', { id })
|
|
25
29
|
.getRawOne();
|
|
26
30
|
if (!row)
|
|
@@ -32,8 +36,38 @@ class TypeOrmExecutionStore {
|
|
|
32
36
|
return result.affected === 1;
|
|
33
37
|
}
|
|
34
38
|
async finishExecution(id, status) {
|
|
35
|
-
const
|
|
36
|
-
|
|
39
|
+
const finishedAt = new Date();
|
|
40
|
+
const result = await this.repo.update({ id, status: (0, typeorm_1.In)([...execution_types_1.LIVE_EXECUTION_STATUSES]) }, { status, finishedAt });
|
|
41
|
+
return result.affected === 1 ? { finishedAt } : null;
|
|
42
|
+
}
|
|
43
|
+
async cancelExecution(id) {
|
|
44
|
+
const finishedAt = new Date();
|
|
45
|
+
const result = await this.repo.update({ id, status: (0, typeorm_1.In)(['queued', ...execution_types_1.LIVE_EXECUTION_STATUSES]) }, { status: 'cancelled', finishedAt });
|
|
46
|
+
return result.affected === 1 ? { finishedAt } : null;
|
|
47
|
+
}
|
|
48
|
+
async refreshLiveStatus(id) {
|
|
49
|
+
await this.repo.query(`WITH live AS MATERIALIZED (
|
|
50
|
+
SELECT
|
|
51
|
+
EXISTS (
|
|
52
|
+
SELECT 1 FROM workflow_step_execution
|
|
53
|
+
WHERE execution_id = $1 AND status IN ('queued', 'running')
|
|
54
|
+
) AS runnable,
|
|
55
|
+
EXISTS (
|
|
56
|
+
SELECT 1 FROM workflow_step_execution
|
|
57
|
+
WHERE execution_id = $1 AND status = 'waiting'
|
|
58
|
+
) AS waiting
|
|
59
|
+
)
|
|
60
|
+
UPDATE workflow_execution e
|
|
61
|
+
SET status = CASE WHEN live.runnable THEN 'running' ELSE 'waiting' END,
|
|
62
|
+
-- A raw query bypasses the UpdateDateColumn hook, so set the time here.
|
|
63
|
+
updated_at = now()
|
|
64
|
+
FROM live
|
|
65
|
+
WHERE e.id = $1
|
|
66
|
+
-- Re-checked against the row it locks, so losing to finishExecution writes nothing.
|
|
67
|
+
AND e.status IN ('running', 'waiting')
|
|
68
|
+
AND (live.runnable OR live.waiting)
|
|
69
|
+
-- Skip a write that changes nothing, so the row is not locked for it.
|
|
70
|
+
AND e.status IS DISTINCT FROM CASE WHEN live.runnable THEN 'running' ELSE 'waiting' END`, [id]);
|
|
37
71
|
}
|
|
38
72
|
}
|
|
39
73
|
exports.TypeOrmExecutionStore = TypeOrmExecutionStore;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-execution-store.js","sourceRoot":"","sources":["../../src/database/typeorm-execution-store.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"typeorm-execution-store.js","sourceRoot":"","sources":["../../src/database/typeorm-execution-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TypeOrmExecutionViewStore = void 0;
|
|
4
4
|
const common_1 = require("../common");
|
|
5
5
|
const execution_store_1 = require("../execution/execution-store");
|
|
6
|
+
const HOST_MODE = "execution.caller_context->>'hostMode'";
|
|
6
7
|
function assertPageableOrder(query) {
|
|
7
8
|
if (query.before && query.order?.top) {
|
|
8
9
|
throw new common_1.UnexpectedError('An execution cursor cannot page a status-first sort');
|
|
@@ -22,6 +23,7 @@ class TypeOrmExecutionViewStore {
|
|
|
22
23
|
.addSelect('execution.workflow_id', 'workflowId')
|
|
23
24
|
.addSelect('execution.status', 'status')
|
|
24
25
|
.addSelect('execution.mode', 'mode')
|
|
26
|
+
.addSelect(HOST_MODE, 'hostMode')
|
|
25
27
|
.addSelect('execution.created_at', 'createdAt')
|
|
26
28
|
.addSelect('execution.updated_at', 'updatedAt')
|
|
27
29
|
.addSelect('execution.finished_at', 'finishedAt');
|
|
@@ -47,8 +49,9 @@ class TypeOrmExecutionViewStore {
|
|
|
47
49
|
}
|
|
48
50
|
if (query.status)
|
|
49
51
|
qb.andWhere('execution.status = ANY(:statuses)', { statuses: query.status });
|
|
50
|
-
if (query.
|
|
51
|
-
qb.andWhere(
|
|
52
|
+
if (query.hostMode) {
|
|
53
|
+
qb.andWhere(`${HOST_MODE} = :hostMode`, { hostMode: query.hostMode });
|
|
54
|
+
}
|
|
52
55
|
if (query.createdAfter)
|
|
53
56
|
qb.andWhere('execution.created_at >= :createdAfter', { createdAfter: query.createdAfter });
|
|
54
57
|
if (query.createdBefore)
|
|
@@ -93,6 +96,7 @@ class TypeOrmExecutionViewStore {
|
|
|
93
96
|
.addSelect('execution.workflow_id', 'workflowId')
|
|
94
97
|
.addSelect('execution.status', 'status')
|
|
95
98
|
.addSelect('execution.mode', 'mode')
|
|
99
|
+
.addSelect(HOST_MODE, 'hostMode')
|
|
96
100
|
.addSelect('execution.graph', 'graph')
|
|
97
101
|
.addSelect('execution.workflow', 'workflow')
|
|
98
102
|
.addSelect('execution.created_at', 'createdAt')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-execution-view-store.js","sourceRoot":"","sources":["../../src/database/typeorm-execution-view-store.ts"],"names":[],"mappings":";;;AAGA,sCAA4C;AAC5C,kEAAsE;
|
|
1
|
+
{"version":3,"file":"typeorm-execution-view-store.js","sourceRoot":"","sources":["../../src/database/typeorm-execution-view-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type Repository } from '@n8n/typeorm';
|
|
2
2
|
import { WorkflowStepExecution } from './entities';
|
|
3
|
-
import { type StepError, type StepKey, type StepKeyId, type StepSlots } from '../execution/execution.types';
|
|
4
|
-
import { type NewStepRecord, type StepRecord, type StepStore, type StepSummary } from '../execution/step-store';
|
|
3
|
+
import { type ResumeCause, type WaitDeclaration, type StepError, type StepKey, type StepKeyId, type StepSlots } from '../execution/execution.types';
|
|
4
|
+
import { type DueStep, type NewStepRecord, type StepRecord, type StepStore, type StepSummary } from '../execution/step-store';
|
|
5
5
|
export declare class TypeOrmStepStore implements StepStore {
|
|
6
6
|
private readonly repo;
|
|
7
7
|
constructor(repo: Repository<WorkflowStepExecution>);
|
|
@@ -11,7 +11,12 @@ export declare class TypeOrmStepStore implements StepStore {
|
|
|
11
11
|
loadStep(id: string): Promise<StepRecord>;
|
|
12
12
|
claimStep(id: string): Promise<StepRecord | null>;
|
|
13
13
|
completeStep(id: string, outputs: StepSlots): Promise<boolean>;
|
|
14
|
-
|
|
14
|
+
suspendStep(id: string, waitDeclaration: WaitDeclaration): Promise<boolean>;
|
|
15
|
+
resumeStep(id: string, resumeCause: ResumeCause): Promise<boolean>;
|
|
16
|
+
resumeDueSteps(due: Date, limit: number): Promise<DueStep[]>;
|
|
17
|
+
nextWaitDeadline(): Promise<Date | null>;
|
|
18
|
+
cancelPendingSteps(executionId: string): Promise<void>;
|
|
19
|
+
cancelStep(id: string): Promise<boolean>;
|
|
15
20
|
failStep(id: string, error: StepError): Promise<boolean>;
|
|
16
21
|
private transition;
|
|
17
22
|
loadStepsByKeys(executionId: string, keys: StepKey[]): Promise<Record<StepKeyId, StepRecord>>;
|
|
@@ -79,7 +79,7 @@ class TypeOrmStepStore {
|
|
|
79
79
|
SELECT 1 FROM workflow_step_execution sibling
|
|
80
80
|
WHERE sibling.execution_id = :executionId AND sibling.status = 'failed'
|
|
81
81
|
)`, { executionId: execution.id })
|
|
82
|
-
.returning(['id', 'executionId', 'nodeId', 'iteration'])
|
|
82
|
+
.returning(['id', 'executionId', 'nodeId', 'iteration', 'waitDeclaration', 'resumeCause'])
|
|
83
83
|
.execute();
|
|
84
84
|
const [row] = result.raw;
|
|
85
85
|
if (!row)
|
|
@@ -91,14 +91,56 @@ class TypeOrmStepStore {
|
|
|
91
91
|
iteration: row.iteration,
|
|
92
92
|
status: 'running',
|
|
93
93
|
outputs: null,
|
|
94
|
+
waitDeclaration: row.wait_declaration,
|
|
95
|
+
resumeCause: row.resume_cause,
|
|
94
96
|
};
|
|
95
97
|
});
|
|
96
98
|
}
|
|
97
99
|
async completeStep(id, outputs) {
|
|
98
100
|
return await this.transition(id, 'running', 'completed', { outputs });
|
|
99
101
|
}
|
|
100
|
-
async
|
|
101
|
-
await this.
|
|
102
|
+
async suspendStep(id, waitDeclaration) {
|
|
103
|
+
return await this.transition(id, 'running', 'waiting', {
|
|
104
|
+
waitDeclaration,
|
|
105
|
+
waitTill: waitDeclaration.resumeAt === undefined ? null : new Date(waitDeclaration.resumeAt),
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
async resumeStep(id, resumeCause) {
|
|
109
|
+
return await this.transition(id, 'waiting', 'queued', { resumeCause });
|
|
110
|
+
}
|
|
111
|
+
async resumeDueSteps(due, limit) {
|
|
112
|
+
const result = await this.repo
|
|
113
|
+
.createQueryBuilder()
|
|
114
|
+
.update(entities_1.WorkflowStepExecution)
|
|
115
|
+
.set({ status: 'queued', resumeCause: { kind: 'deadline' } })
|
|
116
|
+
.where(`id IN (
|
|
117
|
+
SELECT id FROM workflow_step_execution
|
|
118
|
+
WHERE status = 'waiting' AND wait_till <= :due
|
|
119
|
+
ORDER BY wait_till
|
|
120
|
+
LIMIT :limit
|
|
121
|
+
FOR UPDATE SKIP LOCKED
|
|
122
|
+
)`, { due, limit })
|
|
123
|
+
.returning(['id', 'executionId'])
|
|
124
|
+
.execute();
|
|
125
|
+
return result.raw.map(({ id, execution_id: executionId }) => ({
|
|
126
|
+
id,
|
|
127
|
+
executionId,
|
|
128
|
+
}));
|
|
129
|
+
}
|
|
130
|
+
async nextWaitDeadline() {
|
|
131
|
+
const [row] = await this.repo
|
|
132
|
+
.createQueryBuilder('step')
|
|
133
|
+
.select('MIN(step.wait_till)', 'next')
|
|
134
|
+
.where("step.status = 'waiting'")
|
|
135
|
+
.andWhere('step.wait_till IS NOT NULL')
|
|
136
|
+
.getRawMany();
|
|
137
|
+
return row?.next ?? null;
|
|
138
|
+
}
|
|
139
|
+
async cancelPendingSteps(executionId) {
|
|
140
|
+
await this.repo.update({ executionId, status: (0, typeorm_1.In)(['queued', 'waiting']) }, { status: 'cancelled' });
|
|
141
|
+
}
|
|
142
|
+
async cancelStep(id) {
|
|
143
|
+
return await this.transition(id, 'running', 'cancelled');
|
|
102
144
|
}
|
|
103
145
|
async failStep(id, error) {
|
|
104
146
|
return await this.repo.manager.transaction(async (manager) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-step-store.js","sourceRoot":"","sources":["../../src/database/typeorm-step-store.ts"],"names":[],"mappings":";;;AAAA,0CAAmD;AAEnD,yCAAmD;AACnD,+CAA2C;AAC3C,sCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"typeorm-step-store.js","sourceRoot":"","sources":["../../src/database/typeorm-step-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type { CallerContext, ExecutionMode, StepSlots } from '../execution';
|
|
1
|
+
import type { CallerContext, ExecutionMode, StepSlots, WaitDeclaration } from '../execution';
|
|
2
2
|
import type { GraphNode } from '../graph';
|
|
3
3
|
import type { LifecycleEventCallback } from '../lifecycle-events';
|
|
4
|
+
import type { ResponseEmitter, ResponseExpectation } from '../response-channel';
|
|
4
5
|
export interface StepExecutionContext {
|
|
5
6
|
executionId: string;
|
|
6
7
|
stepId: string;
|
|
@@ -8,19 +9,31 @@ export interface StepExecutionContext {
|
|
|
8
9
|
mode: ExecutionMode;
|
|
9
10
|
iteration: number;
|
|
10
11
|
callerContext: CallerContext;
|
|
12
|
+
responseExpectation: ResponseExpectation;
|
|
11
13
|
}
|
|
12
14
|
export interface StepExecutionRequest {
|
|
13
15
|
node: GraphNode;
|
|
14
16
|
inputs: StepSlots;
|
|
15
17
|
context: StepExecutionContext;
|
|
18
|
+
respond: ResponseEmitter;
|
|
16
19
|
}
|
|
17
|
-
export
|
|
20
|
+
export type StepExecutionResult = {
|
|
18
21
|
outputs: StepSlots;
|
|
19
|
-
|
|
22
|
+
wait?: never;
|
|
23
|
+
} | {
|
|
24
|
+
wait: WaitDeclaration;
|
|
25
|
+
outputs?: never;
|
|
26
|
+
};
|
|
20
27
|
export interface IStepExecutor {
|
|
21
28
|
execute(request: StepExecutionRequest): Promise<StepExecutionResult>;
|
|
22
29
|
}
|
|
30
|
+
export interface ExecutionLocation {
|
|
31
|
+
workflowId: string;
|
|
32
|
+
executionId: string;
|
|
33
|
+
}
|
|
34
|
+
export type ExecutionFilesDeleter = (execution: ExecutionLocation) => Promise<void>;
|
|
23
35
|
export interface ExternalDependencies {
|
|
24
36
|
v1StepExecutor?: IStepExecutor;
|
|
25
37
|
lifecycleEventCallback?: LifecycleEventCallback;
|
|
38
|
+
deleteExecutionFiles?: ExecutionFilesDeleter;
|
|
26
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export type { ExternalDependencies, IStepExecutor, StepExecutionContext, StepExecutionRequest, StepExecutionResult, } from './external-dependencies';
|
|
1
|
+
export type { ExecutionFilesDeleter, ExecutionLocation, ExternalDependencies, IStepExecutor, StepExecutionContext, StepExecutionRequest, StepExecutionResult, } from './external-dependencies';
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { LifecycleEventPublisher } from '../lifecycle-events';
|
|
2
|
+
import type { ExecutionResponseSender } from '../response-channel';
|
|
3
|
+
import type { ExecutionStore } from './execution-store';
|
|
4
|
+
import type { ExecutionStatus } from './execution.types';
|
|
5
|
+
import type { StepStore } from './step-store';
|
|
6
|
+
export interface CancelExecutionResult {
|
|
7
|
+
status: ExecutionStatus;
|
|
8
|
+
finishedAt: Date | null;
|
|
9
|
+
}
|
|
10
|
+
export declare class CancelExecutionService {
|
|
11
|
+
private readonly executionStore;
|
|
12
|
+
private readonly stepStore;
|
|
13
|
+
private readonly lifecycleEventPublisher;
|
|
14
|
+
private readonly responseSender;
|
|
15
|
+
constructor(executionStore: ExecutionStore, stepStore: StepStore, lifecycleEventPublisher: LifecycleEventPublisher, responseSender: ExecutionResponseSender);
|
|
16
|
+
cancel(executionId: string): Promise<CancelExecutionResult>;
|
|
17
|
+
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CancelExecutionService = void 0;
|
|
4
|
+
class CancelExecutionService {
|
|
5
|
+
executionStore;
|
|
6
|
+
stepStore;
|
|
7
|
+
lifecycleEventPublisher;
|
|
8
|
+
responseSender;
|
|
9
|
+
constructor(executionStore, stepStore, lifecycleEventPublisher, responseSender) {
|
|
10
|
+
this.executionStore = executionStore;
|
|
11
|
+
this.stepStore = stepStore;
|
|
12
|
+
this.lifecycleEventPublisher = lifecycleEventPublisher;
|
|
13
|
+
this.responseSender = responseSender;
|
|
14
|
+
}
|
|
15
|
+
async cancel(executionId) {
|
|
16
|
+
const cancelled = await this.executionStore.cancelExecution(executionId);
|
|
17
|
+
const execution = await this.executionStore.loadExecution(executionId);
|
|
18
|
+
if (cancelled) {
|
|
19
|
+
await this.stepStore.cancelPendingSteps(executionId);
|
|
20
|
+
this.lifecycleEventPublisher.publish({
|
|
21
|
+
type: 'execution:cancelled',
|
|
22
|
+
executionId,
|
|
23
|
+
workflowId: execution.workflowId,
|
|
24
|
+
at: cancelled.finishedAt.toISOString(),
|
|
25
|
+
});
|
|
26
|
+
if (execution.responseExpectation.kind !== 'none') {
|
|
27
|
+
this.responseSender.send({
|
|
28
|
+
type: 'ended',
|
|
29
|
+
executionId,
|
|
30
|
+
workflowId: execution.workflowId,
|
|
31
|
+
status: 'cancelled',
|
|
32
|
+
lastStep: null,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return { status: execution.status, finishedAt: execution.finishedAt };
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
exports.CancelExecutionService = CancelExecutionService;
|
|
40
|
+
//# sourceMappingURL=cancel-execution.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cancel-execution.service.js","sourceRoot":"","sources":["../../src/execution/cancel-execution.service.ts"],"names":[],"mappings":";;;AAiBA;IAEmB,cAAc;IACd,SAAS;IACT,uBAAuB;IACvB,cAAc;IAJhC,YACkB,cAA8B,EAC9B,SAAoB,EACpB,uBAAgD,EAChD,cAAuC;8BAHvC,cAAc;yBACd,SAAS;uCACT,uBAAuB;8BACvB,cAAc;IAC7B,CAAC;IAGJ,KAAK,CAAC,MAAM,CAAC,WAAmB;QAC/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAEzE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAEvE,IAAI,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAErD,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC;gBACpC,IAAI,EAAE,qBAAqB;gBAC3B,WAAW;gBACX,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,EAAE,EAAE,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE;aACtC,CAAC,CAAC;YAEH,IAAI,SAAS,CAAC,mBAAmB,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACnD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;oBACxB,IAAI,EAAE,OAAO;oBACb,WAAW;oBACX,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,MAAM,EAAE,WAAW;oBACnB,QAAQ,EAAE,IAAI;iBACd,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC;IACvE,CAAC;CACD"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ExecutionFilesDeleter, ExecutionLocation } from '../dependencies';
|
|
2
|
+
import type { EngineLogger } from '../logging';
|
|
3
|
+
export declare class ExecutionFileCleanup {
|
|
4
|
+
private readonly deleteFiles;
|
|
5
|
+
private readonly logger;
|
|
6
|
+
constructor(deleteFiles: ExecutionFilesDeleter | undefined, logger: EngineLogger);
|
|
7
|
+
deleteFilesOf(executions: ExecutionLocation[]): Promise<ExecutionLocation[]>;
|
|
8
|
+
}
|