@n8n/task-runner 1.7.0 → 1.8.1
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 +2 -0
- package/dist/config/base-runner-config.js +11 -1
- package/dist/config/base-runner-config.js.map +1 -1
- package/dist/data-request/data-request-response-reconstruct.d.ts +3 -3
- package/dist/data-request/data-request-response-reconstruct.js +17 -4
- package/dist/data-request/data-request-response-reconstruct.js.map +1 -1
- package/dist/error-reporter.js +17 -7
- package/dist/error-reporter.js.map +1 -1
- package/dist/js-task-runner/built-ins-parser/built-ins-parser-state.d.ts +2 -1
- package/dist/js-task-runner/built-ins-parser/built-ins-parser-state.js +5 -2
- package/dist/js-task-runner/built-ins-parser/built-ins-parser-state.js.map +1 -1
- package/dist/js-task-runner/built-ins-parser/built-ins-parser.js +3 -0
- 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 +3 -2
- package/dist/js-task-runner/js-task-runner.js +35 -13
- package/dist/js-task-runner/js-task-runner.js.map +1 -1
- package/dist/js-task-runner/result-validation.js +1 -1
- package/dist/js-task-runner/result-validation.js.map +1 -1
- package/dist/runner-types.d.ts +9 -1
- package/dist/runner-types.js.map +1 -1
- package/dist/start.js +23 -7
- package/dist/start.js.map +1 -1
- package/dist/task-runner.d.ts +6 -1
- package/dist/task-runner.js +31 -5
- package/dist/task-runner.js.map +1 -1
- package/package.json +4 -4
|
@@ -15,7 +15,7 @@ let HealthcheckServerConfig = class HealthcheckServerConfig {
|
|
|
15
15
|
constructor() {
|
|
16
16
|
this.enabled = false;
|
|
17
17
|
this.host = '127.0.0.1';
|
|
18
|
-
this.port =
|
|
18
|
+
this.port = 5681;
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
21
|
__decorate([
|
|
@@ -39,6 +39,8 @@ let BaseRunnerConfig = class BaseRunnerConfig {
|
|
|
39
39
|
this.grantToken = '';
|
|
40
40
|
this.maxPayloadSize = 1024 * 1024 * 1024;
|
|
41
41
|
this.maxConcurrency = 5;
|
|
42
|
+
this.idleTimeout = 0;
|
|
43
|
+
this.timezone = 'America/New_York';
|
|
42
44
|
}
|
|
43
45
|
};
|
|
44
46
|
exports.BaseRunnerConfig = BaseRunnerConfig;
|
|
@@ -58,6 +60,14 @@ __decorate([
|
|
|
58
60
|
(0, config_1.Env)('N8N_RUNNERS_MAX_CONCURRENCY'),
|
|
59
61
|
__metadata("design:type", Number)
|
|
60
62
|
], BaseRunnerConfig.prototype, "maxConcurrency", void 0);
|
|
63
|
+
__decorate([
|
|
64
|
+
(0, config_1.Env)('N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT'),
|
|
65
|
+
__metadata("design:type", Number)
|
|
66
|
+
], BaseRunnerConfig.prototype, "idleTimeout", void 0);
|
|
67
|
+
__decorate([
|
|
68
|
+
(0, config_1.Env)('GENERIC_TIMEZONE'),
|
|
69
|
+
__metadata("design:type", String)
|
|
70
|
+
], BaseRunnerConfig.prototype, "timezone", void 0);
|
|
61
71
|
__decorate([
|
|
62
72
|
config_1.Nested,
|
|
63
73
|
__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;
|
|
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;IAIvC,CAAC;CAAA,CAAA;AA1BY,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,eAAM;8BACa,uBAAuB;2DAAC;2BAzBhC,gBAAgB;IAD5B,eAAM;GACM,gBAAgB,CA0B5B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IExecuteData, INodeExecutionData } from 'n8n-workflow';
|
|
2
|
-
import type { DataRequestResponse } from '../runner-types';
|
|
2
|
+
import type { DataRequestResponse, InputDataChunkDefinition } from '../runner-types';
|
|
3
3
|
export declare class DataRequestResponseReconstruct {
|
|
4
|
-
|
|
5
|
-
reconstructExecuteData(response: DataRequestResponse): IExecuteData;
|
|
4
|
+
reconstructConnectionInputItems(inputData: DataRequestResponse['inputData'], chunk?: InputDataChunkDefinition): Array<INodeExecutionData | undefined>;
|
|
5
|
+
reconstructExecuteData(response: DataRequestResponse, inputItems: INodeExecutionData[]): IExecuteData;
|
|
6
6
|
}
|
|
@@ -2,12 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DataRequestResponseReconstruct = void 0;
|
|
4
4
|
class DataRequestResponseReconstruct {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
reconstructConnectionInputItems(inputData, chunk) {
|
|
6
|
+
const inputItems = inputData?.main?.[0] ?? [];
|
|
7
|
+
if (!chunk) {
|
|
8
|
+
return inputItems;
|
|
9
|
+
}
|
|
10
|
+
let sparseInputItems = [];
|
|
11
|
+
sparseInputItems = sparseInputItems
|
|
12
|
+
.concat(Array.from({ length: chunk.startIndex }))
|
|
13
|
+
.concat(inputItems)
|
|
14
|
+
.concat(Array.from({ length: inputItems.length - chunk.startIndex - chunk.count }));
|
|
15
|
+
return sparseInputItems;
|
|
7
16
|
}
|
|
8
|
-
reconstructExecuteData(response) {
|
|
17
|
+
reconstructExecuteData(response, inputItems) {
|
|
18
|
+
const inputData = {
|
|
19
|
+
...response.inputData,
|
|
20
|
+
main: [inputItems],
|
|
21
|
+
};
|
|
9
22
|
return {
|
|
10
|
-
data:
|
|
23
|
+
data: inputData,
|
|
11
24
|
node: response.node,
|
|
12
25
|
source: response.connectionInputSource,
|
|
13
26
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-request-response-reconstruct.js","sourceRoot":"","sources":["../../src/data-request/data-request-response-reconstruct.ts"],"names":[],"mappings":";;;AAQA,MAAa,8BAA8B;IAI1C,
|
|
1
|
+
{"version":3,"file":"data-request-response-reconstruct.js","sourceRoot":"","sources":["../../src/data-request/data-request-response-reconstruct.ts"],"names":[],"mappings":";;;AAQA,MAAa,8BAA8B;IAI1C,+BAA+B,CAC9B,SAA2C,EAC3C,KAAgC;QAEhC,MAAM,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,UAAU,CAAC;QACnB,CAAC;QAID,IAAI,gBAAgB,GAA0C,EAAE,CAAC;QAEjE,gBAAgB,GAAG,gBAAgB;aACjC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;aAChD,MAAM,CAAC,UAAU,CAAC;aAClB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAErF,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAKD,sBAAsB,CACrB,QAA6B,EAC7B,UAAgC;QAEhC,MAAM,SAAS,GAAyB;YACvC,GAAG,QAAQ,CAAC,SAAS;YACrB,IAAI,EAAE,CAAC,UAAU,CAAC;SAClB,CAAC;QAEF,OAAO;YACN,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,qBAAqB;SACtC,CAAC;IACH,CAAC;CACD;AA3CD,wEA2CC"}
|
package/dist/error-reporter.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
36
|
exports.ErrorReporter = void 0;
|
|
27
37
|
const integrations_1 = require("@sentry/integrations");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../src/error-reporter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../src/error-reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { BrokerMessage } from '../../message-types';
|
|
2
|
+
import type { InputDataChunkDefinition } from '../../runner-types';
|
|
2
3
|
export declare class BuiltInsParserState {
|
|
3
4
|
neededNodeNames: Set<string>;
|
|
4
5
|
needsAllNodes: boolean;
|
|
@@ -13,6 +14,6 @@ export declare class BuiltInsParserState {
|
|
|
13
14
|
markInputAsNeeded(): void;
|
|
14
15
|
markExecutionAsNeeded(): void;
|
|
15
16
|
markPrevNodeAsNeeded(): void;
|
|
16
|
-
toDataRequestParams(): BrokerMessage.ToRequester.TaskDataRequest['requestParams'];
|
|
17
|
+
toDataRequestParams(chunk?: InputDataChunkDefinition): BrokerMessage.ToRequester.TaskDataRequest['requestParams'];
|
|
17
18
|
static newNeedsAllDataState(): BuiltInsParserState;
|
|
18
19
|
}
|
|
@@ -34,11 +34,14 @@ class BuiltInsParserState {
|
|
|
34
34
|
markPrevNodeAsNeeded() {
|
|
35
35
|
this.needs$prevNode = true;
|
|
36
36
|
}
|
|
37
|
-
toDataRequestParams() {
|
|
37
|
+
toDataRequestParams(chunk) {
|
|
38
38
|
return {
|
|
39
39
|
dataOfNodes: this.needsAllNodes ? 'all' : Array.from(this.neededNodeNames),
|
|
40
40
|
env: this.needs$env,
|
|
41
|
-
input:
|
|
41
|
+
input: {
|
|
42
|
+
include: this.needs$input,
|
|
43
|
+
chunk,
|
|
44
|
+
},
|
|
42
45
|
prevNode: this.needs$prevNode,
|
|
43
46
|
};
|
|
44
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"built-ins-parser-state.js","sourceRoot":"","sources":["../../../src/js-task-runner/built-ins-parser/built-ins-parser-state.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"built-ins-parser-state.js","sourceRoot":"","sources":["../../../src/js-task-runner/built-ins-parser/built-ins-parser-state.ts"],"names":[],"mappings":";;;AAMA,MAAa,mBAAmB;IAa/B,YAAY,OAAqC,EAAE;QAZnD,oBAAe,GAAgB,IAAI,GAAG,EAAE,CAAC;QAEzC,kBAAa,GAAG,KAAK,CAAC;QAEtB,cAAS,GAAG,KAAK,CAAC;QAElB,gBAAW,GAAG,KAAK,CAAC;QAEpB,oBAAe,GAAG,KAAK,CAAC;QAExB,mBAAc,GAAG,KAAK,CAAC;QAGtB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IAKD,iBAAiB;QAChB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAChC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,eAAe;QACd,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,iBAAiB;QAChB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,qBAAqB;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,oBAAoB;QACnB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,mBAAmB,CAClB,KAAgC;QAEhC,OAAO;YACN,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;YAC1E,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,KAAK,EAAE;gBACN,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,KAAK;aACL;YACD,QAAQ,EAAE,IAAI,CAAC,cAAc;SAC7B,CAAC;IACH,CAAC;IAED,MAAM,CAAC,oBAAoB;QAC1B,MAAM,GAAG,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACtC,GAAG,CAAC,iBAAiB,EAAE,CAAC;QACxB,GAAG,CAAC,eAAe,EAAE,CAAC;QACtB,GAAG,CAAC,iBAAiB,EAAE,CAAC;QACxB,GAAG,CAAC,qBAAqB,EAAE,CAAC;QAC5B,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAC3B,OAAO,GAAG,CAAC;IACZ,CAAC;CACD;AAzED,kDAyEC"}
|
|
@@ -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,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,13 +1,13 @@
|
|
|
1
1
|
import type { CodeExecutionMode, IDataObject, INodeExecutionData, INodeParameters, WorkflowExecuteMode, WorkflowParameters, ITaskDataConnections, INode, IRunExecutionData, EnvProviderState, IExecuteData } from 'n8n-workflow';
|
|
2
2
|
import type { MainConfig } from '../config/main-config';
|
|
3
|
-
import type { PartialAdditionalData, TaskResultData } from '../runner-types';
|
|
3
|
+
import type { InputDataChunkDefinition, PartialAdditionalData, TaskResultData } from '../runner-types';
|
|
4
4
|
import { type Task, TaskRunner } from '../task-runner';
|
|
5
5
|
export interface JSExecSettings {
|
|
6
6
|
code: string;
|
|
7
7
|
nodeMode: CodeExecutionMode;
|
|
8
8
|
workflowMode: WorkflowExecuteMode;
|
|
9
9
|
continueOnFail: boolean;
|
|
10
|
-
|
|
10
|
+
chunk?: InputDataChunkDefinition;
|
|
11
11
|
}
|
|
12
12
|
export interface JsTaskData {
|
|
13
13
|
workflow: Omit<WorkflowParameters, 'nodeTypes'>;
|
|
@@ -33,6 +33,7 @@ export declare class JsTaskRunner extends TaskRunner {
|
|
|
33
33
|
private readonly taskDataReconstruct;
|
|
34
34
|
constructor(config: MainConfig, name?: string);
|
|
35
35
|
executeTask(task: Task<JSExecSettings>): Promise<TaskResultData>;
|
|
36
|
+
private validateTaskSettings;
|
|
36
37
|
private getNativeVariables;
|
|
37
38
|
private runForAllItems;
|
|
38
39
|
private runForEachItem;
|
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
36
|
exports.JsTaskRunner = void 0;
|
|
27
37
|
const n8n_core_1 = require("n8n-core");
|
|
@@ -56,12 +66,13 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
56
66
|
async executeTask(task) {
|
|
57
67
|
const settings = task.settings;
|
|
58
68
|
a.ok(settings, 'JS Code not sent to runner');
|
|
69
|
+
this.validateTaskSettings(settings);
|
|
59
70
|
const neededBuiltInsResult = this.builtInsParser.parseUsedBuiltIns(settings.code);
|
|
60
71
|
const neededBuiltIns = neededBuiltInsResult.ok
|
|
61
72
|
? neededBuiltInsResult.result
|
|
62
73
|
: built_ins_parser_state_1.BuiltInsParserState.newNeedsAllDataState();
|
|
63
|
-
const dataResponse = await this.requestData(task.taskId, neededBuiltIns.toDataRequestParams());
|
|
64
|
-
const data = this.reconstructTaskData(dataResponse);
|
|
74
|
+
const dataResponse = await this.requestData(task.taskId, neededBuiltIns.toDataRequestParams(settings.chunk));
|
|
75
|
+
const data = this.reconstructTaskData(dataResponse, settings.chunk);
|
|
65
76
|
await this.requestNodeTypeIfNeeded(neededBuiltIns, data.workflow, task.taskId);
|
|
66
77
|
const workflowParams = data.workflow;
|
|
67
78
|
const workflow = new n8n_workflow_1.Workflow({
|
|
@@ -84,6 +95,12 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
84
95
|
customData: data.runExecutionData.resultData.metadata,
|
|
85
96
|
};
|
|
86
97
|
}
|
|
98
|
+
validateTaskSettings(settings) {
|
|
99
|
+
a.ok(settings.code, 'No code to execute');
|
|
100
|
+
if (settings.nodeMode === 'runOnceForAllItems') {
|
|
101
|
+
a.ok(settings.chunk === undefined, 'Chunking is not supported for runOnceForAllItems');
|
|
102
|
+
}
|
|
103
|
+
}
|
|
87
104
|
getNativeVariables() {
|
|
88
105
|
return {
|
|
89
106
|
Buffer,
|
|
@@ -134,7 +151,11 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
134
151
|
async runForEachItem(taskId, settings, data, workflow, customConsole) {
|
|
135
152
|
const inputItems = data.connectionInputData;
|
|
136
153
|
const returnData = [];
|
|
137
|
-
|
|
154
|
+
const chunkStartIdx = settings.chunk ? settings.chunk.startIndex : 0;
|
|
155
|
+
const chunkEndIdx = settings.chunk
|
|
156
|
+
? settings.chunk.startIndex + settings.chunk.count
|
|
157
|
+
: inputItems.length;
|
|
158
|
+
for (let index = chunkStartIdx; index < chunkEndIdx; index++) {
|
|
138
159
|
const item = inputItems[index];
|
|
139
160
|
const dataProxy = this.createDataProxy(data, workflow, index);
|
|
140
161
|
const context = {
|
|
@@ -196,11 +217,12 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
196
217
|
}
|
|
197
218
|
return new execution_error_1.ExecutionError({ message: JSON.stringify(error) });
|
|
198
219
|
}
|
|
199
|
-
reconstructTaskData(response) {
|
|
220
|
+
reconstructTaskData(response, chunk) {
|
|
221
|
+
const inputData = this.taskDataReconstruct.reconstructConnectionInputItems(response.inputData, chunk);
|
|
200
222
|
return {
|
|
201
223
|
...response,
|
|
202
|
-
connectionInputData:
|
|
203
|
-
executeData: this.taskDataReconstruct.reconstructExecuteData(response),
|
|
224
|
+
connectionInputData: inputData,
|
|
225
|
+
executeData: this.taskDataReconstruct.reconstructExecuteData(response, inputData),
|
|
204
226
|
};
|
|
205
227
|
}
|
|
206
228
|
async requestNodeTypeIfNeeded(neededBuiltIns, workflow, taskId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"js-task-runner.js","sourceRoot":"","sources":["../../src/js-task-runner/js-task-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"js-task-runner.js","sourceRoot":"","sources":["../../src/js-task-runner/js-task-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ function validateTopLevelKeys(item, itemIndex) {
|
|
|
11
11
|
for (const key in item) {
|
|
12
12
|
if (Object.prototype.hasOwnProperty.call(item, key)) {
|
|
13
13
|
if (exports.REQUIRED_N8N_ITEM_KEYS.has(key))
|
|
14
|
-
|
|
14
|
+
continue;
|
|
15
15
|
throw new validation_error_1.ValidationError({
|
|
16
16
|
message: `Unknown top-level item key: ${key}`,
|
|
17
17
|
description: 'Access the properties of an item under `.json`, e.g. `item.json`',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result-validation.js","sourceRoot":"","sources":["../../src/js-task-runner/result-validation.ts"],"names":[],"mappings":";;;AA2CA,oEAiCC;AAKD,oEAkCC;AAnHD,uCAA0C;AAG1C,gEAA4D;AAC5D,2CAAuC;AAE1B,QAAA,sBAAsB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;AAEzF,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,
|
|
1
|
+
{"version":3,"file":"result-validation.js","sourceRoot":"","sources":["../../src/js-task-runner/result-validation.ts"],"names":[],"mappings":"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"}
|
package/dist/runner-types.d.ts
CHANGED
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
import type { EnvProviderState, IDataObject, IExecuteData, IExecuteFunctions, INode, INodeExecutionData, INodeParameters, IRunExecutionData, ITaskDataConnections, ITaskDataConnectionsSource, IWorkflowExecuteAdditionalData, Workflow, WorkflowExecuteMode, WorkflowParameters } from 'n8n-workflow';
|
|
2
|
+
export interface InputDataChunkDefinition {
|
|
3
|
+
startIndex: number;
|
|
4
|
+
count: number;
|
|
5
|
+
}
|
|
6
|
+
export interface InputDataRequestParams {
|
|
7
|
+
include: boolean;
|
|
8
|
+
chunk?: InputDataChunkDefinition;
|
|
9
|
+
}
|
|
2
10
|
export interface TaskDataRequestParams {
|
|
3
11
|
dataOfNodes: string[] | 'all';
|
|
4
12
|
prevNode: boolean;
|
|
5
|
-
input:
|
|
13
|
+
input: InputDataRequestParams;
|
|
6
14
|
env: boolean;
|
|
7
15
|
}
|
|
8
16
|
export interface DataRequestResponse {
|
package/dist/runner-types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner-types.js","sourceRoot":"","sources":["../src/runner-types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"runner-types.js","sourceRoot":"","sources":["../src/runner-types.ts"],"names":[],"mappings":";;;AAqGa,QAAA,cAAc,GAAG;IAC7B,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;IACrB,eAAe;CACN,CAAC"}
|
package/dist/start.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
37
|
};
|
|
@@ -64,12 +74,18 @@ function createSignalHandler(signal) {
|
|
|
64
74
|
}
|
|
65
75
|
void (async function start() {
|
|
66
76
|
const config = typedi_1.default.get(main_config_1.MainConfig);
|
|
77
|
+
(0, n8n_workflow_1.setGlobalState)({
|
|
78
|
+
defaultTimezone: config.baseRunnerConfig.timezone,
|
|
79
|
+
});
|
|
67
80
|
if (config.sentryConfig.sentryDsn) {
|
|
68
81
|
const { ErrorReporter } = await Promise.resolve().then(() => __importStar(require('./error-reporter')));
|
|
69
82
|
errorReporter = new ErrorReporter(config.sentryConfig);
|
|
70
83
|
await errorReporter.start();
|
|
71
84
|
}
|
|
72
85
|
runner = new js_task_runner_1.JsTaskRunner(config);
|
|
86
|
+
runner.on('runner:reached-idle-timeout', () => {
|
|
87
|
+
void createSignalHandler('IDLE_TIMEOUT')();
|
|
88
|
+
});
|
|
73
89
|
const { enabled, host, port } = config.baseRunnerConfig.healthcheckServer;
|
|
74
90
|
if (enabled) {
|
|
75
91
|
const { HealthcheckServer } = await Promise.resolve().then(() => __importStar(require('./healthcheck-server')));
|
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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"}
|
package/dist/task-runner.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
1
2
|
import { WebSocket } from 'ws';
|
|
2
3
|
import type { BaseRunnerConfig } from './config/base-runner-config';
|
|
3
4
|
import type { BrokerMessage, RunnerMessage } from './message-types';
|
|
@@ -35,7 +36,7 @@ export interface TaskRunnerOpts extends BaseRunnerConfig {
|
|
|
35
36
|
taskType: string;
|
|
36
37
|
name?: string;
|
|
37
38
|
}
|
|
38
|
-
export declare abstract class TaskRunner {
|
|
39
|
+
export declare abstract class TaskRunner extends EventEmitter {
|
|
39
40
|
id: string;
|
|
40
41
|
ws: WebSocket;
|
|
41
42
|
canSendOffers: boolean;
|
|
@@ -49,7 +50,10 @@ export declare abstract class TaskRunner {
|
|
|
49
50
|
taskType: string;
|
|
50
51
|
maxConcurrency: number;
|
|
51
52
|
name: string;
|
|
53
|
+
private idleTimer;
|
|
54
|
+
private readonly idleTimeout;
|
|
52
55
|
constructor(opts: TaskRunnerOpts);
|
|
56
|
+
private resetIdleTimer;
|
|
53
57
|
private receiveMessage;
|
|
54
58
|
private stopTaskOffers;
|
|
55
59
|
private startTaskOffers;
|
|
@@ -72,6 +76,7 @@ export declare abstract class TaskRunner {
|
|
|
72
76
|
handleRpcResponse(callId: string, status: BrokerMessage.ToRunner.RPCResponse['status'], data: unknown): void;
|
|
73
77
|
buildRpcCallObject(taskId: string): RPCCallObject;
|
|
74
78
|
stop(): Promise<void>;
|
|
79
|
+
clearIdleTimer(): void;
|
|
75
80
|
private closeConnection;
|
|
76
81
|
private waitUntilAllTasksAreDone;
|
|
77
82
|
}
|
package/dist/task-runner.js
CHANGED
|
@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TaskRunner = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
const nanoid_1 = require("nanoid");
|
|
6
|
+
const node_events_1 = require("node:events");
|
|
6
7
|
const ws_1 = require("ws");
|
|
7
8
|
const node_types_1 = require("./node-types");
|
|
8
9
|
const runner_types_1 = require("./runner-types");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
|
|
10
|
+
const OFFER_VALID_TIME_MS = 5000;
|
|
11
|
+
const OFFER_VALID_EXTRA_MS = 100;
|
|
12
|
+
const msToNs = (ms) => BigInt(ms * 1_000_000);
|
|
13
|
+
class TaskRunner extends node_events_1.EventEmitter {
|
|
12
14
|
constructor(opts) {
|
|
15
|
+
super();
|
|
13
16
|
this.id = (0, nanoid_1.nanoid)();
|
|
14
17
|
this.canSendOffers = false;
|
|
15
18
|
this.runningTasks = new Map();
|
|
@@ -32,6 +35,7 @@ class TaskRunner {
|
|
|
32
35
|
this.taskType = opts.taskType;
|
|
33
36
|
this.name = opts.name ?? 'Node.js Task Runner SDK';
|
|
34
37
|
this.maxConcurrency = opts.maxConcurrency;
|
|
38
|
+
this.idleTimeout = opts.idleTimeout;
|
|
35
39
|
const wsUrl = `ws://${opts.n8nUri}/runners/_ws?id=${this.id}`;
|
|
36
40
|
this.ws = new ws_1.WebSocket(wsUrl, {
|
|
37
41
|
headers: {
|
|
@@ -54,6 +58,16 @@ class TaskRunner {
|
|
|
54
58
|
});
|
|
55
59
|
this.ws.addEventListener('message', this.receiveMessage);
|
|
56
60
|
this.ws.addEventListener('close', this.stopTaskOffers);
|
|
61
|
+
this.resetIdleTimer();
|
|
62
|
+
}
|
|
63
|
+
resetIdleTimer() {
|
|
64
|
+
if (this.idleTimeout === 0)
|
|
65
|
+
return;
|
|
66
|
+
this.clearIdleTimer();
|
|
67
|
+
this.idleTimer = setTimeout(() => {
|
|
68
|
+
if (this.runningTasks.size === 0)
|
|
69
|
+
this.emit('runner:reached-idle-timeout');
|
|
70
|
+
}, this.idleTimeout * 1000);
|
|
57
71
|
}
|
|
58
72
|
startTaskOffers() {
|
|
59
73
|
this.canSendOffers = true;
|
|
@@ -74,16 +88,18 @@ class TaskRunner {
|
|
|
74
88
|
const offersToSend = this.maxConcurrency -
|
|
75
89
|
(Object.values(this.openOffers).length + Object.values(this.runningTasks).length);
|
|
76
90
|
for (let i = 0; i < offersToSend; i++) {
|
|
91
|
+
const validForInMs = OFFER_VALID_TIME_MS + (0, n8n_workflow_1.randomInt)(500);
|
|
92
|
+
const validUntil = process.hrtime.bigint() + msToNs(validForInMs + OFFER_VALID_EXTRA_MS);
|
|
77
93
|
const offer = {
|
|
78
94
|
offerId: (0, nanoid_1.nanoid)(),
|
|
79
|
-
validUntil
|
|
95
|
+
validUntil,
|
|
80
96
|
};
|
|
81
97
|
this.openOffers.set(offer.offerId, offer);
|
|
82
98
|
this.send({
|
|
83
99
|
type: 'runner:taskoffer',
|
|
84
100
|
taskType: this.taskType,
|
|
85
101
|
offerId: offer.offerId,
|
|
86
|
-
validFor:
|
|
102
|
+
validFor: validForInMs,
|
|
87
103
|
});
|
|
88
104
|
}
|
|
89
105
|
}
|
|
@@ -159,6 +175,7 @@ class TaskRunner {
|
|
|
159
175
|
else {
|
|
160
176
|
this.openOffers.delete(offerId);
|
|
161
177
|
}
|
|
178
|
+
this.resetIdleTimer();
|
|
162
179
|
this.runningTasks.set(taskId, {
|
|
163
180
|
taskId,
|
|
164
181
|
active: false,
|
|
@@ -218,6 +235,9 @@ class TaskRunner {
|
|
|
218
235
|
catch (error) {
|
|
219
236
|
this.taskErrored(taskId, error);
|
|
220
237
|
}
|
|
238
|
+
finally {
|
|
239
|
+
this.resetIdleTimer();
|
|
240
|
+
}
|
|
221
241
|
}
|
|
222
242
|
async executeTask(_task) {
|
|
223
243
|
throw new n8n_workflow_1.ApplicationError('Unimplemented');
|
|
@@ -318,10 +338,16 @@ class TaskRunner {
|
|
|
318
338
|
return rpcObject;
|
|
319
339
|
}
|
|
320
340
|
async stop() {
|
|
341
|
+
this.clearIdleTimer();
|
|
321
342
|
this.stopTaskOffers();
|
|
322
343
|
await this.waitUntilAllTasksAreDone();
|
|
323
344
|
await this.closeConnection();
|
|
324
345
|
}
|
|
346
|
+
clearIdleTimer() {
|
|
347
|
+
if (this.idleTimer)
|
|
348
|
+
clearTimeout(this.idleTimer);
|
|
349
|
+
this.idleTimer = undefined;
|
|
350
|
+
}
|
|
325
351
|
async closeConnection() {
|
|
326
352
|
this.ws.close(1000, 'Shutting down');
|
|
327
353
|
await new Promise((resolve) => {
|