n8n 1.73.0 → 1.74.0

package/dist/{runners/runner-lifecycle-events.js → task-runners/task-runner-lifecycle-events.js}

@@ -6,13 +6,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RunnerLifecycleEvents = void 0;
-const typedi_1 = require("typedi");
+exports.TaskRunnerLifecycleEvents = void 0;
+const di_1 = require("@n8n/di");
 const typed_emitter_1 = require("../typed-emitter");
-let RunnerLifecycleEvents = class RunnerLifecycleEvents extends typed_emitter_1.TypedEmitter {
+let TaskRunnerLifecycleEvents = class TaskRunnerLifecycleEvents extends typed_emitter_1.TypedEmitter {
 };
-exports.RunnerLifecycleEvents = RunnerLifecycleEvents;
-exports.RunnerLifecycleEvents = RunnerLifecycleEvents = __decorate([
-    (0, typedi_1.Service)()
-], RunnerLifecycleEvents);
-//# sourceMappingURL=runner-lifecycle-events.js.map
+exports.TaskRunnerLifecycleEvents = TaskRunnerLifecycleEvents;
+exports.TaskRunnerLifecycleEvents = TaskRunnerLifecycleEvents = __decorate([
+    (0, di_1.Service)()
+], TaskRunnerLifecycleEvents);
+//# sourceMappingURL=task-runner-lifecycle-events.js.map

package/dist/task-runners/task-runner-lifecycle-events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-runner-lifecycle-events.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-lifecycle-events.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gCAAkC;AAElC,mDAA+C;AAQxC,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,4BAAyC;CAAG,CAAA;AAA9E,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,YAAO,GAAE;GACG,yBAAyB,CAAqD"}

package/dist/{runners → task-runners}/task-runner-module.d.ts

@@ -1,19 +1,18 @@
 import { TaskRunnersConfig } from '@n8n/config';
-import { ErrorReporter } from 'n8n-core';
-import { Logger } from '../logging/logger.service';
+import { ErrorReporter, Logger } from 'n8n-core';
 export declare class TaskRunnerModule {
     private readonly logger;
     private readonly errorReporter;
     private readonly runnerConfig;
     private taskRunnerHttpServer;
     private taskRunnerWsServer;
-    private taskManager;
+    private taskRequester;
     private taskRunnerProcess;
     private taskRunnerProcessRestartLoopDetector;
     constructor(logger: Logger, errorReporter: ErrorReporter, runnerConfig: TaskRunnersConfig);
     start(): Promise<void>;
     stop(): Promise<void>;
-    private loadTaskManager;
+    private loadTaskRequester;
     private loadTaskRunnerServer;
     private startInternalTaskRunner;
     private onRunnerRestartLoopDetected;

package/dist/{runners → task-runners}/task-runner-module.js

@@ -44,15 +44,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRunnerModule = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const a = __importStar(require("node:assert/strict"));
-const typedi_1 = __importStar(require("typedi"));
 const on_shutdown_1 = require("../decorators/on-shutdown");
-const logger_service_1 = require("../logging/logger.service");
-const task_runner_process_restart_loop_detector_1 = require("../runners/task-runner-process-restart-loop-detector");
+const task_runner_process_restart_loop_detector_1 = require("../task-runners/task-runner-process-restart-loop-detector");
 const missing_auth_token_error_1 = require("./errors/missing-auth-token.error");
-const runner_ws_server_1 = require("./runner-ws-server");
+const task_runner_ws_server_1 = require("./task-runner-ws-server");
 let TaskRunnerModule = class TaskRunnerModule {
     constructor(logger, errorReporter, runnerConfig) {
         this.logger = logger;
@@ -71,7 +70,7 @@ let TaskRunnerModule = class TaskRunnerModule {
         const { mode, authToken } = this.runnerConfig;
         if (mode === 'external' && !authToken)
             throw new missing_auth_token_error_1.MissingAuthTokenError();
-        await this.loadTaskManager();
+        await this.loadTaskRequester();
         await this.loadTaskRunnerServer();
         if (mode === 'internal') {
             await this.startInternalTaskRunner();
@@ -92,27 +91,27 @@ let TaskRunnerModule = class TaskRunnerModule {
         })();
         await Promise.all([stopRunnerProcessTask, stopRunnerServerTask]);
     }
-    async loadTaskManager() {
-        const { TaskManager } = await Promise.resolve().then(() => __importStar(require('../runners/task-managers/task-manager')));
-        const { LocalTaskManager } = await Promise.resolve().then(() => __importStar(require('../runners/task-managers/local-task-manager')));
-        this.taskManager = typedi_1.default.get(LocalTaskManager);
-        typedi_1.default.set(TaskManager, this.taskManager);
+    async loadTaskRequester() {
+        const { TaskRequester } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-managers/task-requester')));
+        const { LocalTaskRequester } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-managers/local-task-requester')));
+        this.taskRequester = di_1.Container.get(LocalTaskRequester);
+        di_1.Container.set(TaskRequester, this.taskRequester);
     }
     async loadTaskRunnerServer() {
-        const { TaskRunnerServer } = await Promise.resolve().then(() => __importStar(require('../runners/task-runner-server')));
-        this.taskRunnerHttpServer = typedi_1.default.get(TaskRunnerServer);
-        this.taskRunnerWsServer = typedi_1.default.get(runner_ws_server_1.TaskRunnerWsServer);
+        const { TaskRunnerServer } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-runner-server')));
+        this.taskRunnerHttpServer = di_1.Container.get(TaskRunnerServer);
+        this.taskRunnerWsServer = di_1.Container.get(task_runner_ws_server_1.TaskRunnerWsServer);
         await this.taskRunnerHttpServer.start();
     }
     async startInternalTaskRunner() {
         a.ok(this.taskRunnerWsServer, 'Task Runner WS Server not loaded');
-        const { TaskRunnerProcess } = await Promise.resolve().then(() => __importStar(require('../runners/task-runner-process')));
-        this.taskRunnerProcess = typedi_1.default.get(TaskRunnerProcess);
+        const { TaskRunnerProcess } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-runner-process')));
+        this.taskRunnerProcess = di_1.Container.get(TaskRunnerProcess);
         this.taskRunnerProcessRestartLoopDetector = new task_runner_process_restart_loop_detector_1.TaskRunnerProcessRestartLoopDetector(this.taskRunnerProcess);
         this.taskRunnerProcessRestartLoopDetector.on('restart-loop-detected', this.onRunnerRestartLoopDetected);
         await this.taskRunnerProcess.start();
-        const { InternalTaskRunnerDisconnectAnalyzer } = await Promise.resolve().then(() => __importStar(require('../runners/internal-task-runner-disconnect-analyzer')));
-        this.taskRunnerWsServer.setDisconnectAnalyzer(typedi_1.default.get(InternalTaskRunnerDisconnectAnalyzer));
+        const { InternalTaskRunnerDisconnectAnalyzer } = await Promise.resolve().then(() => __importStar(require('../task-runners/internal-task-runner-disconnect-analyzer')));
+        this.taskRunnerWsServer.setDisconnectAnalyzer(di_1.Container.get(InternalTaskRunnerDisconnectAnalyzer));
     }
 };
 exports.TaskRunnerModule = TaskRunnerModule;
@@ -123,8 +122,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], TaskRunnerModule.prototype, "stop", null);
 exports.TaskRunnerModule = TaskRunnerModule = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         n8n_core_1.ErrorReporter,
         config_1.TaskRunnersConfig])
 ], TaskRunnerModule);

