n8n 2.38.3 → 2.38.4
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/build.tsbuildinfo +1 -1
- package/dist/modules/agents/builder/get-resource-locator-options.tool.d.ts +2 -2
- package/dist/modules/agents/execution-recorder.js +1 -1
- package/dist/modules/agents/execution-recorder.js.map +1 -1
- package/dist/modules/agents/utils/execution-to-message-mapper.d.ts +1 -1
- package/dist/modules/agents/utils/execution-to-message-mapper.js +5 -0
- package/dist/modules/agents/utils/execution-to-message-mapper.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-provider-connection-manager.ee.d.ts +4 -2
- package/dist/modules/external-secrets.ee/external-secrets-provider-connection-manager.ee.js +70 -40
- package/dist/modules/external-secrets.ee/external-secrets-provider-connection-manager.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/retry-manager.service.d.ts +1 -2
- package/dist/modules/external-secrets.ee/retry-manager.service.js +3 -2
- package/dist/modules/external-secrets.ee/retry-manager.service.js.map +1 -1
- package/dist/task-runners/task-broker/errors/task-runner-shutdown-timeout.error.d.ts +5 -0
- package/dist/task-runners/task-broker/errors/task-runner-shutdown-timeout.error.js +12 -0
- package/dist/task-runners/task-broker/errors/task-runner-shutdown-timeout.error.js.map +1 -0
- package/dist/task-runners/task-broker/task-broker-ws-server.d.ts +2 -0
- package/dist/task-runners/task-broker/task-broker-ws-server.js +17 -2
- package/dist/task-runners/task-broker/task-broker-ws-server.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker.service.d.ts +3 -0
- package/dist/task-runners/task-broker/task-broker.service.js +39 -10
- package/dist/task-runners/task-broker/task-broker.service.js.map +1 -1
- package/dist/task-runners/task-runner-module.js +5 -7
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/task-runners/task-runner-process-base.d.ts +1 -0
- package/dist/task-runners/task-runner-process-base.js +7 -2
- package/dist/task-runners/task-runner-process-base.js.map +1 -1
- package/package.json +18 -18
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker-ws-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-ws-server.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA8D;AAC9D,8CAAsC;AACtC,gCAAkC;AAElC,4CAAyC;AACzC,+CAAwD;AAGxD,
|
|
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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"}
|
|
@@ -16,6 +16,7 @@ export interface Task {
|
|
|
16
16
|
requesterId: string;
|
|
17
17
|
taskType: string;
|
|
18
18
|
timeout?: NodeJS.Timeout;
|
|
19
|
+
timesOutAt?: number;
|
|
19
20
|
}
|
|
20
21
|
export interface TaskOffer {
|
|
21
22
|
offerId: string;
|
|
@@ -47,6 +48,7 @@ export declare class TaskBroker {
|
|
|
47
48
|
private requesters;
|
|
48
49
|
private tasks;
|
|
49
50
|
private isDraining;
|
|
51
|
+
private shutdownDeadline?;
|
|
50
52
|
private runnerAcceptRejects;
|
|
51
53
|
private requesterAcceptRejects;
|
|
52
54
|
private consecutiveAcceptTimeouts;
|
|
@@ -105,6 +107,7 @@ export declare class TaskBroker {
|
|
|
105
107
|
taskOffered(offer: TaskOffer): void;
|
|
106
108
|
startDraining(): void;
|
|
107
109
|
hasActiveTasks(): boolean;
|
|
110
|
+
capTaskTimeoutsForShutdown(deadline: number): void;
|
|
108
111
|
stopDraining(): void;
|
|
109
112
|
getTasks(): Map<string, Task>;
|
|
110
113
|
getPendingTaskOffers(): TaskOffer[];
|
|
@@ -21,6 +21,7 @@ const task_reject_error_1 = require("../../task-runners/task-broker/errors/task-
|
|
|
21
21
|
const task_requester_accept_timeout_error_1 = require("../../task-runners/task-broker/errors/task-requester-accept-timeout.error");
|
|
22
22
|
const task_runner_accept_timeout_error_1 = require("../../task-runners/task-broker/errors/task-runner-accept-timeout.error");
|
|
23
23
|
const task_runner_execution_timeout_error_1 = require("../../task-runners/task-broker/errors/task-runner-execution-timeout.error");
|
|
24
|
+
const task_runner_shutdown_timeout_error_1 = require("../../task-runners/task-broker/errors/task-runner-shutdown-timeout.error");
|
|
24
25
|
const task_runner_unreachable_error_1 = require("../../task-runners/task-broker/errors/task-runner-unreachable.error");
|
|
25
26
|
const task_runner_lifecycle_events_1 = require("../../task-runners/task-runner-lifecycle-events");
|
|
26
27
|
const MAX_REQUEST_TIMEOUT_REFRESHES = 3;
|
|
@@ -386,9 +387,11 @@ let TaskBroker = class TaskBroker {
|
|
|
386
387
|
const task = this.tasks.get(taskId);
|
|
387
388
|
if (!task)
|
|
388
389
|
return;
|
|
390
|
+
const taskTimeoutMs = this.taskRunnersConfig.taskTimeout * constants_1.Time.seconds.toMilliseconds;
|
|
391
|
+
task.timesOutAt = Math.min(Date.now() + taskTimeoutMs, this.shutdownDeadline ?? Infinity);
|
|
389
392
|
task.timeout = setTimeout(async () => {
|
|
390
393
|
await this.handleTaskTimeout(taskId);
|
|
391
|
-
},
|
|
394
|
+
}, task.timesOutAt - Date.now());
|
|
392
395
|
await this.messageRunner(runner.id, {
|
|
393
396
|
type: 'broker:tasksettings',
|
|
394
397
|
taskId,
|
|
@@ -399,24 +402,31 @@ let TaskBroker = class TaskBroker {
|
|
|
399
402
|
const task = this.tasks.get(taskId);
|
|
400
403
|
if (!task)
|
|
401
404
|
return;
|
|
405
|
+
const isCappedByShutdown = this.shutdownDeadline !== undefined && task.timesOutAt === this.shutdownDeadline;
|
|
402
406
|
if (this.taskRunnersConfig.mode === 'internal') {
|
|
403
|
-
this.
|
|
404
|
-
|
|
405
|
-
|
|
407
|
+
if (this.shutdownDeadline === undefined) {
|
|
408
|
+
this.taskRunnerLifecycleEvents.emit('runner:timed-out-during-task', {
|
|
409
|
+
runnerId: task.runnerId,
|
|
410
|
+
});
|
|
411
|
+
}
|
|
406
412
|
}
|
|
407
413
|
else if (this.taskRunnersConfig.mode === 'external') {
|
|
408
414
|
await this.messageRunner(task.runnerId, {
|
|
409
415
|
type: 'broker:taskcancel',
|
|
410
416
|
taskId,
|
|
411
|
-
reason:
|
|
417
|
+
reason: isCappedByShutdown
|
|
418
|
+
? 'Task aborted because this n8n instance is shutting down'
|
|
419
|
+
: 'Task execution timed out',
|
|
412
420
|
});
|
|
413
421
|
}
|
|
414
422
|
const { taskTimeout, mode } = this.taskRunnersConfig;
|
|
415
|
-
await this.taskErrorHandler(taskId,
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
423
|
+
await this.taskErrorHandler(taskId, isCappedByShutdown
|
|
424
|
+
? new task_runner_shutdown_timeout_error_1.TaskRunnerShutdownTimeoutError()
|
|
425
|
+
: new task_runner_execution_timeout_error_1.TaskRunnerExecutionTimeoutError({
|
|
426
|
+
taskTimeout,
|
|
427
|
+
isSelfHosted: this.globalConfig.deployment.type !== 'cloud',
|
|
428
|
+
mode,
|
|
429
|
+
}));
|
|
420
430
|
}
|
|
421
431
|
async taskDoneHandler(taskId, data) {
|
|
422
432
|
const task = this.untrackTask(taskId);
|
|
@@ -660,6 +670,25 @@ let TaskBroker = class TaskBroker {
|
|
|
660
670
|
hasActiveTasks() {
|
|
661
671
|
return this.tasks.size > 0;
|
|
662
672
|
}
|
|
673
|
+
capTaskTimeoutsForShutdown(deadline) {
|
|
674
|
+
this.shutdownDeadline = deadline;
|
|
675
|
+
const cappedTaskIds = [];
|
|
676
|
+
for (const [taskId, task] of this.tasks) {
|
|
677
|
+
if (!task.timeout)
|
|
678
|
+
continue;
|
|
679
|
+
if (task.timesOutAt !== undefined && task.timesOutAt <= deadline)
|
|
680
|
+
continue;
|
|
681
|
+
clearTimeout(task.timeout);
|
|
682
|
+
task.timesOutAt = deadline;
|
|
683
|
+
task.timeout = setTimeout(async () => {
|
|
684
|
+
await this.handleTaskTimeout(taskId);
|
|
685
|
+
}, Math.max(deadline - Date.now(), 0));
|
|
686
|
+
cappedTaskIds.push(taskId);
|
|
687
|
+
}
|
|
688
|
+
if (cappedTaskIds.length > 0) {
|
|
689
|
+
this.logger.info(`Capped ${cappedTaskIds.length} in-flight task timeout(s) to fit the shutdown window (task IDs: ${cappedTaskIds.join(', ')})`);
|
|
690
|
+
}
|
|
691
|
+
}
|
|
663
692
|
stopDraining() {
|
|
664
693
|
this.isDraining = false;
|
|
665
694
|
}
|
|
@@ -1 +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
|
+
{"version":3,"file":"task-broker.service.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,6 +85,10 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
85
85
|
await this.startInternalTaskRunners();
|
|
86
86
|
}
|
|
87
87
|
async stop() {
|
|
88
|
+
if (this.taskBrokerHttpServer) {
|
|
89
|
+
await this.taskBrokerHttpServer.stop();
|
|
90
|
+
this.taskBrokerHttpServer = undefined;
|
|
91
|
+
}
|
|
88
92
|
const stopRunnerProcessTask = (async () => {
|
|
89
93
|
if (this.jsRunnerProcess) {
|
|
90
94
|
await this.jsRunnerProcess.stop();
|
|
@@ -97,13 +101,7 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
97
101
|
this.pyRunnerProcess = undefined;
|
|
98
102
|
}
|
|
99
103
|
})();
|
|
100
|
-
|
|
101
|
-
if (this.taskBrokerHttpServer) {
|
|
102
|
-
await this.taskBrokerHttpServer.stop();
|
|
103
|
-
this.taskBrokerHttpServer = undefined;
|
|
104
|
-
}
|
|
105
|
-
})();
|
|
106
|
-
await Promise.all([stopRunnerProcessTask, stopPythonRunnerProcessTask, stopRunnerServerTask]);
|
|
104
|
+
await Promise.all([stopRunnerProcessTask, stopPythonRunnerProcessTask]);
|
|
107
105
|
}
|
|
108
106
|
async loadTaskRequester() {
|
|
109
107
|
const { TaskRequester } = await import('../task-runners/task-managers/task-requester.js');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAqD;AACrD,wCAAgD;AAChD,gDAA6C;AAC7C,gCAA6C;AAE7C,4CAAyC;AACzC,uCAAyC;AACzC,MAAY,CAAC,+CAA2B;AAExC,0DAAsD;AAEtD,4FAAsF;AAGtF,wHAAgH;AAEhH,gFAA0E;AAC1E,oFAA+E;AAG/E,mEAA+D;AAQxD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAe5B,YACkB,MAAc,EACd,aAA4B,EAC5B,YAA+B,EAC/B,YAA0B;QAH1B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,iBAAY,GAAZ,YAAY,CAAc;
|
|
1
|
+
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { spawn } from 'node:child_process';
|
|
|
4
4
|
import { TaskBrokerAuthService } from './task-broker/auth/task-broker-auth.service';
|
|
5
5
|
import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
|
|
6
6
|
export type ChildProcess = ReturnType<typeof spawn>;
|
|
7
|
+
export declare const RUNNER_EXIT_GRACE_MS = 2000;
|
|
7
8
|
export declare function restartRetryDelay(attempt: number): number;
|
|
8
9
|
export type ExitReason = 'unknown' | 'oom';
|
|
9
10
|
export type TaskRunnerProcessEventMap = {
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.TaskRunnerProcessBase = void 0;
|
|
15
|
+
exports.TaskRunnerProcessBase = exports.RUNNER_EXIT_GRACE_MS = void 0;
|
|
16
16
|
exports.restartRetryDelay = restartRetryDelay;
|
|
17
17
|
const backend_common_1 = require("@n8n/backend-common");
|
|
18
18
|
const config_1 = require("@n8n/config");
|
|
@@ -26,6 +26,7 @@ const task_broker_auth_service_1 = require("./task-broker/auth/task-broker-auth.
|
|
|
26
26
|
const task_runner_lifecycle_events_1 = require("./task-runner-lifecycle-events");
|
|
27
27
|
const RESTART_RETRY_BASE_DELAY_MS = 5_000;
|
|
28
28
|
const RESTART_RETRY_MAX_DELAY_MS = 30_000;
|
|
29
|
+
exports.RUNNER_EXIT_GRACE_MS = 2_000;
|
|
29
30
|
function restartRetryDelay(attempt) {
|
|
30
31
|
return Math.min(RESTART_RETRY_BASE_DELAY_MS * 2 ** (attempt - 1), RESTART_RETRY_MAX_DELAY_MS);
|
|
31
32
|
}
|
|
@@ -101,7 +102,11 @@ let TaskRunnerProcessBase = class TaskRunnerProcessBase extends backend_common_1
|
|
|
101
102
|
await this.startPromise?.catch(() => { });
|
|
102
103
|
if (this.process) {
|
|
103
104
|
this.process.kill();
|
|
104
|
-
await this._runPromise;
|
|
105
|
+
await Promise.race([this._runPromise, (0, sleep_1.sleep)(exports.RUNNER_EXIT_GRACE_MS)]);
|
|
106
|
+
if (this.process) {
|
|
107
|
+
this.process.kill('SIGKILL');
|
|
108
|
+
await this._runPromise;
|
|
109
|
+
}
|
|
105
110
|
}
|
|
106
111
|
}
|
|
107
112
|
async forceRestart() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-process-base.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-process-base.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"task-runner-process-base.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-process-base.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n",
|
|
3
|
-
"version": "2.38.
|
|
3
|
+
"version": "2.38.4",
|
|
4
4
|
"description": "n8n Workflow Automation Tool",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -79,10 +79,10 @@
|
|
|
79
79
|
"vite": "^8.0.2",
|
|
80
80
|
"vitest": "^4.1.9",
|
|
81
81
|
"vitest-mock-extended": "^3.1.0",
|
|
82
|
-
"@n8n/playwright-janitor": "0.1.0",
|
|
83
82
|
"@n8n/backend-test-utils": "1.38.1",
|
|
84
|
-
"@n8n/
|
|
83
|
+
"@n8n/playwright-janitor": "0.1.0",
|
|
85
84
|
"@n8n/typescript-config": "1.11.0",
|
|
85
|
+
"@n8n/vitest-config": "1.21.0",
|
|
86
86
|
"n8n-containers": "1.0.0"
|
|
87
87
|
},
|
|
88
88
|
"dependencies": {
|
|
@@ -213,41 +213,41 @@
|
|
|
213
213
|
"yargs-parser": "21.1.1",
|
|
214
214
|
"zod": "3.25.76",
|
|
215
215
|
"zod-to-json-schema": "3.23.3",
|
|
216
|
-
"@n8n/agents": "0.23.1",
|
|
217
|
-
"@n8n/ai-node-sdk": "0.28.1",
|
|
218
216
|
"@n8n/ai-utilities": "0.31.1",
|
|
219
|
-
"@n8n/
|
|
220
|
-
"@n8n/ai-workflow-builder": "1.38.1",
|
|
217
|
+
"@n8n/agents": "0.23.2",
|
|
221
218
|
"@n8n/backend-common": "1.38.1",
|
|
222
219
|
"@n8n/backend-network": "1.12.1",
|
|
220
|
+
"@n8n/ai-workflow-builder": "1.38.1",
|
|
221
|
+
"@n8n/api-types": "1.38.1",
|
|
222
|
+
"@n8n/ai-node-sdk": "0.28.1",
|
|
223
223
|
"@n8n/blob-storage": "1.6.1",
|
|
224
224
|
"@n8n/chat-hub": "1.31.1",
|
|
225
225
|
"@n8n/client-oauth2": "1.20.1",
|
|
226
226
|
"@n8n/config": "2.36.1",
|
|
227
|
-
"@n8n/constants": "0.37.1",
|
|
228
227
|
"@n8n/db": "1.38.1",
|
|
229
|
-
"@n8n/
|
|
228
|
+
"@n8n/constants": "0.37.1",
|
|
229
|
+
"@n8n/decorators": "1.38.1",
|
|
230
230
|
"@n8n/di": "0.16.0",
|
|
231
|
-
"@n8n/expression-runtime": "0.29.1",
|
|
232
|
-
"@n8n/instance-ai": "1.23.1",
|
|
233
231
|
"@n8n/errors": "0.13.0",
|
|
232
|
+
"@n8n/engine": "0.18.1",
|
|
233
|
+
"@n8n/expression-runtime": "0.29.1",
|
|
234
234
|
"@n8n/mcp-apps": "0.15.1",
|
|
235
235
|
"@n8n/mcp-browser": "0.20.0",
|
|
236
|
-
"@n8n/decorators": "1.38.1",
|
|
237
236
|
"@n8n/n8n-nodes-langchain": "2.38.1",
|
|
238
|
-
"@n8n/node-engine-compatibility": "0.6.1",
|
|
239
237
|
"@n8n/permissions": "0.75.1",
|
|
240
|
-
"@n8n/scheduler": "1.7.1",
|
|
241
238
|
"@n8n/syslog-client": "1.10.0",
|
|
239
|
+
"@n8n/scheduler": "1.7.1",
|
|
242
240
|
"@n8n/task-runner": "2.38.1",
|
|
241
|
+
"@n8n/telemetry": "1.6.1",
|
|
242
|
+
"@n8n/instance-ai": "1.23.2",
|
|
243
243
|
"@n8n/typeorm": "0.9.0",
|
|
244
|
+
"@n8n/node-engine-compatibility": "0.6.1",
|
|
244
245
|
"@n8n/utils": "1.46.1",
|
|
245
|
-
"@n8n/telemetry": "1.6.1",
|
|
246
|
-
"@n8n/workflow-sdk": "0.31.1",
|
|
247
246
|
"n8n-core": "2.38.1",
|
|
248
|
-
"n8n-
|
|
247
|
+
"@n8n/workflow-sdk": "0.31.1",
|
|
249
248
|
"n8n-workflow": "2.38.1",
|
|
250
|
-
"n8n-editor-ui": "2.38.1"
|
|
249
|
+
"n8n-editor-ui": "2.38.1",
|
|
250
|
+
"n8n-nodes-base": "2.38.1"
|
|
251
251
|
},
|
|
252
252
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
253
253
|
"homepage": "https://n8n.io",
|