n8n-core 1.15.1 → 1.17.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/bin/generate-known +67 -34
- package/bin/generate-ui-types +12 -6
- 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/DirectoryLoader.d.ts +1 -0
- package/dist/DirectoryLoader.js +30 -19
- package/dist/DirectoryLoader.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/NodeExecuteFunctions.js +2 -2
- package/dist/NodeExecuteFunctions.js.map +1 -1
- package/dist/WorkflowExecute.js +2 -2
- package/dist/WorkflowExecute.js.map +1 -1
- package/dist/WorkflowExecutionMetadata.js +1 -2
- package/dist/WorkflowExecutionMetadata.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
package/dist/DirectoryLoader.js
CHANGED
|
@@ -27,12 +27,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.LazyPackageDirectoryLoader = exports.PackageDirectoryLoader = exports.CustomDirectoryLoader = exports.DirectoryLoader = void 0;
|
|
30
|
-
const path = __importStar(require("path"));
|
|
31
|
-
const promises_1 = require("fs/promises");
|
|
32
30
|
const fast_glob_1 = __importDefault(require("fast-glob"));
|
|
31
|
+
const promises_1 = require("fs/promises");
|
|
33
32
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
34
|
-
const
|
|
33
|
+
const path = __importStar(require("path"));
|
|
35
34
|
const ClassLoader_1 = require("./ClassLoader");
|
|
35
|
+
const Constants_1 = require("./Constants");
|
|
36
36
|
function toJSON() {
|
|
37
37
|
return {
|
|
38
38
|
...this,
|
|
@@ -50,6 +50,7 @@ class DirectoryLoader {
|
|
|
50
50
|
this.credentialTypes = {};
|
|
51
51
|
this.known = { nodes: {}, credentials: {} };
|
|
52
52
|
this.types = { nodes: [], credentials: [] };
|
|
53
|
+
this.nodesByCredential = {};
|
|
53
54
|
}
|
|
54
55
|
reset() {
|
|
55
56
|
this.loadedNodes = [];
|
|
@@ -117,6 +118,12 @@ class DirectoryLoader {
|
|
|
117
118
|
(0, n8n_workflow_1.getVersionedNodeTypeAll)(tempNode).forEach(({ description }) => {
|
|
118
119
|
this.types.nodes.push(description);
|
|
119
120
|
});
|
|
121
|
+
for (const credential of (0, n8n_workflow_1.getCredentialsForNode)(tempNode)) {
|
|
122
|
+
if (!this.nodesByCredential[credential.name]) {
|
|
123
|
+
this.nodesByCredential[credential.name] = [];
|
|
124
|
+
}
|
|
125
|
+
this.nodesByCredential[credential.name].push(fullNodeName);
|
|
126
|
+
}
|
|
120
127
|
}
|
|
121
128
|
loadCredentialFromFile(credentialName, filePath) {
|
|
122
129
|
let tempCredential;
|
|
@@ -137,6 +144,7 @@ class DirectoryLoader {
|
|
|
137
144
|
className: credentialName,
|
|
138
145
|
sourcePath: filePath,
|
|
139
146
|
extends: tempCredential.extends,
|
|
147
|
+
supportedNodes: this.nodesByCredential[tempCredential.name],
|
|
140
148
|
};
|
|
141
149
|
this.credentialTypes[tempCredential.name] = {
|
|
142
150
|
type: tempCredential,
|
|
@@ -201,18 +209,21 @@ class CustomDirectoryLoader extends DirectoryLoader {
|
|
|
201
209
|
this.packageName = 'CUSTOM';
|
|
202
210
|
}
|
|
203
211
|
async loadAll() {
|
|
204
|
-
const
|
|
212
|
+
const nodes = await (0, fast_glob_1.default)('**/*.node.js', {
|
|
205
213
|
cwd: this.directory,
|
|
206
214
|
absolute: true,
|
|
207
215
|
});
|
|
208
|
-
for (const
|
|
209
|
-
const [fileName
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
+
for (const nodePath of nodes) {
|
|
217
|
+
const [fileName] = path.parse(nodePath).name.split('.');
|
|
218
|
+
this.loadNodeFromFile(fileName, nodePath);
|
|
219
|
+
}
|
|
220
|
+
const credentials = await (0, fast_glob_1.default)('**/*.credentials.js', {
|
|
221
|
+
cwd: this.directory,
|
|
222
|
+
absolute: true,
|
|
223
|
+
});
|
|
224
|
+
for (const credentialPath of credentials) {
|
|
225
|
+
const [fileName] = path.parse(credentialPath).name.split('.');
|
|
226
|
+
this.loadCredentialFromFile(fileName, credentialPath);
|
|
216
227
|
}
|
|
217
228
|
}
|
|
218
229
|
}
|
|
@@ -233,13 +244,6 @@ class PackageDirectoryLoader extends DirectoryLoader {
|
|
|
233
244
|
if (!n8n)
|
|
234
245
|
return;
|
|
235
246
|
const { nodes, credentials } = n8n;
|
|
236
|
-
if (Array.isArray(credentials)) {
|
|
237
|
-
for (const credential of credentials) {
|
|
238
|
-
const filePath = this.resolvePath(credential);
|
|
239
|
-
const [credentialName] = path.parse(credential).name.split('.');
|
|
240
|
-
this.loadCredentialFromFile(credentialName, filePath);
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
247
|
if (Array.isArray(nodes)) {
|
|
244
248
|
for (const node of nodes) {
|
|
245
249
|
const filePath = this.resolvePath(node);
|
|
@@ -247,6 +251,13 @@ class PackageDirectoryLoader extends DirectoryLoader {
|
|
|
247
251
|
this.loadNodeFromFile(nodeName, filePath);
|
|
248
252
|
}
|
|
249
253
|
}
|
|
254
|
+
if (Array.isArray(credentials)) {
|
|
255
|
+
for (const credential of credentials) {
|
|
256
|
+
const filePath = this.resolvePath(credential);
|
|
257
|
+
const [credentialName] = path.parse(credential).name.split('.');
|
|
258
|
+
this.loadCredentialFromFile(credentialName, filePath);
|
|
259
|
+
}
|
|
260
|
+
}
|
|
250
261
|
n8n_workflow_1.LoggerProxy.debug(`Loaded all credentials and nodes from ${this.packageName}`, {
|
|
251
262
|
credentials: (_a = credentials === null || credentials === void 0 ? void 0 : credentials.length) !== null && _a !== void 0 ? _a : 0,
|
|
252
263
|
nodes: (_b = nodes === null || nodes === void 0 ? void 0 : nodes.length) !== null && _b !== void 0 ? _b : 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DirectoryLoader.js","sourceRoot":"","sources":["../src/DirectoryLoader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DirectoryLoader.js","sourceRoot":"","sources":["../src/DirectoryLoader.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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"}
|
|
@@ -1118,10 +1118,10 @@ async function requestWithAuthentication(credentialsType, requestOptions, workfl
|
|
|
1118
1118
|
let credentialsDecrypted;
|
|
1119
1119
|
try {
|
|
1120
1120
|
const parentTypes = additionalData.credentialsHelper.getParentTypes(credentialsType);
|
|
1121
|
-
if (parentTypes.includes('oAuth1Api')) {
|
|
1121
|
+
if (credentialsType === 'oAuth1Api' || parentTypes.includes('oAuth1Api')) {
|
|
1122
1122
|
return await requestOAuth1.call(this, credentialsType, requestOptions, false);
|
|
1123
1123
|
}
|
|
1124
|
-
if (parentTypes.includes('oAuth2Api')) {
|
|
1124
|
+
if (credentialsType === 'oAuth2Api' || parentTypes.includes('oAuth2Api')) {
|
|
1125
1125
|
return await requestOAuth2.call(this, credentialsType, requestOptions, node, additionalData, additionalCredentialOptions === null || additionalCredentialOptions === void 0 ? void 0 : additionalCredentialOptions.oauth2, false);
|
|
1126
1126
|
}
|
|
1127
1127
|
if (additionalCredentialOptions === null || additionalCredentialOptions === void 0 ? void 0 : additionalCredentialOptions.credentialsDecrypted) {
|