package/dist/task-runners/task-runner-module.js.map

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

package/dist/{runners → task-runners}/task-runner-process-restart-loop-detector.d.ts

@@ -1,5 +1,5 @@
-import { TaskRunnerRestartLoopError } from '../runners/errors/task-runner-restart-loop-error';
-import type { TaskRunnerProcess } from '../runners/task-runner-process';
+import { TaskRunnerRestartLoopError } from '../task-runners/errors/task-runner-restart-loop-error';
+import type { TaskRunnerProcess } from '../task-runners/task-runner-process';
 import { TypedEmitter } from '../typed-emitter';
 type TaskRunnerProcessRestartLoopDetectorEventMap = {
     'restart-loop-detected': TaskRunnerRestartLoopError;

package/dist/{runners → task-runners}/task-runner-process-restart-loop-detector.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRunnerProcessRestartLoopDetector = void 0;
 const constants_1 = require("../constants");
-const task_runner_restart_loop_error_1 = require("../runners/errors/task-runner-restart-loop-error");
+const task_runner_restart_loop_error_1 = require("../task-runners/errors/task-runner-restart-loop-error");
 const typed_emitter_1 = require("../typed-emitter");
 const MAX_RESTARTS = 5;
 const RESTARTS_WINDOW = 2 * constants_1.Time.seconds.toMilliseconds;

package/dist/task-runners/task-runner-process-restart-loop-detector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-runner-process-restart-loop-detector.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-process-restart-loop-detector.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AACnC,yGAAkG;AAElG,mDAA+C;AAE/C,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,eAAe,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AASxD,MAAa,oCAAqC,SAAQ,4BAA0D;IAkBnH,YAA6B,iBAAoC;QAChE,KAAK,EAAE,CAAC;QADoB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAbhD,aAAQ,GAAG,YAAY,CAAC;QAMxB,mBAAc,GAAG,eAAe,CAAC;QAE1C,gBAAW,GAAG,CAAC,CAAC;QAGhB,qBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAKrC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YAEjB,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAC/B,IAAI,CAAC,IAAI,CACR,uBAAuB,EACvB,IAAI,2DAA0B,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAC9E,CAAC;YACH,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAKO,SAAS;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,GAAG,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACvD,IAAI,CAAC,KAAK,EAAE,CAAC;QACd,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAEO,KAAK;QACZ,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACpC,CAAC;IAEO,kBAAkB;QACzB,OAAO,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC;IAC1C,CAAC;IAEO,qBAAqB;QAC5B,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAC3C,CAAC;CACD;AAzDD,oFAyDC"}

package/dist/{runners → task-runners}/task-runner-process.d.ts

@@ -1,7 +1,7 @@
 import { TaskRunnersConfig } from '@n8n/config';
-import { Logger } from '../logging/logger.service';
+import { Logger } from 'n8n-core';
 import { TaskRunnerAuthService } from './auth/task-runner-auth.service';
-import { RunnerLifecycleEvents } from './runner-lifecycle-events';
+import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
 import { TypedEmitter } from '../typed-emitter';
 export type ExitReason = 'unknown' | 'oom';
 export type TaskRunnerProcessEventMap = {
@@ -22,7 +22,7 @@ export declare class TaskRunnerProcess extends TypedEmitter<TaskRunnerProcessEve
     private isShuttingDown;
     private logger;
     private readonly passthroughEnvVars;
-    constructor(logger: Logger, runnerConfig: TaskRunnersConfig, authService: TaskRunnerAuthService, runnerLifecycleEvents: RunnerLifecycleEvents);
+    constructor(logger: Logger, runnerConfig: TaskRunnersConfig, authService: TaskRunnerAuthService, runnerLifecycleEvents: TaskRunnerLifecycleEvents);
     start(): Promise<void>;
     startNode(grantToken: string, taskBrokerUri: string): import("child_process").ChildProcessWithoutNullStreams;
     stop(): Promise<void>;

package/dist/{runners → task-runners}/task-runner-process.js

@@ -44,16 +44,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRunnerProcess = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
+const n8n_core_1 = require("n8n-core");
 const a = __importStar(require("node:assert/strict"));
 const node_child_process_1 = require("node:child_process");
 const process = __importStar(require("node:process"));
-const typedi_1 = require("typedi");
 const on_shutdown_1 = require("../decorators/on-shutdown");
-const logger_service_1 = require("../logging/logger.service");
 const task_runner_auth_service_1 = require("./auth/task-runner-auth.service");
 const forward_to_logger_1 = require("./forward-to-logger");
 const node_process_oom_detector_1 = require("./node-process-oom-detector");
-const runner_lifecycle_events_1 = require("./runner-lifecycle-events");
+const task_runner_lifecycle_events_1 = require("./task-runner-lifecycle-events");
 const typed_emitter_1 = require("../typed-emitter");
 let TaskRunnerProcess = class TaskRunnerProcess extends typed_emitter_1.TypedEmitter {
     get isRunning() {
@@ -174,10 +174,10 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], TaskRunnerProcess.prototype, "stop", null);
 exports.TaskRunnerProcess = TaskRunnerProcess = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         config_1.TaskRunnersConfig,
         task_runner_auth_service_1.TaskRunnerAuthService,
-        runner_lifecycle_events_1.RunnerLifecycleEvents])
+        task_runner_lifecycle_events_1.TaskRunnerLifecycleEvents])
 ], TaskRunnerProcess);
 //# sourceMappingURL=task-runner-process.js.map

