@n8n/task-runner 1.11.0 → 1.13.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/LICENSE.md +5 -3
- package/dist/build.tsbuildinfo +1 -1
- package/dist/config/base-runner-config.js +2 -2
- package/dist/config/base-runner-config.js.map +1 -1
- package/dist/config/sentry-config.d.ts +1 -1
- package/dist/config/sentry-config.js +2 -2
- package/dist/config/sentry-config.js.map +1 -1
- package/dist/js-task-runner/built-ins-parser/built-ins-parser.js.map +1 -1
- package/dist/js-task-runner/js-task-runner.d.ts +12 -6
- package/dist/js-task-runner/js-task-runner.js +53 -44
- package/dist/js-task-runner/js-task-runner.js.map +1 -1
- package/dist/js-task-runner/result-validation.js +7 -1
- package/dist/js-task-runner/result-validation.js.map +1 -1
- package/dist/start.js +9 -14
- package/dist/start.js.map +1 -1
- package/dist/task-runner-sentry.d.ts +12 -0
- package/dist/task-runner-sentry.js +56 -0
- package/dist/task-runner-sentry.js.map +1 -0
- package/dist/task-runner.d.ts +16 -14
- package/dist/task-runner.js +144 -87
- package/dist/task-runner.js.map +1 -1
- package/dist/task-state.d.ts +17 -0
- package/dist/task-state.js +63 -0
- package/dist/task-state.js.map +1 -0
- package/package.json +7 -7
|
@@ -38,10 +38,10 @@ let BaseRunnerConfig = class BaseRunnerConfig {
|
|
|
38
38
|
this.taskBrokerUri = 'http://127.0.0.1:5679';
|
|
39
39
|
this.grantToken = '';
|
|
40
40
|
this.maxPayloadSize = 1024 * 1024 * 1024;
|
|
41
|
-
this.maxConcurrency =
|
|
41
|
+
this.maxConcurrency = 10;
|
|
42
42
|
this.idleTimeout = 0;
|
|
43
43
|
this.timezone = 'America/New_York';
|
|
44
|
-
this.taskTimeout =
|
|
44
|
+
this.taskTimeout = 300;
|
|
45
45
|
}
|
|
46
46
|
};
|
|
47
47
|
exports.BaseRunnerConfig = BaseRunnerConfig;
|
|
@@ -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,yCAAyC,CAAC;;wDACtB;AAGzB;IADC,IAAA,YAAG,EAAC,sCAAsC,CAAC;;qDACjB;AAG3B;IADC,IAAA,YAAG,EAAC,sCAAsC,CAAC;;qDACxB;AARf,uBAAuB;IAD5B,eAAM;GACD,uBAAuB,CAS5B;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAEN,kBAAa,GAAW,uBAAuB,CAAC;QAGhD,eAAU,GAAW,EAAE,CAAC;QAGxB,mBAAc,GAAW,IAAI,GAAG,IAAI,GAAG,IAAI,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,yCAAyC,CAAC;;wDACtB;AAGzB;IADC,IAAA,YAAG,EAAC,sCAAsC,CAAC;;qDACjB;AAG3B;IADC,IAAA,YAAG,EAAC,sCAAsC,CAAC;;qDACxB;AARf,uBAAuB;IAD5B,eAAM;GACD,uBAAuB,CAS5B;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAEN,kBAAa,GAAW,uBAAuB,CAAC;QAGhD,eAAU,GAAW,EAAE,CAAC;QAGxB,mBAAc,GAAW,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QAQ5C,mBAAc,GAAW,EAAE,CAAC;QAQ5B,gBAAW,GAAW,CAAC,CAAC;QAGxB,aAAQ,GAAW,kBAAkB,CAAC;QAUtC,gBAAW,GAAW,GAAG,CAAC;IAI3B,CAAC;CAAA,CAAA;AAzCY,4CAAgB;AAE5B;IADC,IAAA,YAAG,EAAC,6BAA6B,CAAC;;uDACa;AAGhD;IADC,IAAA,YAAG,EAAC,yBAAyB,CAAC;;oDACP;AAGxB;IADC,IAAA,YAAG,EAAC,yBAAyB,CAAC;;wDACa;AAQ5C;IADC,IAAA,YAAG,EAAC,6BAA6B,CAAC;;wDACP;AAQ5B;IADC,IAAA,YAAG,EAAC,mCAAmC,CAAC;;qDACjB;AAGxB;IADC,IAAA,YAAG,EAAC,kBAAkB,CAAC;;kDACc;AAUtC;IADC,IAAA,YAAG,EAAC,0BAA0B,CAAC;;qDACN;AAG1B;IADC,eAAM;8BACa,uBAAuB;2DAAC;2BAxChC,gBAAgB;IAD5B,eAAM;GACM,gBAAgB,CAyC5B"}
|
|
@@ -13,7 +13,7 @@ exports.SentryConfig = void 0;
|
|
|
13
13
|
const config_1 = require("@n8n/config");
|
|
14
14
|
let SentryConfig = class SentryConfig {
|
|
15
15
|
constructor() {
|
|
16
|
-
this.
|
|
16
|
+
this.dsn = '';
|
|
17
17
|
this.n8nVersion = '';
|
|
18
18
|
this.environment = '';
|
|
19
19
|
this.deploymentName = '';
|
|
@@ -23,7 +23,7 @@ exports.SentryConfig = SentryConfig;
|
|
|
23
23
|
__decorate([
|
|
24
24
|
(0, config_1.Env)('N8N_SENTRY_DSN'),
|
|
25
25
|
__metadata("design:type", String)
|
|
26
|
-
], SentryConfig.prototype, "
|
|
26
|
+
], SentryConfig.prototype, "dsn", void 0);
|
|
27
27
|
__decorate([
|
|
28
28
|
(0, config_1.Env)('N8N_VERSION'),
|
|
29
29
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sentry-config.js","sourceRoot":"","sources":["../../src/config/sentry-config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAGnC,IAAM,YAAY,GAAlB,MAAM,YAAY;IAAlB;QAGN,
|
|
1
|
+
{"version":3,"file":"sentry-config.js","sourceRoot":"","sources":["../../src/config/sentry-config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAGnC,IAAM,YAAY,GAAlB,MAAM,YAAY;IAAlB;QAGN,QAAG,GAAW,EAAE,CAAC;QAKjB,eAAU,GAAW,EAAE,CAAC;QAGxB,gBAAW,GAAW,EAAE,CAAC;QAGzB,mBAAc,GAAW,EAAE,CAAC;IAG7B,CAAC;CAAA,CAAA;AAjBY,oCAAY;AAGxB;IADC,IAAA,YAAG,EAAC,gBAAgB,CAAC;;yCACL;AAKjB;IADC,IAAA,YAAG,EAAC,aAAa,CAAC;;gDACK;AAGxB;IADC,IAAA,YAAG,EAAC,aAAa,CAAC;;iDACM;AAGzB;IADC,IAAA,YAAG,EAAC,iBAAiB,CAAC;;oDACK;uBAdhB,YAAY;IADxB,eAAM;GACM,YAAY,CAiBxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"built-ins-parser.js","sourceRoot":"","sources":["../../../src/js-task-runner/built-ins-parser/built-ins-parser.ts"],"names":[],"mappings":";;;AACA,iCAA8B;AAC9B,2CAAsC;AAEtC,+CAAwC;AAExC,mDAMyB;AACzB,qEAA+D;AAM/D,MAAa,cAAc;IAA3B;QA8BS,wBAAmB,GAAG,CAC7B,IAAoB,EACpB,KAA0B,EAC1B,SAAiB,EAChB,EAAE;YAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC;YAC/E,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAGtB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjC,OAAO;YACR,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACnC,IAAI,CAAC,IAAA,yBAAS,EAAC,QAAQ,CAAC,EAAE,CAAC;gBAE1B,KAAK,CAAC,iBAAiB,EAAE,CAAC;gBAC1B,OAAO;YACR,CAAC;YAED,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAExC,OAAO;YACR,CAAC;YAGD,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAGvC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC;QA4CM,oBAAe,GAAG,CAAC,IAAgB,EAAE,KAA0B,EAAE,EAAE;YAC1E,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC1B,KAAK,CAAC,eAAe,EAAE,CAAC;YACzB,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAIlC,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC;iBAAM,IACN,IAAI,CAAC,IAAI,KAAK,QAAQ;gBACtB,IAAI,CAAC,IAAI,KAAK,OAAO;gBACrB,IAAI,CAAC,IAAI,KAAK,OAAO;gBAErB,IAAI,CAAC,IAAI,KAAK,MAAM,EACnB,CAAC;gBACF,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAIlC,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACvC,KAAK,CAAC,qBAAqB,EAAE,CAAC;YAC/B,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACtC,KAAK,CAAC,oBAAoB,EAAE,CAAC;YAC9B,CAAC;QACF,CAAC,CAAC;IAOH,CAAC;
|
|
1
|
+
{"version":3,"file":"built-ins-parser.js","sourceRoot":"","sources":["../../../src/js-task-runner/built-ins-parser/built-ins-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Workflow } from 'n8n-workflow';
|
|
2
|
+
import type { CodeExecutionMode, IDataObject, INodeExecutionData, INodeParameters, WorkflowExecuteMode, WorkflowParameters, ITaskDataConnections, INode, IRunExecutionData, EnvProviderState, IExecuteData, IWorkflowDataProxyData } from 'n8n-workflow';
|
|
3
|
+
import { type Context } from 'node:vm';
|
|
2
4
|
import type { MainConfig } from '../config/main-config';
|
|
3
|
-
import {
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
import type { InputDataChunkDefinition, PartialAdditionalData, TaskResultData } from '../runner-types';
|
|
6
|
+
import type { TaskParams } from '../task-runner';
|
|
7
|
+
import { TaskRunner } from '../task-runner';
|
|
8
|
+
export interface RpcCallObject {
|
|
9
|
+
[name: string]: ((...args: unknown[]) => Promise<unknown>) | RpcCallObject;
|
|
7
10
|
}
|
|
8
11
|
export interface JSExecSettings {
|
|
9
12
|
code: string;
|
|
@@ -35,7 +38,8 @@ export declare class JsTaskRunner extends TaskRunner {
|
|
|
35
38
|
private readonly builtInsParser;
|
|
36
39
|
private readonly taskDataReconstruct;
|
|
37
40
|
constructor(config: MainConfig, name?: string);
|
|
38
|
-
|
|
41
|
+
private preventPrototypePollution;
|
|
42
|
+
executeTask(taskParams: TaskParams<JSExecSettings>, abortSignal: AbortSignal): Promise<TaskResultData>;
|
|
39
43
|
private validateTaskSettings;
|
|
40
44
|
private getNativeVariables;
|
|
41
45
|
private runForAllItems;
|
|
@@ -45,4 +49,6 @@ export declare class JsTaskRunner extends TaskRunner {
|
|
|
45
49
|
private reconstructTaskData;
|
|
46
50
|
private requestNodeTypeIfNeeded;
|
|
47
51
|
private buildRpcCallObject;
|
|
52
|
+
private buildCustomConsole;
|
|
53
|
+
buildContext(taskId: string, workflow: Workflow, node: INode, dataProxy: IWorkflowDataProxyData, additionalProperties?: Record<string, unknown>): Context;
|
|
48
54
|
}
|
|
@@ -38,9 +38,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.JsTaskRunner = void 0;
|
|
40
40
|
const set_1 = __importDefault(require("lodash/set"));
|
|
41
|
+
const luxon_1 = require("luxon");
|
|
41
42
|
const n8n_core_1 = require("n8n-core");
|
|
42
43
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
43
44
|
const a = __importStar(require("node:assert"));
|
|
45
|
+
const node_util_1 = require("node:util");
|
|
44
46
|
const node_vm_1 = require("node:vm");
|
|
45
47
|
const unsupported_function_error_1 = require("../js-task-runner/errors/unsupported-function.error");
|
|
46
48
|
const runner_types_1 = require("../runner-types");
|
|
@@ -69,40 +71,39 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
69
71
|
allowedBuiltInModules: parseModuleAllowList(jsRunnerConfig.allowedBuiltInModules ?? ''),
|
|
70
72
|
allowedExternalModules: parseModuleAllowList(jsRunnerConfig.allowedExternalModules ?? ''),
|
|
71
73
|
});
|
|
74
|
+
this.preventPrototypePollution();
|
|
72
75
|
}
|
|
73
|
-
|
|
74
|
-
|
|
76
|
+
preventPrototypePollution() {
|
|
77
|
+
if (process.env.NODE_ENV !== 'test') {
|
|
78
|
+
Object.getOwnPropertyNames(globalThis)
|
|
79
|
+
.map((name) => globalThis[name])
|
|
80
|
+
.filter((value) => typeof value === 'function')
|
|
81
|
+
.forEach((fn) => Object.freeze(fn.prototype));
|
|
82
|
+
}
|
|
83
|
+
[n8n_workflow_1.Workflow, n8n_workflow_1.Expression, n8n_workflow_1.WorkflowDataProxy, luxon_1.DateTime, luxon_1.Interval, luxon_1.Duration]
|
|
84
|
+
.map((constructor) => constructor.prototype)
|
|
85
|
+
.forEach(Object.freeze);
|
|
86
|
+
}
|
|
87
|
+
async executeTask(taskParams, abortSignal) {
|
|
88
|
+
const { taskId, settings } = taskParams;
|
|
75
89
|
a.ok(settings, 'JS Code not sent to runner');
|
|
76
90
|
this.validateTaskSettings(settings);
|
|
77
91
|
const neededBuiltInsResult = this.builtInsParser.parseUsedBuiltIns(settings.code);
|
|
78
92
|
const neededBuiltIns = neededBuiltInsResult.ok
|
|
79
93
|
? neededBuiltInsResult.result
|
|
80
94
|
: built_ins_parser_state_1.BuiltInsParserState.newNeedsAllDataState();
|
|
81
|
-
const dataResponse = await this.requestData(
|
|
95
|
+
const dataResponse = await this.requestData(taskId, neededBuiltIns.toDataRequestParams(settings.chunk));
|
|
82
96
|
const data = this.reconstructTaskData(dataResponse, settings.chunk);
|
|
83
|
-
await this.requestNodeTypeIfNeeded(neededBuiltIns, data.workflow,
|
|
97
|
+
await this.requestNodeTypeIfNeeded(neededBuiltIns, data.workflow, taskId);
|
|
84
98
|
const workflowParams = data.workflow;
|
|
85
99
|
const workflow = new n8n_workflow_1.Workflow({
|
|
86
100
|
...workflowParams,
|
|
87
101
|
nodeTypes: this.nodeTypes,
|
|
88
102
|
});
|
|
89
|
-
const noOp = () => { };
|
|
90
|
-
const customConsole = {
|
|
91
|
-
...Object.keys(console).reduce((acc, name) => {
|
|
92
|
-
acc[name] = noOp;
|
|
93
|
-
return acc;
|
|
94
|
-
}, {}),
|
|
95
|
-
log: (...args) => {
|
|
96
|
-
const logOutput = args
|
|
97
|
-
.map((arg) => (typeof arg === 'object' && arg !== null ? JSON.stringify(arg) : arg))
|
|
98
|
-
.join(' ');
|
|
99
|
-
void this.makeRpcCall(task.taskId, 'logNodeOutput', [logOutput]);
|
|
100
|
-
},
|
|
101
|
-
};
|
|
102
103
|
workflow.staticData = n8n_workflow_1.ObservableObject.create(workflow.staticData);
|
|
103
104
|
const result = settings.nodeMode === 'runOnceForAllItems'
|
|
104
|
-
? await this.runForAllItems(
|
|
105
|
-
: await this.runForEachItem(
|
|
105
|
+
? await this.runForAllItems(taskId, settings, data, workflow, abortSignal)
|
|
106
|
+
: await this.runForEachItem(taskId, settings, data, workflow, abortSignal);
|
|
106
107
|
return {
|
|
107
108
|
result,
|
|
108
109
|
customData: data.runExecutionData.resultData.metadata,
|
|
@@ -118,8 +119,6 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
118
119
|
getNativeVariables() {
|
|
119
120
|
return {
|
|
120
121
|
Buffer,
|
|
121
|
-
Function,
|
|
122
|
-
eval,
|
|
123
122
|
setTimeout,
|
|
124
123
|
setInterval,
|
|
125
124
|
setImmediate,
|
|
@@ -135,26 +134,20 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
135
134
|
FormData,
|
|
136
135
|
};
|
|
137
136
|
}
|
|
138
|
-
async runForAllItems(taskId, settings, data, workflow,
|
|
137
|
+
async runForAllItems(taskId, settings, data, workflow, signal) {
|
|
139
138
|
const dataProxy = this.createDataProxy(data, workflow, data.itemIndex);
|
|
140
139
|
const inputItems = data.connectionInputData;
|
|
141
|
-
const context = {
|
|
142
|
-
require: this.requireResolver,
|
|
143
|
-
module: {},
|
|
144
|
-
console: customConsole,
|
|
140
|
+
const context = this.buildContext(taskId, workflow, data.node, dataProxy, {
|
|
145
141
|
items: inputItems,
|
|
146
|
-
|
|
147
|
-
...this.getNativeVariables(),
|
|
148
|
-
...dataProxy,
|
|
149
|
-
...this.buildRpcCallObject(taskId),
|
|
150
|
-
};
|
|
142
|
+
});
|
|
151
143
|
try {
|
|
152
144
|
const result = await new Promise((resolve, reject) => {
|
|
153
145
|
const abortHandler = () => {
|
|
154
146
|
reject(new timeout_error_1.TimeoutError(this.taskTimeout));
|
|
155
147
|
};
|
|
156
148
|
signal.addEventListener('abort', abortHandler, { once: true });
|
|
157
|
-
const
|
|
149
|
+
const preventPrototypeManipulation = 'Object.getPrototypeOf = () => ({}); Reflect.getPrototypeOf = () => ({}); Object.setPrototypeOf = () => false; Reflect.setPrototypeOf = () => false;';
|
|
150
|
+
const taskResult = (0, node_vm_1.runInContext)(`globalThis.global = globalThis; ${preventPrototypeManipulation}; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`, context, { timeout: this.taskTimeout * 1000 });
|
|
158
151
|
void taskResult
|
|
159
152
|
.then(resolve)
|
|
160
153
|
.catch(reject)
|
|
@@ -175,7 +168,7 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
175
168
|
throw error;
|
|
176
169
|
}
|
|
177
170
|
}
|
|
178
|
-
async runForEachItem(taskId, settings, data, workflow,
|
|
171
|
+
async runForEachItem(taskId, settings, data, workflow, signal) {
|
|
179
172
|
const inputItems = data.connectionInputData;
|
|
180
173
|
const returnData = [];
|
|
181
174
|
const chunkStartIdx = settings.chunk ? settings.chunk.startIndex : 0;
|
|
@@ -185,23 +178,14 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
185
178
|
for (let index = chunkStartIdx; index < chunkEndIdx; index++) {
|
|
186
179
|
const item = inputItems[index];
|
|
187
180
|
const dataProxy = this.createDataProxy(data, workflow, index);
|
|
188
|
-
const context = {
|
|
189
|
-
require: this.requireResolver,
|
|
190
|
-
module: {},
|
|
191
|
-
console: customConsole,
|
|
192
|
-
item,
|
|
193
|
-
$getWorkflowStaticData: (type) => workflow.getStaticData(type, data.node),
|
|
194
|
-
...this.getNativeVariables(),
|
|
195
|
-
...dataProxy,
|
|
196
|
-
...this.buildRpcCallObject(taskId),
|
|
197
|
-
};
|
|
181
|
+
const context = this.buildContext(taskId, workflow, data.node, dataProxy, { item });
|
|
198
182
|
try {
|
|
199
183
|
let result = await new Promise((resolve, reject) => {
|
|
200
184
|
const abortHandler = () => {
|
|
201
185
|
reject(new timeout_error_1.TimeoutError(this.taskTimeout));
|
|
202
186
|
};
|
|
203
187
|
signal.addEventListener('abort', abortHandler);
|
|
204
|
-
const taskResult = (0, node_vm_1.
|
|
188
|
+
const taskResult = (0, node_vm_1.runInContext)(`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`, context, { timeout: this.taskTimeout * 1000 });
|
|
205
189
|
void taskResult
|
|
206
190
|
.then(resolve)
|
|
207
191
|
.catch(reject)
|
|
@@ -288,6 +272,31 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
288
272
|
}
|
|
289
273
|
return rpcObject;
|
|
290
274
|
}
|
|
275
|
+
buildCustomConsole(taskId) {
|
|
276
|
+
return {
|
|
277
|
+
...Object.keys(console).reduce((acc, name) => {
|
|
278
|
+
acc[name] = task_runner_1.noOp;
|
|
279
|
+
return acc;
|
|
280
|
+
}, {}),
|
|
281
|
+
log: (...args) => {
|
|
282
|
+
const formattedLogArgs = args.map((arg) => (0, node_util_1.inspect)(arg));
|
|
283
|
+
void this.makeRpcCall(taskId, 'logNodeOutput', formattedLogArgs);
|
|
284
|
+
},
|
|
285
|
+
};
|
|
286
|
+
}
|
|
287
|
+
buildContext(taskId, workflow, node, dataProxy, additionalProperties = {}) {
|
|
288
|
+
return (0, node_vm_1.createContext)({
|
|
289
|
+
[node_util_1.inspect.custom]: () => '[[ExecutionContext]]',
|
|
290
|
+
require: this.requireResolver,
|
|
291
|
+
module: {},
|
|
292
|
+
console: this.buildCustomConsole(taskId),
|
|
293
|
+
$getWorkflowStaticData: (type) => workflow.getStaticData(type, node),
|
|
294
|
+
...this.getNativeVariables(),
|
|
295
|
+
...dataProxy,
|
|
296
|
+
...this.buildRpcCallObject(taskId),
|
|
297
|
+
...additionalProperties,
|
|
298
|
+
});
|
|
299
|
+
}
|
|
291
300
|
}
|
|
292
301
|
exports.JsTaskRunner = JsTaskRunner;
|
|
293
302
|
//# sourceMappingURL=js-task-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"js-task-runner.js","sourceRoot":"","sources":["../../src/js-task-runner/js-task-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA6B;AAC7B,uCAA6C;AAC7C,+
|
|
1
|
+
{"version":3,"file":"js-task-runner.js","sourceRoot":"","sources":["../../src/js-task-runner/js-task-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,13 @@ exports.validateRunForEachItemOutput = validateRunForEachItemOutput;
|
|
|
6
6
|
const n8n_core_1 = require("n8n-core");
|
|
7
7
|
const validation_error_1 = require("./errors/validation-error");
|
|
8
8
|
const obj_utils_1 = require("./obj-utils");
|
|
9
|
-
exports.REQUIRED_N8N_ITEM_KEYS = new Set([
|
|
9
|
+
exports.REQUIRED_N8N_ITEM_KEYS = new Set([
|
|
10
|
+
'json',
|
|
11
|
+
'binary',
|
|
12
|
+
'pairedItem',
|
|
13
|
+
'error',
|
|
14
|
+
'index',
|
|
15
|
+
]);
|
|
10
16
|
function validateTopLevelKeys(item, itemIndex) {
|
|
11
17
|
for (const key in item) {
|
|
12
18
|
if (Object.prototype.hasOwnProperty.call(item, key)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result-validation.js","sourceRoot":"","sources":["../../src/js-task-runner/result-validation.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"result-validation.js","sourceRoot":"","sources":["../../src/js-task-runner/result-validation.ts"],"names":[],"mappings":";;;AAuDA,oEAiCC;AAKD,oEAkCC;AA/HD,uCAA0C;AAG1C,gEAA4D;AAC5D,2CAAuC;AAE1B,QAAA,sBAAsB,GAAG,IAAI,GAAG,CAAC;IAC7C,MAAM;IACN,QAAQ;IACR,YAAY;IACZ,OAAO;IAOP,OAAO;CACP,CAAC,CAAC;AAEH,SAAS,oBAAoB,CAAC,IAAwB,EAAE,SAAiB;IACxE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,IAAI,8BAAsB,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YAE9C,MAAM,IAAI,kCAAe,CAAC;gBACzB,OAAO,EAAE,+BAA+B,GAAG,EAAE;gBAC7C,WAAW,EAAE,kEAAkE;gBAC/E,SAAS;aACT,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAsB,EAAE,SAAiB;IAC5E,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,kCAAe,CAAC;YACzB,OAAO,EAAE,mCAAmC;YAC5C,WAAW,EAAE,uEAAuE;YACpF,SAAS;SACT,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,IAAA,oBAAQ,EAAC,MAAM,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,kCAAe,CAAC;YACzB,OAAO,EAAE,qCAAqC;YAC9C,WAAW,EAAE,yEAAyE;YACtF,SAAS;SACT,CAAC,CAAC;IACJ,CAAC;AACF,CAAC;AAKD,SAAgB,4BAA4B,CAC3C,eAAsE;IAEtE,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE,CAAC;QACzC,MAAM,IAAI,kCAAe,CAAC;YACzB,OAAO,EAAE,oCAAoC;YAC7C,WAAW,EAAE,gFAAgF;SAC7F,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QAQpC,MAAM,sBAAsB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,8BAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAChE,CAAC;QAEF,IAAI,sBAAsB,EAAE,CAAC;YAC5B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC7D,MAAM,IAAI,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;gBACpC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,yBAAc,EAAC,eAAe,CAAC,CAAC;IACnD,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACjC,OAAO,UAAU,CAAC;AACnB,CAAC;AAKD,SAAgB,4BAA4B,CAC3C,eAA+C,EAC/C,SAAiB;IAEjB,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE,CAAC;QACzC,MAAM,IAAI,kCAAe,CAAC;YACzB,OAAO,EAAE,+BAA+B;YACxC,WAAW,EAAE,2DAA2D,eAAe,0BAA0B;YACjH,SAAS;SACT,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QACpC,MAAM,aAAa,GAClB,eAAe,CAAC,MAAM,GAAG,CAAC;YACzB,CAAC,CAAC,eAAe,OAAO,eAAe,CAAC,CAAC,CAAC,iBAAiB;YAC3D,CAAC,CAAC,8BAA8B,CAAC;QACnC,MAAM,IAAI,kCAAe,CAAC;YACzB,OAAO,EAAE,qCAAqC;YAC9C,WAAW,EAAE,GAAG,aAAa,8FAA8F;YAC3H,SAAS;SACT,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,IAAA,yBAAc,EAAC,CAAC,eAAe,CAAC,CAAC,CAAC;IAEvD,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAKpC,oBAAoB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAE5C,OAAO,UAAU,CAAC;AACnB,CAAC"}
|
package/dist/start.js
CHANGED
|
@@ -32,19 +32,17 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
36
|
require("./polyfills");
|
|
37
|
+
const di_1 = require("@n8n/di");
|
|
40
38
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
41
|
-
const typedi_1 = __importDefault(require("typedi"));
|
|
42
39
|
const main_config_1 = require("./config/main-config");
|
|
43
40
|
const js_task_runner_1 = require("./js-task-runner/js-task-runner");
|
|
41
|
+
const task_runner_sentry_1 = require("./task-runner-sentry");
|
|
44
42
|
let healthCheckServer;
|
|
45
43
|
let runner;
|
|
46
44
|
let isShuttingDown = false;
|
|
47
|
-
let
|
|
45
|
+
let sentry;
|
|
48
46
|
function createSignalHandler(signal, timeoutInS = 10) {
|
|
49
47
|
return async function onSignal() {
|
|
50
48
|
if (isShuttingDown) {
|
|
@@ -62,9 +60,9 @@ function createSignalHandler(signal, timeoutInS = 10) {
|
|
|
62
60
|
runner = undefined;
|
|
63
61
|
void healthCheckServer?.stop();
|
|
64
62
|
}
|
|
65
|
-
if (
|
|
66
|
-
await
|
|
67
|
-
|
|
63
|
+
if (sentry) {
|
|
64
|
+
await sentry.shutdown();
|
|
65
|
+
sentry = undefined;
|
|
68
66
|
}
|
|
69
67
|
}
|
|
70
68
|
catch (e) {
|
|
@@ -78,15 +76,12 @@ function createSignalHandler(signal, timeoutInS = 10) {
|
|
|
78
76
|
};
|
|
79
77
|
}
|
|
80
78
|
void (async function start() {
|
|
81
|
-
const config =
|
|
79
|
+
const config = di_1.Container.get(main_config_1.MainConfig);
|
|
82
80
|
(0, n8n_workflow_1.setGlobalState)({
|
|
83
81
|
defaultTimezone: config.baseRunnerConfig.timezone,
|
|
84
82
|
});
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
errorReporter = new ErrorReporter();
|
|
88
|
-
await errorReporter.init('task_runner', config.sentryConfig.sentryDsn);
|
|
89
|
-
}
|
|
83
|
+
sentry = di_1.Container.get(task_runner_sentry_1.TaskRunnerSentry);
|
|
84
|
+
await sentry.initIfEnabled();
|
|
90
85
|
runner = new js_task_runner_1.JsTaskRunner(config);
|
|
91
86
|
runner.on('runner:reached-idle-timeout', () => {
|
|
92
87
|
void createSignalHandler('IDLE_TIMEOUT', 1)();
|
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { ErrorEvent } from '@sentry/types';
|
|
2
|
+
import { ErrorReporter } from 'n8n-core';
|
|
3
|
+
import { SentryConfig } from './config/sentry-config';
|
|
4
|
+
export declare class TaskRunnerSentry {
|
|
5
|
+
private readonly config;
|
|
6
|
+
private readonly errorReporter;
|
|
7
|
+
constructor(config: SentryConfig, errorReporter: ErrorReporter);
|
|
8
|
+
initIfEnabled(): Promise<void>;
|
|
9
|
+
shutdown(): Promise<void>;
|
|
10
|
+
filterOutUserCodeErrors: (event: ErrorEvent) => boolean;
|
|
11
|
+
private isUserCodeError;
|
|
12
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
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;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.TaskRunnerSentry = void 0;
|
|
13
|
+
const di_1 = require("@n8n/di");
|
|
14
|
+
const n8n_core_1 = require("n8n-core");
|
|
15
|
+
const sentry_config_1 = require("./config/sentry-config");
|
|
16
|
+
let TaskRunnerSentry = class TaskRunnerSentry {
|
|
17
|
+
constructor(config, errorReporter) {
|
|
18
|
+
this.config = config;
|
|
19
|
+
this.errorReporter = errorReporter;
|
|
20
|
+
this.filterOutUserCodeErrors = (event) => {
|
|
21
|
+
const error = event?.exception?.values?.[0];
|
|
22
|
+
return error ? this.isUserCodeError(error) : false;
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
async initIfEnabled() {
|
|
26
|
+
const { dsn, n8nVersion, environment, deploymentName } = this.config;
|
|
27
|
+
if (!dsn)
|
|
28
|
+
return;
|
|
29
|
+
await this.errorReporter.init({
|
|
30
|
+
serverType: 'task_runner',
|
|
31
|
+
dsn,
|
|
32
|
+
release: n8nVersion,
|
|
33
|
+
environment,
|
|
34
|
+
serverName: deploymentName,
|
|
35
|
+
beforeSendFilter: this.filterOutUserCodeErrors,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
async shutdown() {
|
|
39
|
+
if (!this.config.dsn)
|
|
40
|
+
return;
|
|
41
|
+
await this.errorReporter.shutdown();
|
|
42
|
+
}
|
|
43
|
+
isUserCodeError(error) {
|
|
44
|
+
const frames = error.stacktrace?.frames;
|
|
45
|
+
if (!frames)
|
|
46
|
+
return false;
|
|
47
|
+
return frames.some((frame) => frame.filename === 'node:vm' && frame.function === 'runInContext');
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
exports.TaskRunnerSentry = TaskRunnerSentry;
|
|
51
|
+
exports.TaskRunnerSentry = TaskRunnerSentry = __decorate([
|
|
52
|
+
(0, di_1.Service)(),
|
|
53
|
+
__metadata("design:paramtypes", [sentry_config_1.SentryConfig,
|
|
54
|
+
n8n_core_1.ErrorReporter])
|
|
55
|
+
], TaskRunnerSentry);
|
|
56
|
+
//# sourceMappingURL=task-runner-sentry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-runner-sentry.js","sourceRoot":"","sources":["../src/task-runner-sentry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAElC,uCAAyC;AAEzC,0DAAsD;AAM/C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,YACkB,MAAoB,EACpB,aAA4B;QAD5B,WAAM,GAAN,MAAM,CAAc;QACpB,kBAAa,GAAb,aAAa,CAAe;QA6B9C,4BAAuB,GAAG,CAAC,KAAiB,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAG,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAE5C,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACpD,CAAC,CAAC;IAhCC,CAAC;IAEJ,KAAK,CAAC,aAAa;QAClB,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAErE,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YAC7B,UAAU,EAAE,aAAa;YACzB,GAAG;YACH,OAAO,EAAE,UAAU;YACnB,WAAW;YACX,UAAU,EAAE,cAAc;YAC1B,gBAAgB,EAAE,IAAI,CAAC,uBAAuB;SAC9C,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;YAAE,OAAO;QAE7B,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;IACrC,CAAC;IAkBO,eAAe,CAAC,KAAgB;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC;QACxC,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAE1B,OAAO,MAAM,CAAC,IAAI,CACjB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,KAAK,CAAC,QAAQ,KAAK,cAAc,CAC5E,CAAC;IACH,CAAC;CACD,CAAA;AAnDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAGiB,4BAAY;QACL,wBAAa;GAHlC,gBAAgB,CAmD5B"}
|
package/dist/task-runner.d.ts
CHANGED
|
@@ -4,12 +4,7 @@ import type { BaseRunnerConfig } from './config/base-runner-config';
|
|
|
4
4
|
import type { BrokerMessage, RunnerMessage } from './message-types';
|
|
5
5
|
import { TaskRunnerNodeTypes } from './node-types';
|
|
6
6
|
import type { TaskResultData } from './runner-types';
|
|
7
|
-
|
|
8
|
-
taskId: string;
|
|
9
|
-
settings?: T;
|
|
10
|
-
active: boolean;
|
|
11
|
-
cancelled: boolean;
|
|
12
|
-
}
|
|
7
|
+
import { TaskState } from './task-state';
|
|
13
8
|
export interface TaskOffer {
|
|
14
9
|
offerId: string;
|
|
15
10
|
validUntil: bigint;
|
|
@@ -31,6 +26,11 @@ interface RPCCall {
|
|
|
31
26
|
resolve: (data: unknown) => void;
|
|
32
27
|
reject: (error: unknown) => void;
|
|
33
28
|
}
|
|
29
|
+
export declare const noOp: () => void;
|
|
30
|
+
export interface TaskParams<T = unknown> {
|
|
31
|
+
taskId: string;
|
|
32
|
+
settings: T;
|
|
33
|
+
}
|
|
34
34
|
export interface TaskRunnerOpts extends BaseRunnerConfig {
|
|
35
35
|
taskType: string;
|
|
36
36
|
name?: string;
|
|
@@ -39,7 +39,7 @@ export declare abstract class TaskRunner extends EventEmitter {
|
|
|
39
39
|
id: string;
|
|
40
40
|
ws: WebSocket;
|
|
41
41
|
canSendOffers: boolean;
|
|
42
|
-
runningTasks: Map<
|
|
42
|
+
runningTasks: Map<TaskState['taskId'], TaskState>;
|
|
43
43
|
offerInterval: NodeJS.Timeout | undefined;
|
|
44
44
|
openOffers: Map<TaskOffer['offerId'], TaskOffer>;
|
|
45
45
|
dataRequests: Map<DataRequest['requestId'], DataRequest>;
|
|
@@ -52,7 +52,6 @@ export declare abstract class TaskRunner extends EventEmitter {
|
|
|
52
52
|
private idleTimer;
|
|
53
53
|
protected readonly taskTimeout: number;
|
|
54
54
|
private readonly idleTimeout;
|
|
55
|
-
protected taskCancellations: Map<string, AbortController>;
|
|
56
55
|
constructor(opts: TaskRunnerOpts);
|
|
57
56
|
private resetIdleTimer;
|
|
58
57
|
private receiveMessage;
|
|
@@ -66,18 +65,21 @@ export declare abstract class TaskRunner extends EventEmitter {
|
|
|
66
65
|
processNodeTypesResponse(requestId: string, nodeTypes: unknown): void;
|
|
67
66
|
hasOpenTasks(): boolean;
|
|
68
67
|
offerAccepted(offerId: string, taskId: string): void;
|
|
69
|
-
taskCancelled(taskId: string, reason: string): void
|
|
70
|
-
|
|
71
|
-
taskDone(taskId: string, data: RunnerMessage.ToBroker.TaskDone['data']): void;
|
|
68
|
+
taskCancelled(taskId: string, reason: string): Promise<void>;
|
|
69
|
+
taskTimedOut(taskId: string): Promise<void>;
|
|
72
70
|
receivedSettings(taskId: string, settings: unknown): Promise<void>;
|
|
73
|
-
executeTask(
|
|
74
|
-
requestNodeTypes<T = unknown>(taskId:
|
|
75
|
-
requestData<T = unknown>(taskId:
|
|
71
|
+
executeTask(_taskParams: TaskParams, _signal: AbortSignal): Promise<TaskResultData>;
|
|
72
|
+
requestNodeTypes<T = unknown>(taskId: TaskState['taskId'], requestParams: RunnerMessage.ToBroker.NodeTypesRequest['requestParams']): Promise<T>;
|
|
73
|
+
requestData<T = unknown>(taskId: TaskState['taskId'], requestParams: RunnerMessage.ToBroker.TaskDataRequest['requestParams']): Promise<T>;
|
|
76
74
|
makeRpcCall(taskId: string, name: RunnerMessage.ToBroker.RPC['name'], params: unknown[]): Promise<unknown>;
|
|
77
75
|
handleRpcResponse(callId: string, status: BrokerMessage.ToRunner.RPCResponse['status'], data: unknown): void;
|
|
78
76
|
stop(): Promise<void>;
|
|
79
77
|
clearIdleTimer(): void;
|
|
80
78
|
private closeConnection;
|
|
81
79
|
private waitUntilAllTasksAreDone;
|
|
80
|
+
private taskExecutionSucceeded;
|
|
81
|
+
private taskExecutionFailed;
|
|
82
|
+
private cancelTaskRequests;
|
|
83
|
+
private finishTask;
|
|
82
84
|
}
|
|
83
85
|
export {};
|