n8n-core 1.97.2 → 1.99.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/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 +29 -13
- package/dist/execution-engine/node-execution-context/utils/get-input-connection-data.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/ssh-tunnel-helper-functions.js +2 -1
- package/dist/execution-engine/node-execution-context/utils/ssh-tunnel-helper-functions.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/partial-execution-utils/index.d.ts +0 -1
- package/dist/execution-engine/partial-execution-utils/index.js +1 -3
- package/dist/execution-engine/partial-execution-utils/index.js.map +1 -1
- package/dist/execution-engine/ssh-clients-manager.d.ts +17 -7
- package/dist/execution-engine/ssh-clients-manager.js +97 -22
- package/dist/execution-engine/ssh-clients-manager.js.map +1 -1
- package/dist/execution-engine/workflow-execute.js +8 -5
- package/dist/execution-engine/workflow-execute.js.map +1 -1
- package/package.json +10 -10
- package/dist/execution-engine/partial-execution-utils/is-tool.d.ts +0 -2
- package/dist/execution-engine/partial-execution-utils/is-tool.js +0 -21
- package/dist/execution-engine/partial-execution-utils/is-tool.js.map +0 -1
|
@@ -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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"}
|
|
@@ -37,24 +37,42 @@ function makeHandleToolInvocation(contextFactory, node, nodeType, runExecutionDa
|
|
|
37
37
|
}
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
+
function validateInputConfiguration(context, connectionType, nodeInputs, connectedNodes) {
|
|
41
|
+
const parentNode = context.getNode();
|
|
42
|
+
const connections = context.getConnections(parentNode, connectionType);
|
|
43
|
+
for (let index = 0; index < nodeInputs.length; index++) {
|
|
44
|
+
const inputConfiguration = nodeInputs[index];
|
|
45
|
+
if (inputConfiguration.required) {
|
|
46
|
+
if (connections.length === 0 ||
|
|
47
|
+
connections.length <= index ||
|
|
48
|
+
connections.at(index)?.length === 0 ||
|
|
49
|
+
!connectedNodes.find((node) => connections
|
|
50
|
+
.at(index)
|
|
51
|
+
?.map((value) => value.node)
|
|
52
|
+
.includes(node.name))) {
|
|
53
|
+
throw new n8n_workflow_1.NodeOperationError(parentNode, `A ${inputConfiguration?.displayName ?? connectionType} sub-node must be connected and enabled`);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
40
58
|
async function getInputConnectionData(workflow, runExecutionData, parentRunIndex, connectionInputData, parentInputData, additionalData, executeData, mode, closeFunctions, connectionType, itemIndex, abortSignal) {
|
|
41
59
|
const parentNode = this.getNode();
|
|
42
|
-
const
|
|
43
|
-
if (
|
|
44
|
-
throw new n8n_workflow_1.
|
|
60
|
+
const inputConfigurations = this.nodeInputs.filter((input) => input.type === connectionType);
|
|
61
|
+
if (inputConfigurations === undefined || inputConfigurations.length === 0) {
|
|
62
|
+
throw new n8n_workflow_1.UserError('Node does not have input of type', {
|
|
45
63
|
extra: { nodeName: parentNode.name, connectionType },
|
|
46
64
|
});
|
|
47
65
|
}
|
|
66
|
+
const maxConnections = inputConfigurations.reduce((acc, currentItem) => currentItem.maxConnections !== undefined ? acc + currentItem.maxConnections : acc, 0);
|
|
48
67
|
const connectedNodes = this.getConnectedNodes(connectionType);
|
|
68
|
+
validateInputConfiguration(this, connectionType, inputConfigurations, connectedNodes);
|
|
49
69
|
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 : [];
|
|
70
|
+
return maxConnections === 1 ? undefined : [];
|
|
54
71
|
}
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
-
|
|
72
|
+
if (maxConnections !== undefined &&
|
|
73
|
+
maxConnections !== 0 &&
|
|
74
|
+
connectedNodes.length > maxConnections) {
|
|
75
|
+
throw new n8n_workflow_1.NodeOperationError(parentNode, `Only ${maxConnections} ${connectionType} sub-nodes are/is allowed to be connected`);
|
|
58
76
|
}
|
|
59
77
|
const nodes = [];
|
|
60
78
|
for (const connectedNode of connectedNodes) {
|
|
@@ -107,8 +125,6 @@ async function getInputConnectionData(workflow, runExecutionData, parentRunIndex
|
|
|
107
125
|
}
|
|
108
126
|
}
|
|
109
127
|
}
|
|
110
|
-
return
|
|
111
|
-
? (nodes || [])[0]?.response
|
|
112
|
-
: nodes.map((node) => node.response);
|
|
128
|
+
return maxConnections === 1 ? (nodes || [])[0]?.response : nodes.map((node) => node.response);
|
|
113
129
|
}
|
|
114
130
|
//# 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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"}
|
|
@@ -6,7 +6,8 @@ const ssh_clients_manager_1 = require("../../ssh-clients-manager");
|
|
|
6
6
|
const getSSHTunnelFunctions = () => {
|
|
7
7
|
const sshClientsManager = di_1.Container.get(ssh_clients_manager_1.SSHClientsManager);
|
|
8
8
|
return {
|
|
9
|
-
getSSHClient: async (credentials) => await sshClientsManager.getClient(credentials),
|
|
9
|
+
getSSHClient: async (credentials, abortController) => await sshClientsManager.getClient(credentials, abortController),
|
|
10
|
+
updateLastUsed: (client) => sshClientsManager.updateLastUsed(client),
|
|
10
11
|
};
|
|
11
12
|
};
|
|
12
13
|
exports.getSSHTunnelFunctions = getSSHTunnelFunctions;
|
package/dist/execution-engine/node-execution-context/utils/ssh-tunnel-helper-functions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-tunnel-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/ssh-tunnel-helper-functions.ts"],"names":[],"mappings":";;;AAAA,gCAAoC;
|
|
1
|
+
{"version":3,"file":"ssh-tunnel-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/ssh-tunnel-helper-functions.ts"],"names":[],"mappings":";;;AAAA,gCAAoC;AAIpC,mEAA8D;AAEvD,MAAM,qBAAqB,GAAG,GAAuB,EAAE;IAC7D,MAAM,iBAAiB,GAAG,cAAS,CAAC,GAAG,CAAC,uCAAiB,CAAC,CAAC;IAC3D,OAAO;QACN,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,CACpD,MAAM,iBAAiB,CAAC,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;QAChE,cAAc,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,iBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC;KAC5E,CAAC;AACH,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC"}
|
|
@@ -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":";;AAqFA,kDAgFC;AArKD,+CAA6F;AAI7F,SAAS,0BAA0B,CAClC,WAA4B,EAC5B,WAA4B;IAE5B,IAAI,WAAW,CAAC,UAAU,KAAK,WAAW,CAAC,UAAU,EAAE,CAAC;QACvD,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnE,CAAC;SAAM,CAAC;QACP,OAAO,WAAW,CAAC,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;IACxD,CAAC;AACF,CAAC;AAcD,SAAS,QAAQ;IAChB,OAAO;QACN,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,EAAE;KACf,CAAC;AACH,CAAC;AAqDD,SAAgB,mBAAmB,CAClC,KAAoB,EACpB,IAAW,EACX,OAAiB,EACjB,UAAoB;IAEpB,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvD,MAAM,yBAAyB,GAAG,EAAE,CAAC;IACrC,MAAM,4BAA4B,GAAG,EAAE,CAAC;IAExC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElF,IAAI,OAAO,EAAE,CAAC;YACb,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,KAAK,kCAAmB,CAAC,IAAI,EAAE,CAAC;YACzD,4BAA4B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;IACF,CAAC;IAED,IAAI,yBAAyB,CAAC,MAAM,KAAK,CAAC,IAAI,4BAA4B,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzF,OAAO,EAAE,CAAC;IACX,CAAC;IAED,yBAAyB,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC3D,4BAA4B,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAE9D,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,IAAI,YAAY,GAAG,QAAQ,EAAE,CAAC;IAC9B,IAAI,iBAAiB,GACpB,IAAI,CAAC,GAAG,CACP,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EACrD,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CACxD,GAAG,CAAC,CAAC;IAEP,OAAO,yBAAyB,CAAC,MAAM,GAAG,CAAC,IAAI,4BAA4B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxF,iBAAiB,EAAE,CAAC;QAEpB,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,SAAS,CAElE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,iBAAiB,CACzC,CAAC;QAEF,IAAI,uBAAuB,IAAI,CAAC,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,CAAC;YAEtE,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE1C,yBAAyB,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;YAC7D,SAAS;QACV,CAAC;QAED,MAAM,0BAA0B,GAAG,4BAA4B,CAAC,SAAS,CAExE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,iBAAiB,CACzC,CAAC;QAEF,IAAI,0BAA0B,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;YAE5E,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,YAAY,CAAC,QAAQ,GAAG,KAAK,CAAC;YAE9B,4BAA4B,CAAC,MAAM,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;YACnE,SAAS;QACV,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,YAAY,GAAG,QAAQ,EAAE,CAAC;QAC1B,iBAAiB;YAChB,IAAI,CAAC,GAAG,CACP,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EACrD,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CACxD,GAAG,CAAC,CAAC;IACR,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE1B,OAAO,MAAM,CAAC;AACf,CAAC"}
|
|
@@ -6,6 +6,5 @@ export { recreateNodeExecutionStack } from './recreate-node-execution-stack';
|
|
|
6
6
|
export { cleanRunData } from './clean-run-data';
|
|
7
7
|
export { handleCycles } from './handle-cycles';
|
|
8
8
|
export { filterDisabledNodes } from './filter-disabled-nodes';
|
|
9
|
-
export { isTool } from './is-tool';
|
|
10
9
|
export { rewireGraph } from './rewire-graph';
|
|
11
10
|
export { getNextExecutionIndex } from './run-data-utils';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNextExecutionIndex = exports.rewireGraph = exports.
|
|
3
|
+
exports.getNextExecutionIndex = exports.rewireGraph = exports.filterDisabledNodes = exports.handleCycles = exports.cleanRunData = exports.recreateNodeExecutionStack = exports.findSubgraph = exports.findStartNodes = exports.findTriggerForPartialExecution = exports.DirectedGraph = void 0;
|
|
4
4
|
var directed_graph_1 = require("./directed-graph");
|
|
5
5
|
Object.defineProperty(exports, "DirectedGraph", { enumerable: true, get: function () { return directed_graph_1.DirectedGraph; } });
|
|
6
6
|
var find_trigger_for_partial_execution_1 = require("./find-trigger-for-partial-execution");
|
|
@@ -17,8 +17,6 @@ var handle_cycles_1 = require("./handle-cycles");
|
|
|
17
17
|
Object.defineProperty(exports, "handleCycles", { enumerable: true, get: function () { return handle_cycles_1.handleCycles; } });
|
|
18
18
|
var filter_disabled_nodes_1 = require("./filter-disabled-nodes");
|
|
19
19
|
Object.defineProperty(exports, "filterDisabledNodes", { enumerable: true, get: function () { return filter_disabled_nodes_1.filterDisabledNodes; } });
|
|
20
|
-
var is_tool_1 = require("./is-tool");
|
|
21
|
-
Object.defineProperty(exports, "isTool", { enumerable: true, get: function () { return is_tool_1.isTool; } });
|
|
22
20
|
var rewire_graph_1 = require("./rewire-graph");
|
|
23
21
|
Object.defineProperty(exports, "rewireGraph", { enumerable: true, get: function () { return rewire_graph_1.rewireGraph; } });
|
|
24
22
|
var run_data_utils_1 = require("./run-data-utils");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution-engine/partial-execution-utils/index.ts"],"names":[],"mappings":";;;AAAA,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,2FAAsF;AAA7E,oJAAA,8BAA8B,OAAA;AACvC,uDAAoD;AAA3C,kHAAA,cAAc,OAAA;AACvB,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AACrB,iFAA6E;AAApE,2IAAA,0BAA0B,OAAA;AACnC,mDAAgD;AAAvC,8GAAA,YAAY,OAAA;AACrB,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AACrB,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution-engine/partial-execution-utils/index.ts"],"names":[],"mappings":";;;AAAA,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,2FAAsF;AAA7E,oJAAA,8BAA8B,OAAA;AACvC,uDAAoD;AAA3C,kHAAA,cAAc,OAAA;AACvB,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AACrB,iFAA6E;AAApE,2IAAA,0BAA0B,OAAA;AACnC,mDAAgD;AAAvC,8GAAA,YAAY,OAAA;AACrB,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AACrB,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,mDAAyD;AAAhD,uHAAA,qBAAqB,OAAA"}
|
|
@@ -1,16 +1,26 @@
|
|
|
1
|
+
import { Logger } from '@n8n/backend-common';
|
|
1
2
|
import type { SSHCredentials } from 'n8n-workflow';
|
|
2
3
|
import { Client } from 'ssh2';
|
|
3
|
-
declare class SSHClientsConfig {
|
|
4
|
+
export declare class SSHClientsConfig {
|
|
4
5
|
idleTimeout: number;
|
|
5
6
|
}
|
|
7
|
+
type Registration = {
|
|
8
|
+
client: Client;
|
|
9
|
+
lastUsed: Date;
|
|
10
|
+
abortController: AbortController;
|
|
11
|
+
returnPromise: Promise<Client>;
|
|
12
|
+
};
|
|
6
13
|
export declare class SSHClientsManager {
|
|
7
14
|
private readonly config;
|
|
8
|
-
readonly
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
constructor(config: SSHClientsConfig);
|
|
13
|
-
|
|
15
|
+
private readonly logger;
|
|
16
|
+
readonly clients: Map<string, Registration>;
|
|
17
|
+
readonly clientsReversed: WeakMap<Client, string>;
|
|
18
|
+
private cleanupTimer;
|
|
19
|
+
constructor(config: SSHClientsConfig, logger: Logger);
|
|
20
|
+
updateLastUsed(client: Client): void;
|
|
21
|
+
getClient(credentials: SSHCredentials, abortController?: AbortController): Promise<Client>;
|
|
22
|
+
private withCleanupHandler;
|
|
23
|
+
private cleanupClient;
|
|
14
24
|
onShutdown(): void;
|
|
15
25
|
cleanupStaleConnections(): void;
|
|
16
26
|
}
|
|
@@ -9,33 +9,71 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.SSHClientsManager = void 0;
|
|
12
|
+
exports.SSHClientsManager = exports.SSHClientsConfig = void 0;
|
|
13
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
13
14
|
const config_1 = require("@n8n/config");
|
|
14
15
|
const di_1 = require("@n8n/di");
|
|
15
16
|
const node_crypto_1 = require("node:crypto");
|
|
16
17
|
const ssh2_1 = require("ssh2");
|
|
18
|
+
const zod_1 = require("zod");
|
|
17
19
|
let SSHClientsConfig = class SSHClientsConfig {
|
|
18
20
|
constructor() {
|
|
19
21
|
this.idleTimeout = 5 * 60;
|
|
20
22
|
}
|
|
21
23
|
};
|
|
24
|
+
exports.SSHClientsConfig = SSHClientsConfig;
|
|
22
25
|
__decorate([
|
|
23
|
-
(0, config_1.Env)('N8N_SSH_TUNNEL_IDLE_TIMEOUT'
|
|
26
|
+
(0, config_1.Env)('N8N_SSH_TUNNEL_IDLE_TIMEOUT', zod_1.z
|
|
27
|
+
.string()
|
|
28
|
+
.transform((value) => Number.parseInt(value))
|
|
29
|
+
.superRefine((value, ctx) => {
|
|
30
|
+
if (Number.isNaN(value)) {
|
|
31
|
+
return ctx.addIssue({
|
|
32
|
+
message: 'must be a valid integer',
|
|
33
|
+
code: 'custom',
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
if (value <= 0) {
|
|
37
|
+
return ctx.addIssue({
|
|
38
|
+
message: 'must be positive',
|
|
39
|
+
code: 'too_small',
|
|
40
|
+
minimum: 0,
|
|
41
|
+
inclusive: false,
|
|
42
|
+
type: 'number',
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
})),
|
|
24
46
|
__metadata("design:type", Number)
|
|
25
47
|
], SSHClientsConfig.prototype, "idleTimeout", void 0);
|
|
26
|
-
SSHClientsConfig = __decorate([
|
|
48
|
+
exports.SSHClientsConfig = SSHClientsConfig = __decorate([
|
|
27
49
|
config_1.Config
|
|
28
50
|
], SSHClientsConfig);
|
|
29
51
|
let SSHClientsManager = class SSHClientsManager {
|
|
30
|
-
constructor(config) {
|
|
52
|
+
constructor(config, logger) {
|
|
31
53
|
this.config = config;
|
|
54
|
+
this.logger = logger;
|
|
32
55
|
this.clients = new Map();
|
|
56
|
+
this.clientsReversed = new WeakMap();
|
|
33
57
|
process.on('exit', () => this.onShutdown());
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
setInterval(() => this.cleanupStaleConnections(), 60 * 1000);
|
|
58
|
+
this.cleanupTimer = setInterval(() => this.cleanupStaleConnections(), 60 * 1000);
|
|
59
|
+
this.logger = logger.scoped('ssh-client');
|
|
37
60
|
}
|
|
38
|
-
|
|
61
|
+
updateLastUsed(client) {
|
|
62
|
+
const key = this.clientsReversed.get(client);
|
|
63
|
+
if (key) {
|
|
64
|
+
const registration = this.clients.get(key);
|
|
65
|
+
if (registration) {
|
|
66
|
+
registration.lastUsed = new Date();
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
const metadata = {};
|
|
71
|
+
Error.captureStackTrace(metadata, this.updateLastUsed);
|
|
72
|
+
this.logger.warn('Tried to update `lastUsed` for a client that has been cleaned up already. Probably forgot to subscribe to the AbortController somewhere.', metadata);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
async getClient(credentials, abortController) {
|
|
76
|
+
abortController = abortController ?? new AbortController();
|
|
39
77
|
const { sshAuthenticateWith, sshHost, sshPort, sshUser } = credentials;
|
|
40
78
|
const sshConfig = {
|
|
41
79
|
host: sshHost,
|
|
@@ -52,26 +90,62 @@ let SSHClientsManager = class SSHClientsManager {
|
|
|
52
90
|
const existing = this.clients.get(clientHash);
|
|
53
91
|
if (existing) {
|
|
54
92
|
existing.lastUsed = new Date();
|
|
55
|
-
return existing.
|
|
93
|
+
return await existing.returnPromise;
|
|
56
94
|
}
|
|
57
|
-
|
|
58
|
-
|
|
95
|
+
const sshClient = this.withCleanupHandler(new ssh2_1.Client(), abortController, clientHash);
|
|
96
|
+
const returnPromise = new Promise((resolve, reject) => {
|
|
59
97
|
sshClient.once('error', reject);
|
|
60
98
|
sshClient.once('ready', () => {
|
|
61
99
|
sshClient.off('error', reject);
|
|
62
|
-
sshClient.once('close', () => this.clients.delete(clientHash));
|
|
63
|
-
this.clients.set(clientHash, {
|
|
64
|
-
client: sshClient,
|
|
65
|
-
lastUsed: new Date(),
|
|
66
|
-
});
|
|
67
100
|
resolve(sshClient);
|
|
68
101
|
});
|
|
69
102
|
sshClient.connect(sshConfig);
|
|
70
103
|
});
|
|
104
|
+
this.clients.set(clientHash, {
|
|
105
|
+
client: sshClient,
|
|
106
|
+
lastUsed: new Date(),
|
|
107
|
+
abortController,
|
|
108
|
+
returnPromise,
|
|
109
|
+
});
|
|
110
|
+
this.clientsReversed.set(sshClient, clientHash);
|
|
111
|
+
return await returnPromise;
|
|
112
|
+
}
|
|
113
|
+
withCleanupHandler(sshClient, abortController, key) {
|
|
114
|
+
sshClient.on('error', (error) => {
|
|
115
|
+
this.logger.error('encountered error, calling cleanup', { error });
|
|
116
|
+
this.cleanupClient(key);
|
|
117
|
+
});
|
|
118
|
+
sshClient.on('end', () => {
|
|
119
|
+
this.logger.debug('socket was disconnected, calling abort signal', {});
|
|
120
|
+
this.cleanupClient(key);
|
|
121
|
+
});
|
|
122
|
+
sshClient.on('close', () => {
|
|
123
|
+
this.logger.debug('socket was closed, calling abort signal', {});
|
|
124
|
+
this.cleanupClient(key);
|
|
125
|
+
});
|
|
126
|
+
abortController.signal.addEventListener('abort', () => {
|
|
127
|
+
this.logger.debug('Got abort signal, cleaning up ssh client.', {
|
|
128
|
+
reason: abortController.signal.reason,
|
|
129
|
+
});
|
|
130
|
+
this.cleanupClient(key);
|
|
131
|
+
});
|
|
132
|
+
return sshClient;
|
|
133
|
+
}
|
|
134
|
+
cleanupClient(key) {
|
|
135
|
+
const registration = this.clients.get(key);
|
|
136
|
+
if (registration) {
|
|
137
|
+
this.clients.delete(key);
|
|
138
|
+
registration.client.end();
|
|
139
|
+
if (!registration.abortController.signal.aborted) {
|
|
140
|
+
registration.abortController.abort();
|
|
141
|
+
}
|
|
142
|
+
}
|
|
71
143
|
}
|
|
72
144
|
onShutdown() {
|
|
73
|
-
|
|
74
|
-
|
|
145
|
+
this.logger.debug('Shutting down. Cleaning up all clients');
|
|
146
|
+
clearInterval(this.cleanupTimer);
|
|
147
|
+
for (const key of this.clients.keys()) {
|
|
148
|
+
this.cleanupClient(key);
|
|
75
149
|
}
|
|
76
150
|
}
|
|
77
151
|
cleanupStaleConnections() {
|
|
@@ -79,10 +153,10 @@ let SSHClientsManager = class SSHClientsManager {
|
|
|
79
153
|
if (clients.size === 0)
|
|
80
154
|
return;
|
|
81
155
|
const now = Date.now();
|
|
82
|
-
for (const [
|
|
156
|
+
for (const [key, { lastUsed }] of clients.entries()) {
|
|
83
157
|
if (now - lastUsed.getTime() > this.config.idleTimeout * 1000) {
|
|
84
|
-
client.
|
|
85
|
-
|
|
158
|
+
this.logger.debug('Found stale client. Cleaning it up.');
|
|
159
|
+
this.cleanupClient(key);
|
|
86
160
|
}
|
|
87
161
|
}
|
|
88
162
|
}
|
|
@@ -90,6 +164,7 @@ let SSHClientsManager = class SSHClientsManager {
|
|
|
90
164
|
exports.SSHClientsManager = SSHClientsManager;
|
|
91
165
|
exports.SSHClientsManager = SSHClientsManager = __decorate([
|
|
92
166
|
(0, di_1.Service)(),
|
|
93
|
-
__metadata("design:paramtypes", [SSHClientsConfig
|
|
167
|
+
__metadata("design:paramtypes", [SSHClientsConfig,
|
|
168
|
+
backend_common_1.Logger])
|
|
94
169
|
], SSHClientsManager);
|
|
95
170
|
//# sourceMappingURL=ssh-clients-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-clients-manager.js","sourceRoot":"","sources":["../../src/execution-engine/ssh-clients-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAC1C,gCAAkC;AAElC,6CAAyC;AACzC,+BAAkD;
|
|
1
|
+
{"version":3,"file":"ssh-clients-manager.js","sourceRoot":"","sources":["../../src/execution-engine/ssh-clients-manager.ts"],"names":[],"mappings":"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"}
|