package/dist/task-runners/task-runner-process.js.map

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

package/dist/{runners → task-runners}/task-runner-server.d.ts

@@ -1,8 +1,8 @@
 import { GlobalConfig } from '@n8n/config';
 import express from 'express';
-import { Logger } from '../logging/logger.service';
-import { TaskRunnerAuthController } from '../runners/auth/task-runner-auth.controller';
-import { TaskRunnerWsServer } from '../runners/runner-ws-server';
+import { Logger } from 'n8n-core';
+import { TaskRunnerAuthController } from '../task-runners/auth/task-runner-auth.controller';
+import { TaskRunnerWsServer } from '../task-runners/task-runner-ws-server';
 export declare class TaskRunnerServer {
     private readonly logger;
     private readonly globalConfig;

package/dist/{runners → task-runners}/task-runner-server.js

@@ -47,20 +47,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRunnerServer = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const compression_1 = __importDefault(require("compression"));
 const express_1 = __importDefault(require("express"));
+const express_rate_limit_1 = require("express-rate-limit");
+const n8n_core_1 = require("n8n-core");
 const a = __importStar(require("node:assert/strict"));
 const node_crypto_1 = require("node:crypto");
 const node_http_1 = require("node:http");
 const node_url_1 = require("node:url");
-const typedi_1 = require("typedi");
 const ws_1 = require("ws");
 const constants_1 = require("../constants");
-const logger_service_1 = require("../logging/logger.service");
 const middlewares_1 = require("../middlewares");
 const response_helper_1 = require("../response-helper");
-const task_runner_auth_controller_1 = require("../runners/auth/task-runner-auth.controller");
-const runner_ws_server_1 = require("../runners/runner-ws-server");
+const task_runner_auth_controller_1 = require("../task-runners/auth/task-runner-auth.controller");
+const task_runner_ws_server_1 = require("../task-runners/task-runner-ws-server");
 let TaskRunnerServer = class TaskRunnerServer {
     get port() {
         return this.server?.address()?.port;
@@ -166,9 +167,14 @@ let TaskRunnerServer = class TaskRunnerServer {
         this.app.use(middlewares_1.bodyParser);
     }
     configureRoutes() {
-        this.app.use(this.upgradeEndpoint, this.taskRunnerAuthController.authMiddleware, (req, res) => this.taskRunnerWsServer.handleRequest(req, res));
+        const createRateLimiter = () => (0, express_rate_limit_1.rateLimit)({
+            windowMs: 1000,
+            limit: 5,
+            message: { message: 'Too many requests' },
+        });
+        this.app.use(this.upgradeEndpoint, createRateLimiter(), this.taskRunnerAuthController.authMiddleware, (req, res) => this.taskRunnerWsServer.handleRequest(req, res));
         const authEndpoint = `${this.getEndpointBasePath()}/auth`;
-        this.app.post(authEndpoint, (0, response_helper_1.send)(async (req) => await this.taskRunnerAuthController.createGrantToken(req)));
+        this.app.post(authEndpoint, createRateLimiter(), (0, response_helper_1.send)(async (req) => await this.taskRunnerAuthController.createGrantToken(req)));
         this.app.get('/healthz', (_, res) => res.send({ status: 'ok' }));
     }
     getEndpointBasePath() {
@@ -184,10 +190,10 @@ let TaskRunnerServer = class TaskRunnerServer {
 };
 exports.TaskRunnerServer = TaskRunnerServer;
 exports.TaskRunnerServer = TaskRunnerServer = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         config_1.GlobalConfig,
         task_runner_auth_controller_1.TaskRunnerAuthController,
-        runner_ws_server_1.TaskRunnerWsServer])
+        task_runner_ws_server_1.TaskRunnerWsServer])
 ], TaskRunnerServer);
 //# sourceMappingURL=task-runner-server.js.map

