n8n-core 1.15.1 → 1.16.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/ActiveWorkflows.d.ts +7 -5
- package/dist/ActiveWorkflows.js +49 -53
- package/dist/ActiveWorkflows.js.map +1 -1
- package/dist/BinaryData/BinaryData.service.d.ts +1 -2
- package/dist/BinaryData/BinaryData.service.js +0 -22
- package/dist/BinaryData/BinaryData.service.js.map +1 -1
- package/dist/BinaryData/FileSystem.manager.js +8 -7
- package/dist/BinaryData/FileSystem.manager.js.map +1 -1
- package/dist/BinaryData/utils.d.ts +1 -0
- package/dist/BinaryData/utils.js +11 -1
- package/dist/BinaryData/utils.js.map +1 -1
- package/dist/Cipher.d.ts +1 -0
- package/dist/Cipher.js +27 -4
- package/dist/Cipher.js.map +1 -1
- package/dist/ExtractValue.js +2 -2
- package/dist/ExtractValue.js.map +1 -1
- package/dist/InstanceSettings.d.ts +2 -1
- package/dist/InstanceSettings.js +1 -0
- package/dist/InstanceSettings.js.map +1 -1
- package/dist/WorkflowExecute.js +2 -2
- package/dist/WorkflowExecute.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/errors.d.ts +6 -0
- package/dist/errors.js +11 -1
- package/dist/errors.js.map +1 -1
- package/package.json +4 -6
- package/dist/decorators/LogCatch.decorator.d.ts +0 -1
- package/dist/decorators/LogCatch.decorator.js +0 -27
- package/dist/decorators/LogCatch.decorator.js.map +0 -1
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import type { IGetExecutePollFunctions, IGetExecuteTriggerFunctions, INode, IPollResponse, IWorkflowExecuteAdditionalData, Workflow, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
2
|
import type { IWorkflowData } from './Interfaces';
|
|
3
3
|
export declare class ActiveWorkflows {
|
|
4
|
-
private
|
|
5
|
-
isActive(
|
|
4
|
+
private activeWorkflows;
|
|
5
|
+
isActive(workflowId: string): boolean;
|
|
6
6
|
allActiveWorkflows(): string[];
|
|
7
|
-
get(
|
|
8
|
-
add(
|
|
7
|
+
get(workflowId: string): IWorkflowData;
|
|
8
|
+
add(workflowId: string, workflow: Workflow, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode, getTriggerFunctions: IGetExecuteTriggerFunctions, getPollFunctions: IGetExecutePollFunctions): Promise<void>;
|
|
9
9
|
activatePolling(node: INode, workflow: Workflow, additionalData: IWorkflowExecuteAdditionalData, getPollFunctions: IGetExecutePollFunctions, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): Promise<IPollResponse>;
|
|
10
|
-
remove(
|
|
10
|
+
remove(workflowId: string): Promise<boolean>;
|
|
11
|
+
removeAllTriggerAndPollerBasedWorkflows(): Promise<void>;
|
|
12
|
+
private close;
|
|
11
13
|
}
|
package/dist/ActiveWorkflows.js
CHANGED
|
@@ -5,43 +5,45 @@ const cron_1 = require("cron");
|
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
6
|
class ActiveWorkflows {
|
|
7
7
|
constructor() {
|
|
8
|
-
this.
|
|
8
|
+
this.activeWorkflows = {};
|
|
9
9
|
}
|
|
10
|
-
isActive(
|
|
11
|
-
return this.
|
|
10
|
+
isActive(workflowId) {
|
|
11
|
+
return this.activeWorkflows.hasOwnProperty(workflowId);
|
|
12
12
|
}
|
|
13
13
|
allActiveWorkflows() {
|
|
14
|
-
return Object.keys(this.
|
|
14
|
+
return Object.keys(this.activeWorkflows);
|
|
15
15
|
}
|
|
16
|
-
get(
|
|
17
|
-
return this.
|
|
16
|
+
get(workflowId) {
|
|
17
|
+
return this.activeWorkflows[workflowId];
|
|
18
18
|
}
|
|
19
|
-
async add(
|
|
20
|
-
this.
|
|
19
|
+
async add(workflowId, workflow, additionalData, mode, activation, getTriggerFunctions, getPollFunctions) {
|
|
20
|
+
this.activeWorkflows[workflowId] = {};
|
|
21
21
|
const triggerNodes = workflow.getTriggerNodes();
|
|
22
22
|
let triggerResponse;
|
|
23
|
-
this.
|
|
23
|
+
this.activeWorkflows[workflowId].triggerResponses = [];
|
|
24
24
|
for (const triggerNode of triggerNodes) {
|
|
25
25
|
try {
|
|
26
26
|
triggerResponse = await workflow.runTrigger(triggerNode, getTriggerFunctions, additionalData, mode, activation);
|
|
27
27
|
if (triggerResponse !== undefined) {
|
|
28
|
-
this.
|
|
28
|
+
this.activeWorkflows[workflowId].triggerResponses.push(triggerResponse);
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
catch (
|
|
31
|
+
catch (e) {
|
|
32
|
+
const error = e instanceof Error ? e : new Error(`${e}`);
|
|
32
33
|
throw new n8n_workflow_1.WorkflowActivationError(`There was a problem activating the workflow: "${error.message}"`, { cause: error, node: triggerNode });
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
|
-
const
|
|
36
|
-
if (
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
36
|
+
const pollingNodes = workflow.getPollNodes();
|
|
37
|
+
if (pollingNodes.length === 0)
|
|
38
|
+
return;
|
|
39
|
+
this.activeWorkflows[workflowId].pollResponses = [];
|
|
40
|
+
for (const pollNode of pollingNodes) {
|
|
41
|
+
try {
|
|
42
|
+
this.activeWorkflows[workflowId].pollResponses.push(await this.activatePolling(pollNode, workflow, additionalData, getPollFunctions, mode, activation));
|
|
43
|
+
}
|
|
44
|
+
catch (e) {
|
|
45
|
+
const error = e instanceof Error ? e : new Error(`${e}`);
|
|
46
|
+
throw new n8n_workflow_1.WorkflowActivationError(`There was a problem activating the workflow: "${error.message}"`, { cause: error, node: pollNode });
|
|
45
47
|
}
|
|
46
48
|
}
|
|
47
49
|
}
|
|
@@ -86,42 +88,36 @@ class ActiveWorkflows {
|
|
|
86
88
|
closeFunction,
|
|
87
89
|
};
|
|
88
90
|
}
|
|
89
|
-
async remove(
|
|
90
|
-
|
|
91
|
-
|
|
91
|
+
async remove(workflowId) {
|
|
92
|
+
var _a, _b;
|
|
93
|
+
if (!this.isActive(workflowId)) {
|
|
94
|
+
n8n_workflow_1.LoggerProxy.warn(`Cannot deactivate already inactive workflow ID "${workflowId}"`);
|
|
92
95
|
return false;
|
|
93
96
|
}
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
}
|
|
97
|
+
const w = this.activeWorkflows[workflowId];
|
|
98
|
+
(_a = w.triggerResponses) === null || _a === void 0 ? void 0 : _a.forEach(async (r) => this.close(r, workflowId, 'trigger'));
|
|
99
|
+
(_b = w.pollResponses) === null || _b === void 0 ? void 0 : _b.forEach(async (r) => this.close(r, workflowId, 'poller'));
|
|
100
|
+
delete this.activeWorkflows[workflowId];
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
async removeAllTriggerAndPollerBasedWorkflows() {
|
|
104
|
+
var _a, _b;
|
|
105
|
+
for (const workflowId of Object.keys(this.activeWorkflows)) {
|
|
106
|
+
const w = this.activeWorkflows[workflowId];
|
|
107
|
+
(_a = w.triggerResponses) === null || _a === void 0 ? void 0 : _a.forEach(async (r) => this.close(r, workflowId, 'trigger'));
|
|
108
|
+
(_b = w.pollResponses) === null || _b === void 0 ? void 0 : _b.forEach(async (r) => this.close(r, workflowId, 'poller'));
|
|
108
109
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
}
|
|
110
|
+
}
|
|
111
|
+
async close(response, workflowId, target) {
|
|
112
|
+
if (!response.closeFunction)
|
|
113
|
+
return;
|
|
114
|
+
try {
|
|
115
|
+
await response.closeFunction();
|
|
116
|
+
}
|
|
117
|
+
catch (e) {
|
|
118
|
+
const error = e instanceof Error ? e : new Error(`${e}`);
|
|
119
|
+
throw new n8n_workflow_1.WorkflowDeactivationError(`Failed to deactivate ${target} of workflow ID "${workflowId}": "${error.message}"`, { cause: error, workflowId });
|
|
122
120
|
}
|
|
123
|
-
delete this.workflowData[id];
|
|
124
|
-
return true;
|
|
125
121
|
}
|
|
126
122
|
}
|
|
127
123
|
exports.ActiveWorkflows = ActiveWorkflows;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActiveWorkflows.js","sourceRoot":"","sources":["../src/ActiveWorkflows.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ActiveWorkflows.js","sourceRoot":"","sources":["../src/ActiveWorkflows.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import { IBinaryData } from 'n8n-workflow';
|
|
4
3
|
import type { Readable } from 'stream';
|
|
5
4
|
import type { BinaryData } from './types';
|
|
6
|
-
import type { INodeExecutionData } from 'n8n-workflow';
|
|
5
|
+
import type { INodeExecutionData, IBinaryData } from 'n8n-workflow';
|
|
7
6
|
export declare class BinaryDataService {
|
|
8
7
|
private mode;
|
|
9
8
|
private managers;
|
|
@@ -28,9 +28,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
28
28
|
__setModuleDefault(result, mod);
|
|
29
29
|
return result;
|
|
30
30
|
};
|
|
31
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
|
-
};
|
|
34
31
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
32
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
33
|
};
|
|
@@ -42,7 +39,6 @@ const typedi_1 = __importStar(require("typedi"));
|
|
|
42
39
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
43
40
|
const errors_1 = require("./errors");
|
|
44
41
|
const utils_1 = require("./utils");
|
|
45
|
-
const LogCatch_decorator_1 = require("../decorators/LogCatch.decorator");
|
|
46
42
|
let BinaryDataService = class BinaryDataService {
|
|
47
43
|
constructor() {
|
|
48
44
|
this.mode = 'default';
|
|
@@ -193,24 +189,6 @@ let BinaryDataService = class BinaryDataService {
|
|
|
193
189
|
}
|
|
194
190
|
};
|
|
195
191
|
exports.BinaryDataService = BinaryDataService;
|
|
196
|
-
__decorate([
|
|
197
|
-
(0, LogCatch_decorator_1.LogCatch)((error) => n8n_workflow_1.LoggerProxy.error('Failed to copy binary data file', { error })),
|
|
198
|
-
__metadata("design:type", Function),
|
|
199
|
-
__metadata("design:paramtypes", [String, String, Object, String]),
|
|
200
|
-
__metadata("design:returntype", Promise)
|
|
201
|
-
], BinaryDataService.prototype, "copyBinaryFile", null);
|
|
202
|
-
__decorate([
|
|
203
|
-
(0, LogCatch_decorator_1.LogCatch)((error) => n8n_workflow_1.LoggerProxy.error('Failed to write binary data file', { error })),
|
|
204
|
-
__metadata("design:type", Function),
|
|
205
|
-
__metadata("design:paramtypes", [String, String, Object, Object]),
|
|
206
|
-
__metadata("design:returntype", Promise)
|
|
207
|
-
], BinaryDataService.prototype, "store", null);
|
|
208
|
-
__decorate([
|
|
209
|
-
(0, LogCatch_decorator_1.LogCatch)((error) => n8n_workflow_1.LoggerProxy.error('Failed to copy all binary data files for execution', { error })),
|
|
210
|
-
__metadata("design:type", Function),
|
|
211
|
-
__metadata("design:paramtypes", [String, String, Array]),
|
|
212
|
-
__metadata("design:returntype", Promise)
|
|
213
|
-
], BinaryDataService.prototype, "duplicateBinaryData", null);
|
|
214
192
|
exports.BinaryDataService = BinaryDataService = __decorate([
|
|
215
193
|
(0, typedi_1.Service)()
|
|
216
194
|
], BinaryDataService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinaryData.service.js","sourceRoot":"","sources":["../../src/BinaryData/BinaryData.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BinaryData.service.js","sourceRoot":"","sources":["../../src/BinaryData/BinaryData.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,16 +33,17 @@ class FileSystemManager {
|
|
|
33
33
|
}
|
|
34
34
|
async getAsStream(fileId, chunkSize) {
|
|
35
35
|
const filePath = this.resolvePath(fileId);
|
|
36
|
+
if (await (0, utils_1.doesNotExist)(filePath)) {
|
|
37
|
+
throw new errors_1.BinaryFileNotFoundError(filePath);
|
|
38
|
+
}
|
|
36
39
|
return (0, node_fs_1.createReadStream)(filePath, { highWaterMark: chunkSize });
|
|
37
40
|
}
|
|
38
41
|
async getAsBuffer(fileId) {
|
|
39
42
|
const filePath = this.resolvePath(fileId);
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
}
|
|
43
|
-
catch {
|
|
44
|
-
throw new Error(`Error finding file: ${filePath}`);
|
|
43
|
+
if (await (0, utils_1.doesNotExist)(filePath)) {
|
|
44
|
+
throw new errors_1.BinaryFileNotFoundError(filePath);
|
|
45
45
|
}
|
|
46
|
+
return promises_1.default.readFile(filePath);
|
|
46
47
|
}
|
|
47
48
|
async getMetadata(fileId) {
|
|
48
49
|
const filePath = this.resolvePath(`${fileId}.metadata`);
|
|
@@ -104,7 +105,7 @@ class FileSystemManager {
|
|
|
104
105
|
resolvePath(...args) {
|
|
105
106
|
const returnPath = node_path_1.default.join(this.storagePath, ...args);
|
|
106
107
|
if (node_path_1.default.relative(this.storagePath, returnPath).startsWith('..')) {
|
|
107
|
-
throw new errors_1.
|
|
108
|
+
throw new errors_1.InvalidPathError(returnPath);
|
|
108
109
|
}
|
|
109
110
|
return returnPath;
|
|
110
111
|
}
|
|
@@ -119,7 +120,7 @@ class FileSystemManager {
|
|
|
119
120
|
return stats.size;
|
|
120
121
|
}
|
|
121
122
|
catch (error) {
|
|
122
|
-
throw new
|
|
123
|
+
throw new errors_1.BinaryFileNotFoundError(filePath);
|
|
123
124
|
}
|
|
124
125
|
}
|
|
125
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileSystem.manager.js","sourceRoot":"","sources":["../../src/BinaryData/FileSystem.manager.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA2C;AAC3C,gEAAkC;AAClC,0DAA6B;AAC7B,+BAAkC;AAClC,+CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"FileSystem.manager.js","sourceRoot":"","sources":["../../src/BinaryData/FileSystem.manager.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA2C;AAC3C,gEAAkC;AAClC,0DAA6B;AAC7B,+BAAkC;AAClC,+CAAyC;AACzC,mCAAkD;AAClD,sCAAsE;AAKtE,MAAM,sBAAsB,GAC3B,gGAAgG,CAAC;AAElG,MAAa,iBAAiB;IAC7B,YAAoB,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;IAAG,CAAC;IAE3C,KAAK,CAAC,IAAI;QACT,MAAM,IAAA,iBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CACV,UAAkB,EAClB,WAAmB,EACnB,cAAiC,EACjC,EAAE,QAAQ,EAAE,QAAQ,EAA+B;QAEnD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE1C,MAAM,IAAA,iBAAS,EAAC,mBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAExC,MAAM,kBAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAE7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE5C,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEnE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,SAAkB;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI,MAAM,IAAA,oBAAY,EAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,gCAAuB,CAAC,QAAQ,CAAC,CAAC;SAC5C;QAED,OAAO,IAAA,0BAAgB,EAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI,MAAM,IAAA,oBAAY,EAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,gCAAuB,CAAC,QAAQ,CAAC,CAAC;SAC5C;QAED,OAAO,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,MAAM,WAAW,CAAC,CAAC;QAExD,OAAO,IAAA,wBAAS,EAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAA8B;;QAC9C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAI7B,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,MAAM,kBAAE,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAErD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YACjC,MAAM,WAAW,GAAG,MAAA,QAAQ,CAAC,KAAK,CAAC,sBAAsB,CAAC,0CAAG,CAAC,CAAC,CAAC;YAEhE,IAAI,WAAW,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBAE5C,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,kBAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,kBAAE,CAAC,EAAE,CAAC,GAAG,QAAQ,WAAW,CAAC,CAAC,CAAC,CAAC;aACpE;SACD;QAID,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,EAAE,CAC9D,IAAI,CAAC,WAAW,CAAC,aAAa,UAAU,eAAe,WAAW,eAAe,CAAC,CAClF,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CAChB,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAChC,MAAM,kBAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CACnB,UAAkB,EAClB,WAAmB,EACnB,UAAkB,EAClB,EAAE,QAAQ,EAAE,QAAQ,EAA+B;QAEnD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAElD,MAAM,IAAA,iBAAS,EAAC,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAE1C,MAAM,kBAAE,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAEpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAElD,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEzE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAkB,EAAE,WAAmB,EAAE,YAAoB;QAC/E,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAElD,MAAM,IAAA,iBAAS,EAAC,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAE1C,MAAM,kBAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAE1C,OAAO,YAAY,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,SAAiB;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,IAAA,iBAAS,EAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAEvC,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,kBAAE,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;YAC3B,kBAAE,CAAC,MAAM,CAAC,GAAG,OAAO,WAAW,EAAE,GAAG,OAAO,WAAW,CAAC;SACvD,CAAC,CAAC;QAEH,MAAM,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAEjD,MAAM,kBAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAYO,QAAQ,CAAC,UAAkB,EAAE,WAAmB;QACvD,IAAI,CAAC,WAAW;YAAE,WAAW,GAAG,MAAM,CAAC;QAEvC,OAAO,aAAa,UAAU,eAAe,WAAW,gBAAgB,IAAA,SAAI,GAAE,EAAE,CAAC;IAClF,CAAC;IAEO,WAAW,CAAC,GAAG,IAAc;QACpC,MAAM,UAAU,GAAG,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAAC;QAExD,IAAI,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACjE,MAAM,IAAI,yBAAgB,CAAC,UAAU,CAAC,CAAC;SACvC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,MAAc,EAAE,QAA6B;QACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,MAAM,WAAW,CAAC,CAAC;QAExD,MAAM,kBAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/E,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,MAAc;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI;YACH,MAAM,KAAK,GAAG,MAAM,kBAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtC,OAAO,KAAK,CAAC,IAAI,CAAC;SAClB;QAAC,OAAO,KAAK,EAAE;YACf,MAAM,IAAI,gCAAuB,CAAC,QAAQ,CAAC,CAAC;SAC5C;IACF,CAAC;CACD;AArLD,8CAqLC"}
|
|
@@ -6,4 +6,5 @@ export declare const CONFIG_MODES: readonly ["default", "filesystem", "s3"];
|
|
|
6
6
|
export declare function areConfigModes(modes: string[]): modes is BinaryData.ConfigMode[];
|
|
7
7
|
export declare function isStoredMode(mode: string): mode is BinaryData.StoredMode;
|
|
8
8
|
export declare function assertDir(dir: string): Promise<void>;
|
|
9
|
+
export declare function doesNotExist(dir: string): Promise<boolean>;
|
|
9
10
|
export declare function toBuffer(body: Buffer | Readable): Promise<Buffer>;
|
package/dist/BinaryData/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.toBuffer = exports.assertDir = exports.isStoredMode = exports.areConfigModes = exports.CONFIG_MODES = void 0;
|
|
6
|
+
exports.toBuffer = exports.doesNotExist = exports.assertDir = exports.isStoredMode = exports.areConfigModes = exports.CONFIG_MODES = void 0;
|
|
7
7
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
8
8
|
const concat_stream_1 = __importDefault(require("concat-stream"));
|
|
9
9
|
exports.CONFIG_MODES = ['default', 'filesystem', 's3'];
|
|
@@ -25,6 +25,16 @@ async function assertDir(dir) {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
exports.assertDir = assertDir;
|
|
28
|
+
async function doesNotExist(dir) {
|
|
29
|
+
try {
|
|
30
|
+
await promises_1.default.access(dir);
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
exports.doesNotExist = doesNotExist;
|
|
28
38
|
async function toBuffer(body) {
|
|
29
39
|
return new Promise((resolve) => {
|
|
30
40
|
if (Buffer.isBuffer(body))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/BinaryData/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAkC;AAGlC,kEAAyC;AAE5B,QAAA,YAAY,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,CAAU,CAAC;AAErE,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,eAAe,EAAE,IAAI,CAAU,CAAC;AAEpE,SAAgB,cAAc,CAAC,KAAe;IAC7C,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAY,CAAC,QAAQ,CAAC,CAA0B,CAAC,CAAC,CAAC;AAC9E,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,IAAY;IACxC,OAAO,YAAY,CAAC,QAAQ,CAAC,IAA6B,CAAC,CAAC;AAC7D,CAAC;AAFD,oCAEC;AAEM,KAAK,UAAU,SAAS,CAAC,GAAW;IAC1C,IAAI;QACH,MAAM,kBAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;KACrB;IAAC,MAAM;QACP,MAAM,kBAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACzC;AACF,CAAC;AAND,8BAMC;AAEM,KAAK,UAAU,QAAQ,CAAC,IAAuB;IACrD,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;QACtC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC;;YACpC,IAAI,CAAC,IAAI,CAAC,IAAA,uBAAY,EAAC,OAAO,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACJ,CAAC;AALD,4BAKC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/BinaryData/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAkC;AAGlC,kEAAyC;AAE5B,QAAA,YAAY,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,CAAU,CAAC;AAErE,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,eAAe,EAAE,IAAI,CAAU,CAAC;AAEpE,SAAgB,cAAc,CAAC,KAAe;IAC7C,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAY,CAAC,QAAQ,CAAC,CAA0B,CAAC,CAAC,CAAC;AAC9E,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,IAAY;IACxC,OAAO,YAAY,CAAC,QAAQ,CAAC,IAA6B,CAAC,CAAC;AAC7D,CAAC;AAFD,oCAEC;AAEM,KAAK,UAAU,SAAS,CAAC,GAAW;IAC1C,IAAI;QACH,MAAM,kBAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;KACrB;IAAC,MAAM;QACP,MAAM,kBAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACzC;AACF,CAAC;AAND,8BAMC;AAEM,KAAK,UAAU,YAAY,CAAC,GAAW;IAC7C,IAAI;QACH,MAAM,kBAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,OAAO,KAAK,CAAC;KACb;IAAC,MAAM;QACP,OAAO,IAAI,CAAC;KACZ;AACF,CAAC;AAPD,oCAOC;AAEM,KAAK,UAAU,QAAQ,CAAC,IAAuB;IACrD,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;QACtC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC;;YACpC,IAAI,CAAC,IAAI,CAAC,IAAA,uBAAY,EAAC,OAAO,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACJ,CAAC;AALD,4BAKC"}
|
package/dist/Cipher.d.ts
CHANGED
package/dist/Cipher.js
CHANGED
|
@@ -11,19 +11,42 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.Cipher = void 0;
|
|
13
13
|
const typedi_1 = require("typedi");
|
|
14
|
-
const
|
|
14
|
+
const crypto_1 = require("crypto");
|
|
15
15
|
const InstanceSettings_1 = require("./InstanceSettings");
|
|
16
|
+
const RANDOM_BYTES = Buffer.from('53616c7465645f5f', 'hex');
|
|
16
17
|
let Cipher = class Cipher {
|
|
17
18
|
constructor(instanceSettings) {
|
|
18
19
|
this.instanceSettings = instanceSettings;
|
|
19
20
|
}
|
|
20
21
|
encrypt(data) {
|
|
21
|
-
const
|
|
22
|
-
|
|
22
|
+
const salt = (0, crypto_1.randomBytes)(8);
|
|
23
|
+
const [key, iv] = this.getKeyAndIv(salt);
|
|
24
|
+
const cipher = (0, crypto_1.createCipheriv)('aes-256-cbc', key, iv);
|
|
25
|
+
const encrypted = cipher.update(typeof data === 'string' ? data : JSON.stringify(data));
|
|
26
|
+
return Buffer.concat([RANDOM_BYTES, salt, encrypted, cipher.final()]).toString('base64');
|
|
23
27
|
}
|
|
24
28
|
decrypt(data) {
|
|
29
|
+
const input = Buffer.from(data, 'base64');
|
|
30
|
+
if (input.length < 16)
|
|
31
|
+
return '';
|
|
32
|
+
const salt = input.subarray(8, 16);
|
|
33
|
+
const [key, iv] = this.getKeyAndIv(salt);
|
|
34
|
+
const contents = input.subarray(16);
|
|
35
|
+
const decipher = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, iv);
|
|
36
|
+
return Buffer.concat([decipher.update(contents), decipher.final()]).toString('utf-8');
|
|
37
|
+
}
|
|
38
|
+
getKeyAndIv(salt) {
|
|
25
39
|
const { encryptionKey } = this.instanceSettings;
|
|
26
|
-
|
|
40
|
+
const password = Buffer.concat([Buffer.from(encryptionKey, 'binary'), salt]);
|
|
41
|
+
const hash1 = (0, crypto_1.createHash)('md5').update(password).digest();
|
|
42
|
+
const hash2 = (0, crypto_1.createHash)('md5')
|
|
43
|
+
.update(Buffer.concat([hash1, password]))
|
|
44
|
+
.digest();
|
|
45
|
+
const iv = (0, crypto_1.createHash)('md5')
|
|
46
|
+
.update(Buffer.concat([hash2, password]))
|
|
47
|
+
.digest();
|
|
48
|
+
const key = Buffer.concat([hash1, hash2]);
|
|
49
|
+
return [key, iv];
|
|
27
50
|
}
|
|
28
51
|
};
|
|
29
52
|
exports.Cipher = Cipher;
|
package/dist/Cipher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cipher.js","sourceRoot":"","sources":["../src/Cipher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"Cipher.js","sourceRoot":"","sources":["../src/Cipher.ts"],"names":[],"mappings":"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"}
|
package/dist/ExtractValue.js
CHANGED
|
@@ -38,10 +38,10 @@ function findPropertyFromParameterName(parameterName, nodeType, node, nodeParame
|
|
|
38
38
|
function executeRegexExtractValue(value, regex, parameterName, parameterDisplayName) {
|
|
39
39
|
const extracted = regex.exec(value);
|
|
40
40
|
if (!extracted) {
|
|
41
|
-
throw new
|
|
41
|
+
throw new n8n_workflow_1.WorkflowOperationError(`ERROR: ${parameterDisplayName} parameter's value is invalid. This is likely because the URL entered is incorrect`);
|
|
42
42
|
}
|
|
43
43
|
if (extracted.length < 2 || extracted.length > 2) {
|
|
44
|
-
throw new
|
|
44
|
+
throw new n8n_workflow_1.WorkflowOperationError(`Property "${parameterName}" has an invalid extractValue regex "${regex.source}". extractValue expects exactly one group to be returned.`);
|
|
45
45
|
}
|
|
46
46
|
return extracted[1];
|
|
47
47
|
}
|
package/dist/ExtractValue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtractValue.js","sourceRoot":"","sources":["../src/ExtractValue.ts"],"names":[],"mappings":";;;AASA,+
|
|
1
|
+
{"version":3,"file":"ExtractValue.js","sourceRoot":"","sources":["../src/ExtractValue.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,9 @@ interface WritableSettings {
|
|
|
2
2
|
tunnelSubdomain?: string;
|
|
3
3
|
}
|
|
4
4
|
export declare class InstanceSettings {
|
|
5
|
-
readonly userHome
|
|
5
|
+
private readonly userHome;
|
|
6
6
|
readonly n8nFolder: string;
|
|
7
|
+
readonly staticCacheDir: string;
|
|
7
8
|
readonly customExtensionDir: string;
|
|
8
9
|
readonly nodesDownloadDir: string;
|
|
9
10
|
private readonly settingsFile;
|
package/dist/InstanceSettings.js
CHANGED
|
@@ -19,6 +19,7 @@ let InstanceSettings = class InstanceSettings {
|
|
|
19
19
|
constructor() {
|
|
20
20
|
this.userHome = this.getUserHome();
|
|
21
21
|
this.n8nFolder = path_1.default.join(this.userHome, '.n8n');
|
|
22
|
+
this.staticCacheDir = path_1.default.join(this.userHome, '.cache/n8n/public');
|
|
22
23
|
this.customExtensionDir = path_1.default.join(this.n8nFolder, 'custom');
|
|
23
24
|
this.nodesDownloadDir = path_1.default.join(this.n8nFolder, 'nodes');
|
|
24
25
|
this.settingsFile = path_1.default.join(this.n8nFolder, 'config');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InstanceSettings.js","sourceRoot":"","sources":["../src/InstanceSettings.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAwB;AACxB,2BAAwE;AACxE,mCAAiD;AACjD,mCAAiC;AACjC,+CAAyC;AAalC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;
|
|
1
|
+
{"version":3,"file":"InstanceSettings.js","sourceRoot":"","sources":["../src/InstanceSettings.ts"],"names":[],"mappings":"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"}
|
package/dist/WorkflowExecute.js
CHANGED
|
@@ -100,7 +100,7 @@ class WorkflowExecute {
|
|
|
100
100
|
return workflow.settings.executionOrder !== 'v1';
|
|
101
101
|
}
|
|
102
102
|
runPartialWorkflow(workflow, runData, startNodes, destinationNode, pinData) {
|
|
103
|
-
var _a, _b;
|
|
103
|
+
var _a, _b, _c, _d;
|
|
104
104
|
let incomingNodeConnections;
|
|
105
105
|
let connection;
|
|
106
106
|
this.status = 'running';
|
|
@@ -135,7 +135,7 @@ class WorkflowExecute {
|
|
|
135
135
|
if (!runData[connection.node]) {
|
|
136
136
|
continue;
|
|
137
137
|
}
|
|
138
|
-
const nodeIncomingData = (_b = (_a = runData[connection.node][runIndex]) === null ||
|
|
138
|
+
const nodeIncomingData = (_d = (_c = (_b = (_a = runData[connection.node]) === null || _a === void 0 ? void 0 : _a[runIndex]) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c[connection.type]) === null || _d === void 0 ? void 0 : _d[connection.index];
|
|
139
139
|
if (nodeIncomingData) {
|
|
140
140
|
incomingData.push(nodeIncomingData);
|
|
141
141
|
}
|