n8n 1.77.2 → 1.78.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/active-executions.d.ts +2 -2
- package/dist/active-executions.js +9 -7
- package/dist/active-executions.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/config/index.d.ts +0 -3
- package/dist/config/schema.d.ts +0 -8
- package/dist/config/schema.js +0 -8
- package/dist/config/schema.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/dist/controllers/api-keys.controller.d.ts +24 -5
- package/dist/controllers/api-keys.controller.js +49 -9
- package/dist/controllers/api-keys.controller.js.map +1 -1
- package/dist/databases/entities/index.d.ts +2 -0
- package/dist/databases/entities/index.js +2 -0
- package/dist/databases/entities/index.js.map +1 -1
- package/dist/databases/entities/test-case-execution.ee.d.ts +19 -0
- package/dist/databases/entities/test-case-execution.ee.js +83 -0
- package/dist/databases/entities/test-case-execution.ee.js.map +1 -0
- package/dist/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.d.ts +5 -0
- package/dist/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.js +36 -0
- package/dist/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.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/test-case-execution.repository.ee.d.ts +12 -0
- package/dist/databases/repositories/test-case-execution.repository.ee.js +73 -0
- package/dist/databases/repositories/test-case-execution.repository.ee.js.map +1 -0
- package/dist/databases/repositories/test-run.repository.ee.d.ts +4 -3
- package/dist/databases/repositories/test-run.repository.ee.js +9 -6
- package/dist/databases/repositories/test-run.repository.ee.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.js +4 -0
- package/dist/databases/repositories/workflow.repository.js.map +1 -1
- package/dist/evaluation.ee/test-definitions.types.ee.d.ts +1 -0
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.d.ts +1 -1
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.js +3 -0
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.d.ts +5 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +100 -21
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.d.ts +4 -1
- package/dist/evaluation.ee/test-runs.controller.ee.js +17 -1
- package/dist/evaluation.ee/test-runs.controller.ee.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.js +1 -3
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/execution-lifecycle-hooks.d.ts +10 -3
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +82 -74
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/execution-lifecycle/save-execution-progress.d.ts +2 -2
- package/dist/execution-lifecycle/save-execution-progress.js +22 -35
- package/dist/execution-lifecycle/save-execution-progress.js.map +1 -1
- package/dist/execution-lifecycle/to-save-settings.d.ts +4 -3
- package/dist/execution-lifecycle/to-save-settings.js.map +1 -1
- package/dist/executions/execution-recovery.service.d.ts +1 -3
- package/dist/executions/execution-recovery.service.js +3 -11
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/license.d.ts +1 -0
- package/dist/license.js +6 -1
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +0 -7
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/manual-execution.service.js +1 -1
- package/dist/manual-execution.service.js.map +1 -1
- package/dist/middlewares/list-query/dtos/workflow.sort-by.dto.d.ts +8 -0
- package/dist/middlewares/list-query/dtos/workflow.sort-by.dto.js +37 -0
- package/dist/middlewares/list-query/dtos/workflow.sort-by.dto.js.map +1 -0
- package/dist/middlewares/list-query/index.d.ts +1 -1
- package/dist/middlewares/list-query/index.js +2 -0
- package/dist/middlewares/list-query/index.js.map +1 -1
- package/dist/middlewares/list-query/sort-by.d.ts +2 -0
- package/dist/middlewares/list-query/sort-by.js +68 -0
- package/dist/middlewares/list-query/sort-by.js.map +1 -0
- package/dist/node-types.js +12 -0
- package/dist/node-types.js.map +1 -1
- package/dist/requests.d.ts +4 -5
- package/dist/requests.js.map +1 -1
- package/dist/scaling/job-processor.js +2 -2
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/server.js.map +1 -1
- package/dist/services/credentials-tester.service.js +6 -4
- package/dist/services/credentials-tester.service.js.map +1 -1
- package/dist/services/dynamic-node-parameters.service.js +6 -4
- package/dist/services/dynamic-node-parameters.service.js.map +1 -1
- package/dist/services/frontend.service.js +2 -0
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/public-api-key.service.d.ts +6 -1
- package/dist/services/public-api-key.service.js +34 -12
- package/dist/services/public-api-key.service.js.map +1 -1
- package/dist/task-runners/default-task-runner-disconnect-analyzer.d.ts +1 -1
- package/dist/task-runners/default-task-runner-disconnect-analyzer.js.map +1 -1
- package/dist/task-runners/errors/task-runner-oom-error.d.ts +1 -1
- package/dist/task-runners/internal-task-runner-disconnect-analyzer.d.ts +1 -1
- package/dist/task-runners/internal-task-runner-disconnect-analyzer.js.map +1 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.controller.d.ts +12 -0
- package/dist/task-runners/{auth/task-runner-auth.controller.js → task-broker/auth/task-broker-auth.controller.js} +17 -17
- package/dist/task-runners/task-broker/auth/task-broker-auth.controller.js.map +1 -0
- package/dist/task-runners/{auth/task-runner-auth.schema.d.ts → task-broker/auth/task-broker-auth.schema.d.ts} +1 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.schema.js +8 -0
- package/dist/task-runners/task-broker/auth/task-broker-auth.schema.js.map +1 -0
- package/dist/task-runners/{auth/task-runner-auth.service.d.ts → task-broker/auth/task-broker-auth.service.d.ts} +2 -2
- package/dist/task-runners/{auth/task-runner-auth.service.js → task-broker/auth/task-broker-auth.service.js} +8 -8
- package/dist/task-runners/task-broker/auth/task-broker-auth.service.js.map +1 -0
- package/dist/task-runners/task-broker/errors/task-deferred.error.d.ts +4 -0
- package/dist/task-runners/task-broker/errors/task-deferred.error.js +11 -0
- package/dist/task-runners/task-broker/errors/task-deferred.error.js.map +1 -0
- package/dist/task-runners/{errors.d.ts → task-broker/errors/task-reject.error.d.ts} +0 -5
- package/dist/task-runners/task-broker/errors/task-reject.error.js +12 -0
- package/dist/task-runners/task-broker/errors/task-reject.error.js.map +1 -0
- package/dist/task-runners/task-broker/errors/task-runner-timeout.error.js.map +1 -0
- package/dist/task-runners/{task-runner-server.d.ts → task-broker/task-broker-server.d.ts} +6 -6
- package/dist/task-runners/{task-runner-server.js → task-broker/task-broker-server.js} +20 -20
- package/dist/task-runners/task-broker/task-broker-server.js.map +1 -0
- package/dist/task-runners/{task-runner-types.d.ts → task-broker/task-broker-types.d.ts} +5 -11
- package/dist/task-runners/{task-runner-types.js → task-broker/task-broker-types.js} +1 -1
- package/dist/task-runners/task-broker/task-broker-types.js.map +1 -0
- package/dist/task-runners/{task-runner-ws-server.d.ts → task-broker/task-broker-ws-server.d.ts} +6 -6
- package/dist/task-runners/{task-runner-ws-server.js → task-broker/task-broker-ws-server.js} +9 -9
- package/dist/task-runners/task-broker/task-broker-ws-server.js.map +1 -0
- package/dist/task-runners/{task-broker.service.d.ts → task-broker/task-broker.service.d.ts} +3 -2
- package/dist/task-runners/{task-broker.service.js → task-broker/task-broker.service.js} +12 -11
- package/dist/task-runners/task-broker/task-broker.service.js.map +1 -0
- package/dist/task-runners/task-managers/local-task-requester.d.ts +1 -1
- package/dist/task-runners/task-managers/local-task-requester.js +1 -1
- package/dist/task-runners/task-managers/local-task-requester.js.map +1 -1
- package/dist/task-runners/task-runner-module.d.ts +3 -3
- package/dist/task-runners/task-runner-module.js +12 -12
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/task-runners/task-runner-process.d.ts +2 -2
- package/dist/task-runners/task-runner-process.js +2 -2
- package/dist/task-runners/task-runner-process.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +0 -3
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.d.ts +1 -3
- package/dist/workflow-runner.js +14 -22
- 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 +2 -2
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +1 -3
- package/dist/workflows/workflows.controller.d.ts +2 -2
- package/dist/workflows/workflows.controller.js +4 -6
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +12 -12
- package/templates/form-trigger-completion.handlebars +46 -42
- package/templates/form-trigger.handlebars +63 -8
- package/dist/task-runners/auth/task-runner-auth.controller.d.ts +0 -12
- package/dist/task-runners/auth/task-runner-auth.controller.js.map +0 -1
- package/dist/task-runners/auth/task-runner-auth.schema.js +0 -8
- package/dist/task-runners/auth/task-runner-auth.schema.js.map +0 -1
- package/dist/task-runners/auth/task-runner-auth.service.js.map +0 -1
- package/dist/task-runners/errors/task-runner-timeout.error.js.map +0 -1
- package/dist/task-runners/errors.js +0 -21
- package/dist/task-runners/errors.js.map +0 -1
- package/dist/task-runners/task-broker.service.js.map +0 -1
- package/dist/task-runners/task-runner-server.js.map +0 -1
- package/dist/task-runners/task-runner-types.js.map +0 -1
- package/dist/task-runners/task-runner-ws-server.js.map +0 -1
- /package/dist/task-runners/{errors → task-broker/errors}/task-runner-timeout.error.d.ts +0 -0
- /package/dist/task-runners/{errors → task-broker/errors}/task-runner-timeout.error.js +0 -0
|
@@ -9,27 +9,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.TaskBrokerAuthController = void 0;
|
|
13
13
|
const di_1 = require("@n8n/di");
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const bad_request_error_1 = require("
|
|
17
|
-
const forbidden_error_1 = require("
|
|
18
|
-
let
|
|
19
|
-
constructor(
|
|
20
|
-
this.
|
|
14
|
+
const task_broker_auth_schema_1 = require("./task-broker-auth.schema");
|
|
15
|
+
const task_broker_auth_service_1 = require("./task-broker-auth.service");
|
|
16
|
+
const bad_request_error_1 = require("../../../errors/response-errors/bad-request.error");
|
|
17
|
+
const forbidden_error_1 = require("../../../errors/response-errors/forbidden.error");
|
|
18
|
+
let TaskBrokerAuthController = class TaskBrokerAuthController {
|
|
19
|
+
constructor(authService) {
|
|
20
|
+
this.authService = authService;
|
|
21
21
|
this.authMiddleware = this.authMiddleware.bind(this);
|
|
22
22
|
}
|
|
23
23
|
async createGrantToken(req) {
|
|
24
|
-
const result = await
|
|
24
|
+
const result = await task_broker_auth_schema_1.taskBrokerAuthRequestBodySchema.safeParseAsync(req.body);
|
|
25
25
|
if (!result.success) {
|
|
26
26
|
throw new bad_request_error_1.BadRequestError(result.error.errors[0].code);
|
|
27
27
|
}
|
|
28
28
|
const { token: authToken } = result.data;
|
|
29
|
-
if (!this.
|
|
29
|
+
if (!this.authService.isValidAuthToken(authToken)) {
|
|
30
30
|
throw new forbidden_error_1.ForbiddenError();
|
|
31
31
|
}
|
|
32
|
-
const grantToken = await this.
|
|
32
|
+
const grantToken = await this.authService.createGrantToken();
|
|
33
33
|
return {
|
|
34
34
|
token: grantToken,
|
|
35
35
|
};
|
|
@@ -41,7 +41,7 @@ let TaskRunnerAuthController = class TaskRunnerAuthController {
|
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
const grantToken = authHeader.slice('Bearer '.length);
|
|
44
|
-
const isConsumed = await this.
|
|
44
|
+
const isConsumed = await this.authService.tryConsumeGrantToken(grantToken);
|
|
45
45
|
if (!isConsumed) {
|
|
46
46
|
res.status(403).json({ code: 403, message: 'Forbidden' });
|
|
47
47
|
return;
|
|
@@ -49,9 +49,9 @@ let TaskRunnerAuthController = class TaskRunnerAuthController {
|
|
|
49
49
|
next();
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
|
-
exports.
|
|
53
|
-
exports.
|
|
52
|
+
exports.TaskBrokerAuthController = TaskBrokerAuthController;
|
|
53
|
+
exports.TaskBrokerAuthController = TaskBrokerAuthController = __decorate([
|
|
54
54
|
(0, di_1.Service)(),
|
|
55
|
-
__metadata("design:paramtypes", [
|
|
56
|
-
],
|
|
57
|
-
//# sourceMappingURL=task-
|
|
55
|
+
__metadata("design:paramtypes", [task_broker_auth_service_1.TaskBrokerAuthService])
|
|
56
|
+
], TaskBrokerAuthController);
|
|
57
|
+
//# sourceMappingURL=task-broker-auth.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-broker-auth.controller.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAMlC,uEAA4E;AAC5E,yEAAmE;AACnE,yFAAoF;AACpF,qFAAiF;AAM1E,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACpC,YAA6B,WAAkC;QAAlC,gBAAW,GAAX,WAAW,CAAuB;QAE9D,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAMD,KAAK,CAAC,gBAAgB,CAAC,GAAoB;QAC1C,MAAM,MAAM,GAAG,MAAM,yDAA+B,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,mCAAe,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,gCAAc,EAAE,CAAC;QAC5B,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;QAC7D,OAAO;YACN,KAAK,EAAE,UAAU;SACjB,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,cAAc,CAAC,GAAgC,EAAE,GAAa,EAAE,IAAkB;QACvF,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;QAC7C,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACzE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;YAC7D,OAAO;QACR,CAAC;QAED,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YAC1D,OAAO;QACR,CAAC;QAED,IAAI,EAAE,CAAC;IACR,CAAC;CACD,CAAA;AA9CY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,YAAO,GAAE;qCAEiC,gDAAqB;GADnD,wBAAwB,CA8CpC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.taskBrokerAuthRequestBodySchema = void 0;
|
|
4
|
+
const zod_1 = require("zod");
|
|
5
|
+
exports.taskBrokerAuthRequestBodySchema = zod_1.z.object({
|
|
6
|
+
token: zod_1.z.string().min(1),
|
|
7
|
+
});
|
|
8
|
+
//# sourceMappingURL=task-broker-auth.schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-broker-auth.schema.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,+BAA+B,GAAG,OAAC,CAAC,MAAM,CAAC;IACvD,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CACxB,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { GlobalConfig } from '@n8n/config';
|
|
2
|
-
import { CacheService } from '
|
|
3
|
-
export declare class
|
|
2
|
+
import { CacheService } from '../../../services/cache/cache.service';
|
|
3
|
+
export declare class TaskBrokerAuthService {
|
|
4
4
|
private readonly globalConfig;
|
|
5
5
|
private readonly cacheService;
|
|
6
6
|
private readonly grantTokenTtl;
|
|
@@ -9,14 +9,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.TaskBrokerAuthService = void 0;
|
|
13
13
|
const config_1 = require("@n8n/config");
|
|
14
14
|
const di_1 = require("@n8n/di");
|
|
15
15
|
const crypto_1 = require("crypto");
|
|
16
|
-
const constants_1 = require("
|
|
17
|
-
const cache_service_1 = require("
|
|
16
|
+
const constants_1 = require("../../../constants");
|
|
17
|
+
const cache_service_1 = require("../../../services/cache/cache.service");
|
|
18
18
|
const GRANT_TOKEN_TTL = 15 * constants_1.Time.seconds.toMilliseconds;
|
|
19
|
-
let
|
|
19
|
+
let TaskBrokerAuthService = class TaskBrokerAuthService {
|
|
20
20
|
constructor(globalConfig, cacheService, grantTokenTtl = GRANT_TOKEN_TTL) {
|
|
21
21
|
this.globalConfig = globalConfig;
|
|
22
22
|
this.cacheService = cacheService;
|
|
@@ -50,10 +50,10 @@ let TaskRunnerAuthService = class TaskRunnerAuthService {
|
|
|
50
50
|
return `grant-token:${grantToken}`;
|
|
51
51
|
}
|
|
52
52
|
};
|
|
53
|
-
exports.
|
|
54
|
-
exports.
|
|
53
|
+
exports.TaskBrokerAuthService = TaskBrokerAuthService;
|
|
54
|
+
exports.TaskBrokerAuthService = TaskBrokerAuthService = __decorate([
|
|
55
55
|
(0, di_1.Service)(),
|
|
56
56
|
__metadata("design:paramtypes", [config_1.GlobalConfig,
|
|
57
57
|
cache_service_1.CacheService, Object])
|
|
58
|
-
],
|
|
59
|
-
//# sourceMappingURL=task-
|
|
58
|
+
], TaskBrokerAuthService);
|
|
59
|
+
//# sourceMappingURL=task-broker-auth.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-broker-auth.service.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gCAAkC;AAClC,mCAAsD;AAEtD,2CAAmC;AACnC,kEAA8D;AAE9D,MAAM,eAAe,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAGlD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGjC,YACkB,YAA0B,EAC1B,YAA0B,EAE1B,gBAAgB,eAAe;QAH/B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAc;QAE1B,kBAAa,GAAb,aAAa,CAAkB;QANhC,cAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAO/E,CAAC;IAEJ,gBAAgB,CAAC,KAAa;QAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,WAAW,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAE/D,OAAO,IAAA,wBAAe,EAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAKD,KAAK,CAAC,gBAAgB;QACrB,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE7C,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAE1D,OAAO,UAAU,CAAC;IACnB,CAAC;IAMD,KAAK,CAAC,oBAAoB,CAAC,UAAkB;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAS,GAAG,CAAC,CAAC;QAE1D,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAEzC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,kBAAkB;QACzB,OAAO,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAEO,qBAAqB,CAAC,UAAkB;QAC/C,OAAO,eAAe,UAAU,EAAE,CAAC;IACpC,CAAC;CACD,CAAA;AAlDY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,YAAO,GAAE;qCAKuB,qBAAY;QACZ,4BAAY;GALhC,qBAAqB,CAkDjC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TaskDeferredError = void 0;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
class TaskDeferredError extends n8n_workflow_1.ApplicationError {
|
|
6
|
+
constructor() {
|
|
7
|
+
super('Task deferred until runner is ready', { level: 'info' });
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
exports.TaskDeferredError = TaskDeferredError;
|
|
11
|
+
//# sourceMappingURL=task-deferred.error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-deferred.error.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/errors/task-deferred.error.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAEhD,MAAa,iBAAkB,SAAQ,+BAAgB;IACtD;QACC,KAAK,CAAC,qCAAqC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACjE,CAAC;CACD;AAJD,8CAIC"}
|
|
@@ -3,8 +3,3 @@ export declare class TaskRejectError extends ApplicationError {
|
|
|
3
3
|
reason: string;
|
|
4
4
|
constructor(reason: string);
|
|
5
5
|
}
|
|
6
|
-
export declare class TaskDeferredError extends ApplicationError {
|
|
7
|
-
constructor();
|
|
8
|
-
}
|
|
9
|
-
export declare class TaskError extends ApplicationError {
|
|
10
|
-
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TaskRejectError = void 0;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
class TaskRejectError extends n8n_workflow_1.ApplicationError {
|
|
6
|
+
constructor(reason) {
|
|
7
|
+
super(`Task rejected with reason: ${reason}`, { level: 'info' });
|
|
8
|
+
this.reason = reason;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.TaskRejectError = TaskRejectError;
|
|
12
|
+
//# sourceMappingURL=task-reject.error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-reject.error.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/errors/task-reject.error.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAEhD,MAAa,eAAgB,SAAQ,+BAAgB;IACpD,YAAmB,MAAc;QAChC,KAAK,CAAC,8BAA8B,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAD/C,WAAM,GAAN,MAAM,CAAQ;IAEjC,CAAC;CACD;AAJD,0CAIC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-runner-timeout.error.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/errors/task-runner-timeout.error.ts"],"names":[],"mappings":";;;AACA,+CAAgD;AAEhD,MAAa,sBAAuB,SAAQ,+BAAgB;IAG3D,YAAY,EACX,WAAW,EACX,YAAY,EACZ,IAAI,GACkE;QACtE,KAAK,CACJ,kCAAkC,WAAW,IAAI,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,CAC3F,CAAC;QAEF,MAAM,SAAS,GAAG;YACjB,QAAQ,EACP,sIAAsI;YACvI,QAAQ,EAAE,4EAA4E;SACtF,CAAC;QAEF,MAAM,KAAK,GAAG;YACb,cAAc,EACb,iGAAiG;YAClG,iBAAiB,EAChB,qFAAqF;YACtF,eAAe,EAAE,8CAA8C,WAAW,IAAI,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,iFAAiF;SACvM,CAAC;QAEF,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEpE,IAAI,YAAY;YAAE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAE1D,MAAM,eAAe,GAAG,WAAW;aACjC,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,UAAU,EAAE,CAAC;aACzD,IAAI,CAAC,OAAO,CAAC,CAAC;QAEhB,MAAM,WAAW,GAAG,GAAG,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,wCAAwC,eAAe,EAAE,CAAC;QAE9I,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,CAAC;CACD;AAtCD,wDAsCC"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { GlobalConfig } from '@n8n/config';
|
|
2
2
|
import express from 'express';
|
|
3
3
|
import { Logger } from 'n8n-core';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
export declare class
|
|
4
|
+
import { TaskBrokerAuthController } from '../../task-runners/task-broker/auth/task-broker-auth.controller';
|
|
5
|
+
import { TaskBrokerWsServer } from '../../task-runners/task-broker/task-broker-ws-server';
|
|
6
|
+
export declare class TaskBrokerServer {
|
|
7
7
|
private readonly logger;
|
|
8
8
|
private readonly globalConfig;
|
|
9
|
-
private readonly
|
|
10
|
-
private readonly
|
|
9
|
+
private readonly authController;
|
|
10
|
+
private readonly taskBrokerWsServer;
|
|
11
11
|
private server;
|
|
12
12
|
private wsServer;
|
|
13
13
|
readonly app: express.Application;
|
|
14
14
|
get port(): number;
|
|
15
15
|
private get upgradeEndpoint();
|
|
16
|
-
constructor(logger: Logger, globalConfig: GlobalConfig,
|
|
16
|
+
constructor(logger: Logger, globalConfig: GlobalConfig, authController: TaskBrokerAuthController, taskBrokerWsServer: TaskBrokerWsServer);
|
|
17
17
|
start(): Promise<void>;
|
|
18
18
|
stop(): Promise<void>;
|
|
19
19
|
private setupHttpServer;
|
|
@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
45
45
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
46
46
|
};
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
|
-
exports.
|
|
48
|
+
exports.TaskBrokerServer = void 0;
|
|
49
49
|
const config_1 = require("@n8n/config");
|
|
50
50
|
const di_1 = require("@n8n/di");
|
|
51
51
|
const compression_1 = __importDefault(require("compression"));
|
|
@@ -57,23 +57,23 @@ const node_crypto_1 = require("node:crypto");
|
|
|
57
57
|
const node_http_1 = require("node:http");
|
|
58
58
|
const node_url_1 = require("node:url");
|
|
59
59
|
const ws_1 = require("ws");
|
|
60
|
-
const constants_1 = require("
|
|
61
|
-
const middlewares_1 = require("
|
|
62
|
-
const response_helper_1 = require("
|
|
63
|
-
const
|
|
64
|
-
const
|
|
65
|
-
let
|
|
60
|
+
const constants_1 = require("../../constants");
|
|
61
|
+
const middlewares_1 = require("../../middlewares");
|
|
62
|
+
const response_helper_1 = require("../../response-helper");
|
|
63
|
+
const task_broker_auth_controller_1 = require("../../task-runners/task-broker/auth/task-broker-auth.controller");
|
|
64
|
+
const task_broker_ws_server_1 = require("../../task-runners/task-broker/task-broker-ws-server");
|
|
65
|
+
let TaskBrokerServer = class TaskBrokerServer {
|
|
66
66
|
get port() {
|
|
67
67
|
return this.server?.address()?.port;
|
|
68
68
|
}
|
|
69
69
|
get upgradeEndpoint() {
|
|
70
70
|
return `${this.getEndpointBasePath()}/_ws`;
|
|
71
71
|
}
|
|
72
|
-
constructor(logger, globalConfig,
|
|
72
|
+
constructor(logger, globalConfig, authController, taskBrokerWsServer) {
|
|
73
73
|
this.logger = logger;
|
|
74
74
|
this.globalConfig = globalConfig;
|
|
75
|
-
this.
|
|
76
|
-
this.
|
|
75
|
+
this.authController = authController;
|
|
76
|
+
this.taskBrokerWsServer = taskBrokerWsServer;
|
|
77
77
|
this.handleUpgradeRequest = (request, socket, head) => {
|
|
78
78
|
if ((0, node_url_1.parse)(request.url).pathname !== this.upgradeEndpoint) {
|
|
79
79
|
socket.write('HTTP/1.1 404 Not Found\r\n\r\n');
|
|
@@ -124,7 +124,7 @@ let TaskRunnerServer = class TaskRunnerServer {
|
|
|
124
124
|
this.server = undefined;
|
|
125
125
|
}
|
|
126
126
|
})();
|
|
127
|
-
const stopWsServerTask = this.
|
|
127
|
+
const stopWsServerTask = this.taskBrokerWsServer.stop();
|
|
128
128
|
await Promise.all([stopHttpServerTask, stopWsServerTask]);
|
|
129
129
|
}
|
|
130
130
|
async setupHttpServer() {
|
|
@@ -152,7 +152,7 @@ let TaskRunnerServer = class TaskRunnerServer {
|
|
|
152
152
|
maxPayload: this.globalConfig.taskRunners.maxPayload,
|
|
153
153
|
});
|
|
154
154
|
this.server.on('upgrade', this.handleUpgradeRequest);
|
|
155
|
-
this.
|
|
155
|
+
this.taskBrokerWsServer.start();
|
|
156
156
|
}
|
|
157
157
|
async setupErrorHandlers() {
|
|
158
158
|
const { app } = this;
|
|
@@ -172,9 +172,9 @@ let TaskRunnerServer = class TaskRunnerServer {
|
|
|
172
172
|
limit: 5,
|
|
173
173
|
message: { message: 'Too many requests' },
|
|
174
174
|
});
|
|
175
|
-
this.app.use(this.upgradeEndpoint, createRateLimiter(), this.
|
|
175
|
+
this.app.use(this.upgradeEndpoint, createRateLimiter(), this.authController.authMiddleware, (req, res) => this.taskBrokerWsServer.handleRequest(req, res));
|
|
176
176
|
const authEndpoint = `${this.getEndpointBasePath()}/auth`;
|
|
177
|
-
this.app.post(authEndpoint, createRateLimiter(), (0, response_helper_1.send)(async (req) => await this.
|
|
177
|
+
this.app.post(authEndpoint, createRateLimiter(), (0, response_helper_1.send)(async (req) => await this.authController.createGrantToken(req)));
|
|
178
178
|
this.app.get('/healthz', (_, res) => res.send({ status: 'ok' }));
|
|
179
179
|
}
|
|
180
180
|
getEndpointBasePath() {
|
|
@@ -188,12 +188,12 @@ let TaskRunnerServer = class TaskRunnerServer {
|
|
|
188
188
|
return path;
|
|
189
189
|
}
|
|
190
190
|
};
|
|
191
|
-
exports.
|
|
192
|
-
exports.
|
|
191
|
+
exports.TaskBrokerServer = TaskBrokerServer;
|
|
192
|
+
exports.TaskBrokerServer = TaskBrokerServer = __decorate([
|
|
193
193
|
(0, di_1.Service)(),
|
|
194
194
|
__metadata("design:paramtypes", [n8n_core_1.Logger,
|
|
195
195
|
config_1.GlobalConfig,
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
],
|
|
199
|
-
//# sourceMappingURL=task-
|
|
196
|
+
task_broker_auth_controller_1.TaskBrokerAuthController,
|
|
197
|
+
task_broker_ws_server_1.TaskBrokerWsServer])
|
|
198
|
+
], TaskBrokerServer);
|
|
199
|
+
//# sourceMappingURL=task-broker-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-broker-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,19 @@
|
|
|
1
|
+
import type { TaskRunner } from '@n8n/task-runner';
|
|
1
2
|
import type { Response } from 'express';
|
|
2
|
-
import type { INodeExecutionData } from 'n8n-workflow';
|
|
3
3
|
import type WebSocket from 'ws';
|
|
4
|
-
import type {
|
|
5
|
-
import type { AuthlessRequest } from '../requests';
|
|
4
|
+
import type { AuthlessRequest } from '../../requests';
|
|
6
5
|
export interface DisconnectAnalyzer {
|
|
7
6
|
isCloudDeployment: boolean;
|
|
8
7
|
toDisconnectError(opts: DisconnectErrorOptions): Promise<Error>;
|
|
9
8
|
}
|
|
10
|
-
export
|
|
11
|
-
export interface TaskResultData {
|
|
12
|
-
result: INodeExecutionData[];
|
|
13
|
-
customData?: Record<string, string>;
|
|
14
|
-
}
|
|
15
|
-
export interface TaskRunnerServerInitRequest extends AuthlessRequest<{}, {}, {}, {
|
|
9
|
+
export interface TaskBrokerServerInitRequest extends AuthlessRequest<{}, {}, {}, {
|
|
16
10
|
id: TaskRunner['id'];
|
|
17
11
|
token?: string;
|
|
18
12
|
}> {
|
|
19
13
|
ws: WebSocket;
|
|
20
14
|
}
|
|
21
|
-
export type
|
|
22
|
-
req:
|
|
15
|
+
export type TaskBrokerServerInitResponse = Response & {
|
|
16
|
+
req: TaskBrokerServerInitRequest;
|
|
23
17
|
};
|
|
24
18
|
export type DisconnectReason = 'shutting-down' | 'failed-heartbeat-check' | 'unknown';
|
|
25
19
|
export type DisconnectErrorOptions = {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-broker-types.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-types.ts"],"names":[],"mappings":""}
|
package/dist/task-runners/{task-runner-ws-server.d.ts → task-broker/task-broker-ws-server.d.ts}
RENAMED
|
@@ -2,13 +2,13 @@ import { TaskRunnersConfig } from '@n8n/config';
|
|
|
2
2
|
import type { BrokerMessage } from '@n8n/task-runner';
|
|
3
3
|
import { Logger } from 'n8n-core';
|
|
4
4
|
import type WebSocket from 'ws';
|
|
5
|
-
import { WsStatusCodes } from '
|
|
6
|
-
import { DefaultTaskRunnerDisconnectAnalyzer } from '
|
|
5
|
+
import { WsStatusCodes } from '../../constants';
|
|
6
|
+
import { DefaultTaskRunnerDisconnectAnalyzer } from '../../task-runners/default-task-runner-disconnect-analyzer';
|
|
7
|
+
import type { DisconnectAnalyzer, DisconnectReason, TaskBrokerServerInitRequest, TaskBrokerServerInitResponse } from '../../task-runners/task-broker/task-broker-types';
|
|
8
|
+
import { TaskRunnerLifecycleEvents } from '../../task-runners/task-runner-lifecycle-events';
|
|
7
9
|
import { TaskBroker, type TaskRunner } from './task-broker.service';
|
|
8
|
-
import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
|
|
9
|
-
import type { DisconnectAnalyzer, DisconnectReason, TaskRunnerServerInitRequest, TaskRunnerServerInitResponse } from './task-runner-types';
|
|
10
10
|
type WsStatusCode = (typeof WsStatusCodes)[keyof typeof WsStatusCodes];
|
|
11
|
-
export declare class
|
|
11
|
+
export declare class TaskBrokerWsServer {
|
|
12
12
|
private readonly logger;
|
|
13
13
|
private readonly taskBroker;
|
|
14
14
|
private disconnectAnalyzer;
|
|
@@ -25,7 +25,7 @@ export declare class TaskRunnerWsServer {
|
|
|
25
25
|
sendMessage(id: TaskRunner['id'], message: BrokerMessage.ToRunner.All): void;
|
|
26
26
|
add(id: TaskRunner['id'], connection: WebSocket): void;
|
|
27
27
|
removeConnection(id: TaskRunner['id'], reason?: DisconnectReason, code?: WsStatusCode): Promise<void>;
|
|
28
|
-
handleRequest(req:
|
|
28
|
+
handleRequest(req: TaskBrokerServerInitRequest, _res: TaskBrokerServerInitResponse): void;
|
|
29
29
|
private stopConnectedRunners;
|
|
30
30
|
}
|
|
31
31
|
export {};
|
|
@@ -9,19 +9,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.TaskBrokerWsServer = void 0;
|
|
13
13
|
const config_1 = require("@n8n/config");
|
|
14
14
|
const di_1 = require("@n8n/di");
|
|
15
15
|
const n8n_core_1 = require("n8n-core");
|
|
16
16
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
|
-
const constants_1 = require("
|
|
18
|
-
const default_task_runner_disconnect_analyzer_1 = require("
|
|
17
|
+
const constants_1 = require("../../constants");
|
|
18
|
+
const default_task_runner_disconnect_analyzer_1 = require("../../task-runners/default-task-runner-disconnect-analyzer");
|
|
19
|
+
const task_runner_lifecycle_events_1 = require("../../task-runners/task-runner-lifecycle-events");
|
|
19
20
|
const task_broker_service_1 = require("./task-broker.service");
|
|
20
|
-
const task_runner_lifecycle_events_1 = require("./task-runner-lifecycle-events");
|
|
21
21
|
function heartbeat() {
|
|
22
22
|
this.isAlive = true;
|
|
23
23
|
}
|
|
24
|
-
let
|
|
24
|
+
let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
25
25
|
constructor(logger, taskBroker, disconnectAnalyzer, taskTunnersConfig, runnerLifecycleEvents) {
|
|
26
26
|
this.logger = logger;
|
|
27
27
|
this.taskBroker = taskBroker;
|
|
@@ -129,13 +129,13 @@ let TaskRunnerWsServer = class TaskRunnerWsServer {
|
|
|
129
129
|
await Promise.all(Array.from(this.runnerConnections.keys()).map(async (id) => await this.removeConnection(id, 'shutting-down', constants_1.WsStatusCodes.CloseGoingAway)));
|
|
130
130
|
}
|
|
131
131
|
};
|
|
132
|
-
exports.
|
|
133
|
-
exports.
|
|
132
|
+
exports.TaskBrokerWsServer = TaskBrokerWsServer;
|
|
133
|
+
exports.TaskBrokerWsServer = TaskBrokerWsServer = __decorate([
|
|
134
134
|
(0, di_1.Service)(),
|
|
135
135
|
__metadata("design:paramtypes", [n8n_core_1.Logger,
|
|
136
136
|
task_broker_service_1.TaskBroker,
|
|
137
137
|
default_task_runner_disconnect_analyzer_1.DefaultTaskRunnerDisconnectAnalyzer,
|
|
138
138
|
config_1.TaskRunnersConfig,
|
|
139
139
|
task_runner_lifecycle_events_1.TaskRunnerLifecycleEvents])
|
|
140
|
-
],
|
|
141
|
-
//# sourceMappingURL=task-
|
|
140
|
+
], TaskBrokerWsServer);
|
|
141
|
+
//# sourceMappingURL=task-broker-ws-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-broker-ws-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-ws-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { TaskRunnersConfig } from '@n8n/config';
|
|
2
2
|
import type { BrokerMessage, RequesterMessage, RunnerMessage, TaskResultData } from '@n8n/task-runner';
|
|
3
3
|
import { Logger } from 'n8n-core';
|
|
4
|
-
import { TaskDeferredError
|
|
5
|
-
import {
|
|
4
|
+
import { TaskDeferredError } from '../../task-runners/task-broker/errors/task-deferred.error';
|
|
5
|
+
import { TaskRejectError } from '../../task-runners/task-broker/errors/task-reject.error';
|
|
6
|
+
import { TaskRunnerLifecycleEvents } from '../../task-runners/task-runner-lifecycle-events';
|
|
6
7
|
export interface TaskRunner {
|
|
7
8
|
id: string;
|
|
8
9
|
name?: string;
|
|
@@ -18,11 +18,12 @@ const di_1 = require("@n8n/di");
|
|
|
18
18
|
const n8n_core_1 = require("n8n-core");
|
|
19
19
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
20
20
|
const nanoid_1 = require("nanoid");
|
|
21
|
-
const config_2 = __importDefault(require("
|
|
22
|
-
const constants_1 = require("
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
const
|
|
21
|
+
const config_2 = __importDefault(require("../../config"));
|
|
22
|
+
const constants_1 = require("../../constants");
|
|
23
|
+
const task_deferred_error_1 = require("../../task-runners/task-broker/errors/task-deferred.error");
|
|
24
|
+
const task_reject_error_1 = require("../../task-runners/task-broker/errors/task-reject.error");
|
|
25
|
+
const task_runner_timeout_error_1 = require("../../task-runners/task-broker/errors/task-runner-timeout.error");
|
|
26
|
+
const task_runner_lifecycle_events_1 = require("../../task-runners/task-runner-lifecycle-events");
|
|
26
27
|
let TaskBroker = class TaskBroker {
|
|
27
28
|
constructor(logger, taskRunnersConfig, taskRunnerLifecycleEvents) {
|
|
28
29
|
this.logger = logger;
|
|
@@ -148,14 +149,14 @@ let TaskBroker = class TaskBroker {
|
|
|
148
149
|
handleRunnerReject(taskId, reason) {
|
|
149
150
|
const acceptReject = this.runnerAcceptRejects.get(taskId);
|
|
150
151
|
if (acceptReject) {
|
|
151
|
-
acceptReject.reject(new
|
|
152
|
+
acceptReject.reject(new task_reject_error_1.TaskRejectError(reason));
|
|
152
153
|
this.runnerAcceptRejects.delete(taskId);
|
|
153
154
|
}
|
|
154
155
|
}
|
|
155
156
|
handleRunnerDeferred(taskId) {
|
|
156
157
|
const acceptReject = this.runnerAcceptRejects.get(taskId);
|
|
157
158
|
if (acceptReject) {
|
|
158
|
-
acceptReject.reject(new
|
|
159
|
+
acceptReject.reject(new task_deferred_error_1.TaskDeferredError());
|
|
159
160
|
this.runnerAcceptRejects.delete(taskId);
|
|
160
161
|
}
|
|
161
162
|
}
|
|
@@ -259,7 +260,7 @@ let TaskBroker = class TaskBroker {
|
|
|
259
260
|
handleRequesterReject(taskId, reason) {
|
|
260
261
|
const acceptReject = this.requesterAcceptRejects.get(taskId);
|
|
261
262
|
if (acceptReject) {
|
|
262
|
-
acceptReject.reject(new
|
|
263
|
+
acceptReject.reject(new task_reject_error_1.TaskRejectError(reason));
|
|
263
264
|
this.requesterAcceptRejects.delete(taskId);
|
|
264
265
|
}
|
|
265
266
|
}
|
|
@@ -381,11 +382,11 @@ let TaskBroker = class TaskBroker {
|
|
|
381
382
|
}
|
|
382
383
|
catch (e) {
|
|
383
384
|
request.acceptInProgress = false;
|
|
384
|
-
if (e instanceof
|
|
385
|
+
if (e instanceof task_reject_error_1.TaskRejectError) {
|
|
385
386
|
this.logger.info(`Task (${taskId}) rejected by Runner with reason "${e.reason}"`);
|
|
386
387
|
return;
|
|
387
388
|
}
|
|
388
|
-
if (e instanceof
|
|
389
|
+
if (e instanceof task_deferred_error_1.TaskDeferredError) {
|
|
389
390
|
this.logger.debug(`Task (${taskId}) deferred until runner is ready`);
|
|
390
391
|
this.pendingTaskRequests.push(request);
|
|
391
392
|
return;
|
|
@@ -424,7 +425,7 @@ let TaskBroker = class TaskBroker {
|
|
|
424
425
|
await this.sendTaskSettings(task.id, settings);
|
|
425
426
|
}
|
|
426
427
|
catch (e) {
|
|
427
|
-
if (e instanceof
|
|
428
|
+
if (e instanceof task_reject_error_1.TaskRejectError) {
|
|
428
429
|
await this.cancelTask(task.id, e.reason);
|
|
429
430
|
this.logger.info(`Task (${taskId}) rejected by Requester with reason "${e.reason}"`);
|
|
430
431
|
return;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-broker.service.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { RequesterMessage } from '@n8n/task-runner';
|
|
2
2
|
import { NodeTypes } from '../../node-types';
|
|
3
|
+
import { TaskBroker } from '../../task-runners/task-broker/task-broker.service';
|
|
3
4
|
import { TaskRequester } from './task-requester';
|
|
4
|
-
import { TaskBroker } from '../task-broker.service';
|
|
5
5
|
export declare class LocalTaskRequester extends TaskRequester {
|
|
6
6
|
taskBroker: TaskBroker;
|
|
7
7
|
id: string;
|
|
@@ -12,8 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.LocalTaskRequester = void 0;
|
|
13
13
|
const di_1 = require("@n8n/di");
|
|
14
14
|
const node_types_1 = require("../../node-types");
|
|
15
|
+
const task_broker_service_1 = require("../../task-runners/task-broker/task-broker.service");
|
|
15
16
|
const task_requester_1 = require("./task-requester");
|
|
16
|
-
const task_broker_service_1 = require("../task-broker.service");
|
|
17
17
|
let LocalTaskRequester = class LocalTaskRequester extends task_requester_1.TaskRequester {
|
|
18
18
|
constructor(nodeTypes) {
|
|
19
19
|
super(nodeTypes);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-task-requester.js","sourceRoot":"","sources":["../../../src/task-runners/task-managers/local-task-requester.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA6C;AAG7C,6CAAyC;AAEzC,
|
|
1
|
+
{"version":3,"file":"local-task-requester.js","sourceRoot":"","sources":["../../../src/task-runners/task-managers/local-task-requester.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA6C;AAG7C,6CAAyC;AAEzC,wFAA4E;AAE5E,qDAAiD;AAG1C,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,8BAAa;IAKpD,YAAY,SAAoB;QAC/B,KAAK,CAAC,SAAS,CAAC,CAAC;QAHlB,OAAE,GAAG,sBAAsB,CAAC;QAI3B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC1B,CAAC;IAED,iBAAiB;QAChB,IAAI,CAAC,UAAU,GAAG,cAAS,CAAC,GAAG,CAAC,gCAAU,CAAC,CAAC;QAE5C,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAChC,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAA6B,CACrD,CAAC;IACH,CAAC;IAED,WAAW,CAAC,OAAsC;QACjD,KAAK,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;CACD,CAAA;AAtBY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,YAAO,GAAE;qCAMc,sBAAS;GALpB,kBAAkB,CAsB9B"}
|