package/dist/task-runners/task-runner-server.js.map

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

package/dist/task-runners/task-runner-types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=task-runner-types.js.map

package/dist/task-runners/task-runner-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-runner-types.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-types.ts"],"names":[],"mappings":""}

package/dist/{runners/runner-ws-server.d.ts → task-runners/task-runner-ws-server.d.ts}

@@ -1,12 +1,12 @@
 import { TaskRunnersConfig } from '@n8n/config';
 import type { BrokerMessage } from '@n8n/task-runner';
+import { Logger } from 'n8n-core';
 import type WebSocket from 'ws';
 import { WsStatusCodes } from '../constants';
-import { Logger } from '../logging/logger.service';
 import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
-import { RunnerLifecycleEvents } from './runner-lifecycle-events';
-import type { DisconnectAnalyzer, DisconnectReason, TaskRunnerServerInitRequest, TaskRunnerServerInitResponse } from './runner-types';
 import { TaskBroker, type TaskRunner } from './task-broker.service';
+import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
+import type { DisconnectAnalyzer, DisconnectReason, TaskRunnerServerInitRequest, TaskRunnerServerInitResponse } from './task-runner-types';
 type WsStatusCode = (typeof WsStatusCodes)[keyof typeof WsStatusCodes];
 export declare class TaskRunnerWsServer {
     private readonly logger;
@@ -16,7 +16,7 @@ export declare class TaskRunnerWsServer {
     private readonly runnerLifecycleEvents;
     runnerConnections: Map<TaskRunner['id'], WebSocket>;
     private heartbeatTimer;
-    constructor(logger: Logger, taskBroker: TaskBroker, disconnectAnalyzer: DefaultTaskRunnerDisconnectAnalyzer, taskTunnersConfig: TaskRunnersConfig, runnerLifecycleEvents: RunnerLifecycleEvents);
+    constructor(logger: Logger, taskBroker: TaskBroker, disconnectAnalyzer: DefaultTaskRunnerDisconnectAnalyzer, taskTunnersConfig: TaskRunnersConfig, runnerLifecycleEvents: TaskRunnerLifecycleEvents);
     start(): void;
     private startHeartbeatChecks;
     stop(): Promise<void>;

package/dist/{runners/runner-ws-server.js → task-runners/task-runner-ws-server.js}

@@ -11,13 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRunnerWsServer = void 0;
 const config_1 = require("@n8n/config");
+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 constants_1 = require("../constants");
-const logger_service_1 = require("../logging/logger.service");
 const default_task_runner_disconnect_analyzer_1 = require("./default-task-runner-disconnect-analyzer");
-const runner_lifecycle_events_1 = require("./runner-lifecycle-events");
 const task_broker_service_1 = require("./task-broker.service");
+const task_runner_lifecycle_events_1 = require("./task-runner-lifecycle-events");
 function heartbeat() {
     this.isAlive = true;
 }
@@ -131,11 +131,11 @@ let TaskRunnerWsServer = class TaskRunnerWsServer {
 };
 exports.TaskRunnerWsServer = TaskRunnerWsServer;
 exports.TaskRunnerWsServer = TaskRunnerWsServer = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         task_broker_service_1.TaskBroker,
         default_task_runner_disconnect_analyzer_1.DefaultTaskRunnerDisconnectAnalyzer,
         config_1.TaskRunnersConfig,
-        runner_lifecycle_events_1.RunnerLifecycleEvents])
+        task_runner_lifecycle_events_1.TaskRunnerLifecycleEvents])
 ], TaskRunnerWsServer);
