n8n-core 1.77.2 → 1.78.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/execution-engine/node-execution-context/base-execute-context.d.ts +5 -5
- package/dist/execution-engine/node-execution-context/base-execute-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/credentials-test-context.d.ts +7 -0
- package/dist/execution-engine/node-execution-context/credentials-test-context.js +36 -0
- package/dist/execution-engine/node-execution-context/credentials-test-context.js.map +1 -0
- package/dist/execution-engine/node-execution-context/index.d.ts +1 -0
- package/dist/execution-engine/node-execution-context/index.js +3 -1
- package/dist/execution-engine/node-execution-context/index.js.map +1 -1
- package/dist/execution-engine/node-execution-context/node-execution-context.d.ts +8 -8
- package/dist/execution-engine/node-execution-context/node-execution-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/validate-value-against-schema.js +6 -4
- package/dist/execution-engine/node-execution-context/utils/validate-value-against-schema.js.map +1 -1
- package/dist/execution-engine/routing-node.d.ts +13 -15
- package/dist/execution-engine/routing-node.js +42 -39
- package/dist/execution-engine/routing-node.js.map +1 -1
- package/dist/execution-engine/workflow-execute.js +4 -4
- package/dist/execution-engine/workflow-execute.js.map +1 -1
- package/dist/node-execute-functions.d.ts +1 -2
- package/dist/node-execute-functions.js +0 -15
- package/dist/node-execute-functions.js.map +1 -1
- package/package.json +4 -4
|
@@ -3,11 +3,11 @@ import { NodeConnectionType } from 'n8n-workflow';
|
|
|
3
3
|
import { BinaryDataService } from '../../binary-data/binary-data.service';
|
|
4
4
|
import { NodeExecutionContext } from './node-execution-context';
|
|
5
5
|
export declare class BaseExecuteContext extends NodeExecutionContext {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
readonly runExecutionData: IRunExecutionData;
|
|
7
|
+
readonly connectionInputData: INodeExecutionData[];
|
|
8
|
+
readonly inputData: ITaskDataConnections;
|
|
9
|
+
readonly executeData: IExecuteData;
|
|
10
|
+
readonly abortSignal?: AbortSignal | undefined;
|
|
11
11
|
protected readonly binaryDataService: BinaryDataService;
|
|
12
12
|
constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, runExecutionData: IRunExecutionData, runIndex: number, connectionInputData: INodeExecutionData[], inputData: ITaskDataConnections, executeData: IExecuteData, abortSignal?: AbortSignal | undefined);
|
|
13
13
|
getExecutionCancelSignal(): AbortSignal | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-execute-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/base-execute-context.ts"],"names":[],"mappings":";;;AAAA,gCAAoC;AACpC,mCAA6B;AAsB7B,+CAMsB;AAEtB,2EAAsE;AAEtE,qEAAgE;AAEhE,MAAa,kBAAmB,SAAQ,6CAAoB;IAG3D,YACC,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,IAAyB,
|
|
1
|
+
{"version":3,"file":"base-execute-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/base-execute-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { ICredentialTestFunctions } from 'n8n-workflow';
|
|
2
|
+
import { Logger } from '../../logging';
|
|
3
|
+
export declare class CredentialTestContext implements ICredentialTestFunctions {
|
|
4
|
+
readonly helpers: ICredentialTestFunctions['helpers'];
|
|
5
|
+
constructor();
|
|
6
|
+
get logger(): Logger;
|
|
7
|
+
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.CredentialTestContext = void 0;
|
|
13
|
+
const di_1 = require("@n8n/di");
|
|
14
|
+
const decorators_1 = require("../../decorators");
|
|
15
|
+
const logging_1 = require("../../logging");
|
|
16
|
+
const node_execute_functions_1 = require("../../node-execute-functions");
|
|
17
|
+
class CredentialTestContext {
|
|
18
|
+
constructor() {
|
|
19
|
+
this.helpers = {
|
|
20
|
+
...(0, node_execute_functions_1.getSSHTunnelFunctions)(),
|
|
21
|
+
request: async (uriOrObject, options) => {
|
|
22
|
+
return await (0, node_execute_functions_1.proxyRequestToAxios)(undefined, undefined, undefined, uriOrObject, options);
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
get logger() {
|
|
27
|
+
return di_1.Container.get(logging_1.Logger);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
exports.CredentialTestContext = CredentialTestContext;
|
|
31
|
+
__decorate([
|
|
32
|
+
decorators_1.Memoized,
|
|
33
|
+
__metadata("design:type", Object),
|
|
34
|
+
__metadata("design:paramtypes", [])
|
|
35
|
+
], CredentialTestContext.prototype, "logger", null);
|
|
36
|
+
//# sourceMappingURL=credentials-test-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credentials-test-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/credentials-test-context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAoC;AAGpC,6CAAwC;AACxC,uCAAmC;AAEnC,qEAAsF;AAEtF,MAAa,qBAAqB;IAGjC;QACC,IAAI,CAAC,OAAO,GAAG;YACd,GAAG,IAAA,8CAAqB,GAAE;YAC1B,OAAO,EAAE,KAAK,EAAE,WAA4B,EAAE,OAAgB,EAAE,EAAE;gBAEjE,OAAO,MAAM,IAAA,4CAAmB,EAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YACzF,CAAC;SACD,CAAC;IACH,CAAC;IAED,IACI,MAAM;QACT,OAAO,cAAS,CAAC,GAAG,CAAC,gBAAM,CAAC,CAAC;IAC9B,CAAC;CACD;AAjBD,sDAiBC;AAJA;IAAC,qBAAQ;;;mDAGR"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAdditionalKeys = exports.WebhookContext = exports.TriggerContext = exports.SupplyDataContext = exports.PollContext = exports.LocalLoadOptionsContext = exports.LoadOptionsContext = exports.HookContext = exports.ExecuteSingleContext = exports.ExecuteContext = void 0;
|
|
3
|
+
exports.getAdditionalKeys = exports.WebhookContext = exports.TriggerContext = exports.SupplyDataContext = exports.PollContext = exports.LocalLoadOptionsContext = exports.LoadOptionsContext = exports.HookContext = exports.ExecuteSingleContext = exports.ExecuteContext = exports.CredentialTestContext = void 0;
|
|
4
|
+
var credentials_test_context_1 = require("./credentials-test-context");
|
|
5
|
+
Object.defineProperty(exports, "CredentialTestContext", { enumerable: true, get: function () { return credentials_test_context_1.CredentialTestContext; } });
|
|
4
6
|
var execute_context_1 = require("./execute-context");
|
|
5
7
|
Object.defineProperty(exports, "ExecuteContext", { enumerable: true, get: function () { return execute_context_1.ExecuteContext; } });
|
|
6
8
|
var execute_single_context_1 = require("./execute-single-context");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/index.ts"],"names":[],"mappings":";;;AACA,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA;AAC7B,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AAEpB,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA;AAC1B,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AAEvB,mEAAgE;AAAvD,wHAAA,iBAAiB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/index.ts"],"names":[],"mappings":";;;AACA,uEAAmE;AAA1D,iIAAA,qBAAqB,OAAA;AAE9B,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA;AAC7B,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AAEpB,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA;AAC1B,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AAEvB,mEAAgE;AAAvD,wHAAA,iBAAiB,OAAA"}
|
|
@@ -2,14 +2,14 @@ import type { FunctionsBase, ICredentialDataDecryptedObject, IExecuteData, IGetN
|
|
|
2
2
|
import { InstanceSettings } from '../../instance-settings';
|
|
3
3
|
import { Logger } from '../../logging/logger';
|
|
4
4
|
export declare abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCredentials'> {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
5
|
+
readonly workflow: Workflow;
|
|
6
|
+
readonly node: INode;
|
|
7
|
+
readonly additionalData: IWorkflowExecuteAdditionalData;
|
|
8
|
+
readonly mode: WorkflowExecuteMode;
|
|
9
|
+
readonly runExecutionData: IRunExecutionData | null;
|
|
10
|
+
readonly runIndex: number;
|
|
11
|
+
readonly connectionInputData: INodeExecutionData[];
|
|
12
|
+
readonly executeData?: IExecuteData | undefined;
|
|
13
13
|
protected readonly instanceSettings: InstanceSettings;
|
|
14
14
|
constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, runExecutionData?: IRunExecutionData | null, runIndex?: number, connectionInputData?: INodeExecutionData[], executeData?: IExecuteData | undefined);
|
|
15
15
|
get logger(): Logger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-execution-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/node-execution-context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAoC;AACpC,mCAA6B;AAqB7B,+CAMsB;AAEtB,2CAAkF;AAClF,6CAAwC;AACxC,2DAAuD;AACvD,6CAA0C;AAE1C,2EAAsE;AACtE,qDAAiD;AACjD,yDAAqD;AACrD,qEAAgE;AAChE,yFAAmF;AAEnF,MAAsB,oBAAoB;IAGzC,
|
|
1
|
+
{"version":3,"file":"node-execution-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/node-execution-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateValueAgainstSchema = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
-
const validateResourceMapperValue = (parameterName, paramValues, node,
|
|
5
|
+
const validateResourceMapperValue = (parameterName, paramValues, node, resourceMapperTypeOptions) => {
|
|
6
6
|
const result = { valid: true, newValue: paramValues };
|
|
7
|
+
const skipRequiredCheck = resourceMapperTypeOptions?.mode !== 'add';
|
|
8
|
+
const enableTypeValidationOptions = Boolean(resourceMapperTypeOptions?.showTypeConversionOptions);
|
|
7
9
|
const paramNameParts = parameterName.split('.');
|
|
8
10
|
if (paramNameParts.length !== 2) {
|
|
9
11
|
return result;
|
|
@@ -32,8 +34,8 @@ const validateResourceMapperValue = (parameterName, paramValues, node, skipRequi
|
|
|
32
34
|
if (schemaEntry?.type) {
|
|
33
35
|
const validationResult = (0, n8n_workflow_1.validateFieldType)(key, resolvedValue, schemaEntry.type, {
|
|
34
36
|
valueOptions: schemaEntry.options,
|
|
35
|
-
strict: resourceMapperField.attemptToConvertTypes
|
|
36
|
-
parseStrings:
|
|
37
|
+
strict: enableTypeValidationOptions && !resourceMapperField.attemptToConvertTypes,
|
|
38
|
+
parseStrings: enableTypeValidationOptions && resourceMapperField.convertFieldsToString,
|
|
37
39
|
});
|
|
38
40
|
if (!validationResult.valid) {
|
|
39
41
|
return { ...validationResult, fieldName: key };
|
|
@@ -108,7 +110,7 @@ const validateValueAgainstSchema = (node, nodeType, parameterValue, parameterNam
|
|
|
108
110
|
else if (propertyDescription.type === 'resourceMapper' &&
|
|
109
111
|
parameterPath[1] === 'value' &&
|
|
110
112
|
typeof parameterValue === 'object') {
|
|
111
|
-
validationResult = validateResourceMapperValue(parameterName, parameterValue, node, propertyDescription.typeOptions?.resourceMapper
|
|
113
|
+
validationResult = validateResourceMapperValue(parameterName, parameterValue, node, propertyDescription.typeOptions?.resourceMapper);
|
|
112
114
|
}
|
|
113
115
|
else if (['fixedCollection', 'collection'].includes(propertyDescription.type)) {
|
|
114
116
|
validationResult = validateCollection(node, runIndex, itemIndex, propertyDescription, parameterPath, validationResult);
|
package/dist/execution-engine/node-execution-context/utils/validate-value-against-schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-value-against-schema.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/validate-value-against-schema.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"validate-value-against-schema.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/validate-value-against-schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,16 @@
|
|
|
1
|
-
import type { ICredentialsDecrypted,
|
|
1
|
+
import type { ICredentialsDecrypted, INodeExecutionData, INodePropertyOptions, INodeType, DeclarativeRestApiSettings, IWorkflowDataProxyAdditionalKeys, IExecuteSingleFunctions, INodeProperties } from 'n8n-workflow';
|
|
2
|
+
import { type ExecuteContext } from './node-execution-context';
|
|
2
3
|
export declare class RoutingNode {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
rawRoutingRequest(executeSingleFunctions: IExecuteSingleFunctions, requestData: DeclarativeRestApiSettings.ResultOptions, credentialType?: string, credentialsDecrypted?: ICredentialsDecrypted): Promise<IN8nHttpFullResponse>;
|
|
15
|
-
makeRoutingRequest(requestData: DeclarativeRestApiSettings.ResultOptions, executeSingleFunctions: IExecuteSingleFunctions, itemIndex: number, runIndex: number, credentialType?: string, requestOperations?: IN8nRequestOperations, credentialsDecrypted?: ICredentialsDecrypted): Promise<INodeExecutionData[]>;
|
|
16
|
-
getParameterValue(parameterValue: NodeParameterValueType, itemIndex: number, runIndex: number, executeData: IExecuteData, additionalKeys?: IWorkflowDataProxyAdditionalKeys, returnObjectAsString?: boolean): NodeParameterValueType;
|
|
4
|
+
private readonly context;
|
|
5
|
+
private readonly nodeType;
|
|
6
|
+
private readonly credentialsDecrypted?;
|
|
7
|
+
constructor(context: ExecuteContext, nodeType: INodeType, credentialsDecrypted?: ICredentialsDecrypted | undefined);
|
|
8
|
+
runNode(): Promise<INodeExecutionData[][] | undefined>;
|
|
9
|
+
private mergeOptions;
|
|
10
|
+
private runPostReceiveAction;
|
|
11
|
+
private postProcessResponseData;
|
|
12
|
+
private rawRoutingRequest;
|
|
13
|
+
private makeRequest;
|
|
14
|
+
private getParameterValue;
|
|
17
15
|
getRequestOptionsFromParameters(executeSingleFunctions: IExecuteSingleFunctions, nodeProperties: INodeProperties | INodePropertyOptions, itemIndex: number, runIndex: number, path: string, additionalKeys?: IWorkflowDataProxyAdditionalKeys): DeclarativeRestApiSettings.ResultOptions | undefined;
|
|
18
16
|
}
|
|
@@ -11,29 +11,28 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
11
11
|
const node_url_1 = __importDefault(require("node:url"));
|
|
12
12
|
const node_execution_context_1 = require("./node-execution-context");
|
|
13
13
|
class RoutingNode {
|
|
14
|
-
constructor(
|
|
15
|
-
this.
|
|
16
|
-
this.
|
|
17
|
-
this.
|
|
18
|
-
this.mode = mode;
|
|
19
|
-
this.node = node;
|
|
20
|
-
this.workflow = workflow;
|
|
14
|
+
constructor(context, nodeType, credentialsDecrypted) {
|
|
15
|
+
this.context = context;
|
|
16
|
+
this.nodeType = nodeType;
|
|
17
|
+
this.credentialsDecrypted = credentialsDecrypted;
|
|
21
18
|
}
|
|
22
|
-
async runNode(
|
|
23
|
-
const
|
|
19
|
+
async runNode() {
|
|
20
|
+
const { context, nodeType, credentialsDecrypted } = this;
|
|
21
|
+
const { additionalData, executeData, inputData, node, workflow, mode, runIndex, connectionInputData, runExecutionData, } = context;
|
|
22
|
+
const abortSignal = context.getExecutionCancelSignal();
|
|
23
|
+
const items = (inputData["main"] ??
|
|
24
|
+
inputData["ai_tool"])[0];
|
|
24
25
|
const returnData = [];
|
|
25
|
-
const closeFunctions = [];
|
|
26
|
-
const executeFunctions = new node_execution_context_1.ExecuteContext(this.workflow, this.node, this.additionalData, this.mode, this.runExecutionData, runIndex, this.connectionInputData, inputData, executeData, closeFunctions, abortSignal);
|
|
27
26
|
let credentialDescription;
|
|
28
27
|
if (nodeType.description.credentials?.length) {
|
|
29
28
|
if (nodeType.description.credentials.length === 1) {
|
|
30
29
|
credentialDescription = nodeType.description.credentials[0];
|
|
31
30
|
}
|
|
32
31
|
else {
|
|
33
|
-
const authenticationMethod =
|
|
32
|
+
const authenticationMethod = context.getNodeParameter('authentication', 0);
|
|
34
33
|
credentialDescription = nodeType.description.credentials.find((x) => x.displayOptions?.show?.authentication?.includes(authenticationMethod));
|
|
35
34
|
if (!credentialDescription) {
|
|
36
|
-
throw new n8n_workflow_1.NodeOperationError(
|
|
35
|
+
throw new n8n_workflow_1.NodeOperationError(node, `Node type "${node.type}" does not have any credentials of type "${authenticationMethod}" defined`, { level: 'warning' });
|
|
37
36
|
}
|
|
38
37
|
}
|
|
39
38
|
}
|
|
@@ -44,7 +43,7 @@ class RoutingNode {
|
|
|
44
43
|
else if (credentialDescription) {
|
|
45
44
|
try {
|
|
46
45
|
credentials =
|
|
47
|
-
(await
|
|
46
|
+
(await context.getCredentials(credentialDescription.name, 0)) || {};
|
|
48
47
|
}
|
|
49
48
|
catch (error) {
|
|
50
49
|
if (credentialDescription.required) {
|
|
@@ -55,7 +54,7 @@ class RoutingNode {
|
|
|
55
54
|
}
|
|
56
55
|
}
|
|
57
56
|
}
|
|
58
|
-
const { batching } =
|
|
57
|
+
const { batching } = context.getNodeParameter('requestOptions', 0, {});
|
|
59
58
|
const batchSize = batching?.batch?.batchSize > 0 ? batching?.batch?.batchSize : 1;
|
|
60
59
|
const batchInterval = batching?.batch.batchInterval;
|
|
61
60
|
const requestPromises = [];
|
|
@@ -66,7 +65,7 @@ class RoutingNode {
|
|
|
66
65
|
await (0, n8n_workflow_1.sleep)(batchInterval);
|
|
67
66
|
}
|
|
68
67
|
}
|
|
69
|
-
const thisArgs = new node_execution_context_1.ExecuteSingleContext(
|
|
68
|
+
const thisArgs = new node_execution_context_1.ExecuteSingleContext(workflow, node, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, itemIndex, executeData, abortSignal);
|
|
70
69
|
itemContext.push({
|
|
71
70
|
thisArgs,
|
|
72
71
|
requestData: {
|
|
@@ -89,14 +88,14 @@ class RoutingNode {
|
|
|
89
88
|
if (nodeType.description.requestDefaults) {
|
|
90
89
|
for (const key of Object.keys(nodeType.description.requestDefaults)) {
|
|
91
90
|
let value = nodeType.description.requestDefaults[key];
|
|
92
|
-
value = this.getParameterValue(value, itemIndex, runIndex, executeData, { $credentials: credentials, $version:
|
|
91
|
+
value = this.getParameterValue(value, itemIndex, runIndex, executeData, { $credentials: credentials, $version: node.typeVersion }, false);
|
|
93
92
|
itemContext[itemIndex].requestData.options[key] = value;
|
|
94
93
|
}
|
|
95
94
|
}
|
|
96
95
|
for (const property of nodeType.description.properties) {
|
|
97
|
-
let value = (0, get_1.default)(
|
|
98
|
-
value = this.getParameterValue(value, itemIndex, runIndex, executeData, { $credentials: credentials, $version:
|
|
99
|
-
const tempOptions = this.getRequestOptionsFromParameters(itemContext[itemIndex].thisArgs, property, itemIndex, runIndex, '', { $credentials: credentials, $value: value, $version:
|
|
96
|
+
let value = (0, get_1.default)(node.parameters, property.name, []);
|
|
97
|
+
value = this.getParameterValue(value, itemIndex, runIndex, executeData, { $credentials: credentials, $version: node.typeVersion }, false);
|
|
98
|
+
const tempOptions = this.getRequestOptionsFromParameters(itemContext[itemIndex].thisArgs, property, itemIndex, runIndex, '', { $credentials: credentials, $value: value, $version: node.typeVersion });
|
|
100
99
|
this.mergeOptions(itemContext[itemIndex].requestData, tempOptions);
|
|
101
100
|
}
|
|
102
101
|
if (proxy) {
|
|
@@ -105,7 +104,7 @@ class RoutingNode {
|
|
|
105
104
|
for (const property of proxyProperties) {
|
|
106
105
|
if (!(property in proxyParsed) ||
|
|
107
106
|
proxyParsed[property] === null) {
|
|
108
|
-
throw new n8n_workflow_1.NodeOperationError(
|
|
107
|
+
throw new n8n_workflow_1.NodeOperationError(node, 'The proxy is not value', {
|
|
109
108
|
runIndex,
|
|
110
109
|
itemIndex,
|
|
111
110
|
description: `The proxy URL does not contain a valid value for "${property}"`,
|
|
@@ -135,7 +134,7 @@ class RoutingNode {
|
|
|
135
134
|
else {
|
|
136
135
|
itemContext[itemIndex].requestData.options.timeout = 300_000;
|
|
137
136
|
}
|
|
138
|
-
requestPromises.push(this.
|
|
137
|
+
requestPromises.push(this.makeRequest(itemContext[itemIndex].requestData, itemContext[itemIndex].thisArgs, itemIndex, runIndex, credentialDescription?.name, itemContext[itemIndex].requestData.requestOperations, credentialsDecrypted));
|
|
139
138
|
}
|
|
140
139
|
const promisesResponses = await Promise.allSettled(requestPromises);
|
|
141
140
|
let responseData;
|
|
@@ -156,7 +155,7 @@ class RoutingNode {
|
|
|
156
155
|
(0, set_1.default)(error, 'context.runIndex', runIndex);
|
|
157
156
|
throw error;
|
|
158
157
|
}
|
|
159
|
-
throw new n8n_workflow_1.NodeApiError(
|
|
158
|
+
throw new n8n_workflow_1.NodeApiError(node, error, {
|
|
160
159
|
runIndex,
|
|
161
160
|
itemIndex,
|
|
162
161
|
message: error?.message,
|
|
@@ -189,6 +188,7 @@ class RoutingNode {
|
|
|
189
188
|
if (typeof action === 'function') {
|
|
190
189
|
return await action.call(executeSingleFunctions, inputData, responseData);
|
|
191
190
|
}
|
|
191
|
+
const { node } = this.context;
|
|
192
192
|
if (action.type === 'rootProperty') {
|
|
193
193
|
try {
|
|
194
194
|
return inputData.flatMap((item) => {
|
|
@@ -204,7 +204,7 @@ class RoutingNode {
|
|
|
204
204
|
});
|
|
205
205
|
}
|
|
206
206
|
catch (error) {
|
|
207
|
-
throw new n8n_workflow_1.NodeOperationError(
|
|
207
|
+
throw new n8n_workflow_1.NodeOperationError(node, error, {
|
|
208
208
|
runIndex,
|
|
209
209
|
itemIndex,
|
|
210
210
|
description: `The rootProperty "${action.properties.property}" could not be found on item.`,
|
|
@@ -218,20 +218,20 @@ class RoutingNode {
|
|
|
218
218
|
$response: responseData,
|
|
219
219
|
$responseItem: item.json,
|
|
220
220
|
$value: parameterValue,
|
|
221
|
-
$version:
|
|
221
|
+
$version: node.typeVersion,
|
|
222
222
|
}, false);
|
|
223
223
|
});
|
|
224
224
|
return inputData;
|
|
225
225
|
}
|
|
226
226
|
if (action.type === 'limit') {
|
|
227
|
-
const maxResults = this.getParameterValue(action.properties.maxResults, itemIndex, runIndex, executeSingleFunctions.getExecuteData(), { $response: responseData, $value: parameterValue, $version:
|
|
227
|
+
const maxResults = this.getParameterValue(action.properties.maxResults, itemIndex, runIndex, executeSingleFunctions.getExecuteData(), { $response: responseData, $value: parameterValue, $version: node.typeVersion }, false);
|
|
228
228
|
return inputData.slice(0, parseInt(maxResults, 10));
|
|
229
229
|
}
|
|
230
230
|
if (action.type === 'set') {
|
|
231
231
|
const { value } = action.properties;
|
|
232
232
|
return [
|
|
233
233
|
{
|
|
234
|
-
json: this.getParameterValue(value, itemIndex, runIndex, executeSingleFunctions.getExecuteData(), { $response: responseData, $value: parameterValue, $version:
|
|
234
|
+
json: this.getParameterValue(value, itemIndex, runIndex, executeSingleFunctions.getExecuteData(), { $response: responseData, $value: parameterValue, $version: node.typeVersion }, false),
|
|
235
235
|
},
|
|
236
236
|
];
|
|
237
237
|
}
|
|
@@ -260,7 +260,7 @@ class RoutingNode {
|
|
|
260
260
|
$response: responseData,
|
|
261
261
|
$responseItem: item.json,
|
|
262
262
|
$value: parameterValue,
|
|
263
|
-
$version:
|
|
263
|
+
$version: node.typeVersion,
|
|
264
264
|
}, false);
|
|
265
265
|
returnItem[key] = propertyValue;
|
|
266
266
|
}
|
|
@@ -271,7 +271,7 @@ class RoutingNode {
|
|
|
271
271
|
if (action.type === 'binaryData') {
|
|
272
272
|
const body = (responseData.body = Buffer.from(responseData.body));
|
|
273
273
|
let { destinationProperty } = action.properties;
|
|
274
|
-
destinationProperty = this.getParameterValue(destinationProperty, itemIndex, runIndex, executeSingleFunctions.getExecuteData(), { $response: responseData, $value: parameterValue, $version:
|
|
274
|
+
destinationProperty = this.getParameterValue(destinationProperty, itemIndex, runIndex, executeSingleFunctions.getExecuteData(), { $response: responseData, $value: parameterValue, $version: node.typeVersion }, false);
|
|
275
275
|
const binaryData = await executeSingleFunctions.helpers.prepareBinaryData(body);
|
|
276
276
|
return inputData.map((item) => {
|
|
277
277
|
if (typeof item.json === 'string') {
|
|
@@ -323,7 +323,7 @@ class RoutingNode {
|
|
|
323
323
|
}
|
|
324
324
|
return responseData;
|
|
325
325
|
}
|
|
326
|
-
async
|
|
326
|
+
async makeRequest(requestData, executeSingleFunctions, itemIndex, runIndex, credentialType, requestOperations, credentialsDecrypted) {
|
|
327
327
|
let responseData;
|
|
328
328
|
for (const preSendMethod of requestData.preSend) {
|
|
329
329
|
requestData.options = await preSendMethod.call(executeSingleFunctions, requestData.options);
|
|
@@ -331,6 +331,7 @@ class RoutingNode {
|
|
|
331
331
|
const makeRoutingRequest = async (requestOptions) => {
|
|
332
332
|
return await this.rawRoutingRequest(executeSingleFunctions, requestOptions, credentialType, credentialsDecrypted).then(async (data) => await this.postProcessResponseData(executeSingleFunctions, data, requestData, itemIndex, runIndex));
|
|
333
333
|
};
|
|
334
|
+
const { node } = this.context;
|
|
334
335
|
const executePaginationFunctions = Object.create(executeSingleFunctions, {
|
|
335
336
|
makeRoutingRequest: { value: makeRoutingRequest },
|
|
336
337
|
});
|
|
@@ -351,7 +352,7 @@ class RoutingNode {
|
|
|
351
352
|
const additionalKeys = {
|
|
352
353
|
$request: requestData.options,
|
|
353
354
|
$response: {},
|
|
354
|
-
$version:
|
|
355
|
+
$version: node.typeVersion,
|
|
355
356
|
};
|
|
356
357
|
do {
|
|
357
358
|
additionalKeys.$request = requestData.options;
|
|
@@ -388,7 +389,7 @@ class RoutingNode {
|
|
|
388
389
|
if (properties.rootProperty) {
|
|
389
390
|
const tempResponseValue = (0, get_1.default)(tempResponseData[0].json, properties.rootProperty);
|
|
390
391
|
if (tempResponseValue === undefined) {
|
|
391
|
-
throw new n8n_workflow_1.NodeOperationError(
|
|
392
|
+
throw new n8n_workflow_1.NodeOperationError(node, `The rootProperty "${properties.rootProperty}" could not be found on item.`, { runIndex, itemIndex });
|
|
392
393
|
}
|
|
393
394
|
tempResponseData = tempResponseValue.map((item) => {
|
|
394
395
|
return {
|
|
@@ -409,7 +410,8 @@ class RoutingNode {
|
|
|
409
410
|
getParameterValue(parameterValue, itemIndex, runIndex, executeData, additionalKeys, returnObjectAsString = false) {
|
|
410
411
|
if (typeof parameterValue === 'object' ||
|
|
411
412
|
(typeof parameterValue === 'string' && parameterValue.charAt(0) === '=')) {
|
|
412
|
-
|
|
413
|
+
const { node, workflow, mode, connectionInputData, runExecutionData } = this.context;
|
|
414
|
+
return workflow.expression.getParameterValue(parameterValue, runExecutionData ?? null, runIndex, itemIndex, node.name, connectionInputData, mode, additionalKeys ?? {}, executeData, returnObjectAsString);
|
|
413
415
|
}
|
|
414
416
|
return parameterValue;
|
|
415
417
|
}
|
|
@@ -425,7 +427,8 @@ class RoutingNode {
|
|
|
425
427
|
requestOperations: {},
|
|
426
428
|
};
|
|
427
429
|
let basePath = path ? `${path}.` : '';
|
|
428
|
-
|
|
430
|
+
const { node } = this.context;
|
|
431
|
+
if (!n8n_workflow_1.NodeHelpers.displayParameter(node.parameters, nodeProperties, node, node.parameters)) {
|
|
429
432
|
return undefined;
|
|
430
433
|
}
|
|
431
434
|
if (nodeProperties.routing) {
|
|
@@ -516,19 +519,19 @@ class RoutingNode {
|
|
|
516
519
|
nodeProperties = nodeProperties;
|
|
517
520
|
let value;
|
|
518
521
|
if (nodeProperties.type === 'options') {
|
|
519
|
-
const optionValue = n8n_workflow_1.NodeHelpers.getParameterValueByPath(
|
|
522
|
+
const optionValue = n8n_workflow_1.NodeHelpers.getParameterValueByPath(node.parameters, nodeProperties.name, basePath.slice(0, -1));
|
|
520
523
|
const selectedOption = nodeProperties.options.filter((option) => option.value === optionValue);
|
|
521
524
|
if (selectedOption.length) {
|
|
522
|
-
const tempOptions = this.getRequestOptionsFromParameters(executeSingleFunctions, selectedOption[0], itemIndex, runIndex, `${basePath}${nodeProperties.name}`, { $value: optionValue, $version:
|
|
525
|
+
const tempOptions = this.getRequestOptionsFromParameters(executeSingleFunctions, selectedOption[0], itemIndex, runIndex, `${basePath}${nodeProperties.name}`, { $value: optionValue, $version: node.typeVersion });
|
|
523
526
|
this.mergeOptions(returnData, tempOptions);
|
|
524
527
|
}
|
|
525
528
|
}
|
|
526
529
|
else if (nodeProperties.type === 'collection') {
|
|
527
|
-
value = n8n_workflow_1.NodeHelpers.getParameterValueByPath(
|
|
530
|
+
value = n8n_workflow_1.NodeHelpers.getParameterValueByPath(node.parameters, nodeProperties.name, basePath.slice(0, -1));
|
|
528
531
|
for (const propertyOption of nodeProperties.options) {
|
|
529
532
|
if (Object.keys(value).includes(propertyOption.name) &&
|
|
530
533
|
propertyOption.type !== undefined) {
|
|
531
|
-
const tempOptions = this.getRequestOptionsFromParameters(executeSingleFunctions, propertyOption, itemIndex, runIndex, `${basePath}${nodeProperties.name}`, { $version:
|
|
534
|
+
const tempOptions = this.getRequestOptionsFromParameters(executeSingleFunctions, propertyOption, itemIndex, runIndex, `${basePath}${nodeProperties.name}`, { $version: node.typeVersion });
|
|
532
535
|
this.mergeOptions(returnData, tempOptions);
|
|
533
536
|
}
|
|
534
537
|
}
|
|
@@ -536,7 +539,7 @@ class RoutingNode {
|
|
|
536
539
|
else if (nodeProperties.type === 'fixedCollection') {
|
|
537
540
|
basePath = `${basePath}${nodeProperties.name}.`;
|
|
538
541
|
for (const propertyOptions of nodeProperties.options) {
|
|
539
|
-
value = n8n_workflow_1.NodeHelpers.getParameterValueByPath(
|
|
542
|
+
value = n8n_workflow_1.NodeHelpers.getParameterValueByPath(node.parameters, propertyOptions.name, basePath.slice(0, -1));
|
|
540
543
|
if (value === undefined) {
|
|
541
544
|
continue;
|
|
542
545
|
}
|