n8n-core 1.73.0 → 1.74.0

package/dist/InstanceSettings.js

@@ -13,22 +13,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceSettings = void 0;
+const di_1 = require("@n8n/di");
 const crypto_1 = require("crypto");
 const n8n_workflow_1 = require("n8n-workflow");
 const nanoid_1 = require("nanoid");
 const node_fs_1 = require("node:fs");
 const path_1 = __importDefault(require("path"));
-const typedi_1 = require("typedi");
+const logger_1 = require("./logging/logger");
 const decorators_1 = require("./decorators");
 const InstanceSettingsConfig_1 = require("./InstanceSettingsConfig");
 const nanoid = (0, nanoid_1.customAlphabet)(n8n_workflow_1.ALPHABET, 16);
 const inTest = process.env.NODE_ENV === 'test';
 let InstanceSettings = class InstanceSettings {
-    constructor(config) {
+    constructor(config, logger) {
         this.config = config;
-        this.userHome = this.getUserHome();
-        this.n8nFolder = path_1.default.join(this.userHome, '.n8n');
-        this.staticCacheDir = path_1.default.join(this.userHome, '.cache/n8n/public');
+        this.logger = logger;
+        this.n8nFolder = this.config.n8nFolder;
+        this.staticCacheDir = path_1.default.join(this.config.userHome, '.cache/n8n/public');
         this.customExtensionDir = path_1.default.join(this.n8nFolder, 'custom');
         this.nodesDownloadDir = path_1.default.join(this.n8nFolder, 'nodes');
         this.settingsFile = path_1.default.join(this.n8nFolder, 'config');
@@ -56,6 +57,9 @@ let InstanceSettings = class InstanceSettings {
     get isSingleMain() {
         return !this.isMultiMain;
     }
+    get isWorker() {
+        return this.instanceType === 'worker';
+    }
     get isLeader() {
         return this.instanceRole === 'leader';
     }
@@ -85,10 +89,6 @@ let InstanceSettings = class InstanceSettings {
     update(newSettings) {
         this.save({ ...this.settings, ...newSettings });
     }
-    getUserHome() {
-        const homeVarName = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
-        return process.env.N8N_USER_FOLDER ?? process.env[homeVarName] ?? process.cwd();
-    }
     loadOrCreate() {
         if ((0, node_fs_1.existsSync)(this.settingsFile)) {
             const content = (0, node_fs_1.readFileSync)(this.settingsFile, 'utf8');
@@ -109,7 +109,7 @@ let InstanceSettings = class InstanceSettings {
         const settings = { encryptionKey };
         this.save(settings);
         if (!inTest && !process.env.N8N_ENCRYPTION_KEY) {
-            console.info(`No encryption key found - Auto-generated and saved to: ${this.settingsFile}`);
+            this.logger.info(`No encryption key found - Auto-generated and saved to: ${this.settingsFile}`);
         }
         this.ensureSettingsFilePermissions();
         return settings;
@@ -153,10 +153,10 @@ let InstanceSettings = class InstanceSettings {
         }
         const permissionsResult = (0, n8n_workflow_1.toResult)(() => {
             const stats = (0, node_fs_1.statSync)(this.settingsFile);
-            return stats.mode & 0o777;
+            return stats?.mode & 0o777;
         });
         if (!permissionsResult.ok) {
-            console.warn(`Could not ensure settings file permissions: ${permissionsResult.error.message}. To skip this check, set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`);
+            this.logger.warn(`Could not ensure settings file permissions: ${permissionsResult.error.message}. To skip this check, set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`);
             return;
         }
         const arePermissionsCorrect = permissionsResult.result === 0o600;
@@ -164,14 +164,14 @@ let InstanceSettings = class InstanceSettings {
             return;
         }
         if (!this.enforceSettingsFilePermissions.isSet) {
-            console.warn(`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. This is ignored for now, but in the future n8n will attempt to change the permissions automatically. To automatically enforce correct permissions now set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true (recommended), or turn this check off set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`);
+            this.logger.warn(`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. This is ignored for now, but in the future n8n will attempt to change the permissions automatically. To automatically enforce correct permissions now set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true (recommended), or turn this check off set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`);
             return;
         }
         if (this.enforceSettingsFilePermissions.enforce) {
-            console.warn(`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. Changing permissions to 0600..`);
+            this.logger.warn(`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. Changing permissions to 0600..`);
             const chmodResult = (0, n8n_workflow_1.toResult)(() => (0, node_fs_1.chmodSync)(this.settingsFile, 0o600));
             if (!chmodResult.ok) {
-                console.warn(`Could not enforce settings file permissions: ${chmodResult.error.message}. To skip this check, set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`);
+                this.logger.warn(`Could not enforce settings file permissions: ${chmodResult.error.message}. To skip this check, set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`);
             }
         }
     }
@@ -186,7 +186,8 @@ __decorate([
     __metadata("design:paramtypes", [])
 ], InstanceSettings.prototype, "isDocker", null);
 exports.InstanceSettings = InstanceSettings = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [InstanceSettingsConfig_1.InstanceSettingsConfig])
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [InstanceSettingsConfig_1.InstanceSettingsConfig,
+        logger_1.Logger])
 ], InstanceSettings);
 //# sourceMappingURL=InstanceSettings.js.map

package/dist/InstanceSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"InstanceSettings.js","sourceRoot":"","sources":["../src/InstanceSettings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"InstanceSettings.js","sourceRoot":"","sources":["../src/InstanceSettings.ts"],"names":[],"mappings":"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"}

package/dist/InstanceSettingsConfig.d.ts

@@ -1,3 +1,6 @@
 export declare class InstanceSettingsConfig {
     enforceSettingsFilePermissions: boolean;
+    readonly userHome: string;
+    readonly n8nFolder: string;
+    constructor();
 }

package/dist/InstanceSettingsConfig.js

@@ -8,12 +8,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceSettingsConfig = void 0;
 const config_1 = require("@n8n/config");
+const node_path_1 = __importDefault(require("node:path"));
 let InstanceSettingsConfig = class InstanceSettingsConfig {
     constructor() {
         this.enforceSettingsFilePermissions = false;
+        const homeVarName = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
+        this.userHome = process.env.N8N_USER_FOLDER ?? process.env[homeVarName] ?? process.cwd();
+        this.n8nFolder = node_path_1.default.join(this.userHome, '.n8n');
     }
 };
 exports.InstanceSettingsConfig = InstanceSettingsConfig;
@@ -22,6 +29,7 @@ __decorate([
     __metadata("design:type", Boolean)
 ], InstanceSettingsConfig.prototype, "enforceSettingsFilePermissions", void 0);
 exports.InstanceSettingsConfig = InstanceSettingsConfig = __decorate([
-    config_1.Config
+    config_1.Config,
+    __metadata("design:paramtypes", [])
 ], InstanceSettingsConfig);
 //# sourceMappingURL=InstanceSettingsConfig.js.map

package/dist/InstanceSettingsConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"InstanceSettingsConfig.js","sourceRoot":"","sources":["../src/InstanceSettingsConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAGnC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAON,mCAA8B,GAAY,KAAK,CAAC;IACjD,CAAC;CAAA,CAAA;AARY,wDAAsB;AAOlC;IADC,IAAA,YAAG,EAAC,uCAAuC,CAAC;;8EACG;iCAPpC,sBAAsB;IADlC,eAAM;GACM,sBAAsB,CAQlC"}
+{"version":3,"file":"InstanceSettingsConfig.js","sourceRoot":"","sources":["../src/InstanceSettingsConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAA0C;AAC1C,0DAA6B;AAGtB,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAiBlC;QAVA,mCAA8B,GAAY,KAAK,CAAC;QAW/C,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC;QAC1E,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAEzF,IAAI,CAAC,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;CACD,CAAA;AAvBY,wDAAsB;AAOlC;IADC,IAAA,YAAG,EAAC,uCAAuC,CAAC;;8EACG;iCAPpC,sBAAsB;IADlC,eAAM;;GACM,sBAAsB,CAuBlC"}

package/dist/NodeExecuteFunctions.d.ts

@@ -1,6 +1,6 @@
 import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { IncomingMessage } from 'http';
-import type { BinaryHelperFunctions, CloseFunction, FileSystemHelperFunctions, IAdditionalCredentialOptions, IAllExecuteFunctions, IBinaryData, ICredentialTestFunctions, IDataObject, IExecuteData, IHttpRequestOptions, IN8nHttpFullResponse, IN8nHttpResponse, INode, INodeExecutionData, IOAuth2Options, IPairedItemData, IPollFunctions, IRequestOptions, IRunExecutionData, ITaskDataConnections, ITriggerFunctions, IWebhookDescription, IWorkflowDataProxyAdditionalKeys, IWorkflowExecuteAdditionalData, NodeExecutionWithMetadata, NodeHelperFunctions, PaginationOptions, RequestHelperFunctions, Workflow, WorkflowActivateMode, WorkflowExecuteMode, SSHTunnelFunctions, DeduplicationHelperFunctions, IDeduplicationOutput, IDeduplicationOutputItems, ICheckProcessedOptions, DeduplicationScope, DeduplicationItemTypes, ICheckProcessedContextData, WebhookType, SchedulingFunctions, AINodeConnectionType } from 'n8n-workflow';
+import type { BinaryHelperFunctions, FileSystemHelperFunctions, IAdditionalCredentialOptions, IAllExecuteFunctions, IBinaryData, ICredentialTestFunctions, IDataObject, IHttpRequestOptions, IN8nHttpFullResponse, IN8nHttpResponse, INode, INodeExecutionData, IOAuth2Options, IPairedItemData, IPollFunctions, IRequestOptions, IRunExecutionData, ITaskDataConnections, ITriggerFunctions, IWebhookDescription, IWorkflowDataProxyAdditionalKeys, IWorkflowExecuteAdditionalData, NodeExecutionWithMetadata, NodeHelperFunctions, PaginationOptions, RequestHelperFunctions, Workflow, WorkflowActivateMode, WorkflowExecuteMode, SSHTunnelFunctions, DeduplicationHelperFunctions, IDeduplicationOutput, IDeduplicationOutputItems, ICheckProcessedOptions, DeduplicationScope, DeduplicationItemTypes, ICheckProcessedContextData, WebhookType, SchedulingFunctions } from 'n8n-workflow';
 import { Readable } from 'stream';
 import type { BinaryData } from './BinaryData/types';
 export declare const validateUrl: (url?: string) => boolean;
@@ -50,7 +50,6 @@ export declare function normalizeItems(executionData: INodeExecutionData | INode
 export declare function requestWithAuthentication(this: IAllExecuteFunctions, credentialsType: string, requestOptions: IRequestOptions, workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, additionalCredentialOptions?: IAdditionalCredentialOptions, itemIndex?: number): Promise<any>;
 export declare function getNodeWebhookUrl(name: WebhookType, workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, additionalKeys: IWorkflowDataProxyAdditionalKeys, isTest?: boolean): string | undefined;
 export declare function getWebhookDescription(name: WebhookType, workflow: Workflow, node: INode): IWebhookDescription | undefined;
-export declare function getInputConnectionData(this: IAllExecuteFunctions, workflow: Workflow, runExecutionData: IRunExecutionData, parentRunIndex: number, connectionInputData: INodeExecutionData[], parentInputData: ITaskDataConnections, additionalData: IWorkflowExecuteAdditionalData, executeData: IExecuteData, mode: WorkflowExecuteMode, closeFunctions: CloseFunction[], connectionType: AINodeConnectionType, itemIndex: number, abortSignal?: AbortSignal): Promise<unknown>;
 export declare const getRequestHelperFunctions: (workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, runExecutionData?: IRunExecutionData | null, connectionInputData?: INodeExecutionData[]) => RequestHelperFunctions;
 export declare const getSSHTunnelFunctions: () => SSHTunnelFunctions;
 export declare const getSchedulingFunctions: (workflow: Workflow) => SchedulingFunctions;

package/dist/NodeExecuteFunctions.js

@@ -69,13 +69,13 @@ exports.normalizeItems = normalizeItems;
 exports.requestWithAuthentication = requestWithAuthentication;
 exports.getNodeWebhookUrl = getNodeWebhookUrl;
 exports.getWebhookDescription = getWebhookDescription;
-exports.getInputConnectionData = getInputConnectionData;
 exports.isFilePathBlocked = isFilePathBlocked;
 exports.copyInputItems = copyInputItems;
 exports.getExecutePollFunctions = getExecutePollFunctions;
 exports.getExecuteTriggerFunctions = getExecuteTriggerFunctions;
 exports.getCredentialTestFunctions = getCredentialTestFunctions;
 const client_oauth2_1 = require("@n8n/client-oauth2");
+const di_1 = require("@n8n/di");
 const axios_1 = __importDefault(require("axios"));
 const chardet_1 = __importDefault(require("chardet"));
 const crypto_1 = __importStar(require("crypto"));
@@ -96,12 +96,11 @@ const oauth_1_0a_1 = __importDefault(require("oauth-1.0a"));
 const path_1 = __importDefault(require("path"));
 const qs_1 = require("qs");
 const stream_1 = require("stream");
-const typedi_1 = __importDefault(require("typedi"));
 const url_1 = __importStar(require("url"));
+const logger_1 = require("./logging/logger");
 const BinaryData_service_1 = require("./BinaryData/BinaryData.service");
 const utils_1 = require("./BinaryData/utils");
 const Constants_1 = require("./Constants");
-const CreateNodeAsTool_1 = require("./CreateNodeAsTool");
 const data_deduplication_service_1 = require("./data-deduplication-service");
 const InstanceSettings_1 = require("./InstanceSettings");
 const node_execution_context_1 = require("./node-execution-context");
@@ -187,7 +186,7 @@ async function generateContentLengthHeader(config) {
         };
     }
     catch (error) {
-        n8n_workflow_1.LoggerProxy.error('Unable to calculate form data length', { error });
+        di_1.Container.get(logger_1.Logger).error('Unable to calculate form data length', { error });
     }
 }
 const getHostFromRequestObject = (requestObject) => {
@@ -635,7 +634,7 @@ async function proxyRequestToAxios(workflow, additionalData, node, uriOrObject,
             error.config = error.request = undefined;
             error.options = (0, pick_1.default)(config ?? {}, ['url', 'method', 'data', 'headers']);
             if (response) {
-                n8n_workflow_1.LoggerProxy.debug('Request proxied to Axios failed', { status: response.status });
+                di_1.Container.get(logger_1.Logger).debug('Request proxied to Axios failed', { status: response.status });
                 let responseData = response.data;
                 if (Buffer.isBuffer(responseData) || responseData instanceof stream_1.Readable) {
                     responseData = await binaryToString(responseData);
@@ -778,13 +777,13 @@ async function httpRequest(requestOptions) {
     return result.data;
 }
 function getBinaryPath(binaryDataId) {
-    return typedi_1.default.get(BinaryData_service_1.BinaryDataService).getPath(binaryDataId);
+    return di_1.Container.get(BinaryData_service_1.BinaryDataService).getPath(binaryDataId);
 }
 async function getBinaryMetadata(binaryDataId) {
-    return await typedi_1.default.get(BinaryData_service_1.BinaryDataService).getMetadata(binaryDataId);
+    return await di_1.Container.get(BinaryData_service_1.BinaryDataService).getMetadata(binaryDataId);
 }
 async function getBinaryStream(binaryDataId, chunkSize) {
-    return await typedi_1.default.get(BinaryData_service_1.BinaryDataService).getAsStream(binaryDataId, chunkSize);
+    return await di_1.Container.get(BinaryData_service_1.BinaryDataService).getAsStream(binaryDataId, chunkSize);
 }
 function assertBinaryData(inputData, node, itemIndex, propertyName, inputIndex) {
     const binaryKeyData = inputData.main[inputIndex][itemIndex].binary;
@@ -805,13 +804,13 @@ function assertBinaryData(inputData, node, itemIndex, propertyName, inputIndex)
 }
 async function getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex) {
     const binaryData = inputData.main[inputIndex][itemIndex].binary[propertyName];
-    return await typedi_1.default.get(BinaryData_service_1.BinaryDataService).getAsBuffer(binaryData);
+    return await di_1.Container.get(BinaryData_service_1.BinaryDataService).getAsBuffer(binaryData);
 }
 function detectBinaryEncoding(buffer) {
     return chardet_1.default.detect(buffer);
 }
 async function setBinaryDataBuffer(binaryData, bufferOrStream, workflowId, executionId) {
-    return await typedi_1.default.get(BinaryData_service_1.BinaryDataService).store(workflowId, executionId, bufferOrStream, binaryData);
+    return await di_1.Container.get(BinaryData_service_1.BinaryDataService).store(workflowId, executionId, bufferOrStream, binaryData);
 }
 async function copyBinaryFile(workflowId, executionId, filePath, fileName, mimeType) {
     let fileExtension;
@@ -848,7 +847,7 @@ async function copyBinaryFile(workflowId, executionId, filePath, fileName, mimeT
     else if (filePath) {
         returnData.fileName = path_1.default.parse(filePath).base;
     }
-    return await typedi_1.default.get(BinaryData_service_1.BinaryDataService).copyBinaryFile(workflowId, executionId, returnData, filePath);
+    return await di_1.Container.get(BinaryData_service_1.BinaryDataService).copyBinaryFile(workflowId, executionId, returnData, filePath);
 }
 async function prepareBinaryData(binaryData, executionId, workflowId, filePath, mimeType) {
     let fileExtension;
@@ -998,7 +997,7 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
     if (isN8nRequest) {
         return await this.helpers.httpRequest(newRequestOptions).catch(async (error) => {
             if (error.response?.status === 401) {
-                n8n_workflow_1.LoggerProxy.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`);
+                this.logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`);
                 const tokenRefreshOptions = {};
                 if (oAuth2Options?.includeCredentialsOnRefreshOnBody) {
                     const body = {
@@ -1013,14 +1012,14 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
                     };
                 }
                 let newToken;
-                n8n_workflow_1.LoggerProxy.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
+                this.logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
                 if (credentials.grantType === 'clientCredentials') {
                     newToken = await token.client.credentials.getToken();
                 }
                 else {
                     newToken = await token.refresh(tokenRefreshOptions);
                 }
-                n8n_workflow_1.LoggerProxy.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
+                this.logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
                 credentials.oauthTokenData = newToken.data;
                 if (!node.credentials?.[credentialsType]) {
                     throw new n8n_workflow_1.ApplicationError('Node does not have credential type', {
@@ -1067,7 +1066,7 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
                     Authorization: '',
                 };
             }
-            n8n_workflow_1.LoggerProxy.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`);
+            this.logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`);
             let newToken;
             if (credentials.grantType === 'clientCredentials') {
                 newToken = await token.client.credentials.getToken();
@@ -1075,7 +1074,7 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
             else {
                 newToken = await token.refresh(tokenRefreshOptions);
             }
-            n8n_workflow_1.LoggerProxy.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
+            this.logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
             credentials.oauthTokenData = newToken.data;
             if (!node.credentials?.[credentialsType]) {
                 throw new n8n_workflow_1.ApplicationError('Node does not have credential type', {
@@ -1085,7 +1084,7 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
             }
             const nodeCredentials = node.credentials[credentialsType];
             await additionalData.credentialsHelper.updateCredentials(nodeCredentials, credentialsType, credentials);
-            n8n_workflow_1.LoggerProxy.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been saved to database successfully.`);
+            this.logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been saved to database successfully.`);
             const newRequestOptions = newToken.sign(requestOptions);
             newRequestOptions.headers = newRequestOptions.headers ?? {};
             if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {
@@ -1327,111 +1326,6 @@ function getWebhookDescription(name, workflow, node) {
     }
     return undefined;
 }
-async function getInputConnectionData(workflow, runExecutionData, parentRunIndex, connectionInputData, parentInputData, additionalData, executeData, mode, closeFunctions, connectionType, itemIndex, abortSignal) {
-    const parentNode = this.getNode();
-    const parentNodeType = workflow.nodeTypes.getByNameAndVersion(parentNode.type, parentNode.typeVersion);
-    const inputs = n8n_workflow_1.NodeHelpers.getNodeInputs(workflow, parentNode, parentNodeType.description);
-    let inputConfiguration = inputs.find((input) => {
-        if (typeof input === 'string') {
-            return input === connectionType;
-        }
-        return input.type === connectionType;
-    });
-    if (inputConfiguration === undefined) {
-        throw new n8n_workflow_1.ApplicationError('Node does not have input of type', {
-            extra: { nodeName: parentNode.name, connectionType },
-        });
-    }
-    if (typeof inputConfiguration === 'string') {
-        inputConfiguration = {
-            type: inputConfiguration,
-        };
-    }
-    const connectedNodes = workflow
-        .getParentNodes(parentNode.name, connectionType, 1)
-        .map((nodeName) => workflow.getNode(nodeName))
-        .filter((connectedNode) => connectedNode.disabled !== true);
-    if (connectedNodes.length === 0) {
-        if (inputConfiguration.required) {
-            throw new n8n_workflow_1.NodeOperationError(parentNode, `A ${inputConfiguration?.displayName ?? connectionType} sub-node must be connected and enabled`);
-        }
-        return inputConfiguration.maxConnections === 1 ? undefined : [];
-    }
-    if (inputConfiguration.maxConnections !== undefined &&
-        connectedNodes.length > inputConfiguration.maxConnections) {
-        throw new n8n_workflow_1.NodeOperationError(parentNode, `Only ${inputConfiguration.maxConnections} ${connectionType} sub-nodes are/is allowed to be connected`);
-    }
-    const nodes = [];
-    for (const connectedNode of connectedNodes) {
-        const connectedNodeType = workflow.nodeTypes.getByNameAndVersion(connectedNode.type, connectedNode.typeVersion);
-        const contextFactory = (runIndex, inputData) => new node_execution_context_1.SupplyDataContext(workflow, connectedNode, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, connectionType, executeData, closeFunctions, abortSignal);
-        if (!connectedNodeType.supplyData) {
-            if (connectedNodeType.description.outputs.includes("ai_tool")) {
-                let toolRunIndex = 0;
-                const supplyData = (0, CreateNodeAsTool_1.createNodeAsTool)({
-                    node: connectedNode,
-                    nodeType: connectedNodeType,
-                    handleToolInvocation: async (toolArgs) => {
-                        const runIndex = toolRunIndex++;
-                        const context = contextFactory(runIndex, {});
-                        context.addInputData("ai_tool", [[{ json: toolArgs }]]);
-                        try {
-                            const result = await connectedNodeType.execute?.call(context);
-                            const mappedResults = result?.[0]?.flatMap((item) => item.json);
-                            context.addOutputData("ai_tool", runIndex, [
-                                [{ json: { response: mappedResults } }],
-                            ]);
-                            return JSON.stringify(mappedResults);
-                        }
-                        catch (error) {
-                            const nodeError = new n8n_workflow_1.NodeOperationError(connectedNode, error);
-                            context.addOutputData("ai_tool", runIndex, nodeError);
-                            return 'Error during node execution: ' + nodeError.description;
-                        }
-                    },
-                });
-                nodes.push(supplyData);
-            }
-            else {
-                throw new n8n_workflow_1.ApplicationError('Node does not have a `supplyData` method defined', {
-                    extra: { nodeName: connectedNode.name },
-                });
-            }
-        }
-        else {
-            const context = contextFactory(parentRunIndex, parentInputData);
-            try {
-                const supplyData = await connectedNodeType.supplyData.call(context, itemIndex);
-                if (supplyData.closeFunction) {
-                    closeFunctions.push(supplyData.closeFunction);
-                }
-                nodes.push(supplyData);
-            }
-            catch (error) {
-                if (error.functionality === 'configuration-node')
-                    throw error;
-                if (!(error instanceof n8n_workflow_1.ExecutionBaseError)) {
-                    error = new n8n_workflow_1.NodeOperationError(connectedNode, error, {
-                        itemIndex,
-                    });
-                }
-                let currentNodeRunIndex = 0;
-                if (runExecutionData.resultData.runData.hasOwnProperty(parentNode.name)) {
-                    currentNodeRunIndex = runExecutionData.resultData.runData[parentNode.name].length;
-                }
-                await context.addExecutionDataFunctions('input', error, connectionType, parentNode.name, currentNodeRunIndex);
-                throw new n8n_workflow_1.NodeOperationError(connectedNode, `Error in sub-node ${connectedNode.name}`, {
-                    itemIndex,
-                    functionality: 'configuration-node',
-                    description: error.message,
-                });
-            }
-        }
-    }
-    return inputConfiguration.maxConnections === 1
-        ? (nodes || [])[0]?.response
-        : nodes.map((node) => node.response);
-}
 const getRequestHelperFunctions = (workflow, node, additionalData, runExecutionData = null, connectionInputData = []) => {
     const getResolvedValue = (parameterValue, itemIndex, runIndex, executeData, additionalKeys, returnObjectAsString = false) => {
         const mode = 'internal';
@@ -1544,7 +1438,7 @@ const getRequestHelperFunctions = (workflow, node, additionalData, runExecutionD
                 }
                 responseData.push(tempResponseData);
                 additionalKeys.$response = newResponse;
-                additionalKeys.$pageCount = additionalKeys.$pageCount + 1;
+                additionalKeys.$pageCount = (additionalKeys.$pageCount ?? 0) + 1;
                 const maxRequests = getResolvedValue(paginationOptions.maxRequests, itemIndex, runIndex, executeData, additionalKeys, false);
                 if (maxRequests && additionalKeys.$pageCount >= maxRequests) {
                     break;
@@ -1595,11 +1489,11 @@ const getRequestHelperFunctions = (workflow, node, additionalData, runExecutionD
 };
 exports.getRequestHelperFunctions = getRequestHelperFunctions;
 const getSSHTunnelFunctions = () => ({
-    getSSHClient: async (credentials) => await typedi_1.default.get(SSHClientsManager_1.SSHClientsManager).getClient(credentials),
+    getSSHClient: async (credentials) => await di_1.Container.get(SSHClientsManager_1.SSHClientsManager).getClient(credentials),
 });
 exports.getSSHTunnelFunctions = getSSHTunnelFunctions;
 const getSchedulingFunctions = (workflow) => {
-    const scheduledTaskManager = typedi_1.default.get(ScheduledTaskManager_1.ScheduledTaskManager);
+    const scheduledTaskManager = di_1.Container.get(ScheduledTaskManager_1.ScheduledTaskManager);
     return {
         registerCron: (cronExpression, onTick) => scheduledTaskManager.registerCron(workflow, cronExpression, onTick),
     };
@@ -1629,7 +1523,7 @@ function isFilePathBlocked(filePath) {
         return true;
     }
     if (blockFileAccessToN8nFiles) {
-        const { n8nFolder, staticCacheDir } = typedi_1.default.get(InstanceSettings_1.InstanceSettings);
+        const { n8nFolder, staticCacheDir } = di_1.Container.get(InstanceSettings_1.InstanceSettings);
         const restrictedPaths = [n8nFolder, staticCacheDir];
         if (process.env[Constants_1.CONFIG_FILES]) {
             restrictedPaths.push(...process.env[Constants_1.CONFIG_FILES].split(','));
@@ -1678,7 +1572,7 @@ const getFileSystemHelperFunctions = (node) => ({
         return (0, fs_1.createReadStream)(filePath);
     },
     getStoragePath() {
-        return path_1.default.join(typedi_1.default.get(InstanceSettings_1.InstanceSettings).n8nFolder, `storage/${node.type}`);
+        return path_1.default.join(di_1.Container.get(InstanceSettings_1.InstanceSettings).n8nFolder, `storage/${node.type}`);
     },
     async writeContentToFile(filePath, content, flag) {
         if (isFilePathBlocked(filePath)) {
@@ -1747,6 +1641,7 @@ function getExecuteTriggerFunctions(workflow, node, additionalData, mode, activa
 }
 function getCredentialTestFunctions() {
     return {
+        logger: di_1.Container.get(logger_1.Logger),
         helpers: {
             ...(0, exports.getSSHTunnelFunctions)(),
             request: async (uriOrObject, options) => {