n8n-core 1.73.0 → 1.75.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE.md +5 -3
- package/dist/ActiveWorkflows.d.ts +5 -3
- package/dist/ActiveWorkflows.js +17 -12
- package/dist/ActiveWorkflows.js.map +1 -1
- package/dist/BinaryData/BinaryData.service.js +3 -3
- package/dist/BinaryData/BinaryData.service.js.map +1 -1
- package/dist/BinaryData/ObjectStore.manager.js +2 -2
- package/dist/BinaryData/ObjectStore.manager.js.map +1 -1
- package/dist/Cipher.js +2 -2
- package/dist/Cipher.js.map +1 -1
- package/dist/Constants.d.ts +2 -0
- package/dist/Constants.js +4 -1
- package/dist/Constants.js.map +1 -1
- package/dist/CreateNodeAsTool.js.map +1 -1
- package/dist/Credentials.js +2 -2
- package/dist/Credentials.js.map +1 -1
- package/dist/DirectoryLoader.d.ts +6 -2
- package/dist/DirectoryLoader.js +24 -18
- package/dist/DirectoryLoader.js.map +1 -1
- package/dist/InstanceSettings.d.ts +4 -3
- package/dist/InstanceSettings.js +18 -17
- package/dist/InstanceSettings.js.map +1 -1
- package/dist/InstanceSettingsConfig.d.ts +3 -0
- package/dist/InstanceSettingsConfig.js +9 -1
- package/dist/InstanceSettingsConfig.js.map +1 -1
- package/dist/NodeExecuteFunctions.d.ts +1 -2
- package/dist/NodeExecuteFunctions.js +22 -127
- package/dist/NodeExecuteFunctions.js.map +1 -1
- package/dist/ObjectStore/ObjectStore.service.ee.d.ts +3 -1
- package/dist/ObjectStore/ObjectStore.service.ee.js +9 -4
- package/dist/ObjectStore/ObjectStore.service.ee.js.map +1 -1
- package/dist/SSHClientsManager.js +2 -2
- package/dist/SSHClientsManager.js.map +1 -1
- package/dist/ScheduledTaskManager.js +2 -2
- package/dist/ScheduledTaskManager.js.map +1 -1
- package/dist/SerializedBuffer.js +2 -4
- package/dist/SerializedBuffer.js.map +1 -1
- package/dist/TriggersAndPollers.js +2 -2
- package/dist/TriggersAndPollers.js.map +1 -1
- package/dist/WorkflowExecute.d.ts +2 -0
- package/dist/WorkflowExecute.js +135 -117
- package/dist/WorkflowExecute.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/error-reporter.d.ts +19 -3
- package/dist/error-reporter.js +47 -22
- package/dist/error-reporter.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/logging/logger.d.ts +34 -0
- package/dist/logging/logger.js +210 -0
- package/dist/logging/logger.js.map +1 -0
- package/dist/node-execution-context/base-execute-context.d.ts +1 -3
- package/dist/node-execution-context/base-execute-context.js +2 -10
- package/dist/node-execution-context/base-execute-context.js.map +1 -1
- package/dist/node-execution-context/execute-context.js +3 -2
- package/dist/node-execution-context/execute-context.js.map +1 -1
- package/dist/node-execution-context/index.d.ts +2 -1
- package/dist/node-execution-context/index.js +5 -3
- package/dist/node-execution-context/index.js.map +1 -1
- package/dist/node-execution-context/local-load-options-context.d.ts +10 -0
- package/dist/node-execution-context/local-load-options-context.js +49 -0
- package/dist/node-execution-context/local-load-options-context.js.map +1 -0
- package/dist/node-execution-context/node-execution-context.d.ts +10 -4
- package/dist/node-execution-context/node-execution-context.js +70 -8
- package/dist/node-execution-context/node-execution-context.js.map +1 -1
- package/dist/node-execution-context/supply-data-context.js +2 -1
- package/dist/node-execution-context/supply-data-context.js.map +1 -1
- package/dist/node-execution-context/utils/cleanupParameterData.d.ts +2 -0
- package/dist/node-execution-context/utils/cleanupParameterData.js +27 -0
- package/dist/node-execution-context/utils/cleanupParameterData.js.map +1 -0
- package/dist/node-execution-context/utils/ensureType.d.ts +6 -0
- package/dist/node-execution-context/utils/ensureType.js +75 -0
- package/dist/node-execution-context/utils/ensureType.js.map +1 -0
- package/dist/node-execution-context/utils/getAdditionalKeys.d.ts +4 -0
- package/dist/node-execution-context/utils/getAdditionalKeys.js +57 -0
- package/dist/node-execution-context/utils/getAdditionalKeys.js.map +1 -0
- package/dist/node-execution-context/utils/getInputConnectionData.d.ts +4 -0
- package/dist/node-execution-context/utils/getInputConnectionData.js +99 -0
- package/dist/node-execution-context/utils/getInputConnectionData.js.map +1 -0
- package/dist/node-execution-context/utils/validateValueAgainstSchema.d.ts +2 -0
- package/dist/node-execution-context/utils/validateValueAgainstSchema.js +129 -0
- package/dist/node-execution-context/utils/validateValueAgainstSchema.js.map +1 -0
- package/dist/node-execution-context/webhook-context.js +2 -1
- package/dist/node-execution-context/webhook-context.js.map +1 -1
- package/dist/node-execution-context/workflow-node-context.d.ts +6 -0
- package/dist/node-execution-context/workflow-node-context.js +14 -0
- package/dist/node-execution-context/workflow-node-context.js.map +1 -0
- package/dist/utils.d.ts +5 -0
- package/dist/utils.js +10 -0
- package/dist/utils.js.map +1 -0
- package/package.json +7 -4
- package/dist/node-execution-context/utils.d.ts +0 -11
- package/dist/node-execution-context/utils.js +0 -275
- package/dist/node-execution-context/utils.js.map +0 -1
package/LICENSE.md
CHANGED
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
Portions of this software are licensed as follows:
|
|
4
4
|
|
|
5
5
|
- Content of branches other than the main branch (i.e. "master") are not licensed.
|
|
6
|
-
- Source code files that contain ".ee." in their filename are NOT licensed under
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
- Source code files that contain ".ee." in their filename or ".ee" in their dirname are NOT licensed under
|
|
7
|
+
the Sustainable Use License.
|
|
8
|
+
To use source code files that contain ".ee." in their filename or ".ee" in their dirname you must hold a
|
|
9
|
+
valid n8n Enterprise License specifically allowing you access to such source code files and as defined
|
|
10
|
+
in "LICENSE_EE.md".
|
|
9
11
|
- All third party components incorporated into the n8n Software are licensed under the original license
|
|
10
12
|
provided by the owner of the applicable component.
|
|
11
13
|
- Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
|
|
@@ -1,19 +1,21 @@
|
|
|
1
|
-
import type { IGetExecutePollFunctions, IGetExecuteTriggerFunctions,
|
|
1
|
+
import type { IGetExecutePollFunctions, IGetExecuteTriggerFunctions, IWorkflowExecuteAdditionalData, Workflow, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
2
|
import { ErrorReporter } from './error-reporter';
|
|
3
3
|
import type { IWorkflowData } from './Interfaces';
|
|
4
|
+
import { Logger } from './logging/logger';
|
|
4
5
|
import { ScheduledTaskManager } from './ScheduledTaskManager';
|
|
5
6
|
import { TriggersAndPollers } from './TriggersAndPollers';
|
|
6
7
|
export declare class ActiveWorkflows {
|
|
8
|
+
private readonly logger;
|
|
7
9
|
private readonly scheduledTaskManager;
|
|
8
10
|
private readonly triggersAndPollers;
|
|
9
11
|
private readonly errorReporter;
|
|
10
|
-
constructor(scheduledTaskManager: ScheduledTaskManager, triggersAndPollers: TriggersAndPollers, errorReporter: ErrorReporter);
|
|
12
|
+
constructor(logger: Logger, scheduledTaskManager: ScheduledTaskManager, triggersAndPollers: TriggersAndPollers, errorReporter: ErrorReporter);
|
|
11
13
|
private activeWorkflows;
|
|
12
14
|
isActive(workflowId: string): boolean;
|
|
13
15
|
allActiveWorkflows(): string[];
|
|
14
16
|
get(workflowId: string): IWorkflowData;
|
|
15
17
|
add(workflowId: string, workflow: Workflow, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode, getTriggerFunctions: IGetExecuteTriggerFunctions, getPollFunctions: IGetExecutePollFunctions): Promise<void>;
|
|
16
|
-
activatePolling
|
|
18
|
+
private activatePolling;
|
|
17
19
|
remove(workflowId: string): Promise<boolean>;
|
|
18
20
|
removeAllTriggerAndPollerBasedWorkflows(): Promise<void>;
|
|
19
21
|
private closeTrigger;
|
package/dist/ActiveWorkflows.js
CHANGED
|
@@ -10,13 +10,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ActiveWorkflows = void 0;
|
|
13
|
+
const di_1 = require("@n8n/di");
|
|
13
14
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
14
|
-
const typedi_1 = require("typedi");
|
|
15
15
|
const error_reporter_1 = require("./error-reporter");
|
|
16
|
+
const logger_1 = require("./logging/logger");
|
|
16
17
|
const ScheduledTaskManager_1 = require("./ScheduledTaskManager");
|
|
17
18
|
const TriggersAndPollers_1 = require("./TriggersAndPollers");
|
|
18
19
|
let ActiveWorkflows = class ActiveWorkflows {
|
|
19
|
-
constructor(scheduledTaskManager, triggersAndPollers, errorReporter) {
|
|
20
|
+
constructor(logger, scheduledTaskManager, triggersAndPollers, errorReporter) {
|
|
21
|
+
this.logger = logger;
|
|
20
22
|
this.scheduledTaskManager = scheduledTaskManager;
|
|
21
23
|
this.triggersAndPollers = triggersAndPollers;
|
|
22
24
|
this.errorReporter = errorReporter;
|
|
@@ -32,15 +34,13 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
32
34
|
return this.activeWorkflows[workflowId];
|
|
33
35
|
}
|
|
34
36
|
async add(workflowId, workflow, additionalData, mode, activation, getTriggerFunctions, getPollFunctions) {
|
|
35
|
-
this.activeWorkflows[workflowId] = {};
|
|
36
37
|
const triggerNodes = workflow.getTriggerNodes();
|
|
37
|
-
|
|
38
|
-
this.activeWorkflows[workflowId].triggerResponses = [];
|
|
38
|
+
const triggerResponses = [];
|
|
39
39
|
for (const triggerNode of triggerNodes) {
|
|
40
40
|
try {
|
|
41
|
-
triggerResponse = await this.triggersAndPollers.runTrigger(workflow, triggerNode, getTriggerFunctions, additionalData, mode, activation);
|
|
41
|
+
const triggerResponse = await this.triggersAndPollers.runTrigger(workflow, triggerNode, getTriggerFunctions, additionalData, mode, activation);
|
|
42
42
|
if (triggerResponse !== undefined) {
|
|
43
|
-
|
|
43
|
+
triggerResponses.push(triggerResponse);
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
catch (e) {
|
|
@@ -48,6 +48,7 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
48
48
|
throw new n8n_workflow_1.WorkflowActivationError(`There was a problem activating the workflow: "${error.message}"`, { cause: error, node: triggerNode });
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
+
this.activeWorkflows[workflowId] = { triggerResponses };
|
|
51
52
|
const pollingNodes = workflow.getPollNodes();
|
|
52
53
|
if (pollingNodes.length === 0)
|
|
53
54
|
return;
|
|
@@ -56,6 +57,9 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
56
57
|
await this.activatePolling(pollNode, workflow, additionalData, getPollFunctions, mode, activation);
|
|
57
58
|
}
|
|
58
59
|
catch (e) {
|
|
60
|
+
if (triggerResponses.length === 0) {
|
|
61
|
+
delete this.activeWorkflows[workflowId];
|
|
62
|
+
}
|
|
59
63
|
const error = e instanceof Error ? e : new Error(`${e}`);
|
|
60
64
|
throw new n8n_workflow_1.WorkflowActivationError(`There was a problem activating the workflow: "${error.message}"`, { cause: error, node: pollNode });
|
|
61
65
|
}
|
|
@@ -66,7 +70,7 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
66
70
|
const pollTimes = pollFunctions.getNodeParameter('pollTimes');
|
|
67
71
|
const cronTimes = (pollTimes.item || []).map(n8n_workflow_1.toCronExpression);
|
|
68
72
|
const executeTrigger = async (testingTrigger = false) => {
|
|
69
|
-
|
|
73
|
+
this.logger.debug(`Polling trigger initiated for workflow "${workflow.name}"`, {
|
|
70
74
|
workflowName: workflow.name,
|
|
71
75
|
workflowId: workflow.id,
|
|
72
76
|
});
|
|
@@ -94,7 +98,7 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
94
98
|
}
|
|
95
99
|
async remove(workflowId) {
|
|
96
100
|
if (!this.isActive(workflowId)) {
|
|
97
|
-
|
|
101
|
+
this.logger.warn(`Cannot deactivate already inactive workflow ID "${workflowId}"`);
|
|
98
102
|
return false;
|
|
99
103
|
}
|
|
100
104
|
this.scheduledTaskManager.deregisterCrons(workflowId);
|
|
@@ -118,7 +122,7 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
118
122
|
}
|
|
119
123
|
catch (e) {
|
|
120
124
|
if (e instanceof n8n_workflow_1.TriggerCloseError) {
|
|
121
|
-
|
|
125
|
+
this.logger.error(`There was a problem calling "closeFunction" on "${e.node.name}" in workflow "${workflowId}"`);
|
|
122
126
|
this.errorReporter.error(e, { extra: { workflowId } });
|
|
123
127
|
return;
|
|
124
128
|
}
|
|
@@ -129,8 +133,9 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
129
133
|
};
|
|
130
134
|
exports.ActiveWorkflows = ActiveWorkflows;
|
|
131
135
|
exports.ActiveWorkflows = ActiveWorkflows = __decorate([
|
|
132
|
-
(0,
|
|
133
|
-
__metadata("design:paramtypes", [
|
|
136
|
+
(0, di_1.Service)(),
|
|
137
|
+
__metadata("design:paramtypes", [logger_1.Logger,
|
|
138
|
+
ScheduledTaskManager_1.ScheduledTaskManager,
|
|
134
139
|
TriggersAndPollers_1.TriggersAndPollers,
|
|
135
140
|
error_reporter_1.ErrorReporter])
|
|
136
141
|
], 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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"}
|
|
@@ -43,10 +43,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
43
43
|
};
|
|
44
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
45
|
exports.BinaryDataService = void 0;
|
|
46
|
+
const di_1 = require("@n8n/di");
|
|
46
47
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
47
48
|
const promises_1 = require("node:fs/promises");
|
|
48
49
|
const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
|
|
49
|
-
const typedi_1 = __importStar(require("typedi"));
|
|
50
50
|
const utils_1 = require("./utils");
|
|
51
51
|
const invalid_manager_error_1 = require("../errors/invalid-manager.error");
|
|
52
52
|
const invalid_mode_error_1 = require("../errors/invalid-mode.error");
|
|
@@ -68,7 +68,7 @@ let BinaryDataService = class BinaryDataService {
|
|
|
68
68
|
if (config.availableModes.includes('s3')) {
|
|
69
69
|
const { ObjectStoreManager } = await Promise.resolve().then(() => __importStar(require('./ObjectStore.manager')));
|
|
70
70
|
const { ObjectStoreService } = await Promise.resolve().then(() => __importStar(require('../ObjectStore/ObjectStore.service.ee')));
|
|
71
|
-
this.managers.s3 = new ObjectStoreManager(
|
|
71
|
+
this.managers.s3 = new ObjectStoreManager(di_1.Container.get(ObjectStoreService));
|
|
72
72
|
await this.managers.s3.init();
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -198,6 +198,6 @@ let BinaryDataService = class BinaryDataService {
|
|
|
198
198
|
};
|
|
199
199
|
exports.BinaryDataService = BinaryDataService;
|
|
200
200
|
exports.BinaryDataService = BinaryDataService = __decorate([
|
|
201
|
-
(0,
|
|
201
|
+
(0, di_1.Service)()
|
|
202
202
|
], BinaryDataService);
|
|
203
203
|
//# sourceMappingURL=BinaryData.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinaryData.service.js","sourceRoot":"","sources":["../../src/BinaryData/BinaryData.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA+C;AAE/C,+CAAkD;AAClD,gEAAuC;
|
|
1
|
+
{"version":3,"file":"BinaryData.service.js","sourceRoot":"","sources":["../../src/BinaryData/BinaryData.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.ObjectStoreManager = void 0;
|
|
16
|
+
const di_1 = require("@n8n/di");
|
|
16
17
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
17
|
-
const typedi_1 = require("typedi");
|
|
18
18
|
const uuid_1 = require("uuid");
|
|
19
19
|
const utils_1 = require("./utils");
|
|
20
20
|
const ObjectStore_service_ee_1 = require("../ObjectStore/ObjectStore.service.ee");
|
|
@@ -75,7 +75,7 @@ let ObjectStoreManager = class ObjectStoreManager {
|
|
|
75
75
|
};
|
|
76
76
|
exports.ObjectStoreManager = ObjectStoreManager;
|
|
77
77
|
exports.ObjectStoreManager = ObjectStoreManager = __decorate([
|
|
78
|
-
(0,
|
|
78
|
+
(0, di_1.Service)(),
|
|
79
79
|
__metadata("design:paramtypes", [ObjectStore_service_ee_1.ObjectStoreService])
|
|
80
80
|
], ObjectStoreManager);
|
|
81
81
|
//# sourceMappingURL=ObjectStore.manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectStore.manager.js","sourceRoot":"","sources":["../../src/BinaryData/ObjectStore.manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAkC;AAElC
|
|
1
|
+
{"version":3,"file":"ObjectStore.manager.js","sourceRoot":"","sources":["../../src/BinaryData/ObjectStore.manager.ts"],"names":[],"mappings":"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"}
|
package/dist/Cipher.js
CHANGED
|
@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.Cipher = void 0;
|
|
13
|
+
const di_1 = require("@n8n/di");
|
|
13
14
|
const crypto_1 = require("crypto");
|
|
14
|
-
const typedi_1 = require("typedi");
|
|
15
15
|
const InstanceSettings_1 = require("./InstanceSettings");
|
|
16
16
|
const RANDOM_BYTES = Buffer.from('53616c7465645f5f', 'hex');
|
|
17
17
|
let Cipher = class Cipher {
|
|
@@ -51,7 +51,7 @@ let Cipher = class Cipher {
|
|
|
51
51
|
};
|
|
52
52
|
exports.Cipher = Cipher;
|
|
53
53
|
exports.Cipher = Cipher = __decorate([
|
|
54
|
-
(0,
|
|
54
|
+
(0, di_1.Service)(),
|
|
55
55
|
__metadata("design:paramtypes", [InstanceSettings_1.InstanceSettings])
|
|
56
56
|
], Cipher);
|
|
57
57
|
//# sourceMappingURL=Cipher.js.map
|
package/dist/Cipher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cipher.js","sourceRoot":"","sources":["../src/Cipher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"Cipher.js","sourceRoot":"","sources":["../src/Cipher.ts"],"names":[],"mappings":"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"}
|
package/dist/Constants.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { INodeProperties } from 'n8n-workflow';
|
|
2
|
+
export declare const inProduction: boolean;
|
|
3
|
+
export declare const inDevelopment: boolean;
|
|
2
4
|
export declare const CUSTOM_EXTENSION_ENV = "N8N_CUSTOM_EXTENSIONS";
|
|
3
5
|
export declare const PLACEHOLDER_EMPTY_EXECUTION_ID = "__UNKNOWN__";
|
|
4
6
|
export declare const PLACEHOLDER_EMPTY_WORKFLOW_ID = "__EMPTY__";
|
package/dist/Constants.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.commonCORSParameters = exports.commonPollingParameters = exports.UM_EMAIL_TEMPLATES_PWRESET = exports.UM_EMAIL_TEMPLATES_INVITE = exports.BINARY_DATA_STORAGE_PATH = exports.CONFIG_FILES = exports.BLOCK_FILE_ACCESS_TO_N8N_FILES = exports.RESTRICT_FILE_ACCESS_TO = exports.CUSTOM_NODES_CATEGORY = exports.HTTP_REQUEST_TOOL_NODE_TYPE = exports.HTTP_REQUEST_NODE_TYPE = exports.PLACEHOLDER_EMPTY_WORKFLOW_ID = exports.PLACEHOLDER_EMPTY_EXECUTION_ID = exports.CUSTOM_EXTENSION_ENV = void 0;
|
|
3
|
+
exports.commonCORSParameters = exports.commonPollingParameters = exports.UM_EMAIL_TEMPLATES_PWRESET = exports.UM_EMAIL_TEMPLATES_INVITE = exports.BINARY_DATA_STORAGE_PATH = exports.CONFIG_FILES = exports.BLOCK_FILE_ACCESS_TO_N8N_FILES = exports.RESTRICT_FILE_ACCESS_TO = exports.CUSTOM_NODES_CATEGORY = exports.HTTP_REQUEST_TOOL_NODE_TYPE = exports.HTTP_REQUEST_NODE_TYPE = exports.PLACEHOLDER_EMPTY_WORKFLOW_ID = exports.PLACEHOLDER_EMPTY_EXECUTION_ID = exports.CUSTOM_EXTENSION_ENV = exports.inDevelopment = exports.inProduction = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
const { NODE_ENV } = process.env;
|
|
6
|
+
exports.inProduction = NODE_ENV === 'production';
|
|
7
|
+
exports.inDevelopment = !NODE_ENV || NODE_ENV === 'development';
|
|
5
8
|
exports.CUSTOM_EXTENSION_ENV = 'N8N_CUSTOM_EXTENSIONS';
|
|
6
9
|
exports.PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
|
|
7
10
|
exports.PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
|
package/dist/Constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../src/Constants.ts"],"names":[],"mappings":";;;AACA,+CAA+C;
|
|
1
|
+
{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../src/Constants.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAE/C,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AACpB,QAAA,YAAY,GAAG,QAAQ,KAAK,YAAY,CAAC;AACzC,QAAA,aAAa,GAAG,CAAC,QAAQ,IAAI,QAAQ,KAAK,aAAa,CAAC;AAExD,QAAA,oBAAoB,GAAG,uBAAuB,CAAC;AAC/C,QAAA,8BAA8B,GAAG,aAAa,CAAC;AAC/C,QAAA,6BAA6B,GAAG,WAAW,CAAC;AAC5C,QAAA,sBAAsB,GAAG,4BAA4B,CAAC;AACtD,QAAA,2BAA2B,GAAG,0CAA0C,CAAC;AAEzE,QAAA,qBAAqB,GAAG,cAAc,CAAC;AAEvC,QAAA,uBAAuB,GAAG,6BAA6B,CAAC;AACxD,QAAA,8BAA8B,GAAG,oCAAoC,CAAC;AACtE,QAAA,YAAY,GAAG,kBAAkB,CAAC;AAClC,QAAA,wBAAwB,GAAG,8BAA8B,CAAC;AAC1D,QAAA,yBAAyB,GAAG,+BAA+B,CAAC;AAC5D,QAAA,0BAA0B,GAAG,gCAAgC,CAAC;AAE9D,QAAA,uBAAuB,GAAsB;IACzD;QACC,WAAW,EAAE,YAAY;QACzB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE;YACZ,cAAc,EAAE,IAAI;YACpB,uBAAuB,EAAE,eAAe;SACxC;QACD,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE;QAC5C,WAAW,EAAE,oCAAoC;QACjD,WAAW,EAAE,eAAe;QAC5B,OAAO,EAAE,8BAAe;KACxB;CACD,CAAC;AAEW,QAAA,oBAAoB,GAAsB;IACtD;QACC,WAAW,EAAE,wBAAwB;QACrC,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,GAAG;QACZ,WAAW,EACV,qHAAqH;KACtH;CACD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateNodeAsTool.js","sourceRoot":"","sources":["../src/CreateNodeAsTool.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"CreateNodeAsTool.js","sourceRoot":"","sources":["../src/CreateNodeAsTool.ts"],"names":[],"mappings":"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"}
|
package/dist/Credentials.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Credentials = void 0;
|
|
4
|
+
const di_1 = require("@n8n/di");
|
|
4
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
-
const typedi_1 = require("typedi");
|
|
6
6
|
const Cipher_1 = require("./Cipher");
|
|
7
7
|
class Credentials extends n8n_workflow_1.ICredentials {
|
|
8
8
|
constructor() {
|
|
9
9
|
super(...arguments);
|
|
10
|
-
this.cipher =
|
|
10
|
+
this.cipher = di_1.Container.get(Cipher_1.Cipher);
|
|
11
11
|
}
|
|
12
12
|
setData(data) {
|
|
13
13
|
this.data = this.cipher.encrypt(data);
|
package/dist/Credentials.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Credentials.js","sourceRoot":"","sources":["../src/Credentials.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Credentials.js","sourceRoot":"","sources":["../src/Credentials.ts"],"names":[],"mappings":";;;AAAA,gCAAoC;AAEpC,+CAAyE;AAEzE,qCAAkC;AAElC,MAAa,WAEX,SAAQ,2BAAe;IAFzB;;QAGkB,WAAM,GAAG,cAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;IA2CjD,CAAC;IAtCA,OAAO,CAAC,IAAO;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAKD,OAAO;QACN,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,+BAAgB,CAAC,4CAA4C,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAErD,OAAO,IAAA,wBAAS,EAAC,aAAa,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,IAAI,+BAAgB,CACzB,yHAAyH,CACzH,CAAC;QACH,CAAC;IACF,CAAC;IAKD,aAAa;QACZ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,+BAAgB,CAAC,kCAAkC,CAAC,CAAC;QAChE,CAAC;QAED,OAAO;YACN,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SACf,CAAC;IACH,CAAC;CACD;AA9CD,kCA8CC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ICredentialType, ICredentialTypeData, INodeCredentialDescription, INodeType, INodeTypeBaseDescription, INodeTypeData, INodeTypeNameVersion, IVersionedNodeType, KnownNodesAndCredentials } from 'n8n-workflow';
|
|
2
|
+
import { Logger } from './logging/logger';
|
|
2
3
|
import type { n8n } from './Interfaces';
|
|
3
4
|
export type Types = {
|
|
4
5
|
nodes: INodeTypeBaseDescription[];
|
|
@@ -6,8 +7,8 @@ export type Types = {
|
|
|
6
7
|
};
|
|
7
8
|
export declare abstract class DirectoryLoader {
|
|
8
9
|
readonly directory: string;
|
|
9
|
-
protected
|
|
10
|
-
protected
|
|
10
|
+
protected excludeNodes: string[];
|
|
11
|
+
protected includeNodes: string[];
|
|
11
12
|
isLazyLoaded: boolean;
|
|
12
13
|
loadedNodes: INodeTypeNameVersion[];
|
|
13
14
|
nodeTypes: INodeTypeData;
|
|
@@ -15,6 +16,7 @@ export declare abstract class DirectoryLoader {
|
|
|
15
16
|
known: KnownNodesAndCredentials;
|
|
16
17
|
types: Types;
|
|
17
18
|
readonly nodesByCredential: Record<string, string[]>;
|
|
19
|
+
protected readonly logger: Logger;
|
|
18
20
|
constructor(directory: string, excludeNodes?: string[], includeNodes?: string[]);
|
|
19
21
|
abstract packageName: string;
|
|
20
22
|
abstract loadAll(): Promise<void>;
|
|
@@ -41,6 +43,8 @@ export declare class CustomDirectoryLoader extends DirectoryLoader {
|
|
|
41
43
|
export declare class PackageDirectoryLoader extends DirectoryLoader {
|
|
42
44
|
packageJson: n8n.PackageJson;
|
|
43
45
|
packageName: string;
|
|
46
|
+
constructor(directory: string, excludeNodes?: string[], includeNodes?: string[]);
|
|
47
|
+
private extractNodeTypes;
|
|
44
48
|
loadAll(): Promise<void>;
|
|
45
49
|
private inferSupportedNodes;
|
|
46
50
|
private parseJSON;
|
package/dist/DirectoryLoader.js
CHANGED
|
@@ -37,12 +37,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.LazyPackageDirectoryLoader = exports.PackageDirectoryLoader = exports.CustomDirectoryLoader = exports.DirectoryLoader = void 0;
|
|
40
|
+
const di_1 = require("@n8n/di");
|
|
40
41
|
const fast_glob_1 = __importDefault(require("fast-glob"));
|
|
41
42
|
const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
|
|
42
43
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
43
44
|
const node_fs_1 = require("node:fs");
|
|
44
45
|
const promises_1 = require("node:fs/promises");
|
|
45
46
|
const path = __importStar(require("path"));
|
|
47
|
+
const logger_1 = require("./logging/logger");
|
|
46
48
|
const ClassLoader_1 = require("./ClassLoader");
|
|
47
49
|
const Constants_1 = require("./Constants");
|
|
48
50
|
const unrecognized_credential_type_error_1 = require("./errors/unrecognized-credential-type.error");
|
|
@@ -65,6 +67,7 @@ class DirectoryLoader {
|
|
|
65
67
|
this.known = { nodes: {}, credentials: {} };
|
|
66
68
|
this.types = { nodes: [], credentials: [] };
|
|
67
69
|
this.nodesByCredential = {};
|
|
70
|
+
this.logger = di_1.Container.get(logger_1.Logger);
|
|
68
71
|
}
|
|
69
72
|
reset() {
|
|
70
73
|
this.loadedNodes = [];
|
|
@@ -92,11 +95,10 @@ class DirectoryLoader {
|
|
|
92
95
|
const tempNode = this.loadClass(filePath);
|
|
93
96
|
this.addCodex(tempNode, filePath);
|
|
94
97
|
const nodeType = tempNode.description.name;
|
|
95
|
-
|
|
96
|
-
if (this.includeNodes.length && !this.includeNodes.includes(fullNodeType)) {
|
|
98
|
+
if (this.includeNodes.length && !this.includeNodes.includes(nodeType)) {
|
|
97
99
|
return;
|
|
98
100
|
}
|
|
99
|
-
if (this.excludeNodes.includes(
|
|
101
|
+
if (this.excludeNodes.includes(nodeType)) {
|
|
100
102
|
return;
|
|
101
103
|
}
|
|
102
104
|
this.fixIconPaths(tempNode.description, filePath);
|
|
@@ -113,7 +115,7 @@ class DirectoryLoader {
|
|
|
113
115
|
this.addCodex(currentVersionNode, filePath);
|
|
114
116
|
nodeVersion = tempNode.currentVersion;
|
|
115
117
|
if (currentVersionNode.hasOwnProperty('executeSingle')) {
|
|
116
|
-
throw new n8n_workflow_1.ApplicationError('"executeSingle" has been removed. Please update the code of this node to use "execute" instead.', { extra: { nodeType
|
|
118
|
+
throw new n8n_workflow_1.ApplicationError('"executeSingle" has been removed. Please update the code of this node to use "execute" instead.', { extra: { nodeType } });
|
|
117
119
|
}
|
|
118
120
|
}
|
|
119
121
|
else {
|
|
@@ -236,7 +238,7 @@ class DirectoryLoader {
|
|
|
236
238
|
node.description.codex = codex;
|
|
237
239
|
}
|
|
238
240
|
catch {
|
|
239
|
-
|
|
241
|
+
this.logger.debug(`No codex available for: ${node.description.name}`);
|
|
240
242
|
if (isCustom) {
|
|
241
243
|
node.description.codex = {
|
|
242
244
|
categories: [Constants_1.CUSTOM_NODES_CATEGORY],
|
|
@@ -314,10 +316,18 @@ class CustomDirectoryLoader extends DirectoryLoader {
|
|
|
314
316
|
}
|
|
315
317
|
exports.CustomDirectoryLoader = CustomDirectoryLoader;
|
|
316
318
|
class PackageDirectoryLoader extends DirectoryLoader {
|
|
317
|
-
constructor() {
|
|
318
|
-
super(
|
|
319
|
+
constructor(directory, excludeNodes = [], includeNodes = []) {
|
|
320
|
+
super(directory, excludeNodes, includeNodes);
|
|
319
321
|
this.packageJson = this.readJSONSync('package.json');
|
|
320
322
|
this.packageName = this.packageJson.name;
|
|
323
|
+
this.excludeNodes = this.extractNodeTypes(excludeNodes);
|
|
324
|
+
this.includeNodes = this.extractNodeTypes(includeNodes);
|
|
325
|
+
}
|
|
326
|
+
extractNodeTypes(fullNodeTypes) {
|
|
327
|
+
return fullNodeTypes
|
|
328
|
+
.map((fullNodeType) => fullNodeType.split('.'))
|
|
329
|
+
.filter(([packageName]) => packageName === this.packageName)
|
|
330
|
+
.map(([_, nodeType]) => nodeType);
|
|
321
331
|
}
|
|
322
332
|
async loadAll() {
|
|
323
333
|
const { n8n } = this.packageJson;
|
|
@@ -335,7 +345,7 @@ class PackageDirectoryLoader extends DirectoryLoader {
|
|
|
335
345
|
}
|
|
336
346
|
}
|
|
337
347
|
this.inferSupportedNodes();
|
|
338
|
-
|
|
348
|
+
this.logger.debug(`Loaded all credentials and nodes from ${this.packageName}`, {
|
|
339
349
|
credentials: credentials?.length ?? 0,
|
|
340
350
|
nodes: nodes?.length ?? 0,
|
|
341
351
|
});
|
|
@@ -395,9 +405,8 @@ class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
|
|
|
395
405
|
this.types.credentials = await this.readJSON('dist/types/credentials.json');
|
|
396
406
|
if (this.includeNodes.length) {
|
|
397
407
|
const allowedNodes = {};
|
|
398
|
-
for (const
|
|
399
|
-
|
|
400
|
-
if (packageName === this.packageName && nodeType in this.known.nodes) {
|
|
408
|
+
for (const nodeType of this.includeNodes) {
|
|
409
|
+
if (nodeType in this.known.nodes) {
|
|
401
410
|
allowedNodes[nodeType] = this.known.nodes[nodeType];
|
|
402
411
|
}
|
|
403
412
|
}
|
|
@@ -405,15 +414,12 @@ class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
|
|
|
405
414
|
this.types.nodes = this.types.nodes.filter((nodeType) => this.includeNodes.includes(nodeType.name));
|
|
406
415
|
}
|
|
407
416
|
if (this.excludeNodes.length) {
|
|
408
|
-
for (const
|
|
409
|
-
|
|
410
|
-
if (packageName === this.packageName) {
|
|
411
|
-
delete this.known.nodes[nodeType];
|
|
412
|
-
}
|
|
417
|
+
for (const nodeType of this.excludeNodes) {
|
|
418
|
+
delete this.known.nodes[nodeType];
|
|
413
419
|
}
|
|
414
420
|
this.types.nodes = this.types.nodes.filter((nodeType) => !this.excludeNodes.includes(nodeType.name));
|
|
415
421
|
}
|
|
416
|
-
|
|
422
|
+
this.logger.debug(`Lazy-loading nodes and credentials from ${this.packageJson.name}`, {
|
|
417
423
|
nodes: this.types.nodes?.length ?? 0,
|
|
418
424
|
credentials: this.types.credentials?.length ?? 0,
|
|
419
425
|
});
|
|
@@ -421,7 +427,7 @@ class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
|
|
|
421
427
|
return;
|
|
422
428
|
}
|
|
423
429
|
catch {
|
|
424
|
-
|
|
430
|
+
this.logger.debug("Can't enable lazy-loading");
|
|
425
431
|
await super.loadAll();
|
|
426
432
|
}
|
|
427
433
|
}
|