n8n 1.73.1 → 1.74.1

package/dist/collaboration/collaboration.service.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollaborationService = void 0;
+const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
-const typedi_1 = require("typedi");
 const collaboration_state_1 = require("../collaboration/collaboration.state");
 const user_repository_1 = require("../databases/repositories/user.repository");
 const push_1 = require("../push");
@@ -82,12 +82,12 @@ let CollaborationService = class CollaborationService {
             workflowId,
             collaborators: activeCollaborators,
         };
-        this.push.sendToUsers('collaboratorsChanged', msgData, userIds);
+        this.push.sendToUsers({ type: 'collaboratorsChanged', data: msgData }, userIds);
     }
 };
 exports.CollaborationService = CollaborationService;
 exports.CollaborationService = CollaborationService = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [n8n_core_1.ErrorReporter,
         push_1.Push,
         collaboration_state_1.CollaborationState,

package/dist/collaboration/collaboration.service.js.map

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

package/dist/collaboration/collaboration.state.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollaborationState = void 0;
-const typedi_1 = require("typedi");
+const di_1 = require("@n8n/di");
 const constants_1 = require("../constants");
 const cache_service_1 = require("../services/cache/cache.service");
 let CollaborationState = class CollaborationState {
@@ -75,7 +75,7 @@ let CollaborationState = class CollaborationState {
 };
 exports.CollaborationState = CollaborationState;
 exports.CollaborationState = CollaborationState = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [cache_service_1.CacheService])
 ], CollaborationState);
 //# sourceMappingURL=collaboration.state.js.map

package/dist/collaboration/collaboration.state.js.map

@@ -1 +1 @@
-{"version":3,"file":"collaboration.state.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collaboration.state.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.state.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAGlC,2CAAmC;AAEnC,kEAA8D;AAkBvD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAO9B,YAA6B,KAAmB;QAAnB,UAAK,GAAL,KAAK,CAAc;QAFvC,0BAAqB,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IAEf,CAAC;IAKpD,KAAK,CAAC,eAAe,CAAC,UAA0B,EAAE,MAAkB;QACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,UAAU,GAAsB;YACrC,CAAC,MAAM,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAClC,CAAC;QAEF,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;IAKD,KAAK,CAAC,kBAAkB,CAAC,UAA0B,EAAE,MAAkB;QACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAEvD,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAA0B;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAEvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAwB,QAAQ,CAAC,CAAC;QAC7E,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,IAAI,CAAC,4BAA4B,CAAC,mBAAmB,CAAC,CAAC;QAEtF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,KAAK,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,WAAW,CAAC;IACpB,CAAC;IAEO,oBAAoB,CAAC,UAA0B;QACtD,OAAO,iBAAiB,UAAU,EAAE,CAAC;IACtC,CAAC;IAEO,4BAA4B,CAAC,aAA2B;QAC/D,MAAM,OAAO,GAAiB,EAAE,CAAC;QACjC,MAAM,WAAW,GAAiB,EAAE,CAAC;QAErC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YAC1C,IAAI,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACP,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChC,CAAC;QACF,CAAC;QAED,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,UAA0B,EAAE,YAA0B;QAC9F,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,OAAO,CAAC,GAAG,CAChB,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CACxF,CAAC;IACH,CAAC;IAEO,wBAAwB,CAAC,kBAAqC;QACrE,OAAO,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;YACtE,MAAM;YACN,QAAQ;SACR,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB,CAAC,cAAqC;QAC9D,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAEnF,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC;IAChC,CAAC;CACD,CAAA;AAtFY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,YAAO,GAAE;qCAQ2B,4BAAY;GAPpC,kBAAkB,CAsF9B"}

package/dist/commands/audit.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityAudit = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const core_1 = require("@oclif/core");
 const n8n_workflow_1 = require("n8n-workflow");
-const typedi_1 = require("typedi");
 const constants_1 = require("../security-audit/constants");
 const security_audit_service_1 = require("../security-audit/security-audit.service");
 const base_command_1 = require("./base-command");
@@ -21,7 +21,7 @@ class SecurityAudit extends base_command_1.BaseCommand {
             const hint = `Valid categories are: ${constants_1.RISK_CATEGORIES.join(', ')}`;
             throw new n8n_workflow_1.ApplicationError([message, hint].join('. '));
         }
