@n8n/task-runner 1.8.1 → 1.8.3
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/config/base-runner-config.d.ts +1 -0
- package/dist/config/base-runner-config.js +5 -0
- package/dist/config/base-runner-config.js.map +1 -1
- package/dist/js-task-runner/errors/task-cancelled-error.d.ts +4 -0
- package/dist/js-task-runner/errors/task-cancelled-error.js +11 -0
- package/dist/js-task-runner/errors/task-cancelled-error.js.map +1 -0
- package/dist/js-task-runner/errors/timeout-error.d.ts +5 -0
- package/dist/js-task-runner/errors/timeout-error.js +22 -0
- package/dist/js-task-runner/errors/timeout-error.js.map +1 -0
- package/dist/js-task-runner/js-task-runner.d.ts +1 -1
- package/dist/js-task-runner/js-task-runner.js +32 -7
- package/dist/js-task-runner/js-task-runner.js.map +1 -1
- package/dist/start.js +6 -2
- package/dist/start.js.map +1 -1
- package/dist/task-runner.d.ts +6 -2
- package/dist/task-runner.js +38 -8
- package/dist/task-runner.js.map +1 -1
- package/package.json +4 -4
|
@@ -41,6 +41,7 @@ let BaseRunnerConfig = class BaseRunnerConfig {
|
|
|
41
41
|
this.maxConcurrency = 5;
|
|
42
42
|
this.idleTimeout = 0;
|
|
43
43
|
this.timezone = 'America/New_York';
|
|
44
|
+
this.taskTimeout = 60;
|
|
44
45
|
}
|
|
45
46
|
};
|
|
46
47
|
exports.BaseRunnerConfig = BaseRunnerConfig;
|
|
@@ -68,6 +69,10 @@ __decorate([
|
|
|
68
69
|
(0, config_1.Env)('GENERIC_TIMEZONE'),
|
|
69
70
|
__metadata("design:type", String)
|
|
70
71
|
], BaseRunnerConfig.prototype, "timezone", void 0);
|
|
72
|
+
__decorate([
|
|
73
|
+
(0, config_1.Env)('N8N_RUNNERS_TASK_TIMEOUT'),
|
|
74
|
+
__metadata("design:type", Number)
|
|
75
|
+
], BaseRunnerConfig.prototype, "taskTimeout", void 0);
|
|
71
76
|
__decorate([
|
|
72
77
|
config_1.Nested,
|
|
73
78
|
__metadata("design:type", HealthcheckServerConfig)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-runner-config.js","sourceRoot":"","sources":["../../src/config/base-runner-config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAkD;AAGlD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QAEC,YAAO,GAAY,KAAK,CAAC;QAGzB,SAAI,GAAW,WAAW,CAAC;QAG3B,SAAI,GAAW,IAAI,CAAC;IACrB,CAAC;CAAA,CAAA;AAPA;IADC,IAAA,YAAG,EAAC,4BAA4B,CAAC;;wDACT;AAGzB;IADC,IAAA,YAAG,EAAC,yBAAyB,CAAC;;qDACJ;AAG3B;IADC,IAAA,YAAG,EAAC,yBAAyB,CAAC;;qDACX;AARf,uBAAuB;IAD5B,eAAM;GACD,uBAAuB,CAS5B;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAEN,WAAM,GAAW,gBAAgB,CAAC;QAGlC,eAAU,GAAW,EAAE,CAAC;QAGxB,mBAAc,GAAW,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QAG5C,mBAAc,GAAW,CAAC,CAAC;QAQ3B,gBAAW,GAAW,CAAC,CAAC;QAGxB,aAAQ,GAAW,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"base-runner-config.js","sourceRoot":"","sources":["../../src/config/base-runner-config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAkD;AAGlD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QAEC,YAAO,GAAY,KAAK,CAAC;QAGzB,SAAI,GAAW,WAAW,CAAC;QAG3B,SAAI,GAAW,IAAI,CAAC;IACrB,CAAC;CAAA,CAAA;AAPA;IADC,IAAA,YAAG,EAAC,4BAA4B,CAAC;;wDACT;AAGzB;IADC,IAAA,YAAG,EAAC,yBAAyB,CAAC;;qDACJ;AAG3B;IADC,IAAA,YAAG,EAAC,yBAAyB,CAAC;;qDACX;AARf,uBAAuB;IAD5B,eAAM;GACD,uBAAuB,CAS5B;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAEN,WAAM,GAAW,gBAAgB,CAAC;QAGlC,eAAU,GAAW,EAAE,CAAC;QAGxB,mBAAc,GAAW,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QAG5C,mBAAc,GAAW,CAAC,CAAC;QAQ3B,gBAAW,GAAW,CAAC,CAAC;QAGxB,aAAQ,GAAW,kBAAkB,CAAC;QAGtC,gBAAW,GAAW,EAAE,CAAC;IAI1B,CAAC;CAAA,CAAA;AA7BY,4CAAgB;AAE5B;IADC,IAAA,YAAG,EAAC,qBAAqB,CAAC;;gDACO;AAGlC;IADC,IAAA,YAAG,EAAC,yBAAyB,CAAC;;oDACP;AAGxB;IADC,IAAA,YAAG,EAAC,yBAAyB,CAAC;;wDACa;AAG5C;IADC,IAAA,YAAG,EAAC,6BAA6B,CAAC;;wDACR;AAQ3B;IADC,IAAA,YAAG,EAAC,mCAAmC,CAAC;;qDACjB;AAGxB;IADC,IAAA,YAAG,EAAC,kBAAkB,CAAC;;kDACc;AAGtC;IADC,IAAA,YAAG,EAAC,0BAA0B,CAAC;;qDACP;AAGzB;IADC,eAAM;8BACa,uBAAuB;2DAAC;2BA5BhC,gBAAgB;IAD5B,eAAM;GACM,gBAAgB,CA6B5B"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TaskCancelledError = void 0;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
class TaskCancelledError extends n8n_workflow_1.ApplicationError {
|
|
6
|
+
constructor(reason) {
|
|
7
|
+
super(`Task cancelled: ${reason}`, { level: 'warning' });
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
exports.TaskCancelledError = TaskCancelledError;
|
|
11
|
+
//# sourceMappingURL=task-cancelled-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-cancelled-error.js","sourceRoot":"","sources":["../../../src/js-task-runner/errors/task-cancelled-error.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAEhD,MAAa,kBAAmB,SAAQ,+BAAgB;IACvD,YAAY,MAAc;QACzB,KAAK,CAAC,mBAAmB,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;CACD;AAJD,gDAIC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TimeoutError = void 0;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
class TimeoutError extends n8n_workflow_1.ApplicationError {
|
|
6
|
+
constructor(taskTimeout) {
|
|
7
|
+
super(`Task execution timed out after ${taskTimeout} ${taskTimeout === 1 ? 'second' : 'seconds'}`);
|
|
8
|
+
const subtitle = 'The task runner was taking too long on this task, so the task was aborted.';
|
|
9
|
+
const fixes = {
|
|
10
|
+
optimizeScript: 'Optimize your script to prevent long-running tasks, e.g. by processing data in smaller batches.',
|
|
11
|
+
ensureTermination: 'Ensure that all paths in your script are able to terminate, i.e. no infinite loops.',
|
|
12
|
+
};
|
|
13
|
+
const suggestions = [fixes.optimizeScript, fixes.ensureTermination];
|
|
14
|
+
const suggestionsText = suggestions
|
|
15
|
+
.map((suggestion, index) => `${index + 1}. ${suggestion}`)
|
|
16
|
+
.join('<br/>');
|
|
17
|
+
const description = `${subtitle} You can try the following:<br/><br/>${suggestionsText}`;
|
|
18
|
+
this.description = description;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
exports.TimeoutError = TimeoutError;
|
|
22
|
+
//# sourceMappingURL=timeout-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeout-error.js","sourceRoot":"","sources":["../../../src/js-task-runner/errors/timeout-error.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAEhD,MAAa,YAAa,SAAQ,+BAAgB;IAGjD,YAAY,WAAmB;QAC9B,KAAK,CACJ,kCAAkC,WAAW,IAAI,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,CAC3F,CAAC;QAEF,MAAM,QAAQ,GAAG,4EAA4E,CAAC;QAE9F,MAAM,KAAK,GAAG;YACb,cAAc,EACb,iGAAiG;YAClG,iBAAiB,EAChB,qFAAqF;SACtF,CAAC;QAEF,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEpE,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,QAAQ,wCAAwC,eAAe,EAAE,CAAC;QAEzF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,CAAC;CACD;AA3BD,oCA2BC"}
|
|
@@ -32,7 +32,7 @@ export declare class JsTaskRunner extends TaskRunner {
|
|
|
32
32
|
private readonly builtInsParser;
|
|
33
33
|
private readonly taskDataReconstruct;
|
|
34
34
|
constructor(config: MainConfig, name?: string);
|
|
35
|
-
executeTask(task: Task<JSExecSettings
|
|
35
|
+
executeTask(task: Task<JSExecSettings>, signal: AbortSignal): Promise<TaskResultData>;
|
|
36
36
|
private validateTaskSettings;
|
|
37
37
|
private getNativeVariables;
|
|
38
38
|
private runForAllItems;
|
|
@@ -44,6 +44,7 @@ const built_ins_parser_state_1 = require("./built-ins-parser/built-ins-parser-st
|
|
|
44
44
|
const error_like_1 = require("./errors/error-like");
|
|
45
45
|
const execution_error_1 = require("./errors/execution-error");
|
|
46
46
|
const serializable_error_1 = require("./errors/serializable-error");
|
|
47
|
+
const timeout_error_1 = require("./errors/timeout-error");
|
|
47
48
|
const require_resolver_1 = require("./require-resolver");
|
|
48
49
|
const result_validation_1 = require("./result-validation");
|
|
49
50
|
const data_request_response_reconstruct_1 = require("../data-request/data-request-response-reconstruct");
|
|
@@ -63,7 +64,7 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
63
64
|
allowedExternalModules: parseModuleAllowList(jsRunnerConfig.allowedExternalModules ?? ''),
|
|
64
65
|
});
|
|
65
66
|
}
|
|
66
|
-
async executeTask(task) {
|
|
67
|
+
async executeTask(task, signal) {
|
|
67
68
|
const settings = task.settings;
|
|
68
69
|
a.ok(settings, 'JS Code not sent to runner');
|
|
69
70
|
this.validateTaskSettings(settings);
|
|
@@ -88,8 +89,8 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
88
89
|
},
|
|
89
90
|
};
|
|
90
91
|
const result = settings.nodeMode === 'runOnceForAllItems'
|
|
91
|
-
? await this.runForAllItems(task.taskId, settings, data, workflow, customConsole)
|
|
92
|
-
: await this.runForEachItem(task.taskId, settings, data, workflow, customConsole);
|
|
92
|
+
? await this.runForAllItems(task.taskId, settings, data, workflow, customConsole, signal)
|
|
93
|
+
: await this.runForEachItem(task.taskId, settings, data, workflow, customConsole, signal);
|
|
93
94
|
return {
|
|
94
95
|
result,
|
|
95
96
|
customData: data.runExecutionData.resultData.metadata,
|
|
@@ -121,7 +122,7 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
121
122
|
FormData,
|
|
122
123
|
};
|
|
123
124
|
}
|
|
124
|
-
async runForAllItems(taskId, settings, data, workflow, customConsole) {
|
|
125
|
+
async runForAllItems(taskId, settings, data, workflow, customConsole, signal) {
|
|
125
126
|
const dataProxy = this.createDataProxy(data, workflow, data.itemIndex);
|
|
126
127
|
const inputItems = data.connectionInputData;
|
|
127
128
|
const context = {
|
|
@@ -134,7 +135,19 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
134
135
|
...this.buildRpcCallObject(taskId),
|
|
135
136
|
};
|
|
136
137
|
try {
|
|
137
|
-
const result =
|
|
138
|
+
const result = await new Promise((resolve, reject) => {
|
|
139
|
+
const abortHandler = () => {
|
|
140
|
+
reject(new timeout_error_1.TimeoutError(this.taskTimeout));
|
|
141
|
+
};
|
|
142
|
+
signal.addEventListener('abort', abortHandler, { once: true });
|
|
143
|
+
const taskResult = (0, node_vm_1.runInNewContext)(`globalThis.global = globalThis; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`, context, { timeout: this.taskTimeout * 1000 });
|
|
144
|
+
void taskResult
|
|
145
|
+
.then(resolve)
|
|
146
|
+
.catch(reject)
|
|
147
|
+
.finally(() => {
|
|
148
|
+
signal.removeEventListener('abort', abortHandler);
|
|
149
|
+
});
|
|
150
|
+
});
|
|
138
151
|
if (result === null) {
|
|
139
152
|
return [];
|
|
140
153
|
}
|
|
@@ -148,7 +161,7 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
148
161
|
throw error;
|
|
149
162
|
}
|
|
150
163
|
}
|
|
151
|
-
async runForEachItem(taskId, settings, data, workflow, customConsole) {
|
|
164
|
+
async runForEachItem(taskId, settings, data, workflow, customConsole, signal) {
|
|
152
165
|
const inputItems = data.connectionInputData;
|
|
153
166
|
const returnData = [];
|
|
154
167
|
const chunkStartIdx = settings.chunk ? settings.chunk.startIndex : 0;
|
|
@@ -168,7 +181,19 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
168
181
|
...this.buildRpcCallObject(taskId),
|
|
169
182
|
};
|
|
170
183
|
try {
|
|
171
|
-
let result =
|
|
184
|
+
let result = await new Promise((resolve, reject) => {
|
|
185
|
+
const abortHandler = () => {
|
|
186
|
+
reject(new timeout_error_1.TimeoutError(this.taskTimeout));
|
|
187
|
+
};
|
|
188
|
+
signal.addEventListener('abort', abortHandler);
|
|
189
|
+
const taskResult = (0, node_vm_1.runInNewContext)(`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`, context, { timeout: this.taskTimeout * 1000 });
|
|
190
|
+
void taskResult
|
|
191
|
+
.then(resolve)
|
|
192
|
+
.catch(reject)
|
|
193
|
+
.finally(() => {
|
|
194
|
+
signal.removeEventListener('abort', abortHandler);
|
|
195
|
+
});
|
|
196
|
+
});
|
|
172
197
|
if (result === null) {
|
|
173
198
|
continue;
|
|
174
199
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"js-task-runner.js","sourceRoot":"","sources":["../../src/js-task-runner/js-task-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA6C;AAC7C,+CAA2D;AAgB3D,+CAAiC;AACjC,qCAAwD;AASxD,+CAAsD;AAEtD,0EAAqE;AACrE,sFAAgF;AAChF,oDAAkD;AAClD,8DAA0D;AAC1D,oEAA+D;
|
|
1
|
+
{"version":3,"file":"js-task-runner.js","sourceRoot":"","sources":["../../src/js-task-runner/js-task-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/start.js
CHANGED
|
@@ -44,12 +44,16 @@ let healthcheckServer;
|
|
|
44
44
|
let runner;
|
|
45
45
|
let isShuttingDown = false;
|
|
46
46
|
let errorReporter;
|
|
47
|
-
function createSignalHandler(signal) {
|
|
47
|
+
function createSignalHandler(signal, timeoutInS = 10) {
|
|
48
48
|
return async function onSignal() {
|
|
49
49
|
if (isShuttingDown) {
|
|
50
50
|
return;
|
|
51
51
|
}
|
|
52
52
|
console.log(`Received ${signal} signal, shutting down...`);
|
|
53
|
+
setTimeout(() => {
|
|
54
|
+
console.error('Shutdown timeout reached, forcing shutdown...');
|
|
55
|
+
process.exit(1);
|
|
56
|
+
}, timeoutInS * 1000).unref();
|
|
53
57
|
isShuttingDown = true;
|
|
54
58
|
try {
|
|
55
59
|
if (runner) {
|
|
@@ -84,7 +88,7 @@ void (async function start() {
|
|
|
84
88
|
}
|
|
85
89
|
runner = new js_task_runner_1.JsTaskRunner(config);
|
|
86
90
|
runner.on('runner:reached-idle-timeout', () => {
|
|
87
|
-
void createSignalHandler('IDLE_TIMEOUT')();
|
|
91
|
+
void createSignalHandler('IDLE_TIMEOUT', 1)();
|
|
88
92
|
});
|
|
89
93
|
const { enabled, host, port } = config.baseRunnerConfig.healthcheckServer;
|
|
90
94
|
if (enabled) {
|
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2D;AAC3D,oDAA+B;AAE/B,sDAAkD;AAGlD,oEAA+D;AAE/D,IAAI,iBAAgD,CAAC;AACrD,IAAI,MAAgC,CAAC;AACrC,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,IAAI,aAAwC,CAAC;AAE7C,SAAS,mBAAmB,CAAC,MAAc;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
|
package/dist/task-runner.d.ts
CHANGED
|
@@ -15,11 +15,13 @@ export interface TaskOffer {
|
|
|
15
15
|
validUntil: bigint;
|
|
16
16
|
}
|
|
17
17
|
interface DataRequest {
|
|
18
|
+
taskId: string;
|
|
18
19
|
requestId: string;
|
|
19
20
|
resolve: (data: unknown) => void;
|
|
20
21
|
reject: (error: unknown) => void;
|
|
21
22
|
}
|
|
22
23
|
interface NodeTypesRequest {
|
|
24
|
+
taskId: string;
|
|
23
25
|
requestId: string;
|
|
24
26
|
resolve: (data: unknown) => void;
|
|
25
27
|
reject: (error: unknown) => void;
|
|
@@ -51,7 +53,9 @@ export declare abstract class TaskRunner extends EventEmitter {
|
|
|
51
53
|
maxConcurrency: number;
|
|
52
54
|
name: string;
|
|
53
55
|
private idleTimer;
|
|
56
|
+
protected readonly taskTimeout: number;
|
|
54
57
|
private readonly idleTimeout;
|
|
58
|
+
protected taskCancellations: Map<string, AbortController>;
|
|
55
59
|
constructor(opts: TaskRunnerOpts);
|
|
56
60
|
private resetIdleTimer;
|
|
57
61
|
private receiveMessage;
|
|
@@ -65,11 +69,11 @@ export declare abstract class TaskRunner extends EventEmitter {
|
|
|
65
69
|
processNodeTypesResponse(requestId: string, nodeTypes: unknown): void;
|
|
66
70
|
hasOpenTasks(): boolean;
|
|
67
71
|
offerAccepted(offerId: string, taskId: string): void;
|
|
68
|
-
taskCancelled(taskId: string): void;
|
|
72
|
+
taskCancelled(taskId: string, reason: string): void;
|
|
69
73
|
taskErrored(taskId: string, error: unknown): void;
|
|
70
74
|
taskDone(taskId: string, data: RunnerMessage.ToBroker.TaskDone['data']): void;
|
|
71
75
|
receivedSettings(taskId: string, settings: unknown): Promise<void>;
|
|
72
|
-
executeTask(_task: Task): Promise<TaskResultData>;
|
|
76
|
+
executeTask(_task: Task, _signal: AbortSignal): Promise<TaskResultData>;
|
|
73
77
|
requestNodeTypes<T = unknown>(taskId: Task['taskId'], requestParams: RunnerMessage.ToBroker.NodeTypesRequest['requestParams']): Promise<T>;
|
|
74
78
|
requestData<T = unknown>(taskId: Task['taskId'], requestParams: RunnerMessage.ToBroker.TaskDataRequest['requestParams']): Promise<T>;
|
|
75
79
|
makeRpcCall(taskId: string, name: RunnerMessage.ToBroker.RPC['name'], params: unknown[]): Promise<unknown>;
|
package/dist/task-runner.js
CHANGED
|
@@ -7,6 +7,7 @@ const node_events_1 = require("node:events");
|
|
|
7
7
|
const ws_1 = require("ws");
|
|
8
8
|
const node_types_1 = require("./node-types");
|
|
9
9
|
const runner_types_1 = require("./runner-types");
|
|
10
|
+
const task_cancelled_error_1 = require("./js-task-runner/errors/task-cancelled-error");
|
|
10
11
|
const OFFER_VALID_TIME_MS = 5000;
|
|
11
12
|
const OFFER_VALID_EXTRA_MS = 100;
|
|
12
13
|
const msToNs = (ms) => BigInt(ms * 1_000_000);
|
|
@@ -21,6 +22,7 @@ class TaskRunner extends node_events_1.EventEmitter {
|
|
|
21
22
|
this.nodeTypesRequests = new Map();
|
|
22
23
|
this.rpcCalls = new Map();
|
|
23
24
|
this.nodeTypes = new node_types_1.TaskRunnerNodeTypes([]);
|
|
25
|
+
this.taskCancellations = new Map();
|
|
24
26
|
this.receiveMessage = (message) => {
|
|
25
27
|
const data = JSON.parse(message.data);
|
|
26
28
|
void this.onMessage(data);
|
|
@@ -35,6 +37,7 @@ class TaskRunner extends node_events_1.EventEmitter {
|
|
|
35
37
|
this.taskType = opts.taskType;
|
|
36
38
|
this.name = opts.name ?? 'Node.js Task Runner SDK';
|
|
37
39
|
this.maxConcurrency = opts.maxConcurrency;
|
|
40
|
+
this.taskTimeout = opts.taskTimeout;
|
|
38
41
|
this.idleTimeout = opts.idleTimeout;
|
|
39
42
|
const wsUrl = `ws://${opts.n8nUri}/runners/_ws?id=${this.id}`;
|
|
40
43
|
this.ws = new ws_1.WebSocket(wsUrl, {
|
|
@@ -122,7 +125,7 @@ class TaskRunner extends node_events_1.EventEmitter {
|
|
|
122
125
|
this.offerAccepted(message.offerId, message.taskId);
|
|
123
126
|
break;
|
|
124
127
|
case 'broker:taskcancel':
|
|
125
|
-
this.taskCancelled(message.taskId);
|
|
128
|
+
this.taskCancelled(message.taskId, message.reason);
|
|
126
129
|
break;
|
|
127
130
|
case 'broker:tasksettings':
|
|
128
131
|
void this.receivedSettings(message.taskId, message.settings);
|
|
@@ -186,17 +189,31 @@ class TaskRunner extends node_events_1.EventEmitter {
|
|
|
186
189
|
taskId,
|
|
187
190
|
});
|
|
188
191
|
}
|
|
189
|
-
taskCancelled(taskId) {
|
|
192
|
+
taskCancelled(taskId, reason) {
|
|
190
193
|
const task = this.runningTasks.get(taskId);
|
|
191
194
|
if (!task) {
|
|
192
195
|
return;
|
|
193
196
|
}
|
|
194
197
|
task.cancelled = true;
|
|
195
|
-
|
|
198
|
+
for (const [requestId, request] of this.dataRequests.entries()) {
|
|
199
|
+
if (request.taskId === taskId) {
|
|
200
|
+
request.reject(new task_cancelled_error_1.TaskCancelledError(reason));
|
|
201
|
+
this.dataRequests.delete(requestId);
|
|
202
|
+
}
|
|
196
203
|
}
|
|
197
|
-
|
|
198
|
-
|
|
204
|
+
for (const [requestId, request] of this.nodeTypesRequests.entries()) {
|
|
205
|
+
if (request.taskId === taskId) {
|
|
206
|
+
request.reject(new task_cancelled_error_1.TaskCancelledError(reason));
|
|
207
|
+
this.nodeTypesRequests.delete(requestId);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
const controller = this.taskCancellations.get(taskId);
|
|
211
|
+
if (controller) {
|
|
212
|
+
controller.abort();
|
|
213
|
+
this.taskCancellations.delete(taskId);
|
|
199
214
|
}
|
|
215
|
+
if (!task.active)
|
|
216
|
+
this.runningTasks.delete(taskId);
|
|
200
217
|
this.sendOffers();
|
|
201
218
|
}
|
|
202
219
|
taskErrored(taskId, error) {
|
|
@@ -226,20 +243,31 @@ class TaskRunner extends node_events_1.EventEmitter {
|
|
|
226
243
|
this.runningTasks.delete(taskId);
|
|
227
244
|
return;
|
|
228
245
|
}
|
|
246
|
+
const controller = new AbortController();
|
|
247
|
+
this.taskCancellations.set(taskId, controller);
|
|
248
|
+
const taskTimeout = setTimeout(() => {
|
|
249
|
+
if (!task.cancelled) {
|
|
250
|
+
controller.abort();
|
|
251
|
+
this.taskCancellations.delete(taskId);
|
|
252
|
+
}
|
|
253
|
+
}, this.taskTimeout * 1_000);
|
|
229
254
|
task.settings = settings;
|
|
230
255
|
task.active = true;
|
|
231
256
|
try {
|
|
232
|
-
const data = await this.executeTask(task);
|
|
257
|
+
const data = await this.executeTask(task, controller.signal);
|
|
233
258
|
this.taskDone(taskId, data);
|
|
234
259
|
}
|
|
235
260
|
catch (error) {
|
|
236
|
-
|
|
261
|
+
if (!task.cancelled)
|
|
262
|
+
this.taskErrored(taskId, error);
|
|
237
263
|
}
|
|
238
264
|
finally {
|
|
265
|
+
clearTimeout(taskTimeout);
|
|
266
|
+
this.taskCancellations.delete(taskId);
|
|
239
267
|
this.resetIdleTimer();
|
|
240
268
|
}
|
|
241
269
|
}
|
|
242
|
-
async executeTask(_task) {
|
|
270
|
+
async executeTask(_task, _signal) {
|
|
243
271
|
throw new n8n_workflow_1.ApplicationError('Unimplemented');
|
|
244
272
|
}
|
|
245
273
|
async requestNodeTypes(taskId, requestParams) {
|
|
@@ -247,6 +275,7 @@ class TaskRunner extends node_events_1.EventEmitter {
|
|
|
247
275
|
const nodeTypesPromise = new Promise((resolve, reject) => {
|
|
248
276
|
this.nodeTypesRequests.set(requestId, {
|
|
249
277
|
requestId,
|
|
278
|
+
taskId,
|
|
250
279
|
resolve: resolve,
|
|
251
280
|
reject,
|
|
252
281
|
});
|
|
@@ -269,6 +298,7 @@ class TaskRunner extends node_events_1.EventEmitter {
|
|
|
269
298
|
const p = new Promise((resolve, reject) => {
|
|
270
299
|
this.dataRequests.set(requestId, {
|
|
271
300
|
requestId,
|
|
301
|
+
taskId,
|
|
272
302
|
resolve: resolve,
|
|
273
303
|
reject,
|
|
274
304
|
});
|
package/dist/task-runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@n8n/task-runner",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.3",
|
|
4
4
|
"main": "dist/start.js",
|
|
5
5
|
"module": "src/start.ts",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"nanoid": "^3.3.6",
|
|
30
30
|
"typedi": "0.10.0",
|
|
31
31
|
"ws": "^8.18.0",
|
|
32
|
-
"
|
|
33
|
-
"n8n
|
|
34
|
-
"n8n-
|
|
32
|
+
"n8n-core": "1.70.2",
|
|
33
|
+
"@n8n/config": "1.20.2",
|
|
34
|
+
"n8n-workflow": "1.69.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"luxon": "3.4.4"
|