@n8n/task-runner 1.0.1 → 1.2.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/authenticator.js +1 -1
- package/dist/authenticator.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/js-task-runner/errors/error-like.d.ts +5 -0
- package/dist/js-task-runner/errors/error-like.js +10 -0
- package/dist/js-task-runner/errors/error-like.js.map +1 -0
- package/dist/js-task-runner/errors/execution-error.d.ts +15 -0
- package/dist/js-task-runner/errors/execution-error.js +69 -0
- package/dist/js-task-runner/errors/execution-error.js.map +1 -0
- package/dist/js-task-runner/errors/serializable-error.d.ts +4 -0
- package/dist/js-task-runner/errors/serializable-error.js +19 -0
- package/dist/js-task-runner/errors/serializable-error.js.map +1 -0
- package/dist/js-task-runner/errors/validation-error.d.ts +15 -0
- package/dist/js-task-runner/errors/validation-error.js +33 -0
- package/dist/js-task-runner/errors/validation-error.js.map +1 -0
- package/dist/{code.d.ts → js-task-runner/js-task-runner.d.ts} +22 -6
- package/dist/js-task-runner/js-task-runner.js +172 -0
- package/dist/js-task-runner/js-task-runner.js.map +1 -0
- package/dist/js-task-runner/obj-utils.d.ts +3 -0
- package/dist/js-task-runner/obj-utils.js +7 -0
- package/dist/js-task-runner/obj-utils.js.map +1 -0
- package/dist/js-task-runner/require-resolver.d.ts +6 -0
- package/dist/js-task-runner/require-resolver.js +22 -0
- package/dist/js-task-runner/require-resolver.js.map +1 -0
- package/dist/js-task-runner/result-validation.d.ts +4 -0
- package/dist/js-task-runner/result-validation.js +82 -0
- package/dist/js-task-runner/result-validation.js.map +1 -0
- package/dist/start.js +35 -3
- package/dist/start.js.map +1 -1
- package/dist/task-runner.d.ts +3 -0
- package/dist/task-runner.js +22 -7
- package/dist/task-runner.js.map +1 -1
- package/package.json +10 -6
- package/dist/code.js +0 -80
- package/dist/code.js.map +0 -1
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6D;AAC7D,sDAAwC;AAExC,mDAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6D;AAC7D,sDAAwC;AAExC,mDAA+C;AAC/C,oEAA+D;AAE/D,IAAI,MAAgC,CAAC;AACrC,IAAI,cAAc,GAAG,KAAK,CAAC;AAQ3B,SAAS,kBAAkB;IAC1B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACrD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACvD,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,EAAE,CAAC;QAC/B,MAAM,IAAI,+BAAgB,CACzB,kHAAkH,CAClH,CAAC;IACH,CAAC;IAED,OAAO;QACN,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,gBAAgB;QAC3D,SAAS;QACT,UAAU;KACV,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAc;IAC1C,OAAO,KAAK,UAAU,QAAQ;QAC7B,IAAI,cAAc,EAAE,CAAC;YACpB,OAAO;QACR,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,YAAY,MAAM,2BAA2B,CAAC,CAAC;QAE3D,cAAc,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC;YACJ,IAAI,MAAM,EAAE,CAAC;gBACZ,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBACpB,MAAM,GAAG,SAAS,CAAC;YACpB,CAAC;QACF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,CAAC,CAAC,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACxD,CAAC;gBAAS,CAAC;YACV,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;IACF,CAAC,CAAC;AACH,CAAC;AAED,KAAK,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAC;IAEpC,IAAI,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEvB,UAAU,GAAG,MAAM,IAAA,4BAAY,EAAC;YAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;SACrB,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,MAAM,CAAC,MAAM,cAAc,CAAC;IAClD,MAAM,GAAG,IAAI,6BAAY,CAAC;QACzB,KAAK;QACL,UAAU;QACV,cAAc,EAAE,CAAC;QACjB,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;QAC9D,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,4BAA4B;KAChE,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;IAChB,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,CAAC,CAAC,CAAC;IAC7B,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"}
|
package/dist/task-runner.d.ts
CHANGED
|
@@ -55,5 +55,8 @@ export declare abstract class TaskRunner {
|
|
|
55
55
|
makeRpcCall(taskId: string, name: RunnerMessage.ToN8n.RPC['name'], params: unknown[]): Promise<unknown>;
|
|
56
56
|
handleRpcResponse(callId: string, status: N8nMessage.ToRunner.RPCResponse['status'], data: unknown): void;
|
|
57
57
|
buildRpcCallObject(taskId: string): RPCCallObject;
|
|
58
|
+
stop(): Promise<void>;
|
|
59
|
+
private closeConnection;
|
|
60
|
+
private waitUntilAllTasksAreDone;
|
|
58
61
|
}
|
|
59
62
|
export {};
|
package/dist/task-runner.js
CHANGED
|
@@ -190,13 +190,8 @@ class TaskRunner {
|
|
|
190
190
|
const data = await this.executeTask(task);
|
|
191
191
|
this.taskDone(taskId, data);
|
|
192
192
|
}
|
|
193
|
-
catch (
|
|
194
|
-
|
|
195
|
-
this.taskErrored(taskId, e.message);
|
|
196
|
-
}
|
|
197
|
-
else {
|
|
198
|
-
this.taskErrored(taskId, e);
|
|
199
|
-
}
|
|
193
|
+
catch (error) {
|
|
194
|
+
this.taskErrored(taskId, error);
|
|
200
195
|
}
|
|
201
196
|
}
|
|
202
197
|
async executeTask(_task) {
|
|
@@ -276,6 +271,26 @@ class TaskRunner {
|
|
|
276
271
|
}
|
|
277
272
|
return rpcObject;
|
|
278
273
|
}
|
|
274
|
+
async stop() {
|
|
275
|
+
this.stopTaskOffers();
|
|
276
|
+
await this.waitUntilAllTasksAreDone();
|
|
277
|
+
await this.closeConnection();
|
|
278
|
+
}
|
|
279
|
+
async closeConnection() {
|
|
280
|
+
this.ws.close(1000, 'Shutting down');
|
|
281
|
+
await new Promise((resolve) => {
|
|
282
|
+
this.ws.once('close', resolve);
|
|
283
|
+
});
|
|
284
|
+
}
|
|
285
|
+
async waitUntilAllTasksAreDone(maxWaitTimeInMs = 30_000) {
|
|
286
|
+
const start = Date.now();
|
|
287
|
+
while (this.runningTasks.size > 0) {
|
|
288
|
+
if (Date.now() - start > maxWaitTimeInMs) {
|
|
289
|
+
throw new n8n_workflow_1.ApplicationError('Timeout while waiting for tasks to finish');
|
|
290
|
+
}
|
|
291
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
292
|
+
}
|
|
293
|
+
}
|
|
279
294
|
}
|
|
280
295
|
exports.TaskRunner = TaskRunner;
|
|
281
296
|
//# sourceMappingURL=task-runner.js.map
|
package/dist/task-runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":";;;AAAA,+
|
|
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.0
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"main": "dist/start.js",
|
|
5
5
|
"module": "src/start.ts",
|
|
6
6
|
"types": "dist/start.d.ts",
|
|
@@ -12,8 +12,11 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"nanoid": "^3.3.6",
|
|
14
14
|
"ws": "^8.18.0",
|
|
15
|
-
"n8n-workflow": "1.
|
|
16
|
-
"n8n-core": "1.
|
|
15
|
+
"n8n-workflow": "1.63.0",
|
|
16
|
+
"n8n-core": "1.64.0"
|
|
17
|
+
},
|
|
18
|
+
"devDependencies": {
|
|
19
|
+
"luxon": "3.4.4"
|
|
17
20
|
},
|
|
18
21
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
19
22
|
"homepage": "https://n8n.io",
|
|
@@ -30,12 +33,13 @@
|
|
|
30
33
|
"start": "node dist/start.js",
|
|
31
34
|
"dev": "pnpm build && pnpm start",
|
|
32
35
|
"typecheck": "tsc --noEmit",
|
|
33
|
-
"build": "tsc -p ./tsconfig.build.json",
|
|
36
|
+
"build": "tsc -p ./tsconfig.build.json && tsc-alias -p tsconfig.build.json",
|
|
34
37
|
"format": "biome format --write src",
|
|
35
38
|
"format:check": "biome ci src",
|
|
36
|
-
"test": "
|
|
39
|
+
"test": "jest",
|
|
40
|
+
"test:watch": "jest --watch",
|
|
37
41
|
"lint": "eslint . --quiet",
|
|
38
42
|
"lintfix": "eslint . --fix",
|
|
39
|
-
"watch": "tsc -p tsconfig.build.json
|
|
43
|
+
"watch": "concurrently \"tsc -w -p tsconfig.build.json\" \"tsc-alias -w -p tsconfig.build.json\""
|
|
40
44
|
}
|
|
41
45
|
}
|
package/dist/code.js
DELETED
|
@@ -1,80 +0,0 @@
|
|
|
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
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.JsTaskRunner = void 0;
|
|
27
|
-
const n8n_core_1 = require("n8n-core");
|
|
28
|
-
const n8n_workflow_1 = require("n8n-workflow");
|
|
29
|
-
const a = __importStar(require("node:assert"));
|
|
30
|
-
const node_vm_1 = require("node:vm");
|
|
31
|
-
const task_runner_1 = require("./task-runner");
|
|
32
|
-
class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
33
|
-
constructor(taskType, wsUrl, grantToken, maxConcurrency, name) {
|
|
34
|
-
super(taskType, wsUrl, grantToken, maxConcurrency, name ?? 'JS Task Runner');
|
|
35
|
-
}
|
|
36
|
-
async executeTask(task) {
|
|
37
|
-
const allData = await this.requestData(task.taskId, 'all');
|
|
38
|
-
const settings = task.settings;
|
|
39
|
-
a.ok(settings, 'JS Code not sent to runner');
|
|
40
|
-
const workflowParams = allData.workflow;
|
|
41
|
-
const workflow = new n8n_workflow_1.Workflow({
|
|
42
|
-
...workflowParams,
|
|
43
|
-
nodeTypes: {
|
|
44
|
-
getByNameAndVersion() {
|
|
45
|
-
return undefined;
|
|
46
|
-
},
|
|
47
|
-
getByName() {
|
|
48
|
-
return undefined;
|
|
49
|
-
},
|
|
50
|
-
getKnownTypes() {
|
|
51
|
-
return {};
|
|
52
|
-
},
|
|
53
|
-
},
|
|
54
|
-
});
|
|
55
|
-
const dataProxy = new n8n_workflow_1.WorkflowDataProxy(workflow, allData.runExecutionData, allData.runIndex, allData.itemIndex, allData.activeNodeName, allData.connectionInputData, allData.siblingParameters, settings.mode, (0, n8n_core_1.getAdditionalKeys)(allData.additionalData, allData.mode, allData.runExecutionData), allData.executeData, allData.defaultReturnRunIndex, allData.selfData, allData.contextNodeName);
|
|
56
|
-
const customConsole = {
|
|
57
|
-
log: (...args) => {
|
|
58
|
-
const logOutput = args
|
|
59
|
-
.map((arg) => (typeof arg === 'object' && arg !== null ? JSON.stringify(arg) : arg))
|
|
60
|
-
.join(' ');
|
|
61
|
-
console.log('[JS Code]', logOutput);
|
|
62
|
-
void this.makeRpcCall(task.taskId, 'logNodeOutput', [logOutput]);
|
|
63
|
-
},
|
|
64
|
-
};
|
|
65
|
-
const context = {
|
|
66
|
-
require,
|
|
67
|
-
module: {},
|
|
68
|
-
console: customConsole,
|
|
69
|
-
...dataProxy.getDataProxy(),
|
|
70
|
-
...this.buildRpcCallObject(task.taskId),
|
|
71
|
-
};
|
|
72
|
-
const result = (await (0, node_vm_1.runInNewContext)(`module.exports = async function() {${settings.code}\n}()`, context));
|
|
73
|
-
return {
|
|
74
|
-
result,
|
|
75
|
-
customData: allData.runExecutionData.resultData.metadata,
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
exports.JsTaskRunner = JsTaskRunner;
|
|
80
|
-
//# sourceMappingURL=code.js.map
|
package/dist/code.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"code.js","sourceRoot":"","sources":["../src/code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA6C;AAC7C,+CAesB;AACtB,+CAAiC;AACjC,qCAAwD;AAGxD,+CAAsD;AA2CtD,MAAa,YAAa,SAAQ,wBAAU;IAC3C,YACC,QAAgB,EAChB,KAAa,EACb,UAAkB,EAClB,cAAsB,EACtB,IAAa;QAEb,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,IAAI,gBAAgB,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAA0B;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAkB,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE5E,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAC;QAE7C,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,uBAAQ,CAAC;YAC7B,GAAG,cAAc;YACjB,SAAS,EAAE;gBACV,mBAAmB;oBAClB,OAAO,SAAiC,CAAC;gBAC1C,CAAC;gBACD,SAAS;oBACR,OAAO,SAAiC,CAAC;gBAC1C,CAAC;gBACD,aAAa;oBACZ,OAAO,EAAE,CAAC;gBACX,CAAC;aACD;SACD,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,gCAAiB,CACtC,QAAQ,EACR,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,mBAAmB,EAC3B,OAAO,CAAC,iBAAiB,EACzB,QAAQ,CAAC,IAAI,EACb,IAAA,4BAAiB,EAChB,OAAO,CAAC,cAAgD,EACxD,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,gBAAgB,CACxB,EACD,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,eAAe,CACvB,CAAC;QAEF,MAAM,aAAa,GAAG;YACrB,GAAG,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;gBAC3B,MAAM,SAAS,GAAG,IAAI;qBACpB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;qBACnF,IAAI,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;gBACpC,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YAClE,CAAC;SACD,CAAC;QAEF,MAAM,OAAO,GAAY;YACxB,OAAO;YACP,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,aAAa;YAEtB,GAAG,SAAS,CAAC,YAAY,EAAE;YAC3B,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;SACvC,CAAC;QAEF,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,yBAAe,EACpC,sCAAsC,QAAQ,CAAC,IAAI,OAAO,EAC1D,OAAO,CACP,CAA6B,CAAC;QAE/B,OAAO;YACN,MAAM;YACN,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ;SACxD,CAAC;IACH,CAAC;CACD;AAlFD,oCAkFC"}
|