n8n 1.64.1 → 1.65.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/bin/n8n +14 -15
- package/dist/abstract-server.js +1 -1
- package/dist/abstract-server.js.map +1 -1
- package/dist/active-executions.js +2 -0
- package/dist/active-executions.js.map +1 -1
- package/dist/active-workflow-manager.d.ts +5 -1
- package/dist/active-workflow-manager.js +24 -7
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.js +1 -1
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/start.js +19 -14
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +1 -1
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +10 -6
- package/dist/commands/worker.js.map +1 -1
- package/dist/concurrency/concurrency-control.service.js +1 -1
- package/dist/concurrency/concurrency-control.service.js.map +1 -1
- package/dist/config/index.d.ts +0 -10
- package/dist/config/index.js +1 -1
- package/dist/config/index.js.map +1 -1
- package/dist/config/schema.d.ts +0 -40
- package/dist/config/schema.js +0 -40
- package/dist/config/schema.js.map +1 -1
- package/dist/controllers/mfa.controller.d.ts +4 -1
- package/dist/controllers/mfa.controller.js +16 -2
- package/dist/controllers/mfa.controller.js.map +1 -1
- package/dist/controllers/orchestration.controller.d.ts +3 -5
- package/dist/controllers/orchestration.controller.js +6 -19
- package/dist/controllers/orchestration.controller.js.map +1 -1
- package/dist/databases/migrations/common/1724753530828-CreateExecutionAnnotationTables.js +1 -1
- package/dist/databases/migrations/common/1724753530828-CreateExecutionAnnotationTables.js.map +1 -1
- package/dist/databases/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.d.ts +4 -0
- package/dist/databases/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.js +22 -0
- package/dist/databases/migrations/common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.js.map +1 -0
- package/dist/databases/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.d.ts +5 -0
- package/dist/databases/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.js +34 -0
- package/dist/databases/migrations/common/1729607673464-UpdateProcessedDataValueColumnToText.js.map +1 -0
- package/dist/databases/migrations/mysqldb/index.js +4 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/index.js +4 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.d.ts +4 -0
- package/dist/databases/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.js +45 -0
- package/dist/databases/migrations/sqlite/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping.js.map +1 -0
- package/dist/databases/migrations/sqlite/index.js +4 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/eventbus/message-event-bus/message-event-bus.d.ts +3 -3
- package/dist/eventbus/message-event-bus/message-event-bus.js +6 -6
- package/dist/eventbus/message-event-bus/message-event-bus.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.js +1 -1
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/external-secrets/external-secrets-manager.ee.d.ts +4 -2
- package/dist/external-secrets/external-secrets-manager.ee.js +22 -33
- package/dist/external-secrets/external-secrets-manager.ee.js.map +1 -1
- package/dist/external-secrets/providers/aws-secrets/aws-secrets-manager.d.ts +3 -0
- package/dist/external-secrets/providers/aws-secrets/aws-secrets-manager.js +17 -2
- package/dist/external-secrets/providers/aws-secrets/aws-secrets-manager.js.map +1 -1
- package/dist/external-secrets/providers/azure-key-vault/azure-key-vault.d.ts +3 -0
- package/dist/external-secrets/providers/azure-key-vault/azure-key-vault.js +16 -2
- package/dist/external-secrets/providers/azure-key-vault/azure-key-vault.js.map +1 -1
- package/dist/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.d.ts +3 -0
- package/dist/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.js +14 -2
- package/dist/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.js.map +1 -1
- package/dist/external-secrets/providers/vault.js +6 -0
- package/dist/external-secrets/providers/vault.js.map +1 -1
- package/dist/license.d.ts +3 -1
- package/dist/license.js +18 -15
- package/dist/license.js.map +1 -1
- package/dist/logging/logger.service.d.ts +1 -1
- package/dist/logging/logger.service.js +8 -6
- package/dist/logging/logger.service.js.map +1 -1
- package/dist/logging/types.d.ts +1 -1
- package/dist/permissions/global-roles.js +1 -0
- package/dist/permissions/global-roles.js.map +1 -1
- package/dist/public-api/index.js +1 -15
- package/dist/public-api/index.js.map +1 -1
- package/dist/public-api/types.d.ts +1 -1
- package/dist/public-api/types.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts +2 -2
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +30 -1
- package/dist/push/index.d.ts +3 -1
- package/dist/push/index.js +9 -4
- package/dist/push/index.js.map +1 -1
- package/dist/requests.d.ts +1 -6
- package/dist/runners/runner-types.d.ts +6 -2
- package/dist/runners/runner-types.js.map +1 -1
- package/dist/runners/runner-ws-server.d.ts +0 -4
- package/dist/runners/runner-ws-server.js +2 -81
- package/dist/runners/runner-ws-server.js.map +1 -1
- package/dist/runners/task-broker.service.d.ts +5 -1
- package/dist/runners/task-broker.service.js +22 -2
- package/dist/runners/task-broker.service.js.map +1 -1
- package/dist/runners/task-runner-process.d.ts +6 -4
- package/dist/runners/task-runner-process.js +22 -12
- package/dist/runners/task-runner-process.js.map +1 -1
- package/dist/runners/task-runner-server.js +5 -2
- package/dist/runners/task-runner-server.js.map +1 -1
- package/dist/scaling/constants.js +4 -1
- package/dist/scaling/constants.js.map +1 -1
- package/dist/scaling/job-processor.js +2 -1
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/{services/orchestration/main → scaling}/multi-main-setup.ee.d.ts +7 -5
- package/dist/{services/orchestration/main → scaling}/multi-main-setup.ee.js +15 -11
- package/dist/scaling/multi-main-setup.ee.js.map +1 -0
- package/dist/scaling/pubsub/publisher.service.js +1 -1
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/subscriber.service.js +1 -1
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/scaling/scaling.service.d.ts +2 -0
- package/dist/scaling/scaling.service.js +18 -5
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/scaling/worker-server.js +1 -1
- package/dist/scaling/worker-server.js.map +1 -1
- package/dist/services/community-packages.service.d.ts +3 -3
- package/dist/services/community-packages.service.js +12 -6
- package/dist/services/community-packages.service.js.map +1 -1
- package/dist/services/frontend.service.js +2 -2
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/orchestration.service.d.ts +4 -10
- package/dist/services/orchestration.service.js +12 -38
- package/dist/services/orchestration.service.js.map +1 -1
- package/dist/services/pruning.service.d.ts +3 -1
- package/dist/services/pruning.service.js +10 -7
- package/dist/services/pruning.service.js.map +1 -1
- package/dist/services/public-api-key.service.d.ts +12 -4
- package/dist/services/public-api-key.service.js +39 -36
- package/dist/services/public-api-key.service.js.map +1 -1
- package/dist/services/redis-client.service.js +7 -4
- package/dist/services/redis-client.service.js.map +1 -1
- package/dist/services/user.service.js +1 -0
- package/dist/services/user.service.js.map +1 -1
- package/dist/sso/saml/routes/saml.controller.ee.js +11 -9
- package/dist/sso/saml/routes/saml.controller.ee.js.map +1 -1
- package/dist/wait-tracker.js +1 -1
- package/dist/wait-tracker.js.map +1 -1
- package/dist/webhooks/test-webhooks.d.ts +3 -1
- package/dist/webhooks/test-webhooks.js +9 -4
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-forms.d.ts +11 -0
- package/dist/webhooks/waiting-forms.js +122 -0
- package/dist/webhooks/waiting-forms.js.map +1 -0
- package/dist/webhooks/waiting-webhooks.d.ts +11 -2
- package/dist/webhooks/waiting-webhooks.js +34 -10
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +51 -12
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/workflow-runner.js +14 -36
- package/dist/workflow-runner.js.map +1 -1
- package/package.json +14 -14
- package/templates/form-trigger-completion.handlebars +74 -0
- package/templates/form-trigger.handlebars +16 -3
- package/templates/saml-connection-test-failed.handlebars +30 -0
- package/templates/saml-connection-test-success.handlebars +27 -0
- package/dist/services/orchestration/main/multi-main-setup.ee.js.map +0 -1
- package/dist/sso/saml/views/saml-connection-test-failed.d.ts +0 -2
- package/dist/sso/saml/views/saml-connection-test-failed.js +0 -39
- package/dist/sso/saml/views/saml-connection-test-failed.js.map +0 -1
- package/dist/sso/saml/views/saml-connection-test-success.d.ts +0 -2
- package/dist/sso/saml/views/saml-connection-test-success.js +0 -35
- package/dist/sso/saml/views/saml-connection-test-success.js.map +0 -1
- package/dist/waiting-forms.d.ts +0 -7
- package/dist/waiting-forms.js +0 -30
- package/dist/waiting-forms.js.map +0 -1
package/dist/requests.d.ts
CHANGED
|
@@ -164,6 +164,7 @@ export declare namespace UserRequest {
|
|
|
164
164
|
email: string;
|
|
165
165
|
inviteAcceptUrl?: string;
|
|
166
166
|
emailSent: boolean;
|
|
167
|
+
role: AssignableRole;
|
|
167
168
|
};
|
|
168
169
|
error?: string;
|
|
169
170
|
};
|
|
@@ -377,12 +378,6 @@ export declare namespace ExternalSecretsRequest {
|
|
|
377
378
|
provider: string;
|
|
378
379
|
}>;
|
|
379
380
|
}
|
|
380
|
-
export declare namespace OrchestrationRequest {
|
|
381
|
-
type GetAll = AuthenticatedRequest;
|
|
382
|
-
type Get = AuthenticatedRequest<{
|
|
383
|
-
id: string;
|
|
384
|
-
}, {}, {}, {}>;
|
|
385
|
-
}
|
|
386
381
|
export declare namespace WorkflowHistoryRequest {
|
|
387
382
|
type GetList = AuthenticatedRequest<{
|
|
388
383
|
workflowId: string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Response } from 'express';
|
|
2
|
-
import type { INodeExecutionData } from 'n8n-workflow';
|
|
2
|
+
import type { INodeExecutionData, INodeTypeBaseDescription } from 'n8n-workflow';
|
|
3
3
|
import type WebSocket from 'ws';
|
|
4
4
|
import type { TaskRunner } from './task-broker.service';
|
|
5
5
|
import type { AuthlessRequest } from '../requests';
|
|
@@ -53,7 +53,11 @@ export declare namespace N8nMessage {
|
|
|
53
53
|
requestId: string;
|
|
54
54
|
data: unknown;
|
|
55
55
|
}
|
|
56
|
-
|
|
56
|
+
interface NodeTypes {
|
|
57
|
+
type: 'broker:nodetypes';
|
|
58
|
+
nodeTypes: INodeTypeBaseDescription[];
|
|
59
|
+
}
|
|
60
|
+
type All = InfoRequest | TaskOfferAccept | TaskCancel | TaskSettings | RunnerRegistered | RPCResponse | TaskDataResponse | NodeTypes;
|
|
57
61
|
}
|
|
58
62
|
namespace ToRequester {
|
|
59
63
|
interface TaskReady {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner-types.js","sourceRoot":"","sources":["../../src/runners/runner-types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"runner-types.js","sourceRoot":"","sources":["../../src/runners/runner-types.ts"],"names":[],"mappings":";;;AAgOa,QAAA,cAAc,GAAG;IAC7B,eAAe;IACf,uCAAuC;IACvC,4CAA4C;IAI5C,6BAA6B;IAG7B,sBAAsB;IACtB,0BAA0B;IAE1B,4BAA4B;IAC5B,2BAA2B;IAC3B,6BAA6B;IAC7B,wBAAwB;IACxB,wBAAwB;IAGxB,yBAAyB;IACzB,2BAA2B;IAC3B,+BAA+B;IAC/B,qBAAqB;CACZ,CAAC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import type { Application } from 'express';
|
|
2
|
-
import { type Server } from 'http';
|
|
3
1
|
import type WebSocket from 'ws';
|
|
4
2
|
import { Logger } from '../logging/logger.service';
|
|
5
3
|
import type { N8nMessage, TaskRunnerServerInitRequest, TaskRunnerServerInitResponse } from './runner-types';
|
|
@@ -14,5 +12,3 @@ export declare class TaskRunnerService {
|
|
|
14
12
|
removeConnection(id: TaskRunner['id']): void;
|
|
15
13
|
handleRequest(req: TaskRunnerServerInitRequest, _res: TaskRunnerServerInitResponse): void;
|
|
16
14
|
}
|
|
17
|
-
export declare const setupRunnerServer: (restEndpoint: string, server: Server, app: Application) => void;
|
|
18
|
-
export declare const setupRunnerHandler: (restEndpoint: string, app: Application) => void;
|
|
@@ -1,65 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
2
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
19
3
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
4
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
7
|
};
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
-
if (mod && mod.__esModule) return mod;
|
|
26
|
-
var result = {};
|
|
27
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
-
__setModuleDefault(result, mod);
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
10
|
};
|
|
34
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.
|
|
36
|
-
const
|
|
37
|
-
const http_1 = require("http");
|
|
38
|
-
const n8n_workflow_1 = require("n8n-workflow");
|
|
39
|
-
const typedi_1 = __importStar(require("typedi"));
|
|
40
|
-
const url_1 = require("url");
|
|
41
|
-
const ws_1 = require("ws");
|
|
12
|
+
exports.TaskRunnerService = void 0;
|
|
13
|
+
const typedi_1 = require("typedi");
|
|
42
14
|
const logger_service_1 = require("../logging/logger.service");
|
|
43
|
-
const response_helper_1 = require("../response-helper");
|
|
44
|
-
const task_runner_auth_controller_1 = require("../runners/auth/task-runner-auth.controller");
|
|
45
15
|
const task_broker_service_1 = require("./task-broker.service");
|
|
46
16
|
function heartbeat() {
|
|
47
17
|
this.isAlive = true;
|
|
48
18
|
}
|
|
49
|
-
function getEndpointBasePath(restEndpoint) {
|
|
50
|
-
const globalConfig = typedi_1.default.get(config_1.GlobalConfig);
|
|
51
|
-
let path = globalConfig.taskRunners.path;
|
|
52
|
-
if (path.startsWith('/')) {
|
|
53
|
-
path = path.slice(1);
|
|
54
|
-
}
|
|
55
|
-
if (path.endsWith('/')) {
|
|
56
|
-
path = path.slice(-1);
|
|
57
|
-
}
|
|
58
|
-
return `/${restEndpoint}/${path}`;
|
|
59
|
-
}
|
|
60
|
-
function getWsEndpoint(restEndpoint) {
|
|
61
|
-
return `${getEndpointBasePath(restEndpoint)}/_ws`;
|
|
62
|
-
}
|
|
63
19
|
let TaskRunnerService = class TaskRunnerService {
|
|
64
20
|
constructor(logger, taskBroker) {
|
|
65
21
|
this.logger = logger;
|
|
@@ -90,7 +46,6 @@ let TaskRunnerService = class TaskRunnerService {
|
|
|
90
46
|
lastSeen: new Date(),
|
|
91
47
|
name: message.name,
|
|
92
48
|
}, this.sendMessage.bind(this, id));
|
|
93
|
-
this.sendMessage(id, { type: 'broker:runnerregistered' });
|
|
94
49
|
this.logger.info(`Runner "${message.name}"(${id}) has been registered`);
|
|
95
50
|
return;
|
|
96
51
|
}
|
|
@@ -130,38 +85,4 @@ exports.TaskRunnerService = TaskRunnerService = __decorate([
|
|
|
130
85
|
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
131
86
|
task_broker_service_1.TaskBroker])
|
|
132
87
|
], TaskRunnerService);
|
|
133
|
-
const setupRunnerServer = (restEndpoint, server, app) => {
|
|
134
|
-
const globalConfig = typedi_1.default.get(config_1.GlobalConfig);
|
|
135
|
-
const { authToken } = globalConfig.taskRunners;
|
|
136
|
-
if (!authToken) {
|
|
137
|
-
throw new n8n_workflow_1.ApplicationError('Authentication token must be configured when task runners are enabled. Use N8N_RUNNERS_AUTH_TOKEN environment variable to set it.');
|
|
138
|
-
}
|
|
139
|
-
const endpoint = getWsEndpoint(restEndpoint);
|
|
140
|
-
const wsServer = new ws_1.Server({ noServer: true });
|
|
141
|
-
server.on('upgrade', (request, socket, head) => {
|
|
142
|
-
if ((0, url_1.parse)(request.url).pathname !== endpoint) {
|
|
143
|
-
return;
|
|
144
|
-
}
|
|
145
|
-
wsServer.handleUpgrade(request, socket, head, (ws) => {
|
|
146
|
-
request.ws = ws;
|
|
147
|
-
const response = new http_1.ServerResponse(request);
|
|
148
|
-
response.writeHead = (statusCode) => {
|
|
149
|
-
if (statusCode > 200)
|
|
150
|
-
ws.close();
|
|
151
|
-
return response;
|
|
152
|
-
};
|
|
153
|
-
app.handle(request, response);
|
|
154
|
-
});
|
|
155
|
-
});
|
|
156
|
-
};
|
|
157
|
-
exports.setupRunnerServer = setupRunnerServer;
|
|
158
|
-
const setupRunnerHandler = (restEndpoint, app) => {
|
|
159
|
-
const wsEndpoint = getWsEndpoint(restEndpoint);
|
|
160
|
-
const authEndpoint = `${getEndpointBasePath(restEndpoint)}/auth`;
|
|
161
|
-
const taskRunnerAuthController = typedi_1.default.get(task_runner_auth_controller_1.TaskRunnerAuthController);
|
|
162
|
-
const taskRunnerService = typedi_1.default.get(TaskRunnerService);
|
|
163
|
-
app.use(wsEndpoint, taskRunnerAuthController.authMiddleware, (req, res) => taskRunnerService.handleRequest(req, res));
|
|
164
|
-
app.post(authEndpoint, (0, response_helper_1.send)(async (req) => await taskRunnerAuthController.createGrantToken(req)));
|
|
165
|
-
};
|
|
166
|
-
exports.setupRunnerHandler = setupRunnerHandler;
|
|
167
88
|
//# sourceMappingURL=runner-ws-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner-ws-server.js","sourceRoot":"","sources":["../../src/runners/runner-ws-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runner-ws-server.js","sourceRoot":"","sources":["../../src/runners/runner-ws-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { LoadNodesAndCredentials } from '../load-nodes-and-credentials';
|
|
1
2
|
import { Logger } from '../logging/logger.service';
|
|
2
3
|
import { TaskRejectError } from './errors';
|
|
3
4
|
import type { N8nMessage, RunnerMessage, RequesterMessage, TaskResultData } from './runner-types';
|
|
@@ -32,6 +33,7 @@ type RunnerAcceptCallback = () => void;
|
|
|
32
33
|
type TaskRejectCallback = (reason: TaskRejectError) => void;
|
|
33
34
|
export declare class TaskBroker {
|
|
34
35
|
private readonly logger;
|
|
36
|
+
private readonly loadNodesAndCredentials;
|
|
35
37
|
private knownRunners;
|
|
36
38
|
private requesters;
|
|
37
39
|
private tasks;
|
|
@@ -39,13 +41,15 @@ export declare class TaskBroker {
|
|
|
39
41
|
private requesterAcceptRejects;
|
|
40
42
|
private pendingTaskOffers;
|
|
41
43
|
private pendingTaskRequests;
|
|
42
|
-
constructor(logger: Logger);
|
|
44
|
+
constructor(logger: Logger, loadNodesAndCredentials: LoadNodesAndCredentials);
|
|
45
|
+
updateNodeTypes: () => Promise<void>;
|
|
43
46
|
expireTasks(): void;
|
|
44
47
|
registerRunner(runner: TaskRunner, messageCallback: MessageCallback): void;
|
|
45
48
|
deregisterRunner(runnerId: string): void;
|
|
46
49
|
registerRequester(requesterId: string, messageCallback: RequesterMessageCallback): void;
|
|
47
50
|
deregisterRequester(requesterId: string): void;
|
|
48
51
|
private messageRunner;
|
|
52
|
+
private messageAllRunners;
|
|
49
53
|
private messageRequester;
|
|
50
54
|
onRunnerMessage(runnerId: TaskRunner['id'], message: RunnerMessage.ToN8n.All): Promise<void>;
|
|
51
55
|
handleRpcRequest(taskId: Task['id'], callId: string, name: RunnerMessage.ToN8n.RPC['name'], params: unknown[]): Promise<void>;
|
|
@@ -13,11 +13,13 @@ exports.TaskBroker = void 0;
|
|
|
13
13
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
14
14
|
const nanoid_1 = require("nanoid");
|
|
15
15
|
const typedi_1 = require("typedi");
|
|
16
|
+
const load_nodes_and_credentials_1 = require("../load-nodes-and-credentials");
|
|
16
17
|
const logger_service_1 = require("../logging/logger.service");
|
|
17
18
|
const errors_1 = require("./errors");
|
|
18
19
|
let TaskBroker = class TaskBroker {
|
|
19
|
-
constructor(logger) {
|
|
20
|
+
constructor(logger, loadNodesAndCredentials) {
|
|
20
21
|
this.logger = logger;
|
|
22
|
+
this.loadNodesAndCredentials = loadNodesAndCredentials;
|
|
21
23
|
this.knownRunners = new Map();
|
|
22
24
|
this.requesters = new Map();
|
|
23
25
|
this.tasks = new Map();
|
|
@@ -25,6 +27,13 @@ let TaskBroker = class TaskBroker {
|
|
|
25
27
|
this.requesterAcceptRejects = new Map();
|
|
26
28
|
this.pendingTaskOffers = [];
|
|
27
29
|
this.pendingTaskRequests = [];
|
|
30
|
+
this.updateNodeTypes = async () => {
|
|
31
|
+
await this.messageAllRunners({
|
|
32
|
+
type: 'broker:nodetypes',
|
|
33
|
+
nodeTypes: this.loadNodesAndCredentials.types.nodes,
|
|
34
|
+
});
|
|
35
|
+
};
|
|
36
|
+
this.loadNodesAndCredentials.addPostProcessor(this.updateNodeTypes);
|
|
28
37
|
}
|
|
29
38
|
expireTasks() {
|
|
30
39
|
const now = process.hrtime.bigint();
|
|
@@ -36,6 +45,11 @@ let TaskBroker = class TaskBroker {
|
|
|
36
45
|
}
|
|
37
46
|
registerRunner(runner, messageCallback) {
|
|
38
47
|
this.knownRunners.set(runner.id, { runner, messageCallback });
|
|
48
|
+
void this.knownRunners.get(runner.id).messageCallback({ type: 'broker:runnerregistered' });
|
|
49
|
+
void this.knownRunners.get(runner.id).messageCallback({
|
|
50
|
+
type: 'broker:nodetypes',
|
|
51
|
+
nodeTypes: this.loadNodesAndCredentials.types.nodes,
|
|
52
|
+
});
|
|
39
53
|
}
|
|
40
54
|
deregisterRunner(runnerId) {
|
|
41
55
|
this.knownRunners.delete(runnerId);
|
|
@@ -60,6 +74,11 @@ let TaskBroker = class TaskBroker {
|
|
|
60
74
|
async messageRunner(runnerId, message) {
|
|
61
75
|
await this.knownRunners.get(runnerId)?.messageCallback(message);
|
|
62
76
|
}
|
|
77
|
+
async messageAllRunners(message) {
|
|
78
|
+
await Promise.allSettled([...this.knownRunners.values()].map(async (runner) => {
|
|
79
|
+
await runner.messageCallback(message);
|
|
80
|
+
}));
|
|
81
|
+
}
|
|
63
82
|
async messageRequester(requesterId, message) {
|
|
64
83
|
await this.requesters.get(requesterId)?.(message);
|
|
65
84
|
}
|
|
@@ -404,6 +423,7 @@ let TaskBroker = class TaskBroker {
|
|
|
404
423
|
exports.TaskBroker = TaskBroker;
|
|
405
424
|
exports.TaskBroker = TaskBroker = __decorate([
|
|
406
425
|
(0, typedi_1.Service)(),
|
|
407
|
-
__metadata("design:paramtypes", [logger_service_1.Logger
|
|
426
|
+
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
427
|
+
load_nodes_and_credentials_1.LoadNodesAndCredentials])
|
|
408
428
|
], TaskBroker);
|
|
409
429
|
//# sourceMappingURL=task-broker.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker.service.js","sourceRoot":"","sources":["../../src/runners/task-broker.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-broker.service.js","sourceRoot":"","sources":["../../src/runners/task-broker.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAgD;AAChD,mCAAgC;AAChC,mCAAiC;AAEjC,6EAAuE;AACvE,6DAAkD;AAElD,qCAA2C;AA2CpC,IAAM,UAAU,GAAhB,MAAM,UAAU;IAwBtB,YACkB,MAAc,EACd,uBAAgD;QADhD,WAAM,GAAN,MAAM,CAAQ;QACd,4BAAuB,GAAvB,uBAAuB,CAAyB;QAzB1D,iBAAY,GAGhB,IAAI,GAAG,EAAE,CAAC;QAEN,eAAU,GAA0C,IAAI,GAAG,EAAE,CAAC;QAE9D,UAAK,GAA0B,IAAI,GAAG,EAAE,CAAC;QAEzC,wBAAmB,GAGvB,IAAI,GAAG,EAAE,CAAC;QAEN,2BAAsB,GAG1B,IAAI,GAAG,EAAE,CAAC;QAEN,sBAAiB,GAAgB,EAAE,CAAC;QAEpC,wBAAmB,GAAkB,EAAE,CAAC;QAShD,oBAAe,GAAG,KAAK,IAAI,EAAE;YAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC;gBAC5B,IAAI,EAAE,kBAAkB;gBACxB,SAAS,EAAE,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,KAAK;aACnD,CAAC,CAAC;QACJ,CAAC,CAAC;QARD,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACrE,CAAC;IASD,WAAW;QACV,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7D,IAAI,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;gBAChD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;IACF,CAAC;IAED,cAAc,CAAC,MAAkB,EAAE,eAAgC;QAClE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;QAC9D,KAAK,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAE,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,yBAAyB,EAAE,CAAC,CAAC;QAC5F,KAAK,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAE,CAAC,eAAe,CAAC;YACtD,IAAI,EAAE,kBAAkB;YACxB,SAAS,EAAE,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,KAAK;SACnD,CAAC,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAChC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAGnC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7D,IAAI,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACrD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;QAGD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAChC,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAoB,QAAQ,oBAAoB,CAAC,CAAC;gBAC9E,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAoB,QAAQ,oBAAoB,CAAC,CAAC;YACpF,CAAC;QACF,CAAC;IACF,CAAC;IAED,iBAAiB,CAAC,WAAmB,EAAE,eAAyC;QAC/E,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC;IAED,mBAAmB,CAAC,WAAmB;QACtC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAA0B,EAAE,OAAgC;QACvF,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IACjE,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAgC;QAC/D,MAAM,OAAO,CAAC,UAAU,CACvB,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACpD,MAAM,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,WAAmB,EAAE,OAAmC;QACtF,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAA0B,EAAE,OAAgC;QACjF,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO;QACR,CAAC;QACD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACtB,KAAK,qBAAqB;gBACzB,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM;YACP,KAAK,qBAAqB;gBACzB,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBACxD,MAAM;YACP,KAAK,kBAAkB;gBACtB,IAAI,CAAC,WAAW,CAAC;oBAChB,QAAQ;oBACR,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;iBAC1E,CAAC,CAAC;gBACH,MAAM;YACP,KAAK,iBAAiB;gBACrB,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBACzD,MAAM;YACP,KAAK,kBAAkB;gBACtB,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC3D,MAAM;YACP,KAAK,wBAAwB;gBAC5B,MAAM,IAAI,CAAC,iBAAiB,CAC3B,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,KAAK,CACb,CAAC;gBACF,MAAM;YAEP,KAAK,YAAY;gBAChB,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC1F,MAAM;YAEP,KAAK,aAAa;gBACjB,MAAM;QACR,CAAC;IACF,CAAC;IAED,KAAK,CAAC,gBAAgB,CACrB,MAAkB,EAClB,MAAc,EACd,IAAqC,EACrC,MAAiB;QAEjB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO;QACR,CAAC;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE;YAC7C,IAAI,EAAE,YAAY;YAClB,MAAM;YACN,MAAM;YACN,IAAI;YACJ,MAAM;SACN,CAAC,CAAC;IACJ,CAAC;IAED,kBAAkB,CAAC,MAAkB;QACpC,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,YAAY,EAAE,CAAC;YAClB,YAAY,CAAC,MAAM,EAAE,CAAC;YACtB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;IACF,CAAC;IAED,kBAAkB,CAAC,MAAkB,EAAE,MAAc;QACpD,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,YAAY,EAAE,CAAC;YAClB,YAAY,CAAC,MAAM,CAAC,IAAI,wBAAe,CAAC,MAAM,CAAC,CAAC,CAAC;YACjD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,MAAkB,EAClB,SAA2D,EAC3D,WAA+D,EAC/D,KAAc;QAEd,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO;QACR,CAAC;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE;YAC7C,IAAI,EAAE,wBAAwB;YAC9B,MAAM;YACN,SAAS;YACT,WAAW;YACX,KAAK;SACL,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CACnB,MAAkB,EAClB,SAA2D,EAC3D,IAAa;QAEb,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO;QACR,CAAC;QACD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE;YAC1C,IAAI,EAAE,yBAAyB;YAC/B,MAAM;YACN,SAAS;YACT,IAAI;SACJ,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,WAAmB,EAAE,OAAmC;QAChF,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACtB,KAAK,wBAAwB;gBAC5B,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC7D,MAAM;YACP,KAAK,sBAAsB;gBAC1B,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBACtD,MAAM;YACP,KAAK,uBAAuB;gBAC3B,IAAI,CAAC,aAAa,CAAC;oBAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,WAAW;iBACX,CAAC,CAAC;gBACH,MAAM;YACP,KAAK,4BAA4B;gBAChC,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBACxF,MAAM;YACP,KAAK,uBAAuB;gBAC3B,MAAM,IAAI,CAAC,0BAA0B,CACpC,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,IAAI,CACZ,CAAC;gBACF,MAAM;QACR,CAAC;IACF,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC/B,MAAc,EACd,MAAc,EACd,MAAoD,EACpD,IAAa;QAEb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE;YACnC,IAAI,EAAE,oBAAoB;YAC1B,MAAM;YACN,MAAM;YACN,MAAM;YACN,IAAI;SACJ,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,MAAkB,EAAE,SAAiB,EAAE,IAAa;QACrF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAEtD,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE;YACnC,IAAI,EAAE,yBAAyB;YAC/B,MAAM;YACN,SAAS;YACT,IAAI;SACJ,CAAC,CAAC;IACJ,CAAC;IAED,qBAAqB,CACpB,MAAkB,EAClB,QAAyD;QAEzD,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7D,IAAI,YAAY,EAAE,CAAC;YAClB,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC9B,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;IACF,CAAC;IAED,qBAAqB,CAAC,MAAkB,EAAE,MAAc;QACvD,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7D,IAAI,YAAY,EAAE,CAAC;YAClB,YAAY,CAAC,MAAM,CAAC,IAAI,wBAAe,CAAC,MAAM,CAAC,CAAC,CAAC;YACjD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,MAAkB,EAAE,MAAc;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO;QACR,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAE1B,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE;YACvC,IAAI,EAAE,mBAAmB;YACzB,MAAM;YACN,MAAM;SACN,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,MAAkB,EAAE,MAAc;QACxD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO;QACR,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAE1B,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE;YAC7C,IAAI,EAAE,kBAAkB;YACxB,MAAM;YACN,KAAK,EAAE,MAAM;SACb,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,MAAkB;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,+BAAgB,CAAC,4CAA4C,MAAM,GAAG,EAAE;gBACjF,KAAK,EAAE,OAAO;aACd,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,8CAA8C,IAAI,CAAC,QAAQ,GAAG,CAAC;YAC9E,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACpC,MAAM,IAAI,+BAAgB,CAAC,MAAM,EAAE;gBAClC,KAAK,EAAE,OAAO;aACd,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAkB,EAAE,QAAiB;QAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE;YACnC,IAAI,EAAE,qBAAqB;YAC3B,MAAM;YACN,QAAQ;SACR,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAkB,EAAE,IAAoB;QAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO;QACR,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7C,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,IAAI;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAkB,EAAE,KAAc;QACxD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO;QACR,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7C,IAAI,EAAE,kBAAkB;YACxB,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,KAAK;SACL,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAgB,EAAE,OAAoB;QACvD,MAAM,MAAM,GAAG,IAAA,eAAM,EAAC,CAAC,CAAC,CAAC;QAEzB,IAAI,CAAC;YACJ,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,OAAqB,EAAE,MAAM,EAAE,CAAC,CAAC;gBAGhF,UAAU,CAAC,GAAG,EAAE;oBACf,MAAM,CAAC,kBAAkB,CAAC,CAAC;gBAC5B,CAAC,EAAE,IAAI,CAAC,CAAC;YACV,CAAC,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACxC,IAAI,EAAE,wBAAwB;gBAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,MAAM;aACN,CAAC,CAAC;YAEH,MAAM,aAAa,CAAC;QACrB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,gBAAgB,GAAG,KAAK,CAAC;YACjC,IAAI,CAAC,YAAY,wBAAe,EAAE,CAAC;gBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,qCAAqC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;gBAClF,OAAO;YACR,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;QAED,MAAM,IAAI,GAAS;YAClB,EAAE,EAAE,MAAM;YACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;SAChC,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CACtD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,CACxC,CAAC;QACF,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,gCAAgC,OAAO,CAAC,SAAS,oFAAoF,CACrI,CAAC;YACF,OAAO;QACR,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAEjD,IAAI,CAAC;YACJ,MAAM,aAAa,GAAG,IAAI,OAAO,CAChC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnB,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,EAAE;oBACvC,MAAM,EAAE,OAA8E;oBACtF,MAAM;iBACN,CAAC,CAAC;gBAGH,UAAU,CAAC,GAAG,EAAE;oBACf,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBAC/B,CAAC,EAAE,IAAI,CAAC,CAAC;YACV,CAAC,CACD,CAAC;YAEF,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE;gBAChD,IAAI,EAAE,kBAAkB;gBACxB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM;aACN,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC;YACrC,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,wBAAe,EAAE,CAAC;gBAClC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;gBACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,wCAAwC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;gBACrF,OAAO;YACR,CAAC;YACD,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;YACjD,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAUD,WAAW;QACV,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAChD,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;gBAC9B,SAAS;YACV,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC5F,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;gBACvB,SAAS;YACV,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAEjD,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAChC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YAE7C,KAAK,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;IAED,aAAa,CAAC,OAAoB;QACjC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAED,WAAW,CAAC,KAAgB;QAC3B,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAMD,QAAQ;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,oBAAoB;QACnB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAC/B,CAAC;IAED,sBAAsB;QACrB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACjC,CAAC;IAED,eAAe;QACd,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,kBAAkB;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,sBAAsB;QACrB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACjC,CAAC;IAED,QAAQ,CAAC,KAA2B;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,oBAAoB,CAAC,iBAA8B;QAClD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC5C,CAAC;IAED,sBAAsB,CAAC,mBAAkC;QACxD,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IAChD,CAAC;IAED,sBAAsB,CACrB,mBAGC;QAED,IAAI,CAAC,mBAAmB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACzE,CAAC;CACD,CAAA;AA3hBY,gCAAU;qBAAV,UAAU;IADtB,IAAA,gBAAO,GAAE;qCA0BiB,uBAAM;QACW,oDAAuB;GA1BtD,UAAU,CA2hBtB"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TaskRunnersConfig } from '@n8n/config';
|
|
2
2
|
import { TaskRunnerAuthService } from './auth/task-runner-auth.service';
|
|
3
3
|
export declare class TaskRunnerProcess {
|
|
4
|
-
private readonly
|
|
4
|
+
private readonly runnerConfig;
|
|
5
5
|
private readonly authService;
|
|
6
6
|
get isRunning(): boolean;
|
|
7
7
|
get pid(): number | undefined;
|
|
8
|
+
get runPromise(): Promise<void> | null;
|
|
9
|
+
private get useLauncher();
|
|
8
10
|
private process;
|
|
9
|
-
private
|
|
11
|
+
private _runPromise;
|
|
10
12
|
private isShuttingDown;
|
|
11
|
-
constructor(
|
|
13
|
+
constructor(runnerConfig: TaskRunnersConfig, authService: TaskRunnerAuthService);
|
|
12
14
|
start(): Promise<void>;
|
|
13
15
|
startNode(grantToken: string, n8nUri: string): import("child_process").ChildProcessWithoutNullStreams;
|
|
14
16
|
startLauncher(grantToken: string, n8nUri: string): import("child_process").ChildProcessWithoutNullStreams;
|
|
@@ -47,18 +47,26 @@ let TaskRunnerProcess = class TaskRunnerProcess {
|
|
|
47
47
|
get pid() {
|
|
48
48
|
return this.process?.pid;
|
|
49
49
|
}
|
|
50
|
-
|
|
51
|
-
this.
|
|
50
|
+
get runPromise() {
|
|
51
|
+
return this._runPromise;
|
|
52
|
+
}
|
|
53
|
+
get useLauncher() {
|
|
54
|
+
return this.runnerConfig.mode === 'internal_launcher';
|
|
55
|
+
}
|
|
56
|
+
constructor(runnerConfig, authService) {
|
|
57
|
+
this.runnerConfig = runnerConfig;
|
|
52
58
|
this.authService = authService;
|
|
53
59
|
this.process = null;
|
|
54
|
-
this.
|
|
60
|
+
this._runPromise = null;
|
|
55
61
|
this.isShuttingDown = false;
|
|
62
|
+
a.ok(this.runnerConfig.mode === 'internal_childprocess' ||
|
|
63
|
+
this.runnerConfig.mode === 'internal_launcher');
|
|
56
64
|
}
|
|
57
65
|
async start() {
|
|
58
66
|
a.ok(!this.process, 'Task Runner Process already running');
|
|
59
67
|
const grantToken = await this.authService.createGrantToken();
|
|
60
|
-
const n8nUri = `127.0.0.1:${this.
|
|
61
|
-
this.process = this.
|
|
68
|
+
const n8nUri = `127.0.0.1:${this.runnerConfig.port}`;
|
|
69
|
+
this.process = this.useLauncher
|
|
62
70
|
? this.startLauncher(grantToken, n8nUri)
|
|
63
71
|
: this.startNode(grantToken, n8nUri);
|
|
64
72
|
this.process.stdout?.pipe(process.stdout);
|
|
@@ -72,17 +80,19 @@ let TaskRunnerProcess = class TaskRunnerProcess {
|
|
|
72
80
|
PATH: process.env.PATH,
|
|
73
81
|
N8N_RUNNERS_GRANT_TOKEN: grantToken,
|
|
74
82
|
N8N_RUNNERS_N8N_URI: n8nUri,
|
|
83
|
+
N8N_RUNNERS_MAX_PAYLOAD: this.runnerConfig.maxPayload.toString(),
|
|
75
84
|
NODE_FUNCTION_ALLOW_BUILTIN: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
|
|
76
85
|
NODE_FUNCTION_ALLOW_EXTERNAL: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
|
|
77
86
|
},
|
|
78
87
|
});
|
|
79
88
|
}
|
|
80
89
|
startLauncher(grantToken, n8nUri) {
|
|
81
|
-
return (0, node_child_process_1.spawn)(this.
|
|
90
|
+
return (0, node_child_process_1.spawn)(this.runnerConfig.launcherPath, ['launch', this.runnerConfig.launcherRunner], {
|
|
82
91
|
env: {
|
|
83
92
|
PATH: process.env.PATH,
|
|
84
93
|
N8N_RUNNERS_GRANT_TOKEN: grantToken,
|
|
85
94
|
N8N_RUNNERS_N8N_URI: n8nUri,
|
|
95
|
+
N8N_RUNNERS_MAX_PAYLOAD: this.runnerConfig.maxPayload.toString(),
|
|
86
96
|
NODE_FUNCTION_ALLOW_BUILTIN: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
|
|
87
97
|
NODE_FUNCTION_ALLOW_EXTERNAL: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
|
|
88
98
|
RUST_LOG: process.env.RUST_LOG,
|
|
@@ -94,13 +104,13 @@ let TaskRunnerProcess = class TaskRunnerProcess {
|
|
|
94
104
|
return;
|
|
95
105
|
}
|
|
96
106
|
this.isShuttingDown = true;
|
|
97
|
-
if (this.
|
|
107
|
+
if (this.useLauncher) {
|
|
98
108
|
await this.killLauncher();
|
|
99
109
|
}
|
|
100
110
|
else {
|
|
101
111
|
this.killNode();
|
|
102
112
|
}
|
|
103
|
-
await this.
|
|
113
|
+
await this._runPromise;
|
|
104
114
|
this.isShuttingDown = false;
|
|
105
115
|
}
|
|
106
116
|
killNode() {
|
|
@@ -113,9 +123,9 @@ let TaskRunnerProcess = class TaskRunnerProcess {
|
|
|
113
123
|
if (!this.process?.pid) {
|
|
114
124
|
return;
|
|
115
125
|
}
|
|
116
|
-
const killProcess = (0, node_child_process_1.spawn)(this.
|
|
126
|
+
const killProcess = (0, node_child_process_1.spawn)(this.runnerConfig.launcherPath, [
|
|
117
127
|
'kill',
|
|
118
|
-
this.
|
|
128
|
+
this.runnerConfig.launcherRunner,
|
|
119
129
|
this.process.pid.toString(),
|
|
120
130
|
]);
|
|
121
131
|
await new Promise((resolve) => {
|
|
@@ -125,7 +135,7 @@ let TaskRunnerProcess = class TaskRunnerProcess {
|
|
|
125
135
|
});
|
|
126
136
|
}
|
|
127
137
|
monitorProcess(taskRunnerProcess) {
|
|
128
|
-
this.
|
|
138
|
+
this._runPromise = new Promise((resolve) => {
|
|
129
139
|
taskRunnerProcess.on('exit', (code) => {
|
|
130
140
|
this.onProcessExit(code, resolve);
|
|
131
141
|
});
|
|
@@ -148,7 +158,7 @@ __decorate([
|
|
|
148
158
|
], TaskRunnerProcess.prototype, "stop", null);
|
|
149
159
|
exports.TaskRunnerProcess = TaskRunnerProcess = __decorate([
|
|
150
160
|
(0, typedi_1.Service)(),
|
|
151
|
-
__metadata("design:paramtypes", [config_1.
|
|
161
|
+
__metadata("design:paramtypes", [config_1.TaskRunnersConfig,
|
|
152
162
|
task_runner_auth_service_1.TaskRunnerAuthService])
|
|
153
163
|
], TaskRunnerProcess);
|
|
154
164
|
//# sourceMappingURL=task-runner-process.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-process.js","sourceRoot":"","sources":["../../src/runners/task-runner-process.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"task-runner-process.js","sourceRoot":"","sources":["../../src/runners/task-runner-process.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,7 +114,7 @@ let TaskRunnerServer = class TaskRunnerServer {
|
|
|
114
114
|
async setupHttpServer() {
|
|
115
115
|
const { app } = this;
|
|
116
116
|
this.server = (0, node_http_1.createServer)(app);
|
|
117
|
-
const { taskRunners: { port,
|
|
117
|
+
const { taskRunners: { port, listenAddress: address }, } = this.globalConfig;
|
|
118
118
|
this.server.on('error', (error) => {
|
|
119
119
|
if (error.code === 'EADDRINUSE') {
|
|
120
120
|
this.logger.info(`n8n Task Runner's port ${port} is already in use. Do you have another instance of n8n running already?`);
|
|
@@ -131,7 +131,10 @@ let TaskRunnerServer = class TaskRunnerServer {
|
|
|
131
131
|
const { authToken } = this.globalConfig.taskRunners;
|
|
132
132
|
a.ok(authToken);
|
|
133
133
|
a.ok(this.server);
|
|
134
|
-
this.wsServer = new ws_1.Server({
|
|
134
|
+
this.wsServer = new ws_1.Server({
|
|
135
|
+
noServer: true,
|
|
136
|
+
maxPayload: this.globalConfig.taskRunners.maxPayload,
|
|
137
|
+
});
|
|
135
138
|
this.server.on('upgrade', this.handleUpgradeRequest);
|
|
136
139
|
}
|
|
137
140
|
async setupErrorHandlers() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-server.js","sourceRoot":"","sources":["../../src/runners/task-runner-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,8DAAsC;AACtC,sDAA8B;AAC9B,sDAAwC;AACxC,6CAA0C;AAC1C,yCAA0F;AAE1F,uCAA6C;AAC7C,mCAAiC;AACjC,2BAAwC;AAExC,2CAA+D;AAC/D,0DAAsD;AACtD,6DAAkD;AAClD,+CAA0D;AAC1D,uDAAyC;AACzC,4FAAsF;AAKtF,iEAA+D;AAMxD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAO5B,IAAW,IAAI;QACd,OAAQ,IAAI,CAAC,MAAM,EAAE,OAAO,EAAkB,EAAE,IAAI,CAAC;IACtD,CAAC;IAED,IAAY,eAAe;QAC1B,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,MAAM,CAAC;IAC5C,CAAC;IAED,YACkB,MAAc,EACd,YAA0B,EAC1B,wBAAkD,EAClD,iBAAoC;QAHpC,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAc;QAC1B,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,sBAAiB,GAAjB,iBAAiB,CAAmB;
|
|
1
|
+
{"version":3,"file":"task-runner-server.js","sourceRoot":"","sources":["../../src/runners/task-runner-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,5 +9,8 @@ exports.SELF_SEND_COMMANDS = new Set([
|
|
|
9
9
|
'add-webhooks-triggers-and-pollers',
|
|
10
10
|
'remove-triggers-and-pollers',
|
|
11
11
|
]);
|
|
12
|
-
exports.IMMEDIATE_COMMANDS = new Set([
|
|
12
|
+
exports.IMMEDIATE_COMMANDS = new Set([
|
|
13
|
+
'add-webhooks-triggers-and-pollers',
|
|
14
|
+
'relay-execution-lifecycle-event',
|
|
15
|
+
]);
|
|
13
16
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/scaling/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG,MAAM,CAAC;AAEpB,QAAA,aAAa,GAAG,KAAK,CAAC;AAGtB,QAAA,sBAAsB,GAAG,cAAc,CAAC;AAGxC,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAKvD,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACzC,mCAAmC;IACnC,6BAA6B;CAC7B,CAAC,CAAC;AAMU,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/scaling/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG,MAAM,CAAC;AAEpB,QAAA,aAAa,GAAG,KAAK,CAAC;AAGtB,QAAA,sBAAsB,GAAG,cAAc,CAAC;AAGxC,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAKvD,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACzC,mCAAmC;IACnC,6BAA6B;CAC7B,CAAC,CAAC;AAMU,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACzC,mCAAmC;IACnC,iCAAiC;CACjC,CAAC,CAAC"}
|
|
@@ -53,7 +53,7 @@ let JobProcessor = class JobProcessor {
|
|
|
53
53
|
this.nodeTypes = nodeTypes;
|
|
54
54
|
this.instanceSettings = instanceSettings;
|
|
55
55
|
this.runningJobs = {};
|
|
56
|
-
this.logger = this.logger.
|
|
56
|
+
this.logger = this.logger.scoped('scaling');
|
|
57
57
|
}
|
|
58
58
|
async processJob(job) {
|
|
59
59
|
const { executionId, loadStaticData } = job.data;
|
|
@@ -122,6 +122,7 @@ let JobProcessor = class JobProcessor {
|
|
|
122
122
|
workflowRun = workflowExecute.processRunExecutionData(workflow);
|
|
123
123
|
}
|
|
124
124
|
else {
|
|
125
|
+
n8n_workflow_1.ErrorReporterProxy.info(`Worker found execution ${executionId} without data`);
|
|
125
126
|
workflowExecute = new n8n_core_1.WorkflowExecute(additionalData, execution.mode);
|
|
126
127
|
workflowRun = workflowExecute.run(workflow);
|
|
127
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-processor.js","sourceRoot":"","sources":["../../src/scaling/job-processor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAA6D;
|
|
1
|
+
{"version":3,"file":"job-processor.js","sourceRoot":"","sources":["../../src/scaling/job-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
import { GlobalConfig } from '@n8n/config';
|
|
1
2
|
import { InstanceSettings } from 'n8n-core';
|
|
2
|
-
import { Logger } from '
|
|
3
|
-
import { Publisher } from '
|
|
4
|
-
import { RedisClientService } from '
|
|
5
|
-
import { TypedEmitter } from '
|
|
3
|
+
import { Logger } from '../logging/logger.service';
|
|
4
|
+
import { Publisher } from '../scaling/pubsub/publisher.service';
|
|
5
|
+
import { RedisClientService } from '../services/redis-client.service';
|
|
6
|
+
import { TypedEmitter } from '../typed-emitter';
|
|
6
7
|
type MultiMainEvents = {
|
|
7
8
|
'leader-stepdown': never;
|
|
8
9
|
'leader-takeover': never;
|
|
@@ -12,7 +13,8 @@ export declare class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
|
|
|
12
13
|
private readonly instanceSettings;
|
|
13
14
|
private readonly publisher;
|
|
14
15
|
private readonly redisClientService;
|
|
15
|
-
|
|
16
|
+
private readonly globalConfig;
|
|
17
|
+
constructor(logger: Logger, instanceSettings: InstanceSettings, publisher: Publisher, redisClientService: RedisClientService, globalConfig: GlobalConfig);
|
|
16
18
|
private leaderKey;
|
|
17
19
|
private readonly leaderKeyTtl;
|
|
18
20
|
private leaderCheckInterval;
|