-        const result = await typedi_1.Container.get(security_audit_service_1.SecurityAuditService).run(categories, auditFlags['days-abandoned-workflow']);
+        const result = await di_1.Container.get(security_audit_service_1.SecurityAuditService).run(categories, auditFlags['days-abandoned-workflow']);
         if (Array.isArray(result) && result.length === 0) {
             this.logger.info('No security issues found');
         }
@@ -48,7 +48,7 @@ SecurityAudit.flags = {
         description: 'Comma-separated list of categories to include in the audit',
     }),
     'days-abandoned-workflow': core_1.Flags.integer({
-        default: typedi_1.Container.get(config_1.SecurityConfig).daysAbandonedWorkflow,
+        default: di_1.Container.get(config_1.SecurityConfig).daysAbandonedWorkflow,
         description: 'Days for a workflow to be considered abandoned if not executed',
     }),
 };

package/dist/commands/audit.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../src/commands/audit.ts"],"names":[],"mappings":";;;AAAA,wCAA6C;AAC7C,sCAAoC;AACpC,+CAAgD;AAChD,mCAAmC;AAEnC,0DAA6D;AAC7D,oFAA+E;AAG/E,iDAA6C;AAE7C,MAAa,aAAc,SAAQ,0BAAW;IAsB7C,KAAK,CAAC,GAAG;QACR,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAE9D,MAAM,UAAU,GACf,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAsB,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YAC7E,2BAAe,CAAC;QAEjB,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,OAAO,GACZ,iBAAiB,CAAC,MAAM,GAAG,CAAC;gBAC3B,CAAC,CAAC,gCAAgC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChE,CAAC,CAAC,8BAA8B,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;YAEzD,MAAM,IAAI,GAAG,yBAAyB,2BAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAEnE,MAAM,IAAI,+BAAgB,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC,GAAG,CAC3D,UAAU,EACV,UAAU,CAAC,yBAAyB,CAAC,CACrC,CAAC;QAEF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAY;QACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;;AAzDF,sCA0DC;AAzDO,yBAAW,GAAG,wDAAwD,CAAC;AAEvE,sBAAQ,GAAG;IACjB,aAAa;IACb,+CAA+C;IAC/C,0CAA0C;CAC1C,CAAC;AAEK,mBAAK,GAAG;IACd,IAAI,EAAE,YAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC;QACxB,OAAO,EAAE,2BAAe,CAAC,IAAI,CAAC,GAAG,CAAC;QAClC,WAAW,EAAE,4DAA4D;KACzE,CAAC;IAEF,yBAAyB,EAAE,YAAK,CAAC,OAAO,CAAC;QACxC,OAAO,EAAE,kBAAS,CAAC,GAAG,CAAC,uBAAc,CAAC,CAAC,qBAAqB;QAC5D,WAAW,EAAE,gEAAgE;KAC7E,CAAC;CACF,CAAC"}
+{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../src/commands/audit.ts"],"names":[],"mappings":";;;AAAA,wCAA6C;AAC7C,gCAAoC;AACpC,sCAAoC;AACpC,+CAAgD;AAEhD,0DAA6D;AAC7D,oFAA+E;AAG/E,iDAA6C;AAE7C,MAAa,aAAc,SAAQ,0BAAW;IAsB7C,KAAK,CAAC,GAAG;QACR,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAE9D,MAAM,UAAU,GACf,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAsB,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YAC7E,2BAAe,CAAC;QAEjB,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,OAAO,GACZ,iBAAiB,CAAC,MAAM,GAAG,CAAC;gBAC3B,CAAC,CAAC,gCAAgC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChE,CAAC,CAAC,8BAA8B,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;YAEzD,MAAM,IAAI,GAAG,yBAAyB,2BAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAEnE,MAAM,IAAI,+BAAgB,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC,GAAG,CAC3D,UAAU,EACV,UAAU,CAAC,yBAAyB,CAAC,CACrC,CAAC;QAEF,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAY;QACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;;AAzDF,sCA0DC;AAzDO,yBAAW,GAAG,wDAAwD,CAAC;AAEvE,sBAAQ,GAAG;IACjB,aAAa;IACb,+CAA+C;IAC/C,0CAA0C;CAC1C,CAAC;AAEK,mBAAK,GAAG;IACd,IAAI,EAAE,YAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC;QACxB,OAAO,EAAE,2BAAe,CAAC,IAAI,CAAC,GAAG,CAAC;QAClC,WAAW,EAAE,4DAA4D;KACzE,CAAC;IAEF,yBAAyB,EAAE,YAAK,CAAC,OAAO,CAAC;QACxC,OAAO,EAAE,cAAS,CAAC,GAAG,CAAC,uBAAc,CAAC,CAAC,qBAAqB;QAC5D,WAAW,EAAE,gEAAgE;KAC7E,CAAC;CACF,CAAC"}

package/dist/commands/base-command.d.ts

@@ -1,11 +1,10 @@
 import 'reflect-metadata';
 import { GlobalConfig } from '@n8n/config';
 import { Command } from '@oclif/core';
-import { InstanceSettings, ErrorReporter } from 'n8n-core';
+import { InstanceSettings, Logger, ErrorReporter } from 'n8n-core';
 import type { AbstractServer } from '../abstract-server';
 import { ExternalHooks } from '../external-hooks';
 import { License } from '../license';
-import { Logger } from '../logging/logger.service';
 import { NodeTypes } from '../node-types';
 import { ShutdownService } from '../shutdown/shutdown.service';
 export declare abstract class BaseCommand extends Command {

package/dist/commands/base-command.js

@@ -39,10 +39,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCommand = void 0;
 require("reflect-metadata");
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const core_1 = require("@oclif/core");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
-const typedi_1 = require("typedi");
 const config_2 = __importDefault(require("../config"));
 const constants_1 = require("../constants");
 const CrashJournal = __importStar(require("../crash-journal"));
@@ -53,39 +53,38 @@ const message_event_bus_1 = require("../eventbus/message-event-bus/message-event
 const telemetry_event_relay_1 = require("../events/relays/telemetry.event-relay");
 const expression_evaluator_1 = require("../expression-evaluator");
 const external_hooks_1 = require("../external-hooks");
-const external_secrets_manager_ee_1 = require("../external-secrets/external-secrets-manager.ee");
+const external_secrets_manager_ee_1 = require("../external-secrets.ee/external-secrets-manager.ee");
 const license_1 = require("../license");
 const load_nodes_and_credentials_1 = require("../load-nodes-and-credentials");
-const logger_service_1 = require("../logging/logger.service");
 const node_types_1 = require("../node-types");
 const posthog_1 = require("../posthog");
 const shutdown_service_1 = require("../shutdown/shutdown.service");
-const workflow_history_manager_ee_1 = require("../workflows/workflow-history/workflow-history-manager.ee");
+const workflow_history_manager_ee_1 = require("../workflows/workflow-history.ee/workflow-history-manager.ee");
 class BaseCommand extends core_1.Command {
     constructor() {
         super(...arguments);
-        this.logger = typedi_1.Container.get(logger_service_1.Logger);
-        this.instanceSettings = typedi_1.Container.get(n8n_core_1.InstanceSettings);
-        this.shutdownService = typedi_1.Container.get(shutdown_service_1.ShutdownService);
-        this.globalConfig = typedi_1.Container.get(config_1.GlobalConfig);
-        this.gracefulShutdownTimeoutInS = typedi_1.Container.get(config_1.GlobalConfig).generic.gracefulShutdownTimeout;
+        this.logger = di_1.Container.get(n8n_core_1.Logger);
+        this.instanceSettings = di_1.Container.get(n8n_core_1.InstanceSettings);
+        this.shutdownService = di_1.Container.get(shutdown_service_1.ShutdownService);
+        this.globalConfig = di_1.Container.get(config_1.GlobalConfig);
+        this.gracefulShutdownTimeoutInS = di_1.Container.get(config_1.GlobalConfig).generic.gracefulShutdownTimeout;
         this.needsCommunityPackages = false;
     }
     async init() {
-        this.errorReporter = typedi_1.Container.get(n8n_core_1.ErrorReporter);
+        this.errorReporter = di_1.Container.get(n8n_core_1.ErrorReporter);
         await this.errorReporter.init(this.instanceSettings.instanceType, this.globalConfig.sentry.backendDsn);
         (0, expression_evaluator_1.initExpressionEvaluator)();
         process.once('SIGTERM', this.onTerminationSignal('SIGTERM'));
         process.once('SIGINT', this.onTerminationSignal('SIGINT'));
-        this.nodeTypes = typedi_1.Container.get(node_types_1.NodeTypes);
-        await typedi_1.Container.get(load_nodes_and_credentials_1.LoadNodesAndCredentials).init();
+        this.nodeTypes = di_1.Container.get(node_types_1.NodeTypes);
+        await di_1.Container.get(load_nodes_and_credentials_1.LoadNodesAndCredentials).init();
         await Db.init().catch(async (error) => await this.exitWithCrash('There was an error initializing DB', error));
         if (constants_1.inDevelopment || constants_1.inTest) {
             this.shutdownService.validate();
         }
         await this.server?.init();
         await Db.migrate().catch(async (error) => await this.exitWithCrash('There was an error running database migrations', error));
-        typedi_1.Container.get(deprecation_service_1.DeprecationService).warn();
+        di_1.Container.get(deprecation_service_1.DeprecationService).warn();
         if (config_2.default.getEnv('executions.mode') === 'queue' &&
             this.globalConfig.database.type === 'sqlite') {
             this.logger.warn('Scaling mode is not officially supported with sqlite. Please use PostgreSQL instead.');
@@ -93,11 +92,11 @@ class BaseCommand extends core_1.Command {
         const { communityPackages } = this.globalConfig.nodes;
         if (communityPackages.enabled && this.needsCommunityPackages) {
             const { CommunityPackagesService } = await Promise.resolve().then(() => __importStar(require('../services/community-packages.service')));
-            await typedi_1.Container.get(CommunityPackagesService).checkForMissingPackages();
+            await di_1.Container.get(CommunityPackagesService).checkForMissingPackages();
         }
-        typedi_1.Container.get(message_event_bus_1.MessageEventBus);
-        await typedi_1.Container.get(posthog_1.PostHogClient).init();
-        await typedi_1.Container.get(telemetry_event_relay_1.TelemetryEventRelay).init();
+        di_1.Container.get(message_event_bus_1.MessageEventBus);
+        await di_1.Container.get(posthog_1.PostHogClient).init();
+        await di_1.Container.get(telemetry_event_relay_1.TelemetryEventRelay).init();
     }
     async stopProcess() {
     }
@@ -125,7 +124,7 @@ class BaseCommand extends core_1.Command {
         if (isSelected && !isAvailable) {
             throw new n8n_workflow_1.ApplicationError('External storage selected but unavailable. Please make external storage available by adding "s3" to `N8N_AVAILABLE_BINARY_DATA_MODES`.');
         }
-        const isLicensed = typedi_1.Container.get(license_1.License).isFeatureEnabled(constants_1.LICENSE_FEATURES.BINARY_DATA_S3);
+        const isLicensed = di_1.Container.get(license_1.License).isFeatureEnabled(constants_1.LICENSE_FEATURES.BINARY_DATA_S3);
         if (isSelected && isAvailable && isLicensed) {
             this.logger.debug('License found for external storage - object store to init in read-write mode');
             await this._initObjectStoreService();
@@ -143,7 +142,7 @@ class BaseCommand extends core_1.Command {
         }
     }
     async _initObjectStoreService(options = { isReadOnly: false }) {
-        const objectStoreService = typedi_1.Container.get(n8n_core_1.ObjectStoreService);
+        const objectStoreService = di_1.Container.get(n8n_core_1.ObjectStoreService);
         const { host, bucket, credentials } = this.globalConfig.externalStorage.s3;
         if (host === '') {
             throw new n8n_workflow_1.ApplicationError('External storage host not configured. Please set `N8N_EXTERNAL_STORAGE_S3_HOST`.');
@@ -181,18 +180,18 @@ class BaseCommand extends core_1.Command {
             process.exit(1);
         }
         const binaryDataConfig = config_2.default.getEnv('binaryDataManager');
-        await typedi_1.Container.get(n8n_core_1.BinaryDataService).init(binaryDataConfig);
+        await di_1.Container.get(n8n_core_1.BinaryDataService).init(binaryDataConfig);
     }
     async initDataDeduplicationService() {
         const dataDeduplicationService = (0, deduplication_1.getDataDeduplicationService)();
         await n8n_core_1.DataDeduplicationService.init(dataDeduplicationService);
     }
     async initExternalHooks() {
-        this.externalHooks = typedi_1.Container.get(external_hooks_1.ExternalHooks);
+        this.externalHooks = di_1.Container.get(external_hooks_1.ExternalHooks);
         await this.externalHooks.init();
     }
     async initLicense() {
-        this.license = typedi_1.Container.get(license_1.License);
+        this.license = di_1.Container.get(license_1.License);
         await this.license.init();
         const { activationKey } = this.globalConfig.license;
         if (activationKey) {
@@ -212,11 +211,11 @@ class BaseCommand extends core_1.Command {
         }
     }
     async initExternalSecrets() {
-        const secretsManager = typedi_1.Container.get(external_secrets_manager_ee_1.ExternalSecretsManager);
+        const secretsManager = di_1.Container.get(external_secrets_manager_ee_1.ExternalSecretsManager);
         await secretsManager.init();
     }
     initWorkflowHistory() {
-        typedi_1.Container.get(workflow_history_manager_ee_1.WorkflowHistoryManager).init();
+        di_1.Container.get(workflow_history_manager_ee_1.WorkflowHistoryManager).init();
     }
     async finally(error) {
         if (constants_1.inTest || this.id === 'start')

package/dist/commands/base-command.js.map

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

package/dist/commands/db/revert.d.ts

@@ -1,6 +1,6 @@
 import { MigrationExecutor, DataSource as Connection } from '@n8n/typeorm';
 import { Command } from '@oclif/core';
-import { Logger } from '../../logging/logger.service';
+import { Logger } from 'n8n-core';
 export declare function main(logger: Logger, connection: Connection, migrationExecutor: MigrationExecutor): Promise<void>;
 export declare class DbRevertMigrationCommand extends Command {
     static description: string;

package/dist/commands/db/revert.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbRevertMigrationCommand = void 0;
 exports.main = main;
+const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const core_1 = require("@oclif/core");
-const typedi_1 = require("typedi");
+const n8n_core_1 = require("n8n-core");
 const config_1 = require("../../databases/config");
 const migration_helpers_1 = require("../../databases/utils/migration-helpers");
-const logger_service_1 = require("../../logging/logger.service");
 async function main(logger, connection, migrationExecutor) {
     const executedMigrations = await migrationExecutor.getExecutedMigrations();
     const lastExecutedMigration = executedMigrations.at(0);
@@ -40,7 +40,7 @@ async function main(logger, connection, migrationExecutor) {
 class DbRevertMigrationCommand extends core_1.Command {
     constructor() {
         super(...arguments);
-        this.logger = typedi_1.Container.get(logger_service_1.Logger);
+        this.logger = di_1.Container.get(n8n_core_1.Logger);
     }
     async init() {
         await this.parse(DbRevertMigrationCommand);

package/dist/commands/db/revert.js.map

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

package/dist/commands/execute-batch.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecuteBatch = void 0;
+const di_1 = require("@n8n/di");
 const core_1 = require("@oclif/core");
 const fs_1 = __importDefault(require("fs"));
 const json_diff_1 = require("json-diff");
@@ -11,7 +12,6 @@ const pick_1 = __importDefault(require("lodash/pick"));
 const n8n_workflow_1 = require("n8n-workflow");
 const os_1 = __importDefault(require("os"));
 const path_1 = require("path");
-const typedi_1 = require("typedi");
 const active_executions_1 = require("../active-executions");
 const workflow_repository_1 = require("../databases/repositories/workflow.repository");
 const ownership_service_1 = require("../services/ownership.service");
@@ -29,7 +29,7 @@ class ExecuteBatch extends base_command_1.BaseCommand {
             process.exit(0);
         }
         ExecuteBatch.cancelled = true;
-        await typedi_1.Container.get(active_executions_1.ActiveExecutions).shutdown(true);
+        await di_1.Container.get(active_executions_1.ActiveExecutions).shutdown(true);
         if (skipExit !== true) {
             process.exit(0);
         }
@@ -145,8 +145,8 @@ class ExecuteBatch extends base_command_1.BaseCommand {
         if (flags.githubWorkflow) {
             ExecuteBatch.githubWorkflow = true;
         }
-        ExecuteBatch.instanceOwner = await typedi_1.Container.get(ownership_service_1.OwnershipService).getInstanceOwner();
-        const query = typedi_1.Container.get(workflow_repository_1.WorkflowRepository).createQueryBuilder('workflows');
+        ExecuteBatch.instanceOwner = await di_1.Container.get(ownership_service_1.OwnershipService).getInstanceOwner();
+        const query = di_1.Container.get(workflow_repository_1.WorkflowRepository).createQueryBuilder('workflows');
         if (ids.length > 0) {
             query.andWhere('workflows.id in (:...ids)', { ids });
         }
@@ -438,8 +438,8 @@ class ExecuteBatch extends base_command_1.BaseCommand {
                     workflowData,
                     userId: ExecuteBatch.instanceOwner.id,
                 };
-                const executionId = await typedi_1.Container.get(workflow_runner_1.WorkflowRunner).run(runData);
-                const activeExecutions = typedi_1.Container.get(active_executions_1.ActiveExecutions);
+                const executionId = await di_1.Container.get(workflow_runner_1.WorkflowRunner).run(runData);
+                const activeExecutions = di_1.Container.get(active_executions_1.ActiveExecutions);
                 const data = await activeExecutions.getPostExecutePromise(executionId);
                 if (gotCancel || ExecuteBatch.cancelled) {
                     clearTimeout(timeoutTimer);

package/dist/commands/execute-batch.js.map

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

package/dist/commands/execute.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Execute = void 0;
+const di_1 = require("@n8n/di");
 const core_1 = require("@oclif/core");
 const n8n_workflow_1 = require("n8n-workflow");
-const typedi_1 = require("typedi");
 const active_executions_1 = require("../active-executions");
 const workflow_repository_1 = require("../databases/repositories/workflow.repository");
 const ownership_service_1 = require("../services/ownership.service");
@@ -34,7 +34,7 @@ class Execute extends base_command_1.BaseCommand {
         let workflowData = null;
         if (flags.id) {
             workflowId = flags.id;
-            workflowData = await typedi_1.Container.get(workflow_repository_1.WorkflowRepository).findOneBy({ id: workflowId });
+            workflowData = await di_1.Container.get(workflow_repository_1.WorkflowRepository).findOneBy({ id: workflowId });
             if (workflowData === null) {
                 this.logger.info(`The workflow with the id "${workflowId}" does not exist.`);
                 process.exit(1);
@@ -47,15 +47,15 @@ class Execute extends base_command_1.BaseCommand {
             workflowId = undefined;
         }
         const startingNode = (0, utils_1.findCliWorkflowStart)(workflowData.nodes);
-        const user = await typedi_1.Container.get(ownership_service_1.OwnershipService).getInstanceOwner();
+        const user = await di_1.Container.get(ownership_service_1.OwnershipService).getInstanceOwner();
         const runData = {
             executionMode: 'cli',
             startNodes: [{ name: startingNode.name, sourceData: null }],
             workflowData,
             userId: user.id,
         };
-        const executionId = await typedi_1.Container.get(workflow_runner_1.WorkflowRunner).run(runData);
-        const activeExecutions = typedi_1.Container.get(active_executions_1.ActiveExecutions);
+        const executionId = await di_1.Container.get(workflow_runner_1.WorkflowRunner).run(runData);
+        const activeExecutions = di_1.Container.get(active_executions_1.ActiveExecutions);
         const data = await activeExecutions.getPostExecutePromise(executionId);
         if (data === undefined) {
             throw new n8n_workflow_1.ApplicationError('Workflow did not return any data');

package/dist/commands/execute.js.map

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

package/dist/commands/export/credentials.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportCredentialsCommand = void 0;
+const di_1 = require("@n8n/di");
 const core_1 = require("@oclif/core");
 const fs_1 = __importDefault(require("fs"));
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const path_1 = __importDefault(require("path"));
-const typedi_1 = __importDefault(require("typedi"));
 const credentials_repository_1 = require("../../databases/repositories/credentials.repository");
 const base_command_1 = require("../base-command");
 class ExportCredentialsCommand extends base_command_1.BaseCommand {
@@ -63,7 +63,7 @@ class ExportCredentialsCommand extends base_command_1.BaseCommand {
                 }
             }
         }
-        const credentials = await typedi_1.default.get(credentials_repository_1.CredentialsRepository).findBy(flags.id ? { id: flags.id } : {});
+        const credentials = await di_1.Container.get(credentials_repository_1.CredentialsRepository).findBy(flags.id ? { id: flags.id } : {});
         if (flags.decrypted) {
             for (let i = 0; i < credentials.length; i++) {
                 const { name, type, data } = credentials[i];