-//# sourceMappingURL=runner-ws-server.js.map
+//# sourceMappingURL=task-runner-ws-server.js.map

package/dist/task-runners/task-runner-ws-server.js.map

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

package/dist/telemetry/index.d.ts

@@ -1,11 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
 import type RudderStack from '@rudderstack/rudder-sdk-node';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import { WorkflowRepository } from '../databases/repositories/workflow.repository';
 import type { IExecutionTrackProperties } from '../interfaces';
 import { License } from '../license';
-import { Logger } from '../logging/logger.service';
 import { PostHogClient } from '../posthog';
 interface IExecutionTrackData {
     count: number;

package/dist/telemetry/index.js

@@ -47,9 +47,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Telemetry = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const axios_1 = __importDefault(require("axios"));
 const n8n_core_1 = require("n8n-core");
-const typedi_1 = require("typedi");
 const constants_1 = require("../constants");
 const project_relation_repository_1 = require("../databases/repositories/project-relation.repository");
 const project_repository_1 = require("../databases/repositories/project.repository");
@@ -57,9 +57,8 @@ const user_repository_1 = require("../databases/repositories/user.repository");
 const workflow_repository_1 = require("../databases/repositories/workflow.repository");
 const on_shutdown_1 = require("../decorators/on-shutdown");
 const license_1 = require("../license");
-const logger_service_1 = require("../logging/logger.service");
 const posthog_1 = require("../posthog");
-const source_control_preferences_service_ee_1 = require("../environments/source-control/source-control-preferences.service.ee");
+const source_control_preferences_service_ee_1 = require("../environments.ee/source-control/source-control-preferences.service.ee");
 let Telemetry = class Telemetry {
     constructor(logger, postHog, license, instanceSettings, workflowRepository, globalConfig) {
         this.logger = logger;
@@ -119,17 +118,17 @@ let Telemetry = class Telemetry {
             });
         }
         this.executionCountsBuffer = {};
-        const sourceControlPreferences = typedi_1.Container.get(source_control_preferences_service_ee_1.SourceControlPreferencesService).getPreferences();
+        const sourceControlPreferences = di_1.Container.get(source_control_preferences_service_ee_1.SourceControlPreferencesService).getPreferences();
         const pulsePacket = {
             plan_name_current: this.license.getPlanName(),
             quota: this.license.getTriggerLimit(),
             usage: await this.workflowRepository.getActiveTriggerCount(),
-            role_count: await typedi_1.Container.get(user_repository_1.UserRepository).countUsersByRole(),
-            source_control_set_up: typedi_1.Container.get(source_control_preferences_service_ee_1.SourceControlPreferencesService).isSourceControlSetup(),
+            role_count: await di_1.Container.get(user_repository_1.UserRepository).countUsersByRole(),
+            source_control_set_up: di_1.Container.get(source_control_preferences_service_ee_1.SourceControlPreferencesService).isSourceControlSetup(),
             branchName: sourceControlPreferences.branchName,
             read_only_instance: sourceControlPreferences.branchReadOnly,
-            team_projects: (await typedi_1.Container.get(project_repository_1.ProjectRepository).getProjectCounts()).team,
-            project_role_count: await typedi_1.Container.get(project_relation_repository_1.ProjectRelationRepository).countUsersByRole(),
+            team_projects: (await di_1.Container.get(project_repository_1.ProjectRepository).getProjectCounts()).team,
+            project_role_count: await di_1.Container.get(project_relation_repository_1.ProjectRelationRepository).countUsersByRole(),
         };
         this.track('pulse', pulsePacket);
     }
