n8n 1.71.2 → 1.72.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/abstract-server.js +2 -3
- package/dist/abstract-server.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/config/types.d.ts +1 -0
- package/dist/controllers/mfa.controller.js +11 -4
- package/dist/controllers/mfa.controller.js.map +1 -1
- package/dist/credential-types.d.ts +1 -2
- package/dist/credential-types.js +1 -19
- package/dist/credential-types.js.map +1 -1
- package/dist/databases/entities/test-definition.ee.d.ts +4 -0
- package/dist/databases/entities/test-definition.ee.js +4 -0
- package/dist/databases/entities/test-definition.ee.js.map +1 -1
- package/dist/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.d.ts +5 -0
- package/dist/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.js +17 -0
- package/dist/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.js.map +1 -0
- package/dist/databases/migrations/mysqldb/index.js +2 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/index.js +2 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/index.js +2 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/databases/repositories/installed-packages.repository.js +1 -1
- package/dist/databases/repositories/installed-packages.repository.js.map +1 -1
- package/dist/databases/repositories/shared-workflow.repository.d.ts +1 -0
- package/dist/databases/repositories/shared-workflow.repository.js +8 -0
- package/dist/databases/repositories/shared-workflow.repository.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.d.ts +1 -1
- package/dist/databases/repositories/workflow.repository.js +2 -1
- package/dist/databases/repositories/workflow.repository.js.map +1 -1
- package/dist/environments/variables/variables.controller.ee.d.ts +2 -1
- package/dist/environments/variables/variables.controller.ee.js +9 -3
- package/dist/environments/variables/variables.controller.ee.js.map +1 -1
- package/dist/environments/variables/variables.service.ee.d.ts +1 -1
- package/dist/environments/variables/variables.service.ee.js +8 -2
- package/dist/environments/variables/variables.service.ee.js.map +1 -1
- package/dist/error-reporting.js +3 -4
- package/dist/error-reporting.js.map +1 -1
- package/dist/errors/response-errors/invalid-mfa-recovery-code-error.d.ts +4 -0
- package/dist/errors/response-errors/invalid-mfa-recovery-code-error.js +11 -0
- package/dist/errors/response-errors/invalid-mfa-recovery-code-error.js.map +1 -0
- package/dist/evaluation/test-definition.schema.d.ts +13 -0
- package/dist/evaluation/test-definition.schema.js +1 -0
- package/dist/evaluation/test-definition.schema.js.map +1 -1
- package/dist/evaluation/test-definition.service.ee.js +17 -0
- package/dist/evaluation/test-definition.service.ee.js.map +1 -1
- package/dist/evaluation/test-definitions.types.ee.d.ts +2 -0
- package/dist/evaluation/test-runner/test-runner.service.ee.js +1 -1
- package/dist/evaluation/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation/test-runner/utils.ee.d.ts +1 -1
- package/dist/evaluation/test-runner/utils.ee.js +2 -2
- package/dist/evaluation/test-runner/utils.ee.js.map +1 -1
- package/dist/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.js +1 -1
- package/dist/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.js.map +1 -1
- package/dist/load-nodes-and-credentials.d.ts +3 -1
- package/dist/load-nodes-and-credentials.js +29 -4
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/mfa/mfa.service.d.ts +3 -1
- package/dist/mfa/mfa.service.js +12 -1
- package/dist/mfa/mfa.service.js.map +1 -1
- package/dist/node-types.d.ts +0 -2
- package/dist/node-types.js +4 -32
- package/dist/node-types.js.map +1 -1
- package/dist/requests.d.ts +2 -1
- package/dist/runners/errors/task-runner-restart-loop-error.d.ts +6 -0
- package/dist/runners/errors/task-runner-restart-loop-error.js +16 -0
- package/dist/runners/errors/task-runner-restart-loop-error.js.map +1 -0
- package/dist/runners/task-runner-module.d.ts +5 -1
- package/dist/runners/task-runner-module.js +16 -2
- package/dist/runners/task-runner-module.js.map +1 -1
- package/dist/runners/task-runner-process-restart-loop-detector.d.ts +19 -0
- package/dist/runners/task-runner-process-restart-loop-detector.js +43 -0
- package/dist/runners/task-runner-process-restart-loop-detector.js.map +1 -0
- package/dist/runners/task-runner-process.d.ts +1 -1
- package/dist/runners/task-runner-process.js +6 -6
- package/dist/runners/task-runner-process.js.map +1 -1
- package/dist/runners/task-runner-server.js +2 -3
- package/dist/runners/task-runner-server.js.map +1 -1
- package/dist/services/frontend.service.js +7 -0
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/wait-tracker.d.ts +3 -1
- package/dist/wait-tracker.js +10 -1
- package/dist/wait-tracker.js.map +1 -1
- package/dist/webhooks/test-webhooks.d.ts +10 -1
- package/dist/webhooks/test-webhooks.js +9 -2
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +10 -1
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +4 -2
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.d.ts +4 -1
- package/dist/workflow-runner.js +46 -18
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +1 -1
- package/dist/workflows/workflow-execution.service.js +11 -2
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +5 -1
- package/dist/workflows/workflow.service.js +6 -0
- package/dist/workflows/workflow.service.js.map +1 -1
- package/package.json +10 -11
- package/templates/form-trigger-completion.handlebars +3 -0
- package/dist/errors/unrecognized-node-type.error.d.ts +0 -5
- package/dist/errors/unrecognized-node-type.error.js +0 -12
- package/dist/errors/unrecognized-node-type.error.js.map +0 -1
|
@@ -23,14 +23,27 @@ export declare const testDefinitionPatchRequestBodySchema: z.ZodObject<{
|
|
|
23
23
|
description: z.ZodOptional<z.ZodString>;
|
|
24
24
|
evaluationWorkflowId: z.ZodOptional<z.ZodString>;
|
|
25
25
|
annotationTagId: z.ZodOptional<z.ZodString>;
|
|
26
|
+
mockedNodes: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
27
|
+
name: z.ZodString;
|
|
28
|
+
}, "strip", z.ZodTypeAny, {
|
|
29
|
+
name: string;
|
|
30
|
+
}, {
|
|
31
|
+
name: string;
|
|
32
|
+
}>, "many">>;
|
|
26
33
|
}, "strict", z.ZodTypeAny, {
|
|
27
34
|
name?: string | undefined;
|
|
28
35
|
description?: string | undefined;
|
|
36
|
+
mockedNodes?: {
|
|
37
|
+
name: string;
|
|
38
|
+
}[] | undefined;
|
|
29
39
|
evaluationWorkflowId?: string | undefined;
|
|
30
40
|
annotationTagId?: string | undefined;
|
|
31
41
|
}, {
|
|
32
42
|
name?: string | undefined;
|
|
33
43
|
description?: string | undefined;
|
|
44
|
+
mockedNodes?: {
|
|
45
|
+
name: string;
|
|
46
|
+
}[] | undefined;
|
|
34
47
|
evaluationWorkflowId?: string | undefined;
|
|
35
48
|
annotationTagId?: string | undefined;
|
|
36
49
|
}>;
|
|
@@ -17,6 +17,7 @@ exports.testDefinitionPatchRequestBodySchema = zod_1.z
|
|
|
17
17
|
description: zod_1.z.string().optional(),
|
|
18
18
|
evaluationWorkflowId: zod_1.z.string().min(1).optional(),
|
|
19
19
|
annotationTagId: zod_1.z.string().min(1).optional(),
|
|
20
|
+
mockedNodes: zod_1.z.array(zod_1.z.object({ name: zod_1.z.string() })).optional(),
|
|
20
21
|
})
|
|
21
22
|
.strict();
|
|
22
23
|
//# sourceMappingURL=test-definition.schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-definition.schema.js","sourceRoot":"","sources":["../../src/evaluation/test-definition.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,qCAAqC,GAAG,OAAC;KACpD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAChC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,oBAAoB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClD,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC7C,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,oCAAoC,GAAG,OAAC;KACnD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;IAC3C,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,oBAAoB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClD,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"test-definition.schema.js","sourceRoot":"","sources":["../../src/evaluation/test-definition.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,qCAAqC,GAAG,OAAC;KACpD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAChC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,oBAAoB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClD,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC7C,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,oCAAoC,GAAG,OAAC;KACnD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;IAC3C,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,oBAAoB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClD,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7C,WAAW,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC/D,CAAC;KACD,MAAM,EAAE,CAAC"}
|
|
@@ -47,6 +47,9 @@ let TestDefinitionService = class TestDefinitionService {
|
|
|
47
47
|
id: attrs.annotationTagId,
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
|
+
if (attrs.mockedNodes) {
|
|
51
|
+
entity.mockedNodes = attrs.mockedNodes;
|
|
52
|
+
}
|
|
50
53
|
return entity;
|
|
51
54
|
}
|
|
52
55
|
toEntity(attrs) {
|
|
@@ -75,6 +78,20 @@ let TestDefinitionService = class TestDefinitionService {
|
|
|
75
78
|
throw new bad_request_error_1.BadRequestError('Annotation tag not found');
|
|
76
79
|
}
|
|
77
80
|
}
|
|
81
|
+
if (attrs.mockedNodes && attrs.mockedNodes.length > 0) {
|
|
82
|
+
const existingTestDefinition = await this.testDefinitionRepository.findOneOrFail({
|
|
83
|
+
where: {
|
|
84
|
+
id,
|
|
85
|
+
},
|
|
86
|
+
relations: ['workflow'],
|
|
87
|
+
});
|
|
88
|
+
const existingNodeNames = new Set(existingTestDefinition.workflow.nodes.map((n) => n.name));
|
|
89
|
+
attrs.mockedNodes.forEach((node) => {
|
|
90
|
+
if (!existingNodeNames.has(node.name)) {
|
|
91
|
+
throw new bad_request_error_1.BadRequestError(`Pinned node not found in the workflow: ${node.name}`);
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
}
|
|
78
95
|
const queryResult = await this.testDefinitionRepository.update(id, this.toEntityLike(attrs));
|
|
79
96
|
if (queryResult.affected === 0) {
|
|
80
97
|
throw new not_found_error_1.NotFoundError('Test definition not found');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-definition.service.ee.js","sourceRoot":"","sources":["../../src/evaluation/test-definition.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAGjC,wGAAgG;AAChG,0GAAkG;AAClG,kFAA6E;AAC7E,8EAAyE;AACzE,uDAAmD;AAa5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACjC,YACS,wBAAkD,EAClD,uBAAgD;QADhD,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,4BAAuB,GAAvB,uBAAuB,CAAyB;IACtD,CAAC;IAEI,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"test-definition.service.ee.js","sourceRoot":"","sources":["../../src/evaluation/test-definition.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAGjC,wGAAgG;AAChG,0GAAkG;AAClG,kFAA6E;AAC7E,8EAAyE;AACzE,uDAAmD;AAa5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACjC,YACS,wBAAkD,EAClD,uBAAgD;QADhD,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,4BAAuB,GAAvB,uBAAuB,CAAyB;IACtD,CAAC;IAEI,YAAY,CAAC,KAQpB;QACA,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;YACd,MAAM,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QACtB,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QAClC,CAAC;QAED,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACvB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC/C,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACtB,MAAM,CAAC,QAAQ,GAAG;gBACjB,EAAE,EAAE,KAAK,CAAC,UAAU;aACpB,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,oBAAoB,EAAE,CAAC;YAChC,MAAM,CAAC,kBAAkB,GAAG;gBAC3B,EAAE,EAAE,KAAK,CAAC,oBAAoB;aAC9B,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;YAC3B,MAAM,CAAC,aAAa,GAAG;gBACtB,EAAE,EAAE,KAAK,CAAC,eAAe;aACzB,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACvB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACxC,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,KAMR;QACA,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU,EAAE,qBAA+B;QACxD,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAoB;QAC9B,MAAM,IAAA,gCAAc,EAAC,IAAI,CAAC,CAAC;QAE3B,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAyB;QACjD,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzC,MAAM,IAAA,gCAAc,EAAC,WAAW,CAAC,CAAC;QACnC,CAAC;QAGD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;YAC3B,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC;gBACrE,KAAK,EAAE;oBACN,EAAE,EAAE,KAAK,CAAC,eAAe;iBACzB;aACD,CAAC,CAAC;YAEH,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC1B,MAAM,IAAI,mCAAe,CAAC,0BAA0B,CAAC,CAAC;YACvD,CAAC;QACF,CAAC;QAGD,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC;gBAChF,KAAK,EAAE;oBACN,EAAE;iBACF;gBACD,SAAS,EAAE,CAAC,UAAU,CAAC;aACvB,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAE5F,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAClC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACvC,MAAM,IAAI,mCAAe,CAAC,0CAA0C,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClF,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC;QAGD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7F,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,+BAAa,CAAC,2BAA2B,CAAC,CAAC;QACtD,CAAC;IACF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,qBAA+B;QACvD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC;QAE/F,IAAI,YAAY,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,+BAAa,CAAC,2BAA2B,CAAC,CAAC;QACtD,CAAC;IACF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAA0B,EAAE,wBAAkC,EAAE;QAC7E,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IACpF,CAAC;CACD,CAAA;AAnIY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,gBAAO,GAAE;qCAG0B,wDAAwB;QACzB,sDAAuB;GAH7C,qBAAqB,CAmIjC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { MockedNodeItem } from '../databases/entities/test-definition.ee';
|
|
1
2
|
import type { AuthenticatedRequest, ListQuery } from '../requests';
|
|
2
3
|
export declare namespace TestDefinitionsRequest {
|
|
3
4
|
namespace RouteParams {
|
|
@@ -18,6 +19,7 @@ export declare namespace TestDefinitionsRequest {
|
|
|
18
19
|
name?: string;
|
|
19
20
|
evaluationWorkflowId?: string;
|
|
20
21
|
annotationTagId?: string;
|
|
22
|
+
mockedNodes?: MockedNodeItem[];
|
|
21
23
|
}>;
|
|
22
24
|
type Delete = AuthenticatedRequest<RouteParams.TestId>;
|
|
23
25
|
type Run = AuthenticatedRequest<RouteParams.TestId>;
|
|
@@ -36,7 +36,7 @@ let TestRunnerService = class TestRunnerService {
|
|
|
36
36
|
}
|
|
37
37
|
async runTestCase(workflow, pastExecutionData, userId) {
|
|
38
38
|
const pinData = (0, utils_ee_1.createPinData)(workflow, pastExecutionData);
|
|
39
|
-
const pastExecutionStartNode = (0, utils_ee_1.
|
|
39
|
+
const pastExecutionStartNode = (0, utils_ee_1.getPastExecutionTriggerNode)(pastExecutionData);
|
|
40
40
|
const data = {
|
|
41
41
|
destinationNode: pastExecutionData.startData?.destinationNode,
|
|
42
42
|
startNodes: pastExecutionStartNode
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-runner.service.ee.js","sourceRoot":"","sources":["../../../src/evaluation/test-runner/test-runner.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAgC;AAQhC,8DAAiC;AACjC,mCAAiC;AAEjC,2DAAuD;AAKvD,wFAAoF;AACpF,kGAA0F;AAC1F,4FAAoF;AACpF,sFAAkF;AAClF,yFAAgE;AAChE,uDAAmD;AAEnD,mEAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"test-runner.service.ee.js","sourceRoot":"","sources":["../../../src/evaluation/test-runner/test-runner.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { IRunExecutionData, IPinData } from 'n8n-workflow';
|
|
2
2
|
import type { WorkflowEntity } from '../../databases/entities/workflow-entity';
|
|
3
3
|
export declare function createPinData(workflow: WorkflowEntity, executionData: IRunExecutionData): IPinData;
|
|
4
|
-
export declare function
|
|
4
|
+
export declare function getPastExecutionTriggerNode(executionData: IRunExecutionData): string | undefined;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createPinData = createPinData;
|
|
4
|
-
exports.
|
|
4
|
+
exports.getPastExecutionTriggerNode = getPastExecutionTriggerNode;
|
|
5
5
|
function createPinData(workflow, executionData) {
|
|
6
6
|
const triggerNodes = workflow.nodes.filter((node) => /trigger$/i.test(node.type));
|
|
7
7
|
const pinData = {};
|
|
@@ -13,7 +13,7 @@ function createPinData(workflow, executionData) {
|
|
|
13
13
|
}
|
|
14
14
|
return pinData;
|
|
15
15
|
}
|
|
16
|
-
function
|
|
16
|
+
function getPastExecutionTriggerNode(executionData) {
|
|
17
17
|
return Object.keys(executionData.resultData.runData).find((nodeName) => {
|
|
18
18
|
const data = executionData.resultData.runData[nodeName];
|
|
19
19
|
return !data[0].source || data[0].source.length === 0 || data[0].source[0] === null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.ee.js","sourceRoot":"","sources":["../../../src/evaluation/test-runner/utils.ee.ts"],"names":[],"mappings":";;AASA,sCAaC;AAMD,
|
|
1
|
+
{"version":3,"file":"utils.ee.js","sourceRoot":"","sources":["../../../src/evaluation/test-runner/utils.ee.ts"],"names":[],"mappings":";;AASA,sCAaC;AAMD,kEAKC;AAxBD,SAAgB,aAAa,CAAC,QAAwB,EAAE,aAAgC;IACvF,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAElF,MAAM,OAAO,GAAG,EAAc,CAAC;IAE/B,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;IACF,CAAC;IAED,OAAO,OAAO,CAAC;AAChB,CAAC;AAMD,SAAgB,2BAA2B,CAAC,aAAgC;IAC3E,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACtE,MAAM,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IACrF,CAAC,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.js
CHANGED
|
@@ -63,7 +63,7 @@ class MessageEventBusDestinationSentry extends message_event_bus_destination_ee_
|
|
|
63
63
|
environment,
|
|
64
64
|
release: constants_1.N8N_VERSION,
|
|
65
65
|
transport: Sentry.makeNodeTransport,
|
|
66
|
-
integrations: Sentry.
|
|
66
|
+
integrations: Sentry.getDefaultIntegrations({}),
|
|
67
67
|
stackParser: Sentry.defaultStackParser,
|
|
68
68
|
});
|
|
69
69
|
}
|
package/dist/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-event-bus-destination-sentry.ee.js","sourceRoot":"","sources":["../../../src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qDAAuC;AAOvC,2CAA0C;AAE1C,yFAAgF;AAChF,0FAAyG;AAGlG,MAAM,yCAAyC,GAAG,CACxD,SAAkB,EACqC,EAAE;IACzD,MAAM,CAAC,GAAG,SAAoD,CAAC;IAC/D,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC;AAC5B,CAAC,CAAC;AANW,QAAA,yCAAyC,6CAMpD;AAEF,MAAa,gCACZ,SAAQ,6DAA0B;IAWlC,YAAY,gBAAiC,EAAE,OAAgD;QAC9F,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAPlC,qBAAgB,GAAG,GAAG,CAAC;QAQtB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,YAAY,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,wCAA8C,CAAC;QAC3E,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,OAAO,CAAC,WAAW;YAAE,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QAChE,IAAI,OAAO,CAAC,gBAAgB;YAAE,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAC/E,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;QAEjD,IAAI,CAAC,YAAY,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC;YACzC,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,WAAW;YACX,OAAO,EAAE,uBAAW;YACpB,SAAS,EAAE,MAAM,CAAC,iBAAiB;YACnC,YAAY,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"message-event-bus-destination-sentry.ee.js","sourceRoot":"","sources":["../../../src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { GlobalConfig } from '@n8n/config';
|
|
2
2
|
import type { DirectoryLoader, Types } from 'n8n-core';
|
|
3
3
|
import { InstanceSettings, PackageDirectoryLoader } from 'n8n-core';
|
|
4
|
-
import type { INodeTypeData, ICredentialTypeData } from 'n8n-workflow';
|
|
4
|
+
import type { INodeTypeData, ICredentialTypeData, LoadedClass, ICredentialType, INodeType, IVersionedNodeType } from 'n8n-workflow';
|
|
5
5
|
import { Logger } from './logging/logger.service';
|
|
6
6
|
interface LoadedNodesAndCredentials {
|
|
7
7
|
nodes: INodeTypeData;
|
|
@@ -205,6 +205,8 @@ export declare class LoadNodesAndCredentials {
|
|
|
205
205
|
private runDirectoryLoader;
|
|
206
206
|
createAiTools(): void;
|
|
207
207
|
postProcessLoaders(): Promise<void>;
|
|
208
|
+
getNode(fullNodeType: string): LoadedClass<INodeType | IVersionedNodeType>;
|
|
209
|
+
getCredential(credentialType: string): LoadedClass<ICredentialType>;
|
|
208
210
|
setupHotReload(): Promise<void>;
|
|
209
211
|
}
|
|
210
212
|
export {};
|
|
@@ -225,18 +225,21 @@ let LoadNodesAndCredentials = class LoadNodesAndCredentials {
|
|
|
225
225
|
this.loaded = { nodes: {}, credentials: {} };
|
|
226
226
|
this.types = { nodes: [], credentials: [] };
|
|
227
227
|
for (const loader of Object.values(this.loaders)) {
|
|
228
|
-
const { known, types, directory } = loader;
|
|
229
|
-
this.types.nodes = this.types.nodes.concat(types.nodes)
|
|
228
|
+
const { known, types, directory, packageName } = loader;
|
|
229
|
+
this.types.nodes = this.types.nodes.concat(types.nodes.map(({ name, ...rest }) => ({
|
|
230
|
+
...rest,
|
|
231
|
+
name: `${packageName}.${name}`,
|
|
232
|
+
})));
|
|
230
233
|
this.types.credentials = this.types.credentials.concat(types.credentials);
|
|
231
234
|
for (const nodeTypeName in loader.nodeTypes) {
|
|
232
|
-
this.loaded.nodes[nodeTypeName] = loader.nodeTypes[nodeTypeName];
|
|
235
|
+
this.loaded.nodes[`${packageName}.${nodeTypeName}`] = loader.nodeTypes[nodeTypeName];
|
|
233
236
|
}
|
|
234
237
|
for (const credentialTypeName in loader.credentialTypes) {
|
|
235
238
|
this.loaded.credentials[credentialTypeName] = loader.credentialTypes[credentialTypeName];
|
|
236
239
|
}
|
|
237
240
|
for (const type in known.nodes) {
|
|
238
241
|
const { className, sourcePath } = known.nodes[type];
|
|
239
|
-
this.known.nodes[type] = {
|
|
242
|
+
this.known.nodes[`${packageName}.${type}`] = {
|
|
240
243
|
className,
|
|
241
244
|
sourcePath: path_1.default.join(directory, sourcePath),
|
|
242
245
|
};
|
|
@@ -259,6 +262,28 @@ let LoadNodesAndCredentials = class LoadNodesAndCredentials {
|
|
|
259
262
|
await postProcessor();
|
|
260
263
|
}
|
|
261
264
|
}
|
|
265
|
+
getNode(fullNodeType) {
|
|
266
|
+
const [packageName, nodeType] = fullNodeType.split('.');
|
|
267
|
+
const { loaders } = this;
|
|
268
|
+
const loader = loaders[packageName];
|
|
269
|
+
if (!loader) {
|
|
270
|
+
throw new n8n_core_1.UnrecognizedNodeTypeError(packageName, nodeType);
|
|
271
|
+
}
|
|
272
|
+
return loader.getNode(nodeType);
|
|
273
|
+
}
|
|
274
|
+
getCredential(credentialType) {
|
|
275
|
+
const { loadedCredentials } = this;
|
|
276
|
+
for (const loader of Object.values(this.loaders)) {
|
|
277
|
+
if (credentialType in loader.known.credentials) {
|
|
278
|
+
const loaded = loader.getCredential(credentialType);
|
|
279
|
+
loadedCredentials[credentialType] = loaded;
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
if (credentialType in loadedCredentials) {
|
|
283
|
+
return loadedCredentials[credentialType];
|
|
284
|
+
}
|
|
285
|
+
throw new n8n_core_1.UnrecognizedCredentialTypeError(credentialType);
|
|
286
|
+
}
|
|
262
287
|
async setupHotReload() {
|
|
263
288
|
const { default: debounce } = await Promise.resolve().then(() => __importStar(require('lodash/debounce')));
|
|
264
289
|
const { watch } = await Promise.resolve().then(() => __importStar(require('chokidar')));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-nodes-and-credentials.js","sourceRoot":"","sources":["../src/load-nodes-and-credentials.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"load-nodes-and-credentials.js","sourceRoot":"","sources":["../src/load-nodes-and-credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,5 +19,7 @@ export declare class MfaService {
|
|
|
19
19
|
}>;
|
|
20
20
|
validateMfa(userId: string, mfaCode: string | undefined, mfaRecoveryCode: string | undefined): Promise<boolean>;
|
|
21
21
|
enableMfa(userId: string): Promise<import("../databases/entities/auth-user").AuthUser>;
|
|
22
|
-
|
|
22
|
+
disableMfaWithMfaCode(userId: string, mfaCode: string): Promise<void>;
|
|
23
|
+
disableMfaWithRecoveryCode(userId: string, recoveryCode: string): Promise<void>;
|
|
24
|
+
private disableMfaForUser;
|
|
23
25
|
}
|
package/dist/mfa/mfa.service.js
CHANGED
|
@@ -15,6 +15,7 @@ const typedi_1 = require("typedi");
|
|
|
15
15
|
const uuid_1 = require("uuid");
|
|
16
16
|
const auth_user_repository_1 = require("../databases/repositories/auth-user.repository");
|
|
17
17
|
const invalid_mfa_code_error_1 = require("../errors/response-errors/invalid-mfa-code.error");
|
|
18
|
+
const invalid_mfa_recovery_code_error_1 = require("../errors/response-errors/invalid-mfa-recovery-code-error");
|
|
18
19
|
const totp_service_1 = require("./totp.service");
|
|
19
20
|
let MfaService = class MfaService {
|
|
20
21
|
constructor(authUserRepository, totp, cipher) {
|
|
@@ -74,11 +75,21 @@ let MfaService = class MfaService {
|
|
|
74
75
|
user.mfaEnabled = true;
|
|
75
76
|
return await this.authUserRepository.save(user);
|
|
76
77
|
}
|
|
77
|
-
async
|
|
78
|
+
async disableMfaWithMfaCode(userId, mfaCode) {
|
|
78
79
|
const isValidToken = await this.validateMfa(userId, mfaCode, undefined);
|
|
79
80
|
if (!isValidToken) {
|
|
80
81
|
throw new invalid_mfa_code_error_1.InvalidMfaCodeError();
|
|
81
82
|
}
|
|
83
|
+
await this.disableMfaForUser(userId);
|
|
84
|
+
}
|
|
85
|
+
async disableMfaWithRecoveryCode(userId, recoveryCode) {
|
|
86
|
+
const isValidToken = await this.validateMfa(userId, undefined, recoveryCode);
|
|
87
|
+
if (!isValidToken) {
|
|
88
|
+
throw new invalid_mfa_recovery_code_error_1.InvalidMfaRecoveryCodeError();
|
|
89
|
+
}
|
|
90
|
+
await this.disableMfaForUser(userId);
|
|
91
|
+
}
|
|
92
|
+
async disableMfaForUser(userId) {
|
|
82
93
|
await this.authUserRepository.update(userId, {
|
|
83
94
|
mfaEnabled: false,
|
|
84
95
|
mfaSecret: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfa.service.js","sourceRoot":"","sources":["../../src/mfa/mfa.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkC;AAClC,mCAAiC;AACjC,+BAAkC;AAElC,wFAAmF;AACnF,4FAAsF;
|
|
1
|
+
{"version":3,"file":"mfa.service.js","sourceRoot":"","sources":["../../src/mfa/mfa.service.ts"],"names":[],"mappings":"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"}
|
package/dist/node-types.d.ts
CHANGED
|
@@ -11,9 +11,7 @@ export declare class NodeTypes implements INodeTypes {
|
|
|
11
11
|
};
|
|
12
12
|
getByName(nodeType: string): INodeType | IVersionedNodeType;
|
|
13
13
|
getByNameAndVersion(nodeType: string, version?: number): INodeType;
|
|
14
|
-
applySpecialNodeParameters(): void;
|
|
15
14
|
getKnownTypes(): Record<string, import("n8n-workflow").LoadingDetails>;
|
|
16
|
-
private getNode;
|
|
17
15
|
getNodeTranslationPath({ nodeSourcePath, longNodeType, locale, }: {
|
|
18
16
|
nodeSourcePath: string;
|
|
19
17
|
longNodeType: string;
|
package/dist/node-types.js
CHANGED
|
@@ -11,27 +11,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.NodeTypes = void 0;
|
|
13
13
|
const promises_1 = require("fs/promises");
|
|
14
|
-
const n8n_core_1 = require("n8n-core");
|
|
15
14
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
16
15
|
const path_1 = require("path");
|
|
17
16
|
const typedi_1 = require("typedi");
|
|
18
|
-
const unrecognized_node_type_error_1 = require("./errors/unrecognized-node-type.error");
|
|
19
17
|
const load_nodes_and_credentials_1 = require("./load-nodes-and-credentials");
|
|
20
18
|
let NodeTypes = class NodeTypes {
|
|
21
19
|
constructor(loadNodesAndCredentials) {
|
|
22
20
|
this.loadNodesAndCredentials = loadNodesAndCredentials;
|
|
23
|
-
loadNodesAndCredentials.addPostProcessor(async () => this.applySpecialNodeParameters());
|
|
24
21
|
}
|
|
25
22
|
getWithSourcePath(nodeTypeName, version) {
|
|
26
|
-
const nodeType = this.getNode(nodeTypeName);
|
|
27
|
-
if (!nodeType) {
|
|
28
|
-
throw new n8n_workflow_1.ApplicationError('Unknown node type', { tags: { nodeTypeName } });
|
|
29
|
-
}
|
|
23
|
+
const nodeType = this.loadNodesAndCredentials.getNode(nodeTypeName);
|
|
30
24
|
const { description } = n8n_workflow_1.NodeHelpers.getVersionedNodeType(nodeType.type, version);
|
|
31
25
|
return { description: { ...description }, sourcePath: nodeType.sourcePath };
|
|
32
26
|
}
|
|
33
27
|
getByName(nodeType) {
|
|
34
|
-
return this.getNode(nodeType).type;
|
|
28
|
+
return this.loadNodesAndCredentials.getNode(nodeType).type;
|
|
35
29
|
}
|
|
36
30
|
getByNameAndVersion(nodeType, version) {
|
|
37
31
|
const origType = nodeType;
|
|
@@ -39,7 +33,7 @@ let NodeTypes = class NodeTypes {
|
|
|
39
33
|
if (toolRequested) {
|
|
40
34
|
nodeType = nodeType.replace(/Tool$/, '');
|
|
41
35
|
}
|
|
42
|
-
const node = this.getNode(nodeType);
|
|
36
|
+
const node = this.loadNodesAndCredentials.getNode(nodeType);
|
|
43
37
|
const versionedNodeType = n8n_workflow_1.NodeHelpers.getVersionedNodeType(node.type, version);
|
|
44
38
|
if (!toolRequested)
|
|
45
39
|
return versionedNodeType;
|
|
@@ -60,29 +54,9 @@ let NodeTypes = class NodeTypes {
|
|
|
60
54
|
loadedNodes[nodeType + 'Tool'] = { sourcePath: '', type: tool };
|
|
61
55
|
return tool;
|
|
62
56
|
}
|
|
63
|
-
applySpecialNodeParameters() {
|
|
64
|
-
for (const nodeTypeData of Object.values(this.loadNodesAndCredentials.loadedNodes)) {
|
|
65
|
-
const nodeType = n8n_workflow_1.NodeHelpers.getVersionedNodeType(nodeTypeData.type);
|
|
66
|
-
n8n_workflow_1.NodeHelpers.applySpecialNodeParameters(nodeType);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
57
|
getKnownTypes() {
|
|
70
58
|
return this.loadNodesAndCredentials.knownNodes;
|
|
71
59
|
}
|
|
72
|
-
getNode(type) {
|
|
73
|
-
const { loadedNodes, knownNodes } = this.loadNodesAndCredentials;
|
|
74
|
-
if (type in loadedNodes) {
|
|
75
|
-
return loadedNodes[type];
|
|
76
|
-
}
|
|
77
|
-
if (type in knownNodes) {
|
|
78
|
-
const { className, sourcePath } = knownNodes[type];
|
|
79
|
-
const loaded = (0, n8n_core_1.loadClassInIsolation)(sourcePath, className);
|
|
80
|
-
n8n_workflow_1.NodeHelpers.applySpecialNodeParameters(loaded);
|
|
81
|
-
loadedNodes[type] = { sourcePath, type: loaded };
|
|
82
|
-
return loadedNodes[type];
|
|
83
|
-
}
|
|
84
|
-
throw new unrecognized_node_type_error_1.UnrecognizedNodeTypeError(type);
|
|
85
|
-
}
|
|
86
60
|
async getNodeTranslationPath({ nodeSourcePath, longNodeType, locale, }) {
|
|
87
61
|
const nodeDir = (0, path_1.dirname)(nodeSourcePath);
|
|
88
62
|
const maxVersion = await this.getMaxVersion(nodeDir);
|
|
@@ -111,9 +85,7 @@ let NodeTypes = class NodeTypes {
|
|
|
111
85
|
}
|
|
112
86
|
getNodeTypeDescriptions(nodeTypes) {
|
|
113
87
|
return nodeTypes.map(({ name: nodeTypeName, version: nodeTypeVersion }) => {
|
|
114
|
-
const nodeType = this.getNode(nodeTypeName);
|
|
115
|
-
if (!nodeType)
|
|
116
|
-
throw new n8n_workflow_1.ApplicationError(`Unknown node type: ${nodeTypeName}`);
|
|
88
|
+
const nodeType = this.loadNodesAndCredentials.getNode(nodeTypeName);
|
|
117
89
|
const { description } = n8n_workflow_1.NodeHelpers.getVersionedNodeType(nodeType.type, nodeTypeVersion);
|
|
118
90
|
const descriptionCopy = { ...description };
|
|
119
91
|
descriptionCopy.name = descriptionCopy.name.startsWith('n8n-nodes')
|
package/dist/node-types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-types.js","sourceRoot":"","sources":["../src/node-types.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,0CAAsC;
|
|
1
|
+
{"version":3,"file":"node-types.js","sourceRoot":"","sources":["../src/node-types.ts"],"names":[],"mappings":"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"}
|
package/dist/requests.d.ts
CHANGED
|
@@ -226,7 +226,8 @@ export declare namespace MFA {
|
|
|
226
226
|
mfaCode: string;
|
|
227
227
|
}, {}>;
|
|
228
228
|
type Disable = AuthenticatedRequest<{}, {}, {
|
|
229
|
-
mfaCode
|
|
229
|
+
mfaCode?: string;
|
|
230
|
+
mfaRecoveryCode?: string;
|
|
230
231
|
}, {}>;
|
|
231
232
|
type Config = AuthenticatedRequest<{}, {}, {
|
|
232
233
|
login: {
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TaskRunnerRestartLoopError = void 0;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
class TaskRunnerRestartLoopError extends n8n_workflow_1.ApplicationError {
|
|
6
|
+
constructor(howManyTimes, timePeriodMs) {
|
|
7
|
+
const message = `Task runner has restarted ${howManyTimes} times within ${timePeriodMs / 1000} seconds. This is an abnormally high restart rate that suggests a bug or other issue is preventing your runner process from starting up. If this issues persists, please file a report at: https://github.com/n8n-io/n8n/issues`;
|
|
8
|
+
super(message, {
|
|
9
|
+
level: 'fatal',
|
|
10
|
+
});
|
|
11
|
+
this.howManyTimes = howManyTimes;
|
|
12
|
+
this.timePeriodMs = timePeriodMs;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.TaskRunnerRestartLoopError = TaskRunnerRestartLoopError;
|
|
16
|
+
//# sourceMappingURL=task-runner-restart-loop-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-runner-restart-loop-error.js","sourceRoot":"","sources":["../../../src/runners/errors/task-runner-restart-loop-error.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAEhD,MAAa,0BAA2B,SAAQ,+BAAgB;IAC/D,YACiB,YAAoB,EACpB,YAAoB;QAEpC,MAAM,OAAO,GAAG,6BAA6B,YAAY,iBAAiB,YAAY,GAAG,IAAI,iOAAiO,CAAC;QAE/T,KAAK,CAAC,OAAO,EAAE;YACd,KAAK,EAAE,OAAO;SACd,CAAC,CAAC;QAPa,iBAAY,GAAZ,YAAY,CAAQ;QACpB,iBAAY,GAAZ,YAAY,CAAQ;IAOrC,CAAC;CACD;AAXD,gEAWC"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import { TaskRunnersConfig } from '@n8n/config';
|
|
2
|
+
import { Logger } from '../logging/logger.service';
|
|
2
3
|
export declare class TaskRunnerModule {
|
|
4
|
+
private readonly logger;
|
|
3
5
|
private readonly runnerConfig;
|
|
4
6
|
private taskRunnerHttpServer;
|
|
5
7
|
private taskRunnerWsServer;
|
|
6
8
|
private taskManager;
|
|
7
9
|
private taskRunnerProcess;
|
|
8
|
-
|
|
10
|
+
private taskRunnerProcessRestartLoopDetector;
|
|
11
|
+
constructor(logger: Logger, runnerConfig: TaskRunnersConfig);
|
|
9
12
|
start(): Promise<void>;
|
|
10
13
|
stop(): Promise<void>;
|
|
11
14
|
private loadTaskManager;
|
|
12
15
|
private loadTaskRunnerServer;
|
|
13
16
|
private startInternalTaskRunner;
|
|
17
|
+
private onRunnerRestartLoopDetected;
|
|
14
18
|
}
|
|
@@ -44,14 +44,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
44
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
45
|
exports.TaskRunnerModule = void 0;
|
|
46
46
|
const config_1 = require("@n8n/config");
|
|
47
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
47
48
|
const a = __importStar(require("node:assert/strict"));
|
|
48
49
|
const typedi_1 = __importStar(require("typedi"));
|
|
49
50
|
const on_shutdown_1 = require("../decorators/on-shutdown");
|
|
51
|
+
const logger_service_1 = require("../logging/logger.service");
|
|
52
|
+
const task_runner_process_restart_loop_detector_1 = require("../runners/task-runner-process-restart-loop-detector");
|
|
50
53
|
const missing_auth_token_error_1 = require("./errors/missing-auth-token.error");
|
|
51
54
|
const runner_ws_server_1 = require("./runner-ws-server");
|
|
52
55
|
let TaskRunnerModule = class TaskRunnerModule {
|
|
53
|
-
constructor(runnerConfig) {
|
|
56
|
+
constructor(logger, runnerConfig) {
|
|
57
|
+
this.logger = logger;
|
|
54
58
|
this.runnerConfig = runnerConfig;
|
|
59
|
+
this.onRunnerRestartLoopDetected = async (error) => {
|
|
60
|
+
this.logger.error(error.message);
|
|
61
|
+
n8n_workflow_1.ErrorReporterProxy.error(error);
|
|
62
|
+
await (0, n8n_workflow_1.sleep)(1000);
|
|
63
|
+
process.exit(1);
|
|
64
|
+
};
|
|
65
|
+
this.logger = this.logger.scoped('task-runner');
|
|
55
66
|
}
|
|
56
67
|
async start() {
|
|
57
68
|
a.ok(this.runnerConfig.enabled, 'Task runner is disabled');
|
|
@@ -95,6 +106,8 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
95
106
|
a.ok(this.taskRunnerWsServer, 'Task Runner WS Server not loaded');
|
|
96
107
|
const { TaskRunnerProcess } = await Promise.resolve().then(() => __importStar(require('../runners/task-runner-process')));
|
|
97
108
|
this.taskRunnerProcess = typedi_1.default.get(TaskRunnerProcess);
|
|
109
|
+
this.taskRunnerProcessRestartLoopDetector = new task_runner_process_restart_loop_detector_1.TaskRunnerProcessRestartLoopDetector(this.taskRunnerProcess);
|
|
110
|
+
this.taskRunnerProcessRestartLoopDetector.on('restart-loop-detected', this.onRunnerRestartLoopDetected);
|
|
98
111
|
await this.taskRunnerProcess.start();
|
|
99
112
|
const { InternalTaskRunnerDisconnectAnalyzer } = await Promise.resolve().then(() => __importStar(require('../runners/internal-task-runner-disconnect-analyzer')));
|
|
100
113
|
this.taskRunnerWsServer.setDisconnectAnalyzer(typedi_1.default.get(InternalTaskRunnerDisconnectAnalyzer));
|
|
@@ -109,6 +122,7 @@ __decorate([
|
|
|
109
122
|
], TaskRunnerModule.prototype, "stop", null);
|
|
110
123
|
exports.TaskRunnerModule = TaskRunnerModule = __decorate([
|
|
111
124
|
(0, typedi_1.Service)(),
|
|
112
|
-
__metadata("design:paramtypes", [
|
|
125
|
+
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
126
|
+
config_1.TaskRunnersConfig])
|
|
113
127
|
], TaskRunnerModule);
|
|
114
128
|
//# sourceMappingURL=task-runner-module.js.map
|