n8n-core 1.69.0 → 1.70.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/BinaryData/BinaryData.service.js +17 -7
- package/dist/BinaryData/BinaryData.service.js.map +1 -1
- package/dist/CreateNodeAsTool.d.ts +2 -2
- package/dist/CreateNodeAsTool.js.map +1 -1
- package/dist/DirectoryLoader.js +17 -7
- package/dist/DirectoryLoader.js.map +1 -1
- package/dist/NodeExecuteFunctions.d.ts +3 -16
- package/dist/NodeExecuteFunctions.js +22 -742
- package/dist/NodeExecuteFunctions.js.map +1 -1
- package/dist/PartialExecutionUtils/DirectedGraph.js +17 -7
- package/dist/PartialExecutionUtils/DirectedGraph.js.map +1 -1
- package/dist/PartialExecutionUtils/findTriggerForPartialExecution.js +17 -7
- package/dist/PartialExecutionUtils/findTriggerForPartialExecution.js.map +1 -1
- package/dist/PartialExecutionUtils/getIncomingData.js +17 -7
- package/dist/PartialExecutionUtils/getIncomingData.js.map +1 -1
- package/dist/PartialExecutionUtils/handleCycles.js +17 -7
- package/dist/PartialExecutionUtils/handleCycles.js.map +1 -1
- package/dist/PartialExecutionUtils/recreateNodeExecutionStack.js +17 -7
- package/dist/PartialExecutionUtils/recreateNodeExecutionStack.js.map +1 -1
- package/dist/WorkflowExecute.js +18 -8
- package/dist/WorkflowExecute.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/data-deduplication-service.js +17 -7
- package/dist/data-deduplication-service.js.map +1 -1
- package/dist/index.js +17 -7
- package/dist/index.js.map +1 -1
- package/dist/node-execution-context/base-execute-context.d.ts +29 -0
- package/dist/node-execution-context/base-execute-context.js +120 -0
- package/dist/node-execution-context/base-execute-context.js.map +1 -0
- package/dist/node-execution-context/execute-context.d.ts +20 -0
- package/dist/node-execution-context/execute-context.js +92 -0
- package/dist/node-execution-context/execute-context.js.map +1 -0
- package/dist/node-execution-context/execute-single-context.d.ts +5 -19
- package/dist/node-execution-context/execute-single-context.js +8 -56
- package/dist/node-execution-context/execute-single-context.js.map +1 -1
- package/dist/node-execution-context/helpers/binary-helpers.d.ts +0 -0
- package/dist/node-execution-context/helpers/binary-helpers.js +2 -0
- package/dist/node-execution-context/helpers/binary-helpers.js.map +1 -0
- package/dist/node-execution-context/hook-context.d.ts +1 -2
- package/dist/node-execution-context/hook-context.js +2 -9
- package/dist/node-execution-context/hook-context.js.map +1 -1
- package/dist/node-execution-context/index.d.ts +3 -0
- package/dist/node-execution-context/index.js +7 -1
- package/dist/node-execution-context/index.js.map +1 -1
- package/dist/node-execution-context/load-options-context.d.ts +0 -1
- package/dist/node-execution-context/load-options-context.js +1 -8
- package/dist/node-execution-context/load-options-context.js.map +1 -1
- package/dist/node-execution-context/node-execution-context.d.ts +11 -2
- package/dist/node-execution-context/node-execution-context.js +115 -1
- package/dist/node-execution-context/node-execution-context.js.map +1 -1
- package/dist/node-execution-context/poll-context.d.ts +1 -2
- package/dist/node-execution-context/poll-context.js +1 -8
- package/dist/node-execution-context/poll-context.js.map +1 -1
- package/dist/node-execution-context/supply-data-context.d.ts +14 -0
- package/dist/node-execution-context/supply-data-context.js +65 -0
- package/dist/node-execution-context/supply-data-context.js.map +1 -0
- package/dist/node-execution-context/trigger-context.d.ts +1 -2
- package/dist/node-execution-context/trigger-context.js +1 -8
- package/dist/node-execution-context/trigger-context.js.map +1 -1
- package/dist/node-execution-context/utils.d.ts +11 -0
- package/dist/node-execution-context/utils.js +275 -0
- package/dist/node-execution-context/utils.js.map +1 -0
- package/dist/node-execution-context/webhook-context.d.ts +1 -4
- package/dist/node-execution-context/webhook-context.js +12 -34
- package/dist/node-execution-context/webhook-context.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,275 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateValueAgainstSchema = void 0;
|
|
4
|
+
exports.cleanupParameterData = cleanupParameterData;
|
|
5
|
+
exports.ensureType = ensureType;
|
|
6
|
+
exports.getAdditionalKeys = getAdditionalKeys;
|
|
7
|
+
const luxon_1 = require("luxon");
|
|
8
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
9
|
+
const Constants_1 = require("../Constants");
|
|
10
|
+
const ExecutionMetadata_1 = require("../ExecutionMetadata");
|
|
11
|
+
const Secrets_1 = require("../Secrets");
|
|
12
|
+
function cleanupParameterData(inputData) {
|
|
13
|
+
if (typeof inputData !== 'object' || inputData === null) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
if (Array.isArray(inputData)) {
|
|
17
|
+
inputData.forEach((value) => cleanupParameterData(value));
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
if (typeof inputData === 'object') {
|
|
21
|
+
Object.keys(inputData).forEach((key) => {
|
|
22
|
+
const value = inputData[key];
|
|
23
|
+
if (typeof value === 'object') {
|
|
24
|
+
if (luxon_1.DateTime.isDateTime(value)) {
|
|
25
|
+
inputData[key] = value.toString();
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
cleanupParameterData(value);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
const validateResourceMapperValue = (parameterName, paramValues, node, skipRequiredCheck = false) => {
|
|
35
|
+
const result = { valid: true, newValue: paramValues };
|
|
36
|
+
const paramNameParts = parameterName.split('.');
|
|
37
|
+
if (paramNameParts.length !== 2) {
|
|
38
|
+
return result;
|
|
39
|
+
}
|
|
40
|
+
const resourceMapperParamName = paramNameParts[0];
|
|
41
|
+
const resourceMapperField = node.parameters[resourceMapperParamName];
|
|
42
|
+
if (!resourceMapperField || !(0, n8n_workflow_1.isResourceMapperValue)(resourceMapperField)) {
|
|
43
|
+
return result;
|
|
44
|
+
}
|
|
45
|
+
const schema = resourceMapperField.schema;
|
|
46
|
+
const paramValueNames = Object.keys(paramValues);
|
|
47
|
+
for (let i = 0; i < paramValueNames.length; i++) {
|
|
48
|
+
const key = paramValueNames[i];
|
|
49
|
+
const resolvedValue = paramValues[key];
|
|
50
|
+
const schemaEntry = schema.find((s) => s.id === key);
|
|
51
|
+
if (!skipRequiredCheck &&
|
|
52
|
+
schemaEntry?.required === true &&
|
|
53
|
+
schemaEntry.type !== 'boolean' &&
|
|
54
|
+
!resolvedValue) {
|
|
55
|
+
return {
|
|
56
|
+
valid: false,
|
|
57
|
+
errorMessage: `The value "${String(key)}" is required but not set`,
|
|
58
|
+
fieldName: key,
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
if (schemaEntry?.type) {
|
|
62
|
+
const validationResult = (0, n8n_workflow_1.validateFieldType)(key, resolvedValue, schemaEntry.type, {
|
|
63
|
+
valueOptions: schemaEntry.options,
|
|
64
|
+
});
|
|
65
|
+
if (!validationResult.valid) {
|
|
66
|
+
return { ...validationResult, fieldName: key };
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
paramValues[key] = validationResult.newValue;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return result;
|
|
74
|
+
};
|
|
75
|
+
const validateCollection = (node, runIndex, itemIndex, propertyDescription, parameterPath, validationResult) => {
|
|
76
|
+
let nestedDescriptions;
|
|
77
|
+
if (propertyDescription.type === 'fixedCollection') {
|
|
78
|
+
nestedDescriptions = propertyDescription.options.find((entry) => entry.name === parameterPath[1])?.values;
|
|
79
|
+
}
|
|
80
|
+
if (propertyDescription.type === 'collection') {
|
|
81
|
+
nestedDescriptions = propertyDescription.options;
|
|
82
|
+
}
|
|
83
|
+
if (!nestedDescriptions) {
|
|
84
|
+
return validationResult;
|
|
85
|
+
}
|
|
86
|
+
const validationMap = {};
|
|
87
|
+
for (const prop of nestedDescriptions) {
|
|
88
|
+
if (!prop.validateType || prop.ignoreValidationDuringExecution)
|
|
89
|
+
continue;
|
|
90
|
+
validationMap[prop.name] = {
|
|
91
|
+
type: prop.validateType,
|
|
92
|
+
displayName: prop.displayName,
|
|
93
|
+
options: prop.validateType === 'options' ? prop.options : undefined,
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
if (!Object.keys(validationMap).length) {
|
|
97
|
+
return validationResult;
|
|
98
|
+
}
|
|
99
|
+
if (validationResult.valid) {
|
|
100
|
+
for (const value of Array.isArray(validationResult.newValue)
|
|
101
|
+
? validationResult.newValue
|
|
102
|
+
: [validationResult.newValue]) {
|
|
103
|
+
for (const key of Object.keys(value)) {
|
|
104
|
+
if (!validationMap[key])
|
|
105
|
+
continue;
|
|
106
|
+
const fieldValidationResult = (0, n8n_workflow_1.validateFieldType)(key, value[key], validationMap[key].type, {
|
|
107
|
+
valueOptions: validationMap[key].options,
|
|
108
|
+
});
|
|
109
|
+
if (!fieldValidationResult.valid) {
|
|
110
|
+
throw new n8n_workflow_1.ExpressionError(`Invalid input for field '${validationMap[key].displayName}' inside '${propertyDescription.displayName}' in [item ${itemIndex}]`, {
|
|
111
|
+
description: fieldValidationResult.errorMessage,
|
|
112
|
+
runIndex,
|
|
113
|
+
itemIndex,
|
|
114
|
+
nodeCause: node.name,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
value[key] = fieldValidationResult.newValue;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return validationResult;
|
|
122
|
+
};
|
|
123
|
+
const validateValueAgainstSchema = (node, nodeType, parameterValue, parameterName, runIndex, itemIndex) => {
|
|
124
|
+
const parameterPath = parameterName.split('.');
|
|
125
|
+
const propertyDescription = nodeType.description.properties.find((prop) => parameterPath[0] === prop.name && n8n_workflow_1.NodeHelpers.displayParameter(node.parameters, prop, node));
|
|
126
|
+
if (!propertyDescription) {
|
|
127
|
+
return parameterValue;
|
|
128
|
+
}
|
|
129
|
+
let validationResult = { valid: true, newValue: parameterValue };
|
|
130
|
+
if (parameterPath.length === 1 &&
|
|
131
|
+
propertyDescription.validateType &&
|
|
132
|
+
!propertyDescription.ignoreValidationDuringExecution) {
|
|
133
|
+
validationResult = (0, n8n_workflow_1.validateFieldType)(parameterName, parameterValue, propertyDescription.validateType);
|
|
134
|
+
}
|
|
135
|
+
else if (propertyDescription.type === 'resourceMapper' &&
|
|
136
|
+
parameterPath[1] === 'value' &&
|
|
137
|
+
typeof parameterValue === 'object') {
|
|
138
|
+
validationResult = validateResourceMapperValue(parameterName, parameterValue, node, propertyDescription.typeOptions?.resourceMapper?.mode !== 'add');
|
|
139
|
+
}
|
|
140
|
+
else if (['fixedCollection', 'collection'].includes(propertyDescription.type)) {
|
|
141
|
+
validationResult = validateCollection(node, runIndex, itemIndex, propertyDescription, parameterPath, validationResult);
|
|
142
|
+
}
|
|
143
|
+
if (!validationResult.valid) {
|
|
144
|
+
throw new n8n_workflow_1.ExpressionError(`Invalid input for '${validationResult.fieldName
|
|
145
|
+
? String(validationResult.fieldName)
|
|
146
|
+
: propertyDescription.displayName}' [item ${itemIndex}]`, {
|
|
147
|
+
description: validationResult.errorMessage,
|
|
148
|
+
runIndex,
|
|
149
|
+
itemIndex,
|
|
150
|
+
nodeCause: node.name,
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
return validationResult.newValue;
|
|
154
|
+
};
|
|
155
|
+
exports.validateValueAgainstSchema = validateValueAgainstSchema;
|
|
156
|
+
function ensureType(toType, parameterValue, parameterName, errorOptions) {
|
|
157
|
+
let returnData = parameterValue;
|
|
158
|
+
if (returnData === null) {
|
|
159
|
+
throw new n8n_workflow_1.ExpressionError(`Parameter '${parameterName}' must not be null`, errorOptions);
|
|
160
|
+
}
|
|
161
|
+
if (returnData === undefined) {
|
|
162
|
+
throw new n8n_workflow_1.ExpressionError(`Parameter '${parameterName}' could not be 'undefined'`, errorOptions);
|
|
163
|
+
}
|
|
164
|
+
if (['object', 'array', 'json'].includes(toType)) {
|
|
165
|
+
if (typeof returnData !== 'object') {
|
|
166
|
+
if (typeof returnData === 'string' && returnData.length) {
|
|
167
|
+
try {
|
|
168
|
+
const parsedValue = JSON.parse(returnData);
|
|
169
|
+
returnData = parsedValue;
|
|
170
|
+
}
|
|
171
|
+
catch (error) {
|
|
172
|
+
throw new n8n_workflow_1.ExpressionError(`Parameter '${parameterName}' could not be parsed`, {
|
|
173
|
+
...errorOptions,
|
|
174
|
+
description: error.message,
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
throw new n8n_workflow_1.ExpressionError(`Parameter '${parameterName}' must be an ${toType}, but we got '${String(parameterValue)}'`, errorOptions);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
else if (toType === 'json') {
|
|
183
|
+
try {
|
|
184
|
+
JSON.stringify(returnData);
|
|
185
|
+
}
|
|
186
|
+
catch (error) {
|
|
187
|
+
throw new n8n_workflow_1.ExpressionError(`Parameter '${parameterName}' is not valid JSON`, {
|
|
188
|
+
...errorOptions,
|
|
189
|
+
description: error.message,
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
if (toType === 'array' && !Array.isArray(returnData)) {
|
|
194
|
+
throw new n8n_workflow_1.ExpressionError(`Parameter '${parameterName}' must be an array, but we got object`, errorOptions);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
try {
|
|
198
|
+
if (toType === 'string') {
|
|
199
|
+
if (typeof returnData === 'object') {
|
|
200
|
+
returnData = JSON.stringify(returnData);
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
returnData = String(returnData);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
if (toType === 'number') {
|
|
207
|
+
returnData = Number(returnData);
|
|
208
|
+
if (Number.isNaN(returnData)) {
|
|
209
|
+
throw new n8n_workflow_1.ExpressionError(`Parameter '${parameterName}' must be a number, but we got '${parameterValue}'`, errorOptions);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
if (toType === 'boolean') {
|
|
213
|
+
returnData = Boolean(returnData);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
catch (error) {
|
|
217
|
+
if (error instanceof n8n_workflow_1.ExpressionError)
|
|
218
|
+
throw error;
|
|
219
|
+
throw new n8n_workflow_1.ExpressionError(`Parameter '${parameterName}' could not be converted to ${toType}`, {
|
|
220
|
+
...errorOptions,
|
|
221
|
+
description: error.message,
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
return returnData;
|
|
225
|
+
}
|
|
226
|
+
function getAdditionalKeys(additionalData, mode, runExecutionData, options) {
|
|
227
|
+
const executionId = additionalData.executionId ?? Constants_1.PLACEHOLDER_EMPTY_EXECUTION_ID;
|
|
228
|
+
const resumeUrl = `${additionalData.webhookWaitingBaseUrl}/${executionId}`;
|
|
229
|
+
const resumeFormUrl = `${additionalData.formWaitingBaseUrl}/${executionId}`;
|
|
230
|
+
return {
|
|
231
|
+
$execution: {
|
|
232
|
+
id: executionId,
|
|
233
|
+
mode: mode === 'manual' ? 'test' : 'production',
|
|
234
|
+
resumeUrl,
|
|
235
|
+
resumeFormUrl,
|
|
236
|
+
customData: runExecutionData
|
|
237
|
+
? {
|
|
238
|
+
set(key, value) {
|
|
239
|
+
try {
|
|
240
|
+
(0, ExecutionMetadata_1.setWorkflowExecutionMetadata)(runExecutionData, key, value);
|
|
241
|
+
}
|
|
242
|
+
catch (e) {
|
|
243
|
+
if (mode === 'manual') {
|
|
244
|
+
throw e;
|
|
245
|
+
}
|
|
246
|
+
n8n_workflow_1.LoggerProxy.debug(e.message);
|
|
247
|
+
}
|
|
248
|
+
},
|
|
249
|
+
setAll(obj) {
|
|
250
|
+
try {
|
|
251
|
+
(0, ExecutionMetadata_1.setAllWorkflowExecutionMetadata)(runExecutionData, obj);
|
|
252
|
+
}
|
|
253
|
+
catch (e) {
|
|
254
|
+
if (mode === 'manual') {
|
|
255
|
+
throw e;
|
|
256
|
+
}
|
|
257
|
+
n8n_workflow_1.LoggerProxy.debug(e.message);
|
|
258
|
+
}
|
|
259
|
+
},
|
|
260
|
+
get(key) {
|
|
261
|
+
return (0, ExecutionMetadata_1.getWorkflowExecutionMetadata)(runExecutionData, key);
|
|
262
|
+
},
|
|
263
|
+
getAll() {
|
|
264
|
+
return (0, ExecutionMetadata_1.getAllWorkflowExecutionMetadata)(runExecutionData);
|
|
265
|
+
},
|
|
266
|
+
}
|
|
267
|
+
: undefined,
|
|
268
|
+
},
|
|
269
|
+
$vars: additionalData.variables,
|
|
270
|
+
$secrets: options?.secretsEnabled ? (0, Secrets_1.getSecretsProxy)(additionalData) : undefined,
|
|
271
|
+
$executionId: executionId,
|
|
272
|
+
$resumeWebhookUrl: resumeUrl,
|
|
273
|
+
};
|
|
274
|
+
}
|
|
275
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/node-execution-context/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import type { Request, Response } from 'express';
|
|
2
|
-
import type { CloseFunction, ICredentialDataDecryptedObject, IDataObject,
|
|
2
|
+
import type { CloseFunction, ICredentialDataDecryptedObject, IDataObject, INode, IRunExecutionData, IWebhookData, IWebhookFunctions, IWorkflowExecuteAdditionalData, NodeConnectionType, WebhookType, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
3
3
|
import { NodeExecutionContext } from './node-execution-context';
|
|
4
4
|
export declare class WebhookContext extends NodeExecutionContext implements IWebhookFunctions {
|
|
5
5
|
private readonly webhookData;
|
|
6
6
|
private readonly closeFunctions;
|
|
7
|
-
private readonly runExecutionData;
|
|
8
7
|
readonly helpers: IWebhookFunctions['helpers'];
|
|
9
8
|
readonly nodeHelpers: IWebhookFunctions['nodeHelpers'];
|
|
10
9
|
constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, webhookData: IWebhookData, closeFunctions: CloseFunction[], runExecutionData: IRunExecutionData | null);
|
|
@@ -19,6 +18,4 @@ export declare class WebhookContext extends NodeExecutionContext implements IWeb
|
|
|
19
18
|
getNodeWebhookUrl(name: WebhookType): string | undefined;
|
|
20
19
|
getWebhookName(): WebhookType;
|
|
21
20
|
getInputConnectionData(inputName: NodeConnectionType, itemIndex: number): Promise<unknown>;
|
|
22
|
-
evaluateExpression(expression: string, evaluateItemIndex?: number): import("n8n-workflow").NodeParameterValue | import("n8n-workflow").INodeParameters | import("n8n-workflow").INodeParameters[] | import("n8n-workflow").NodeParameterValue[];
|
|
23
|
-
getNodeParameter(parameterName: string, fallbackValue?: any, options?: IGetNodeParameterOptions): NodeParameterValueType | object;
|
|
24
21
|
}
|
|
@@ -6,10 +6,17 @@ const NodeExecuteFunctions_1 = require("../NodeExecuteFunctions");
|
|
|
6
6
|
const node_execution_context_1 = require("./node-execution-context");
|
|
7
7
|
class WebhookContext extends node_execution_context_1.NodeExecutionContext {
|
|
8
8
|
constructor(workflow, node, additionalData, mode, webhookData, closeFunctions, runExecutionData) {
|
|
9
|
-
|
|
9
|
+
let connectionInputData = [];
|
|
10
|
+
let executionData;
|
|
11
|
+
if (runExecutionData?.executionData !== undefined) {
|
|
12
|
+
executionData = runExecutionData.executionData.nodeExecutionStack[0];
|
|
13
|
+
if (executionData !== undefined) {
|
|
14
|
+
connectionInputData = executionData.data.main[0];
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
super(workflow, node, additionalData, mode, runExecutionData, 0, connectionInputData, executionData);
|
|
10
18
|
this.webhookData = webhookData;
|
|
11
19
|
this.closeFunctions = closeFunctions;
|
|
12
|
-
this.runExecutionData = runExecutionData;
|
|
13
20
|
this.helpers = {
|
|
14
21
|
createDeferredPromise: n8n_workflow_1.createDeferredPromise,
|
|
15
22
|
returnJsonArray: NodeExecuteFunctions_1.returnJsonArray,
|
|
@@ -21,7 +28,7 @@ class WebhookContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
21
28
|
};
|
|
22
29
|
}
|
|
23
30
|
async getCredentials(type) {
|
|
24
|
-
return await
|
|
31
|
+
return await this._getCredentials(type);
|
|
25
32
|
}
|
|
26
33
|
getBodyData() {
|
|
27
34
|
return this.assertHttpRequest().body;
|
|
@@ -52,7 +59,7 @@ class WebhookContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
52
59
|
return httpRequest;
|
|
53
60
|
}
|
|
54
61
|
getNodeWebhookUrl(name) {
|
|
55
|
-
return (0, NodeExecuteFunctions_1.getNodeWebhookUrl)(name, this.workflow, this.node, this.additionalData, this.mode,
|
|
62
|
+
return (0, NodeExecuteFunctions_1.getNodeWebhookUrl)(name, this.workflow, this.node, this.additionalData, this.mode, this.additionalKeys);
|
|
56
63
|
}
|
|
57
64
|
getWebhookName() {
|
|
58
65
|
return this.webhookData.webhookDescription.name;
|
|
@@ -73,36 +80,7 @@ class WebhookContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
73
80
|
node: this.node,
|
|
74
81
|
source: null,
|
|
75
82
|
};
|
|
76
|
-
|
|
77
|
-
return await NodeExecuteFunctions_1.getInputConnectionData.call(this, this.workflow, runExecutionData, runIndex, connectionInputData, {}, this.additionalData, executeData, this.mode, this.closeFunctions, inputName, itemIndex);
|
|
78
|
-
}
|
|
79
|
-
evaluateExpression(expression, evaluateItemIndex) {
|
|
80
|
-
const itemIndex = evaluateItemIndex ?? 0;
|
|
81
|
-
const runIndex = 0;
|
|
82
|
-
let connectionInputData = [];
|
|
83
|
-
let executionData;
|
|
84
|
-
if (this.runExecutionData?.executionData !== undefined) {
|
|
85
|
-
executionData = this.runExecutionData.executionData.nodeExecutionStack[0];
|
|
86
|
-
if (executionData !== undefined) {
|
|
87
|
-
connectionInputData = executionData.data.main[0];
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
const additionalKeys = (0, NodeExecuteFunctions_1.getAdditionalKeys)(this.additionalData, this.mode, this.runExecutionData);
|
|
91
|
-
return this.workflow.expression.resolveSimpleParameterValue(`=${expression}`, {}, this.runExecutionData, runIndex, itemIndex, this.node.name, connectionInputData, this.mode, additionalKeys, executionData);
|
|
92
|
-
}
|
|
93
|
-
getNodeParameter(parameterName, fallbackValue, options) {
|
|
94
|
-
const itemIndex = 0;
|
|
95
|
-
const runIndex = 0;
|
|
96
|
-
let connectionInputData = [];
|
|
97
|
-
let executionData;
|
|
98
|
-
if (this.runExecutionData?.executionData !== undefined) {
|
|
99
|
-
executionData = this.runExecutionData.executionData.nodeExecutionStack[0];
|
|
100
|
-
if (executionData !== undefined) {
|
|
101
|
-
connectionInputData = executionData.data.main[0];
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
const additionalKeys = (0, NodeExecuteFunctions_1.getAdditionalKeys)(this.additionalData, this.mode, this.runExecutionData);
|
|
105
|
-
return (0, NodeExecuteFunctions_1.getNodeParameter)(this.workflow, this.runExecutionData, runIndex, connectionInputData, this.node, parameterName, itemIndex, this.mode, additionalKeys, executionData, fallbackValue, options);
|
|
83
|
+
return await NodeExecuteFunctions_1.getInputConnectionData.call(this, this.workflow, runExecutionData, this.runIndex, connectionInputData, {}, this.additionalData, executeData, this.mode, this.closeFunctions, inputName, itemIndex);
|
|
106
84
|
}
|
|
107
85
|
}
|
|
108
86
|
exports.WebhookContext = WebhookContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-context.js","sourceRoot":"","sources":["../../src/node-execution-context/webhook-context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"webhook-context.js","sourceRoot":"","sources":["../../src/node-execution-context/webhook-context.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n-core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.70.0",
|
|
4
4
|
"description": "Core functionality of n8n",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -47,9 +47,9 @@
|
|
|
47
47
|
"uuid": "10.0.0",
|
|
48
48
|
"xml2js": "0.6.2",
|
|
49
49
|
"zod": "3.23.8",
|
|
50
|
-
"@n8n/config": "1.19.0",
|
|
51
50
|
"@n8n/client-oauth2": "0.21.0",
|
|
52
|
-
"n8n-workflow": "1.
|
|
51
|
+
"n8n-workflow": "1.69.0",
|
|
52
|
+
"@n8n/config": "1.20.0"
|
|
53
53
|
},
|
|
54
54
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
55
55
|
"homepage": "https://n8n.io",
|