@n8n/task-runner 1.2.0 → 1.3.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/build.tsbuildinfo +1 -1
- package/dist/js-task-runner/errors/serializable-error.d.ts +1 -1
- package/dist/js-task-runner/errors/serializable-error.js +17 -9
- package/dist/js-task-runner/errors/serializable-error.js.map +1 -1
- package/dist/js-task-runner/js-task-runner.d.ts +1 -0
- package/dist/js-task-runner/js-task-runner.js +26 -13
- package/dist/js-task-runner/js-task-runner.js.map +1 -1
- package/dist/node-types.d.ts +10 -0
- package/dist/node-types.js +45 -0
- package/dist/node-types.js.map +1 -0
- package/dist/runner-types.d.ts +6 -2
- package/dist/runner-types.js.map +1 -1
- package/dist/start.js +3 -38
- package/dist/start.js.map +1 -1
- package/dist/task-runner.d.ts +4 -0
- package/dist/task-runner.js +13 -0
- package/dist/task-runner.js.map +1 -1
- package/package.json +4 -4
- package/dist/authenticator.d.ts +0 -5
- package/dist/authenticator.js +0 -57
- package/dist/authenticator.js.map +0 -1
|
@@ -1,18 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SerializableError = void 0;
|
|
4
|
+
exports.makeSerializable = makeSerializable;
|
|
5
|
+
function makeSerializable(error) {
|
|
6
|
+
Object.defineProperties(error, {
|
|
7
|
+
message: {
|
|
8
|
+
value: error.message,
|
|
9
|
+
enumerable: true,
|
|
10
|
+
configurable: true,
|
|
11
|
+
},
|
|
12
|
+
stack: {
|
|
13
|
+
value: error.stack,
|
|
14
|
+
enumerable: true,
|
|
15
|
+
configurable: true,
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
return error;
|
|
19
|
+
}
|
|
4
20
|
class SerializableError extends Error {
|
|
5
21
|
constructor(message) {
|
|
6
22
|
super(message);
|
|
7
|
-
this
|
|
8
|
-
}
|
|
9
|
-
makeMessageEnumerable() {
|
|
10
|
-
Object.defineProperty(this, 'message', {
|
|
11
|
-
value: this.message,
|
|
12
|
-
enumerable: true,
|
|
13
|
-
writable: true,
|
|
14
|
-
configurable: true,
|
|
15
|
-
});
|
|
23
|
+
makeSerializable(this);
|
|
16
24
|
}
|
|
17
25
|
}
|
|
18
26
|
exports.SerializableError = SerializableError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializable-error.js","sourceRoot":"","sources":["../../../src/js-task-runner/errors/serializable-error.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"serializable-error.js","sourceRoot":"","sources":["../../../src/js-task-runner/errors/serializable-error.ts"],"names":[],"mappings":";;;AAIA,4CAeC;AAfD,SAAgB,gBAAgB,CAAC,KAAY;IAC5C,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE;QAC9B,OAAO,EAAE;YACR,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;SAClB;QACD,KAAK,EAAE;YACN,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;SAClB;KACD,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACd,CAAC;AAMD,MAAsB,iBAAkB,SAAQ,KAAK;IACpD,YAAY,OAAe;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACD;AAND,8CAMC"}
|
|
@@ -52,6 +52,7 @@ export declare class JsTaskRunner extends TaskRunner {
|
|
|
52
52
|
private readonly requireResolver;
|
|
53
53
|
constructor({ grantToken, maxConcurrency, wsUrl, name, allowedBuiltInModules, allowedExternalModules, }: JsTaskRunnerOpts);
|
|
54
54
|
executeTask(task: Task<JSExecSettings>): Promise<TaskResultData>;
|
|
55
|
+
private getNativeVariables;
|
|
55
56
|
private runForAllItems;
|
|
56
57
|
private runForEachItem;
|
|
57
58
|
private createDataProxy;
|
|
@@ -31,6 +31,7 @@ const node_vm_1 = require("node:vm");
|
|
|
31
31
|
const task_runner_1 = require("../task-runner");
|
|
32
32
|
const error_like_1 = require("./errors/error-like");
|
|
33
33
|
const execution_error_1 = require("./errors/execution-error");
|
|
34
|
+
const serializable_error_1 = require("./errors/serializable-error");
|
|
34
35
|
const require_resolver_1 = require("./require-resolver");
|
|
35
36
|
const result_validation_1 = require("./result-validation");
|
|
36
37
|
class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
@@ -49,17 +50,7 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
49
50
|
const workflowParams = allData.workflow;
|
|
50
51
|
const workflow = new n8n_workflow_1.Workflow({
|
|
51
52
|
...workflowParams,
|
|
52
|
-
nodeTypes:
|
|
53
|
-
getByNameAndVersion() {
|
|
54
|
-
return undefined;
|
|
55
|
-
},
|
|
56
|
-
getByName() {
|
|
57
|
-
return undefined;
|
|
58
|
-
},
|
|
59
|
-
getKnownTypes() {
|
|
60
|
-
return {};
|
|
61
|
-
},
|
|
62
|
-
},
|
|
53
|
+
nodeTypes: this.nodeTypes,
|
|
63
54
|
});
|
|
64
55
|
const customConsole = {
|
|
65
56
|
log: (...args) => {
|
|
@@ -77,6 +68,26 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
77
68
|
customData: allData.runExecutionData.resultData.metadata,
|
|
78
69
|
};
|
|
79
70
|
}
|
|
71
|
+
getNativeVariables() {
|
|
72
|
+
return {
|
|
73
|
+
Buffer,
|
|
74
|
+
Function,
|
|
75
|
+
eval,
|
|
76
|
+
setTimeout,
|
|
77
|
+
setInterval,
|
|
78
|
+
setImmediate,
|
|
79
|
+
clearTimeout,
|
|
80
|
+
clearInterval,
|
|
81
|
+
clearImmediate,
|
|
82
|
+
btoa,
|
|
83
|
+
atob,
|
|
84
|
+
TextDecoder,
|
|
85
|
+
TextDecoderStream,
|
|
86
|
+
TextEncoder,
|
|
87
|
+
TextEncoderStream,
|
|
88
|
+
FormData,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
80
91
|
async runForAllItems(taskId, settings, allData, workflow, customConsole) {
|
|
81
92
|
const dataProxy = this.createDataProxy(allData, workflow, allData.itemIndex);
|
|
82
93
|
const inputItems = allData.connectionInputData;
|
|
@@ -85,11 +96,12 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
85
96
|
module: {},
|
|
86
97
|
console: customConsole,
|
|
87
98
|
items: inputItems,
|
|
99
|
+
...this.getNativeVariables(),
|
|
88
100
|
...dataProxy,
|
|
89
101
|
...this.buildRpcCallObject(taskId),
|
|
90
102
|
};
|
|
91
103
|
try {
|
|
92
|
-
const result = (await (0, node_vm_1.runInNewContext)(`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`, context));
|
|
104
|
+
const result = (await (0, node_vm_1.runInNewContext)(`globalThis.global = globalThis; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`, context));
|
|
93
105
|
if (result === null) {
|
|
94
106
|
return [];
|
|
95
107
|
}
|
|
@@ -114,6 +126,7 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
114
126
|
module: {},
|
|
115
127
|
console: customConsole,
|
|
116
128
|
item,
|
|
129
|
+
...this.getNativeVariables(),
|
|
117
130
|
...dataProxy,
|
|
118
131
|
...this.buildRpcCallObject(taskId),
|
|
119
132
|
};
|
|
@@ -160,7 +173,7 @@ class JsTaskRunner extends task_runner_1.TaskRunner {
|
|
|
160
173
|
}
|
|
161
174
|
toExecutionErrorIfNeeded(error) {
|
|
162
175
|
if (error instanceof Error) {
|
|
163
|
-
return error;
|
|
176
|
+
return (0, serializable_error_1.makeSerializable)(error);
|
|
164
177
|
}
|
|
165
178
|
if ((0, error_like_1.isErrorLike)(error)) {
|
|
166
179
|
return new execution_error_1.ExecutionError(error);
|
|
@@ -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,+CAIsB;
|
|
1
|
+
{"version":3,"file":"js-task-runner.js","sourceRoot":"","sources":["../../src/js-task-runner/js-task-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA6C;AAC7C,+CAIsB;AAetB,+CAAiC;AACjC,qCAAwD;AAGxD,+CAAsD;AAEtD,oDAAkD;AAClD,8DAA0D;AAC1D,oEAA+D;AAE/D,yDAA2D;AAC3D,2DAAiG;AAoEjG,MAAa,YAAa,SAAQ,wBAAU;IAG3C,YAAY,EACX,UAAU,EACV,cAAc,EACd,KAAK,EACL,IAAI,GAAG,gBAAgB,EACvB,qBAAqB,EACrB,sBAAsB,GACJ;QAClB,KAAK,CAAC,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;QAE7D,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE,CACnD,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAEjF,IAAI,CAAC,eAAe,GAAG,IAAA,wCAAqB,EAAC;YAC5C,qBAAqB,EAAE,oBAAoB,CAAC,qBAAqB,IAAI,EAAE,CAAC;YACxE,sBAAsB,EAAE,oBAAoB,CAAC,sBAAsB,IAAI,EAAE,CAAC;SAC1E,CAAC,CAAC;IACJ,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,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG;YAGrB,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,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YAClE,CAAC;SACD,CAAC;QAEF,MAAM,MAAM,GACX,QAAQ,CAAC,QAAQ,KAAK,oBAAoB;YACzC,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC;YACpF,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QAEvF,OAAO;YACN,MAAM;YACN,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ;SACxD,CAAC;IACH,CAAC;IAEO,kBAAkB;QACzB,OAAO;YAEN,MAAM;YACN,QAAQ;YACR,IAAI;YACJ,UAAU;YACV,WAAW;YACX,YAAY;YACZ,YAAY;YACZ,aAAa;YACb,cAAc;YAGd,IAAI;YACJ,IAAI;YACJ,WAAW;YACX,iBAAiB;YACjB,WAAW;YACX,iBAAiB;YACjB,QAAQ;SACR,CAAC;IACH,CAAC;IAKO,KAAK,CAAC,cAAc,CAC3B,MAAc,EACd,QAAwB,EACxB,OAAwB,EACxB,QAAkB,EAClB,aAA4B;QAE5B,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;QAE/C,MAAM,OAAO,GAAY;YACxB,OAAO,EAAE,IAAI,CAAC,eAAe;YAC7B,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,aAAa;YACtB,KAAK,EAAE,UAAU;YAEjB,GAAG,IAAI,CAAC,kBAAkB,EAAE;YAC5B,GAAG,SAAS;YACZ,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;SAClC,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,yBAAe,EACpC,oFAAoF,QAAQ,CAAC,IAAI,OAAO,EACxG,OAAO,CACP,CAA6B,CAAC;YAE/B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACrB,OAAO,EAAE,CAAC;YACX,CAAC;YAED,OAAO,IAAA,gDAA4B,EAAC,MAAM,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YAEZ,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;YAE/C,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAC7B,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC7C,CAAC;YAED,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAKO,KAAK,CAAC,cAAc,CAC3B,MAAc,EACd,QAAwB,EACxB,OAAwB,EACxB,QAAkB,EAClB,aAA4B;QAE5B,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;QAC/C,MAAM,UAAU,GAAyB,EAAE,CAAC;QAE5C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YACxD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YACjE,MAAM,OAAO,GAAY;gBACxB,OAAO,EAAE,IAAI,CAAC,eAAe;gBAC7B,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,aAAa;gBACtB,IAAI;gBAEJ,GAAG,IAAI,CAAC,kBAAkB,EAAE;gBAC5B,GAAG,SAAS;gBACZ,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;aAClC,CAAC;YAEF,IAAI,CAAC;gBACJ,IAAI,MAAM,GAAG,CAAC,MAAM,IAAA,yBAAe,EAClC,oDAAoD,QAAQ,CAAC,IAAI,OAAO,EACxE,OAAO,CACP,CAAmC,CAAC;gBAGrC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;oBACrB,SAAS;gBACV,CAAC;gBAED,MAAM,GAAG,IAAA,gDAA4B,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACrD,IAAI,MAAM,EAAE,CAAC;oBACZ,UAAU,CAAC,IAAI,CACd,MAAM,CAAC,MAAM;wBACZ,CAAC,CAAC;4BACA,IAAI,EAAE,MAAM,CAAC,IAAI;4BACjB,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;4BAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;yBACrB;wBACF,CAAC,CAAC;4BACA,IAAI,EAAE,MAAM,CAAC,IAAI;4BACjB,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;yBAC3B,CACH,CAAC;gBACH,CAAC;YACF,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBAEZ,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;gBAE/C,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;oBAC9B,MAAM,KAAK,CAAC;gBACb,CAAC;gBAED,UAAU,CAAC,IAAI,CAAC;oBACf,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;oBAC9B,UAAU,EAAE;wBACX,IAAI,EAAE,KAAK;qBACX;iBACD,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAEO,eAAe,CAAC,OAAwB,EAAE,QAAkB,EAAE,SAAiB;QACtF,OAAO,IAAI,gCAAiB,CAC3B,QAAQ,EACR,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,QAAQ,EAChB,SAAS,EACT,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,mBAAmB,EAC3B,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,IAAI,EACZ,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,EAGvB,OAAO,CAAC,gBAAgB,IAAI;YAC3B,GAAG,EAAE,EAAE;YACP,kBAAkB,EAAE,KAAK;YACzB,kBAAkB,EAAE,IAAI;SACxB,CACD,CAAC,YAAY,EAAE,CAAC;IAClB,CAAC;IAEO,wBAAwB,CAAC,KAAc;QAC9C,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC5B,OAAO,IAAA,qCAAgB,EAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,IAAA,wBAAW,EAAC,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,gCAAc,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,gCAAc,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;CACD;AAhPD,oCAgPC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type IDataObject, type INodeType, type INodeTypeDescription, type INodeTypes, type IVersionedNodeType } from 'n8n-workflow';
|
|
2
|
+
export declare const DEFAULT_NODETYPE_VERSION = 1;
|
|
3
|
+
export declare class TaskRunnerNodeTypes implements INodeTypes {
|
|
4
|
+
private nodeTypesByVersion;
|
|
5
|
+
constructor(nodeTypes: INodeTypeDescription[]);
|
|
6
|
+
private parseNodeTypes;
|
|
7
|
+
getByName(_nodeType: string): INodeType | IVersionedNodeType;
|
|
8
|
+
getByNameAndVersion(nodeType: string, version?: number): INodeType;
|
|
9
|
+
getKnownTypes(): IDataObject;
|
|
10
|
+
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TaskRunnerNodeTypes = exports.DEFAULT_NODETYPE_VERSION = void 0;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
exports.DEFAULT_NODETYPE_VERSION = 1;
|
|
6
|
+
class TaskRunnerNodeTypes {
|
|
7
|
+
constructor(nodeTypes) {
|
|
8
|
+
this.nodeTypesByVersion = this.parseNodeTypes(nodeTypes);
|
|
9
|
+
}
|
|
10
|
+
parseNodeTypes(nodeTypes) {
|
|
11
|
+
const versionedTypes = new Map();
|
|
12
|
+
for (const nt of nodeTypes) {
|
|
13
|
+
const versions = Array.isArray(nt.version)
|
|
14
|
+
? nt.version
|
|
15
|
+
: [nt.version ?? exports.DEFAULT_NODETYPE_VERSION];
|
|
16
|
+
const versioned = versionedTypes.get(nt.name) ?? new Map();
|
|
17
|
+
for (const version of versions) {
|
|
18
|
+
versioned.set(version, { ...versioned.get(version), ...nt });
|
|
19
|
+
}
|
|
20
|
+
versionedTypes.set(nt.name, versioned);
|
|
21
|
+
}
|
|
22
|
+
return versionedTypes;
|
|
23
|
+
}
|
|
24
|
+
getByName(_nodeType) {
|
|
25
|
+
throw new n8n_workflow_1.ApplicationError('Unimplemented `getByName`', { level: 'error' });
|
|
26
|
+
}
|
|
27
|
+
getByNameAndVersion(nodeType, version) {
|
|
28
|
+
const versions = this.nodeTypesByVersion.get(nodeType);
|
|
29
|
+
if (!versions) {
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
const nodeVersion = versions.get(version ?? Math.max(...versions.keys()));
|
|
33
|
+
if (!nodeVersion) {
|
|
34
|
+
return undefined;
|
|
35
|
+
}
|
|
36
|
+
return {
|
|
37
|
+
description: nodeVersion,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
getKnownTypes() {
|
|
41
|
+
throw new n8n_workflow_1.ApplicationError('Unimplemented `getKnownTypes`', { level: 'error' });
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
exports.TaskRunnerNodeTypes = TaskRunnerNodeTypes;
|
|
45
|
+
//# sourceMappingURL=node-types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"node-types.js","sourceRoot":"","sources":["../src/node-types.ts"],"names":[],"mappings":";;;AAAA,+CAOsB;AAIT,QAAA,wBAAwB,GAAG,CAAC,CAAC;AAE1C,MAAa,mBAAmB;IAG/B,YAAY,SAAiC;QAC5C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAEO,cAAc,CAAC,SAAiC;QACvD,MAAM,cAAc,GAAG,IAAI,GAAG,EAA0B,CAAC;QAEzD,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC;gBACzC,CAAC,CAAC,EAAE,CAAC,OAAO;gBACZ,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,IAAI,gCAAwB,CAAC,CAAC;YAE5C,MAAM,SAAS,GACd,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,EAAgC,CAAC;YACxE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAChC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC9D,CAAC;YAED,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,cAAc,CAAC;IACvB,CAAC;IAGD,SAAS,CAAC,SAAiB;QAC1B,MAAM,IAAI,+BAAgB,CAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,mBAAmB,CAAC,QAAgB,EAAE,OAAgB;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,OAAO,SAAiC,CAAC;QAC1C,CAAC;QACD,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,OAAO,SAAiC,CAAC;QAC1C,CAAC;QACD,OAAO;YACN,WAAW,EAAE,WAAW;SACxB,CAAC;IACH,CAAC;IAGD,aAAa;QACZ,MAAM,IAAI,+BAAgB,CAAC,+BAA+B,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IACjF,CAAC;CACD;AAlDD,kDAkDC"}
|
package/dist/runner-types.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { INodeExecutionData } from 'n8n-workflow';
|
|
1
|
+
import type { INodeExecutionData, INodeTypeBaseDescription } from 'n8n-workflow';
|
|
2
2
|
export type DataRequestType = 'input' | 'node' | 'all';
|
|
3
3
|
export interface TaskResultData {
|
|
4
4
|
result: INodeExecutionData[];
|
|
@@ -40,7 +40,11 @@ export declare namespace N8nMessage {
|
|
|
40
40
|
requestId: string;
|
|
41
41
|
data: unknown;
|
|
42
42
|
}
|
|
43
|
-
|
|
43
|
+
interface NodeTypes {
|
|
44
|
+
type: 'broker:nodetypes';
|
|
45
|
+
nodeTypes: INodeTypeBaseDescription[];
|
|
46
|
+
}
|
|
47
|
+
type All = InfoRequest | TaskOfferAccept | TaskCancel | TaskSettings | RunnerRegistered | RPCResponse | TaskDataResponse | NodeTypes;
|
|
44
48
|
}
|
|
45
49
|
namespace ToRequester {
|
|
46
50
|
interface TaskReady {
|
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":";;;AAoNa,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
|
@@ -1,43 +1,16 @@
|
|
|
1
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
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
3
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
27
|
-
const a = __importStar(require("node:assert/strict"));
|
|
28
|
-
const authenticator_1 = require("./authenticator");
|
|
29
4
|
const js_task_runner_1 = require("./js-task-runner/js-task-runner");
|
|
30
5
|
let runner;
|
|
31
6
|
let isShuttingDown = false;
|
|
32
7
|
function readAndParseConfig() {
|
|
33
|
-
const authToken = process.env.N8N_RUNNERS_AUTH_TOKEN;
|
|
34
8
|
const grantToken = process.env.N8N_RUNNERS_GRANT_TOKEN;
|
|
35
|
-
if (!
|
|
36
|
-
throw new n8n_workflow_1.ApplicationError('Missing
|
|
9
|
+
if (!grantToken) {
|
|
10
|
+
throw new n8n_workflow_1.ApplicationError('Missing N8N_RUNNERS_GRANT_TOKEN environment variable');
|
|
37
11
|
}
|
|
38
12
|
return {
|
|
39
13
|
n8nUri: process.env.N8N_RUNNERS_N8N_URI ?? '127.0.0.1:5679',
|
|
40
|
-
authToken,
|
|
41
14
|
grantToken,
|
|
42
15
|
};
|
|
43
16
|
}
|
|
@@ -65,18 +38,10 @@ function createSignalHandler(signal) {
|
|
|
65
38
|
}
|
|
66
39
|
void (async function start() {
|
|
67
40
|
const config = readAndParseConfig();
|
|
68
|
-
let grantToken = config.grantToken;
|
|
69
|
-
if (!grantToken) {
|
|
70
|
-
a.ok(config.authToken);
|
|
71
|
-
grantToken = await (0, authenticator_1.authenticate)({
|
|
72
|
-
authToken: config.authToken,
|
|
73
|
-
n8nUri: config.n8nUri,
|
|
74
|
-
});
|
|
75
|
-
}
|
|
76
41
|
const wsUrl = `ws://${config.n8nUri}/runners/_ws`;
|
|
77
42
|
runner = new js_task_runner_1.JsTaskRunner({
|
|
78
43
|
wsUrl,
|
|
79
|
-
grantToken,
|
|
44
|
+
grantToken: config.grantToken,
|
|
80
45
|
maxConcurrency: 5,
|
|
81
46
|
allowedBuiltInModules: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
|
|
82
47
|
allowedExternalModules: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
|
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":";;AAAA,+CAA6D;AAE7D,oEAA+D;AAE/D,IAAI,MAAgC,CAAC;AACrC,IAAI,cAAc,GAAG,KAAK,CAAC;AAO3B,SAAS,kBAAkB;IAC1B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACvD,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,MAAM,IAAI,+BAAgB,CAAC,sDAAsD,CAAC,CAAC;IACpF,CAAC;IAED,OAAO;QACN,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,gBAAgB;QAC3D,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,MAAM,KAAK,GAAG,QAAQ,MAAM,CAAC,MAAM,cAAc,CAAC;IAClD,MAAM,GAAG,IAAI,6BAAY,CAAC;QACzB,KAAK;QACL,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,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
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { type INodeTypeDescription } from 'n8n-workflow';
|
|
1
2
|
import { WebSocket } from 'ws';
|
|
3
|
+
import { TaskRunnerNodeTypes } from './node-types';
|
|
2
4
|
import { type RunnerMessage, type N8nMessage, type TaskResultData } from './runner-types';
|
|
3
5
|
export interface Task<T = unknown> {
|
|
4
6
|
taskId: string;
|
|
@@ -35,6 +37,7 @@ export declare abstract class TaskRunner {
|
|
|
35
37
|
openOffers: Map<TaskOffer['offerId'], TaskOffer>;
|
|
36
38
|
dataRequests: Map<DataRequest['requestId'], DataRequest>;
|
|
37
39
|
rpcCalls: Map<RPCCall['callId'], RPCCall>;
|
|
40
|
+
nodeTypes: TaskRunnerNodeTypes;
|
|
38
41
|
constructor(taskType: string, wsUrl: string, grantToken: string, maxConcurrency: number, name?: string | undefined);
|
|
39
42
|
private receiveMessage;
|
|
40
43
|
private stopTaskOffers;
|
|
@@ -43,6 +46,7 @@ export declare abstract class TaskRunner {
|
|
|
43
46
|
sendOffers(): void;
|
|
44
47
|
send(message: RunnerMessage.ToN8n.All): void;
|
|
45
48
|
onMessage(message: N8nMessage.ToRunner.All): void;
|
|
49
|
+
setNodeTypes(nodeTypes: INodeTypeDescription[]): void;
|
|
46
50
|
processDataResponse(requestId: string, data: unknown): void;
|
|
47
51
|
hasOpenTasks(): boolean;
|
|
48
52
|
offerAccepted(offerId: string, taskId: string): void;
|
package/dist/task-runner.js
CHANGED
|
@@ -5,9 +5,11 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
5
5
|
const nanoid_1 = require("nanoid");
|
|
6
6
|
const node_url_1 = require("node:url");
|
|
7
7
|
const ws_1 = require("ws");
|
|
8
|
+
const node_types_1 = require("./node-types");
|
|
8
9
|
const runner_types_1 = require("./runner-types");
|
|
9
10
|
const VALID_TIME_MS = 1000;
|
|
10
11
|
const VALID_EXTRA_MS = 100;
|
|
12
|
+
const DEFAULT_MAX_PAYLOAD_SIZE = 1024 * 1024 * 1024;
|
|
11
13
|
class TaskRunner {
|
|
12
14
|
constructor(taskType, wsUrl, grantToken, maxConcurrency, name) {
|
|
13
15
|
this.taskType = taskType;
|
|
@@ -19,6 +21,7 @@ class TaskRunner {
|
|
|
19
21
|
this.openOffers = new Map();
|
|
20
22
|
this.dataRequests = new Map();
|
|
21
23
|
this.rpcCalls = new Map();
|
|
24
|
+
this.nodeTypes = new node_types_1.TaskRunnerNodeTypes([]);
|
|
22
25
|
this.receiveMessage = (message) => {
|
|
23
26
|
const data = JSON.parse(message.data);
|
|
24
27
|
void this.onMessage(data);
|
|
@@ -36,6 +39,9 @@ class TaskRunner {
|
|
|
36
39
|
headers: {
|
|
37
40
|
authorization: `Bearer ${grantToken}`,
|
|
38
41
|
},
|
|
42
|
+
maxPayload: process.env.N8N_RUNNERS_MAX_PAYLOAD
|
|
43
|
+
? parseInt(process.env.N8N_RUNNERS_MAX_PAYLOAD)
|
|
44
|
+
: DEFAULT_MAX_PAYLOAD_SIZE,
|
|
39
45
|
});
|
|
40
46
|
this.ws.addEventListener('message', this.receiveMessage);
|
|
41
47
|
this.ws.addEventListener('close', this.stopTaskOffers);
|
|
@@ -101,8 +107,15 @@ class TaskRunner {
|
|
|
101
107
|
break;
|
|
102
108
|
case 'broker:rpcresponse':
|
|
103
109
|
this.handleRpcResponse(message.callId, message.status, message.data);
|
|
110
|
+
break;
|
|
111
|
+
case 'broker:nodetypes':
|
|
112
|
+
this.setNodeTypes(message.nodeTypes);
|
|
113
|
+
break;
|
|
104
114
|
}
|
|
105
115
|
}
|
|
116
|
+
setNodeTypes(nodeTypes) {
|
|
117
|
+
this.nodeTypes = new node_types_1.TaskRunnerNodeTypes(nodeTypes);
|
|
118
|
+
}
|
|
106
119
|
processDataResponse(requestId, data) {
|
|
107
120
|
const request = this.dataRequests.get(requestId);
|
|
108
121
|
if (!request) {
|
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.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"main": "dist/start.js",
|
|
5
5
|
"module": "src/start.ts",
|
|
6
6
|
"types": "dist/start.d.ts",
|
|
@@ -12,8 +12,8 @@
|
|
|
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.64.0",
|
|
16
|
+
"n8n-core": "1.65.0"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"luxon": "3.4.4"
|
|
@@ -40,6 +40,6 @@
|
|
|
40
40
|
"test:watch": "jest --watch",
|
|
41
41
|
"lint": "eslint . --quiet",
|
|
42
42
|
"lintfix": "eslint . --fix",
|
|
43
|
-
"watch": "
|
|
43
|
+
"watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\""
|
|
44
44
|
}
|
|
45
45
|
}
|
package/dist/authenticator.d.ts
DELETED
package/dist/authenticator.js
DELETED
|
@@ -1,57 +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.authenticate = authenticate;
|
|
27
|
-
const n8n_workflow_1 = require("n8n-workflow");
|
|
28
|
-
const a = __importStar(require("node:assert/strict"));
|
|
29
|
-
async function authenticate(opts) {
|
|
30
|
-
try {
|
|
31
|
-
const authEndpoint = `http://${opts.n8nUri}/runners/auth`;
|
|
32
|
-
const response = await fetch(authEndpoint, {
|
|
33
|
-
method: 'POST',
|
|
34
|
-
headers: {
|
|
35
|
-
'Content-Type': 'application/json',
|
|
36
|
-
},
|
|
37
|
-
body: JSON.stringify({
|
|
38
|
-
token: opts.authToken,
|
|
39
|
-
}),
|
|
40
|
-
});
|
|
41
|
-
if (!response.ok) {
|
|
42
|
-
throw new n8n_workflow_1.ApplicationError(`Invalid response status ${response.status}: ${await response.text()}`);
|
|
43
|
-
}
|
|
44
|
-
const { data } = (await response.json());
|
|
45
|
-
const grantToken = data.token;
|
|
46
|
-
a.ok(grantToken);
|
|
47
|
-
return grantToken;
|
|
48
|
-
}
|
|
49
|
-
catch (e) {
|
|
50
|
-
console.error(e);
|
|
51
|
-
const error = e;
|
|
52
|
-
throw new n8n_workflow_1.ApplicationError(`Could not connect to n8n message broker ${opts.n8nUri}: ${error.message}`, {
|
|
53
|
-
cause: error,
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
//# sourceMappingURL=authenticator.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"authenticator.js","sourceRoot":"","sources":["../src/authenticator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAWA,oCAmCC;AA9CD,+CAAgD;AAChD,sDAAwC;AAUjC,KAAK,UAAU,YAAY,CAAC,IAAc;IAChD,IAAI,CAAC;QACJ,MAAM,YAAY,GAAG,UAAU,IAAI,CAAC,MAAM,eAAe,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;YAC1C,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBAER,cAAc,EAAE,kBAAkB;aAClC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACpB,KAAK,EAAE,IAAI,CAAC,SAAS;aACrB,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,+BAAgB,CACzB,2BAA2B,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CACtE,CAAC;QACH,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAgC,CAAC;QACxE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAEjB,OAAO,UAAU,CAAC;IACnB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,MAAM,IAAI,+BAAgB,CACzB,2CAA2C,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,EAC1E;YACC,KAAK,EAAE,KAAK;SACZ,CACD,CAAC;IACH,CAAC;AACF,CAAC"}
|