@@ -212,8 +211,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], Telemetry.prototype, "stopTracking", null);
 exports.Telemetry = Telemetry = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         posthog_1.PostHogClient,
         license_1.License,
         n8n_core_1.InstanceSettings,

package/dist/telemetry/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gCAA6C;AAE7C,kDAA0B;AAC1B,uCAAoD;AAGpD,2CAAoE;AACpE,sGAAiG;AACjG,oFAAgF;AAChF,8EAA0E;AAC1E,sFAAkF;AAClF,0DAAsD;AAEtD,uCAAoC;AACpC,uCAA0C;AAE1C,mIAA0H;AAoBnH,IAAM,SAAS,GAAf,MAAM,SAAS;IAOrB,YACkB,MAAc,EACd,OAAsB,EACtB,OAAgB,EAChB,gBAAkC,EAClC,kBAAsC,EACtC,YAA0B;QAL1B,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAe;QACtB,YAAO,GAAP,OAAO,CAAS;QAChB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;QARpC,0BAAqB,GAAsB,EAAE,CAAC;IASnD,CAAC;IAEJ,KAAK,CAAC,IAAI;QACT,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC;QACjE,IAAI,OAAO,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAErD,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;gBAC1D,OAAO;YACR,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC;YAEjD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,wDAAa,8BAA8B,GAAC,CAAC;YAC9E,MAAM,aAAa,GAAG,eAAK,CAAC,MAAM,EAAE,CAAC;YACrC,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC9C,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;gBACtD,OAAO,GAAG,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,GAAG,EAAE;gBACvC,aAAa;gBACb,QAAQ;gBACR,YAAY;gBACZ,IAAI,EAAE,KAAK;aACX,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,EAAE,CAAC;QACnB,CAAC;IACF,CAAC;IAEO,UAAU;QACjB,IAAI,CAAC,sBAAsB,GAAG,WAAW,CACxC,KAAK,IAAI,EAAE;YACV,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC,EACD,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAClB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,KAAK;QAClB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,OAAO;QACR,CAAC;QAED,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACzF,MAAM,IAAI,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YACpD,MAAM,GAAG,GACR,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,CAAC,CAAC;gBAC/B,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,CAAC,CAAC;gBACjC,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,IAAI,CAAC,CAAC;gBAC7B,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC;YACjC,OAAO,GAAG,GAAG,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;YAC9C,IAAI,CAAC,KAAK,CAAC,0BAA0B,EAAE;gBACtC,aAAa,EAAE,GAAG;gBAClB,WAAW,EAAE,UAAU;gBACvB,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC;aACzC,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAEhC,MAAM,wBAAwB,GAAG,cAAS,CAAC,GAAG,CAC7C,uEAA+B,CAC/B,CAAC,cAAc,EAAE,CAAC;QAGnB,MAAM,WAAW,GAAG;YACnB,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YAC7C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YACrC,KAAK,EAAE,MAAM,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,EAAE;YAC5D,UAAU,EAAE,MAAM,cAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,gBAAgB,EAAE;YAClE,qBAAqB,EAAE,cAAS,CAAC,GAAG,CAAC,uEAA+B,CAAC,CAAC,oBAAoB,EAAE;YAC5F,UAAU,EAAE,wBAAwB,CAAC,UAAU;YAC/C,kBAAkB,EAAE,wBAAwB,CAAC,cAAc;YAC3D,aAAa,EAAE,CAAC,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI;YAC/E,kBAAkB,EAAE,MAAM,cAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC,gBAAgB,EAAE;SACrF,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAClC,CAAC;IAED,sBAAsB,CAAC,UAAqC;QAC3D,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC;YAE1C,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,IAAI;gBAClF,OAAO,EAAE,UAAU,CAAC,OAAO;aAC3B,CAAC;YAEF,MAAM,GAAG,GAA0B,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAC7E,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAClC,EAAE,CAAC;YAEH,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC;YAE1E,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC5B,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG;oBAC7C,KAAK,EAAE,CAAC;oBACR,KAAK,EAAE,QAAQ;iBACf,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,qBAAqB,CAAC,KAAK,EAAE,CAAC;YAC/B,CAAC;YAED,IACC,CAAC,UAAU,CAAC,OAAO;gBACnB,UAAU,CAAC,SAAS;gBACpB,UAAU,CAAC,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC,EACvD,CAAC;gBACF,IAAI,CAAC,KAAK,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAC;YACtD,CAAC;QACF,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY;QACjB,aAAa,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAE3C,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,QAAQ,CAAC,MAAiF;QACzF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,OAAO;QACR,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAE7C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;YACzB,MAAM,EAAE,UAAU;YAClB,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE;YACjC,OAAO,EAAE;gBAER,EAAE,EAAE,SAAS;aACb;SACD,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CACJ,SAAiB,EACjB,aAAwC,EAAE,EAC1C,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE;QAExC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,OAAO;QACR,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;QAC/B,MAAM,iBAAiB,GAAG;YACzB,GAAG,UAAU;YACb,WAAW,EAAE,UAAU;YACvB,WAAW,EAAE,uBAAW;SACxB,CAAC;QAEF,MAAM,OAAO,GAAG;YACf,MAAM,EAAE,GAAG,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;YACtD,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE,iBAAiB;YAC7B,OAAO,EAAE,EAAE;SACX,CAAC;QAEF,IAAI,WAAW,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAC7B,GAAG,OAAO;YAEV,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE;SAC9C,CAAC,CAAC;IACJ,CAAC;IAGD,eAAe;QACd,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;CACD,CAAA;AApMY,8BAAS;AAsIf;IADL,IAAA,wBAAU,EAAC,oCAAwB,CAAC;;;;6CAKpC;oBA1IW,SAAS;IADrB,IAAA,YAAO,GAAE;qCASiB,iBAAM;QACL,uBAAa;QACb,iBAAO;QACE,2BAAgB;QACd,wCAAkB;QACxB,qBAAY;GAbhC,SAAS,CAoMrB"}

