n8n-core 1.98.0 → 1.100.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/execution-lifecycle-hooks.d.ts +2 -1
- package/dist/execution-engine/execution-lifecycle-hooks.js +1 -0
- package/dist/execution-engine/execution-lifecycle-hooks.js.map +1 -1
- package/dist/execution-engine/node-execution-context/execute-context.d.ts +2 -1
- package/dist/execution-engine/node-execution-context/execute-context.js +14 -0
- package/dist/execution-engine/node-execution-context/execute-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/node-execution-context.d.ts +2 -1
- package/dist/execution-engine/node-execution-context/node-execution-context.js +3 -0
- package/dist/execution-engine/node-execution-context/node-execution-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/supply-data-context.d.ts +3 -3
- package/dist/execution-engine/node-execution-context/supply-data-context.js +15 -10
- package/dist/execution-engine/node-execution-context/supply-data-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/create-node-as-tool.d.ts +1 -1
- package/dist/execution-engine/node-execution-context/utils/get-input-connection-data.js +84 -33
- package/dist/execution-engine/node-execution-context/utils/get-input-connection-data.js.map +1 -1
- package/dist/execution-engine/partial-execution-utils/get-source-data-groups.js +2 -1
- package/dist/execution-engine/partial-execution-utils/get-source-data-groups.js.map +1 -1
- package/dist/execution-engine/workflow-execute.js +25 -2
- package/dist/execution-engine/workflow-execute.js.map +1 -1
- package/dist/utils/is-json-compatible.d.ts +7 -0
- package/dist/utils/is-json-compatible.js +85 -0
- package/dist/utils/is-json-compatible.js.map +1 -0
- package/package.json +10 -10
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import type { IDataObject, IExecuteResponsePromiseData, INode, IRun, IRunExecutionData, ITaskData, ITaskStartedData, IWorkflowBase, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
1
|
+
import type { IDataObject, IExecuteResponsePromiseData, INode, IRun, IRunExecutionData, ITaskData, ITaskStartedData, IWorkflowBase, StructuredChunk, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
2
|
export type ExecutionLifecycleHookHandlers = {
|
|
3
3
|
nodeExecuteBefore: Array<(this: ExecutionLifecycleHooks, nodeName: string, data: ITaskStartedData) => Promise<void> | void>;
|
|
4
4
|
nodeExecuteAfter: Array<(this: ExecutionLifecycleHooks, nodeName: string, data: ITaskData, executionData: IRunExecutionData) => Promise<void> | void>;
|
|
5
5
|
workflowExecuteBefore: Array<(this: ExecutionLifecycleHooks, workflow: Workflow, data?: IRunExecutionData) => Promise<void> | void>;
|
|
6
6
|
workflowExecuteAfter: Array<(this: ExecutionLifecycleHooks, data: IRun, newStaticData: IDataObject) => Promise<void> | void>;
|
|
7
7
|
sendResponse: Array<(this: ExecutionLifecycleHooks, response: IExecuteResponsePromiseData) => Promise<void> | void>;
|
|
8
|
+
sendChunk: Array<(this: ExecutionLifecycleHooks, chunk: StructuredChunk) => Promise<void> | void>;
|
|
8
9
|
nodeFetchedData: Array<(this: ExecutionLifecycleHooks, workflowId: string, node: INode) => Promise<void> | void>;
|
|
9
10
|
};
|
|
10
11
|
export type ExecutionLifecycleHookName = keyof ExecutionLifecycleHookHandlers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-lifecycle-hooks.js","sourceRoot":"","sources":["../../src/execution-engine/execution-lifecycle-hooks.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"execution-lifecycle-hooks.js","sourceRoot":"","sources":["../../src/execution-engine/execution-lifecycle-hooks.ts"],"names":[],"mappings":";;;AAkFA,MAAa,uBAAuB;IAWnC,YACU,IAAyB,EACzB,WAAmB,EACnB,YAA2B;QAF3B,SAAI,GAAJ,IAAI,CAAqB;QACzB,gBAAW,GAAX,WAAW,CAAQ;QACnB,iBAAY,GAAZ,YAAY,CAAe;QAb5B,aAAQ,GAAmC;YACnD,gBAAgB,EAAE,EAAE;YACpB,iBAAiB,EAAE,EAAE;YACrB,eAAe,EAAE,EAAE;YACnB,YAAY,EAAE,EAAE;YAChB,oBAAoB,EAAE,EAAE;YACxB,qBAAqB,EAAE,EAAE;YACzB,SAAS,EAAE,EAAE;SACb,CAAC;IAMC,CAAC;IAEJ,UAAU,CACT,QAAc,EACd,GAAG,QAA6D;QAGhE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,OAAO,CAKX,QAAc,EAAE,UAAkB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACtC,KAAK,MAAM,YAAY,IAAI,KAAK,EAAE,CAAC;YAClC,MAAM,iBAAiB,GAAG,YAGR,CAAC;YACnB,MAAM,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACjD,CAAC;IACF,CAAC;CACD;AAxCD,0DAwCC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AINodeConnectionType, CallbackManager, CloseFunction, IExecuteData, IExecuteFunctions, IExecuteResponsePromiseData, INode, INodeExecutionData, IRunExecutionData, ITaskDataConnections, IWorkflowExecuteAdditionalData, NodeExecutionHint, Result, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
1
|
+
import type { AINodeConnectionType, CallbackManager, ChunkType, CloseFunction, IDataObject, IExecuteData, IExecuteFunctions, IExecuteResponsePromiseData, INode, INodeExecutionData, IRunExecutionData, ITaskDataConnections, IWorkflowExecuteAdditionalData, NodeExecutionHint, Result, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
2
|
import { BaseExecuteContext } from './base-execute-context';
|
|
3
3
|
export declare class ExecuteContext extends BaseExecuteContext implements IExecuteFunctions {
|
|
4
4
|
private readonly closeFunctions;
|
|
@@ -7,6 +7,7 @@ export declare class ExecuteContext extends BaseExecuteContext implements IExecu
|
|
|
7
7
|
readonly getNodeParameter: IExecuteFunctions['getNodeParameter'];
|
|
8
8
|
readonly hints: NodeExecutionHint[];
|
|
9
9
|
constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, runExecutionData: IRunExecutionData, runIndex: number, connectionInputData: INodeExecutionData[], inputData: ITaskDataConnections, executeData: IExecuteData, closeFunctions: CloseFunction[], abortSignal?: AbortSignal);
|
|
10
|
+
sendChunk(type: ChunkType, content?: IDataObject | string): Promise<void>;
|
|
10
11
|
startJob<T = unknown, E = unknown>(jobType: string, settings: unknown, itemIndex: number): Promise<Result<T, E>>;
|
|
11
12
|
getInputConnectionData(connectionType: AINodeConnectionType, itemIndex: number): Promise<unknown>;
|
|
12
13
|
getInputData(inputIndex?: number, connectionType?: "main"): INodeExecutionData[];
|
|
@@ -38,6 +38,20 @@ class ExecuteContext extends base_execute_context_1.BaseExecuteContext {
|
|
|
38
38
|
};
|
|
39
39
|
this.getNodeParameter = ((parameterName, itemIndex, fallbackValue, options) => this._getNodeParameter(parameterName, itemIndex, fallbackValue, options));
|
|
40
40
|
}
|
|
41
|
+
async sendChunk(type, content) {
|
|
42
|
+
const node = this.getNode();
|
|
43
|
+
const metadata = {
|
|
44
|
+
nodeId: node.id,
|
|
45
|
+
nodeName: node.name,
|
|
46
|
+
timestamp: Date.now(),
|
|
47
|
+
};
|
|
48
|
+
const message = {
|
|
49
|
+
type,
|
|
50
|
+
content: content ? JSON.stringify(content) : undefined,
|
|
51
|
+
metadata,
|
|
52
|
+
};
|
|
53
|
+
await this.additionalData.hooks?.runHook('sendChunk', [message]);
|
|
54
|
+
}
|
|
41
55
|
async startJob(jobType, settings, itemIndex) {
|
|
42
56
|
return await this.additionalData.startRunnerTask(this.additionalData, jobType, settings, this, this.inputData, this.node, this.workflow, this.runExecutionData, this.runIndex, itemIndex, this.node.name, this.connectionInputData, {}, this.mode, (0, n8n_workflow_1.createEnvProviderState)(), this.executeData);
|
|
43
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/execute-context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"execute-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/execute-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
|
-
import type { FunctionsBase, ICredentialDataDecryptedObject, IExecuteData, IGetNodeParameterOptions, INode, INodeExecutionData, INodeInputConfiguration, INodeOutputConfiguration, IRunExecutionData, IWorkflowExecuteAdditionalData, NodeConnectionType, NodeParameterValueType, NodeTypeAndVersion, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
|
+
import type { FunctionsBase, ICredentialDataDecryptedObject, IExecuteData, IGetNodeParameterOptions, INode, INodeExecutionData, INodeInputConfiguration, INodeOutputConfiguration, IRunExecutionData, IWorkflowExecuteAdditionalData, NodeConnectionType, NodeInputConnections, NodeParameterValueType, NodeTypeAndVersion, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
3
3
|
import { InstanceSettings } from '../../instance-settings';
|
|
4
4
|
export declare abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCredentials'> {
|
|
5
5
|
readonly workflow: Workflow;
|
|
@@ -31,6 +31,7 @@ export declare abstract class NodeExecutionContext implements Omit<FunctionsBase
|
|
|
31
31
|
getNodeInputs(): INodeInputConfiguration[];
|
|
32
32
|
get nodeOutputs(): INodeOutputConfiguration[];
|
|
33
33
|
getConnectedNodes(connectionType: NodeConnectionType): INode[];
|
|
34
|
+
getConnections(destination: INode, connectionType: NodeConnectionType): NodeInputConnections;
|
|
34
35
|
getNodeOutputs(): INodeOutputConfiguration[];
|
|
35
36
|
getKnownNodeTypes(): import("n8n-workflow").IDataObject;
|
|
36
37
|
getRestApiUrl(): string;
|
|
@@ -108,6 +108,9 @@ class NodeExecutionContext {
|
|
|
108
108
|
.filter((node) => !!node)
|
|
109
109
|
.filter((node) => node.disabled !== true);
|
|
110
110
|
}
|
|
111
|
+
getConnections(destination, connectionType) {
|
|
112
|
+
return this.workflow.connectionsByDestinationNode[destination.name]?.[connectionType] ?? [];
|
|
113
|
+
}
|
|
111
114
|
getNodeOutputs() {
|
|
112
115
|
return this.nodeOutputs;
|
|
113
116
|
}
|
|
@@ -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,wDAA6C;AAC7C,gDAA2C;AAC3C,gCAAoC;AACpC,qDAA6B;
|
|
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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"}
|
|
@@ -14,9 +14,9 @@ export declare class SupplyDataContext extends BaseExecuteContext implements ISu
|
|
|
14
14
|
getInputConnectionData(connectionType: AINodeConnectionType, itemIndex: number): Promise<unknown>;
|
|
15
15
|
getInputData(inputIndex?: number, connectionType?: NodeConnectionType): INodeExecutionData[];
|
|
16
16
|
getNextRunIndex(): number;
|
|
17
|
-
addInputData(connectionType: AINodeConnectionType, data: INodeExecutionData[][]): {
|
|
17
|
+
addInputData(connectionType: AINodeConnectionType, data: INodeExecutionData[][], runIndex?: number): {
|
|
18
18
|
index: number;
|
|
19
19
|
};
|
|
20
|
-
addOutputData(connectionType: AINodeConnectionType, currentNodeRunIndex: number, data: INodeExecutionData[][] | ExecutionBaseError, metadata?: ITaskMetadata): void;
|
|
21
|
-
addExecutionDataFunctions(type: 'input' | 'output', data: INodeExecutionData[][] | ExecutionBaseError, connectionType: AINodeConnectionType, sourceNodeName: string, currentNodeRunIndex: number, metadata?: ITaskMetadata): Promise<void>;
|
|
20
|
+
addOutputData(connectionType: AINodeConnectionType, currentNodeRunIndex: number, data: INodeExecutionData[][] | ExecutionBaseError, metadata?: ITaskMetadata, sourceNodeRunIndex?: number): void;
|
|
21
|
+
addExecutionDataFunctions(type: 'input' | 'output', data: INodeExecutionData[][] | ExecutionBaseError, connectionType: AINodeConnectionType, sourceNodeName: string, currentNodeRunIndex: number, metadata?: ITaskMetadata, sourceNodeRunIndex?: number): Promise<void>;
|
|
22
22
|
}
|
|
@@ -58,25 +58,30 @@ class SupplyDataContext extends base_execute_context_1.BaseExecuteContext {
|
|
|
58
58
|
const nodeName = this.node.name;
|
|
59
59
|
return this.runExecutionData.resultData.runData[nodeName]?.length ?? 0;
|
|
60
60
|
}
|
|
61
|
-
addInputData(connectionType, data) {
|
|
61
|
+
addInputData(connectionType, data, runIndex) {
|
|
62
62
|
const nodeName = this.node.name;
|
|
63
63
|
const currentNodeRunIndex = this.getNextRunIndex();
|
|
64
|
-
this.addExecutionDataFunctions('input', data, connectionType, nodeName, currentNodeRunIndex).catch((error) => {
|
|
64
|
+
this.addExecutionDataFunctions('input', data, connectionType, nodeName, currentNodeRunIndex, undefined, runIndex).catch((error) => {
|
|
65
65
|
this.logger.warn(`There was a problem logging input data of node "${nodeName}": ${error.message}`);
|
|
66
66
|
});
|
|
67
67
|
return { index: currentNodeRunIndex };
|
|
68
68
|
}
|
|
69
|
-
addOutputData(connectionType, currentNodeRunIndex, data, metadata) {
|
|
69
|
+
addOutputData(connectionType, currentNodeRunIndex, data, metadata, sourceNodeRunIndex) {
|
|
70
70
|
const nodeName = this.node.name;
|
|
71
|
-
this.addExecutionDataFunctions('output', data, connectionType, nodeName, currentNodeRunIndex, metadata).catch((error) => {
|
|
71
|
+
this.addExecutionDataFunctions('output', data, connectionType, nodeName, currentNodeRunIndex, metadata, sourceNodeRunIndex).catch((error) => {
|
|
72
72
|
this.logger.warn(`There was a problem logging output data of node "${nodeName}": ${error.message}`);
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
|
-
async addExecutionDataFunctions(type, data, connectionType, sourceNodeName, currentNodeRunIndex, metadata) {
|
|
76
|
-
const { additionalData, runExecutionData, runIndex:
|
|
75
|
+
async addExecutionDataFunctions(type, data, connectionType, sourceNodeName, currentNodeRunIndex, metadata, sourceNodeRunIndex) {
|
|
76
|
+
const { additionalData, runExecutionData, runIndex: currentRunIndex, node: { name: nodeName }, } = this;
|
|
77
77
|
let taskData;
|
|
78
78
|
const source = this.parentNode
|
|
79
|
-
? [
|
|
79
|
+
? [
|
|
80
|
+
{
|
|
81
|
+
previousNode: this.parentNode.name,
|
|
82
|
+
previousNodeRun: sourceNodeRunIndex ?? currentRunIndex,
|
|
83
|
+
},
|
|
84
|
+
]
|
|
80
85
|
: [];
|
|
81
86
|
if (type === 'input') {
|
|
82
87
|
taskData = {
|
|
@@ -136,12 +141,12 @@ class SupplyDataContext extends base_execute_context_1.BaseExecuteContext {
|
|
|
136
141
|
runExecutionData.executionData.metadata[sourceNodeName] = [];
|
|
137
142
|
sourceTaskData = runExecutionData.executionData.metadata[sourceNodeName];
|
|
138
143
|
}
|
|
139
|
-
if (!sourceTaskData[
|
|
140
|
-
sourceTaskData[
|
|
144
|
+
if (!sourceTaskData[currentNodeRunIndex]) {
|
|
145
|
+
sourceTaskData[currentNodeRunIndex] = {
|
|
141
146
|
subRun: [],
|
|
142
147
|
};
|
|
143
148
|
}
|
|
144
|
-
sourceTaskData[
|
|
149
|
+
sourceTaskData[currentNodeRunIndex].subRun.push({
|
|
145
150
|
node: nodeName,
|
|
146
151
|
runIndex: currentNodeRunIndex,
|
|
147
152
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supply-data-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/supply-data-context.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"supply-data-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/supply-data-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,50 +11,103 @@ function getNextRunIndex(runExecutionData, nodeName) {
|
|
|
11
11
|
function makeHandleToolInvocation(contextFactory, node, nodeType, runExecutionData) {
|
|
12
12
|
let runIndex = getNextRunIndex(runExecutionData, node.name);
|
|
13
13
|
return async (toolArgs) => {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
14
|
+
let maxTries = 1;
|
|
15
|
+
if (node.retryOnFail === true) {
|
|
16
|
+
maxTries = Math.min(5, Math.max(2, node.maxTries ?? 3));
|
|
17
|
+
}
|
|
18
|
+
let waitBetweenTries = 0;
|
|
19
|
+
if (node.retryOnFail === true) {
|
|
20
|
+
waitBetweenTries = Math.min(5000, Math.max(0, node.waitBetweenTries ?? 1000));
|
|
21
|
+
}
|
|
22
|
+
let lastError;
|
|
23
|
+
for (let tryIndex = 0; tryIndex < maxTries; tryIndex++) {
|
|
24
|
+
const localRunIndex = runIndex++;
|
|
25
|
+
const context = contextFactory(localRunIndex);
|
|
26
|
+
const abortSignal = context.getExecutionCancelSignal?.();
|
|
27
|
+
if (abortSignal?.aborted) {
|
|
28
|
+
return 'Error during node execution: Execution was cancelled';
|
|
29
|
+
}
|
|
30
|
+
if (tryIndex !== 0) {
|
|
31
|
+
lastError = undefined;
|
|
32
|
+
if (waitBetweenTries !== 0) {
|
|
33
|
+
try {
|
|
34
|
+
await (0, n8n_workflow_1.sleepWithAbort)(waitBetweenTries, abortSignal);
|
|
35
|
+
}
|
|
36
|
+
catch (abortError) {
|
|
37
|
+
return 'Error during node execution: Execution was cancelled';
|
|
38
|
+
}
|
|
25
39
|
}
|
|
26
|
-
|
|
27
|
-
|
|
40
|
+
}
|
|
41
|
+
context.addInputData(n8n_workflow_1.NodeConnectionTypes.AiTool, [[{ json: toolArgs }]]);
|
|
42
|
+
try {
|
|
43
|
+
const result = await nodeType.execute?.call(context);
|
|
44
|
+
const mappedResults = result?.[0]?.flatMap((item) => item.json);
|
|
45
|
+
let response = mappedResults;
|
|
46
|
+
if (result?.some((x) => x.some((y) => y.binary))) {
|
|
47
|
+
if (!mappedResults || mappedResults.flatMap((x) => Object.keys(x ?? {})).length === 0) {
|
|
48
|
+
response =
|
|
49
|
+
'Error: The Tool attempted to return binary data, which is not supported in Agents';
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
context.logger.warn(`Response from Tool '${node.name}' included binary data, which is not supported in Agents. The binary data was omitted from the response.`);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
context.addOutputData(n8n_workflow_1.NodeConnectionTypes.AiTool, localRunIndex, [
|
|
56
|
+
[{ json: { response } }],
|
|
57
|
+
]);
|
|
58
|
+
return JSON.stringify(response);
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
if (abortSignal?.aborted) {
|
|
62
|
+
return 'Error during node execution: Execution was cancelled';
|
|
63
|
+
}
|
|
64
|
+
const nodeError = new n8n_workflow_1.NodeOperationError(node, error);
|
|
65
|
+
context.addOutputData(n8n_workflow_1.NodeConnectionTypes.AiTool, localRunIndex, nodeError);
|
|
66
|
+
lastError = nodeError;
|
|
67
|
+
if (tryIndex === maxTries - 1) {
|
|
68
|
+
return 'Error during node execution: ' + (nodeError.description ?? nodeError.message);
|
|
28
69
|
}
|
|
29
70
|
}
|
|
30
|
-
context.addOutputData(n8n_workflow_1.NodeConnectionTypes.AiTool, localRunIndex, [[{ json: { response } }]]);
|
|
31
|
-
return JSON.stringify(response);
|
|
32
|
-
}
|
|
33
|
-
catch (error) {
|
|
34
|
-
const nodeError = new n8n_workflow_1.NodeOperationError(node, error);
|
|
35
|
-
context.addOutputData(n8n_workflow_1.NodeConnectionTypes.AiTool, localRunIndex, nodeError);
|
|
36
|
-
return 'Error during node execution: ' + (nodeError.description ?? nodeError.message);
|
|
37
71
|
}
|
|
72
|
+
return 'Error during node execution : ' + (lastError?.description ?? lastError?.message);
|
|
38
73
|
};
|
|
39
74
|
}
|
|
75
|
+
function validateInputConfiguration(context, connectionType, nodeInputs, connectedNodes) {
|
|
76
|
+
const parentNode = context.getNode();
|
|
77
|
+
const connections = context.getConnections(parentNode, connectionType);
|
|
78
|
+
for (let index = 0; index < nodeInputs.length; index++) {
|
|
79
|
+
const inputConfiguration = nodeInputs[index];
|
|
80
|
+
if (inputConfiguration.required) {
|
|
81
|
+
if (connections.length === 0 ||
|
|
82
|
+
connections.length <= index ||
|
|
83
|
+
connections.at(index)?.length === 0 ||
|
|
84
|
+
!connectedNodes.find((node) => connections
|
|
85
|
+
.at(index)
|
|
86
|
+
?.map((value) => value.node)
|
|
87
|
+
.includes(node.name))) {
|
|
88
|
+
throw new n8n_workflow_1.NodeOperationError(parentNode, `A ${inputConfiguration?.displayName ?? connectionType} sub-node must be connected and enabled`);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
40
93
|
async function getInputConnectionData(workflow, runExecutionData, parentRunIndex, connectionInputData, parentInputData, additionalData, executeData, mode, closeFunctions, connectionType, itemIndex, abortSignal) {
|
|
41
94
|
const parentNode = this.getNode();
|
|
42
|
-
const
|
|
43
|
-
if (
|
|
44
|
-
throw new n8n_workflow_1.
|
|
95
|
+
const inputConfigurations = this.nodeInputs.filter((input) => input.type === connectionType);
|
|
96
|
+
if (inputConfigurations === undefined || inputConfigurations.length === 0) {
|
|
97
|
+
throw new n8n_workflow_1.UserError('Node does not have input of type', {
|
|
45
98
|
extra: { nodeName: parentNode.name, connectionType },
|
|
46
99
|
});
|
|
47
100
|
}
|
|
101
|
+
const maxConnections = inputConfigurations.reduce((acc, currentItem) => currentItem.maxConnections !== undefined ? acc + currentItem.maxConnections : acc, 0);
|
|
48
102
|
const connectedNodes = this.getConnectedNodes(connectionType);
|
|
103
|
+
validateInputConfiguration(this, connectionType, inputConfigurations, connectedNodes);
|
|
49
104
|
if (connectedNodes.length === 0) {
|
|
50
|
-
|
|
51
|
-
throw new n8n_workflow_1.NodeOperationError(parentNode, `A ${inputConfiguration?.displayName ?? connectionType} sub-node must be connected and enabled`);
|
|
52
|
-
}
|
|
53
|
-
return inputConfiguration.maxConnections === 1 ? undefined : [];
|
|
105
|
+
return maxConnections === 1 ? undefined : [];
|
|
54
106
|
}
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
-
|
|
107
|
+
if (maxConnections !== undefined &&
|
|
108
|
+
maxConnections !== 0 &&
|
|
109
|
+
connectedNodes.length > maxConnections) {
|
|
110
|
+
throw new n8n_workflow_1.NodeOperationError(parentNode, `Only ${maxConnections} ${connectionType} sub-nodes are/is allowed to be connected`);
|
|
58
111
|
}
|
|
59
112
|
const nodes = [];
|
|
60
113
|
for (const connectedNode of connectedNodes) {
|
|
@@ -107,8 +160,6 @@ async function getInputConnectionData(workflow, runExecutionData, parentRunIndex
|
|
|
107
160
|
}
|
|
108
161
|
}
|
|
109
162
|
}
|
|
110
|
-
return
|
|
111
|
-
? (nodes || [])[0]?.response
|
|
112
|
-
: nodes.map((node) => node.response);
|
|
163
|
+
return maxConnections === 1 ? (nodes || [])[0]?.response : nodes.map((node) => node.response);
|
|
113
164
|
}
|
|
114
165
|
//# sourceMappingURL=get-input-connection-data.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-input-connection-data.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/get-input-connection-data.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"get-input-connection-data.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/get-input-connection-data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getSourceDataGroups = getSourceDataGroups;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
4
5
|
function sortByInputIndexThenByName(connection1, connection2) {
|
|
5
6
|
if (connection1.inputIndex === connection2.inputIndex) {
|
|
6
7
|
return connection1.from.name.localeCompare(connection2.from.name);
|
|
@@ -24,7 +25,7 @@ function getSourceDataGroups(graph, node, runData, pinnedData) {
|
|
|
24
25
|
if (hasData) {
|
|
25
26
|
sortedConnectionsWithData.push(connection);
|
|
26
27
|
}
|
|
27
|
-
else {
|
|
28
|
+
else if (connection.type === n8n_workflow_1.NodeConnectionTypes.Main) {
|
|
28
29
|
sortedConnectionsWithoutData.push(connection);
|
|
29
30
|
}
|
|
30
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-source-data-groups.js","sourceRoot":"","sources":["../../../src/execution-engine/partial-execution-utils/get-source-data-groups.ts"],"names":[],"mappings":";;AAqFA,kDAgFC;
|
|
1
|
+
{"version":3,"file":"get-source-data-groups.js","sourceRoot":"","sources":["../../../src/execution-engine/partial-execution-utils/get-source-data-groups.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,7 @@ const p_cancelable_1 = __importDefault(require("p-cancelable"));
|
|
|
47
47
|
const error_reporter_1 = require("../errors/error-reporter");
|
|
48
48
|
const workflow_has_issues_error_1 = require("../errors/workflow-has-issues.error");
|
|
49
49
|
const NodeExecuteFunctions = __importStar(require("../node-execute-functions"));
|
|
50
|
+
const is_json_compatible_1 = require("../utils/is-json-compatible");
|
|
50
51
|
const node_execution_context_1 = require("./node-execution-context");
|
|
51
52
|
const partial_execution_utils_1 = require("./partial-execution-utils");
|
|
52
53
|
const routing_node_1 = require("./routing-node");
|
|
@@ -239,6 +240,7 @@ class WorkflowExecute {
|
|
|
239
240
|
}
|
|
240
241
|
runPartialWorkflow2(workflow, runData, pinData = {}, dirtyNodeNames = [], destinationNodeName, agentRequest) {
|
|
241
242
|
assert.ok(destinationNodeName, 'a destinationNodeName is required for the new partial execution flow');
|
|
243
|
+
const originalDestination = destinationNodeName;
|
|
242
244
|
let destination = workflow.getNode(destinationNodeName);
|
|
243
245
|
assert.ok(destination, `Could not find a node with the name ${destinationNodeName} in the workflow.`);
|
|
244
246
|
let graph = partial_execution_utils_1.DirectedGraph.fromWorkflow(workflow);
|
|
@@ -302,6 +304,7 @@ class WorkflowExecute {
|
|
|
302
304
|
this.runExecutionData = {
|
|
303
305
|
startData: {
|
|
304
306
|
destinationNode: destinationNodeName,
|
|
307
|
+
originalDestinationNode: originalDestination,
|
|
305
308
|
runNodeFilter: Array.from(filteredNodes.values()).map((node) => node.name),
|
|
306
309
|
},
|
|
307
310
|
resultData: {
|
|
@@ -316,7 +319,7 @@ class WorkflowExecute {
|
|
|
316
319
|
waitingExecutionSource,
|
|
317
320
|
},
|
|
318
321
|
};
|
|
319
|
-
return this.processRunExecutionData(
|
|
322
|
+
return this.processRunExecutionData(workflow);
|
|
320
323
|
}
|
|
321
324
|
moveNodeMetadata() {
|
|
322
325
|
const metadata = (0, get_1.default)(this.runExecutionData, 'executionData.metadata');
|
|
@@ -696,6 +699,21 @@ class WorkflowExecute {
|
|
|
696
699
|
? await nodeType.execute(context)
|
|
697
700
|
: await nodeType.execute.call(context);
|
|
698
701
|
}
|
|
702
|
+
const jsonCompatibleResult = (0, is_json_compatible_1.isJsonCompatible)(data);
|
|
703
|
+
if (!jsonCompatibleResult.isValid) {
|
|
704
|
+
di_1.Container.get(error_reporter_1.ErrorReporter).error(new n8n_workflow_1.UnexpectedError('node execution output incorrect data'), {
|
|
705
|
+
extra: {
|
|
706
|
+
nodeName: node.name,
|
|
707
|
+
nodeType: node.type,
|
|
708
|
+
nodeVersion: node.typeVersion,
|
|
709
|
+
workflowId: workflow.id,
|
|
710
|
+
workflowName: workflow.name ?? 'Unnamed workflow',
|
|
711
|
+
executionId: this.additionalData.executionId ?? 'unsaved-execution',
|
|
712
|
+
errorPath: jsonCompatibleResult.errorPath,
|
|
713
|
+
errorMessage: jsonCompatibleResult.errorMessage,
|
|
714
|
+
},
|
|
715
|
+
});
|
|
716
|
+
}
|
|
699
717
|
const closeFunctionsResults = await Promise.allSettled(closeFunctions.map(async (fn) => await fn()));
|
|
700
718
|
const closingErrors = closeFunctionsResults
|
|
701
719
|
.filter((result) => result.status === 'rejected')
|
|
@@ -930,10 +948,12 @@ class WorkflowExecute {
|
|
|
930
948
|
});
|
|
931
949
|
let runNodeData = await this.runNode(workflow, executionData, this.runExecutionData, runIndex, this.additionalData, this.mode, this.abortController.signal);
|
|
932
950
|
nodeSuccessData = runNodeData.data;
|
|
933
|
-
|
|
951
|
+
let didContinueOnFail = nodeSuccessData?.[0]?.[0]?.json?.error !== undefined;
|
|
934
952
|
while (didContinueOnFail && tryIndex !== maxTries - 1) {
|
|
935
953
|
await (0, n8n_workflow_1.sleep)(waitBetweenTries);
|
|
936
954
|
runNodeData = await this.runNode(workflow, executionData, this.runExecutionData, runIndex, this.additionalData, this.mode, this.abortController.signal);
|
|
955
|
+
nodeSuccessData = runNodeData.data;
|
|
956
|
+
didContinueOnFail = nodeSuccessData?.[0]?.[0]?.json?.error !== undefined;
|
|
937
957
|
tryIndex++;
|
|
938
958
|
}
|
|
939
959
|
if (runNodeData.hints?.length) {
|
|
@@ -1019,6 +1039,9 @@ class WorkflowExecute {
|
|
|
1019
1039
|
if (executionError !== undefined) {
|
|
1020
1040
|
taskData.error = executionError;
|
|
1021
1041
|
taskData.executionStatus = 'error';
|
|
1042
|
+
await hooks?.runHook('sendChunk', [
|
|
1043
|
+
{ type: 'error', content: executionError.description },
|
|
1044
|
+
]);
|
|
1022
1045
|
if (executionData.node.continueOnFail === true ||
|
|
1023
1046
|
['continueRegularOutput', 'continueErrorOutput'].includes(executionData.node.onError || '')) {
|
|
1024
1047
|
if (executionData.data.hasOwnProperty('main') && executionData.data.main.length > 0) {
|