package/dist/user-management/email/node-mailer.d.ts

@@ -1,6 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
-import { ErrorReporter } from 'n8n-core';
-import { Logger } from '../../logging/logger.service';
+import { ErrorReporter, Logger } from 'n8n-core';
 import type { MailData, SendEmailResult } from './interfaces';
 export declare class NodeMailer {
     private readonly logger;

package/dist/user-management/email/node-mailer.js

@@ -14,12 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeMailer = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const lodash_1 = require("lodash");
 const n8n_core_1 = require("n8n-core");
 const node_path_1 = __importDefault(require("node:path"));
 const nodemailer_1 = require("nodemailer");
-const typedi_1 = require("typedi");
-const logger_service_1 = require("../../logging/logger.service");
 let NodeMailer = class NodeMailer {
     constructor(globalConfig, logger, errorReporter) {
         this.logger = logger;
@@ -77,9 +76,9 @@ let NodeMailer = class NodeMailer {
 };
 exports.NodeMailer = NodeMailer;
 exports.NodeMailer = NodeMailer = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [config_1.GlobalConfig,
-        logger_service_1.Logger,
+        n8n_core_1.Logger,
         n8n_core_1.ErrorReporter])
 ], NodeMailer);
 //# sourceMappingURL=node-mailer.js.map

package/dist/user-management/email/node-mailer.js.map

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

package/dist/user-management/email/user-management-mailer.d.ts

@@ -1,9 +1,9 @@
 import { GlobalConfig } from '@n8n/config';
+import { Logger } from 'n8n-core';
 import type { User } from '../../databases/entities/user';
 import type { WorkflowEntity } from '../../databases/entities/workflow-entity';
 import { UserRepository } from '../../databases/repositories/user.repository';
 import { EventService } from '../../events/event.service';
-import { Logger } from '../../logging/logger.service';
 import { UrlService } from '../../services/url.service';
 import type { InviteEmailData, PasswordResetData, SendEmailResult } from './interfaces';
 import { NodeMailer } from './node-mailer';

package/dist/user-management/email/user-management-mailer.js

@@ -14,16 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserManagementMailer = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const handlebars_1 = __importDefault(require("handlebars"));
+const n8n_core_1 = require("n8n-core");
 const path_1 = require("path");
-const typedi_1 = require("typedi");
 const constants_1 = require("../../constants");
 const user_repository_1 = require("../../databases/repositories/user.repository");
 const internal_server_error_1 = require("../../errors/response-errors/internal-server.error");
 const event_service_1 = require("../../events/event.service");
-const logger_service_1 = require("../../logging/logger.service");
 const url_service_1 = require("../../services/url.service");
 const utils_1 = require("../../utils");
 const node_mailer_1 = require("./node-mailer");
@@ -38,7 +38,7 @@ let UserManagementMailer = class UserManagementMailer {
         this.isEmailSetUp = emailsConfig.mode === 'smtp' && emailsConfig.smtp.host !== '';
         this.templateOverrides = emailsConfig.template;
         if (this.isEmailSetUp) {
-            this.mailer = typedi_1.Container.get(node_mailer_1.NodeMailer);
+            this.mailer = di_1.Container.get(node_mailer_1.NodeMailer);
         }
     }
     async invite(inviteEmailData) {
@@ -159,9 +159,9 @@ let UserManagementMailer = class UserManagementMailer {
 };
 exports.UserManagementMailer = UserManagementMailer;
 exports.UserManagementMailer = UserManagementMailer = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [config_1.GlobalConfig,
-        logger_service_1.Logger,
+        n8n_core_1.Logger,
         user_repository_1.UserRepository,
         url_service_1.UrlService,
         event_service_1.EventService])