n8n 1.61.0 → 1.62.0

package/dist/services/orchestration.service.js

@@ -39,7 +39,7 @@ exports.OrchestrationService = void 0;
 const n8n_core_1 = require("n8n-core");
 const typedi_1 = __importStar(require("typedi"));
 const config_1 = __importDefault(require("../config"));
-const logger_1 = require("../logger");
+const logger_service_1 = require("../logging/logger.service");
 const multi_main_setup_ee_1 = require("./orchestration/main/multi-main-setup.ee");
 let OrchestrationService = class OrchestrationService {
     constructor(logger, instanceSettings, multiMainSetup) {
@@ -99,17 +99,16 @@ let OrchestrationService = class OrchestrationService {
         this.subscriber.shutdown();
         this.isInitialized = false;
     }
-    async publish(command, data) {
+    async publish(commandKey, payload) {
         if (!this.sanityCheck())
             return;
-        const payload = data;
-        this.logger.debug(`[Instance ID ${this.instanceId}] Publishing command "${command}"`, payload);
-        await this.publisher.publishCommand({ command, payload });
+        this.logger.debug(`[Instance ID ${this.instanceId}] Publishing command "${commandKey}"`, payload);
+        await this.publisher.publishCommand({ command: commandKey, payload });
     }
     async getWorkerStatus(id) {
         if (!this.sanityCheck())
             return;
-        const command = 'getStatus';
+        const command = 'get-worker-status';
         this.logger.debug(`Sending "${command}" to command channel`);
         await this.publisher.publishCommand({
             command,
@@ -119,7 +118,7 @@ let OrchestrationService = class OrchestrationService {
     async getWorkerIds() {
         if (!this.sanityCheck())
             return;
-        const command = 'getId';
+        const command = 'get-worker-id';
         this.logger.debug(`Sending "${command}" to command channel`);
         await this.publisher.publishCommand({ command });
     }
@@ -137,7 +136,7 @@ let OrchestrationService = class OrchestrationService {
 exports.OrchestrationService = OrchestrationService;
 exports.OrchestrationService = OrchestrationService = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_1.Logger,
+    __metadata("design:paramtypes", [logger_service_1.Logger,
         n8n_core_1.InstanceSettings,
         multi_main_setup_ee_1.MultiMainSetup])
 ], OrchestrationService);

package/dist/services/orchestration.service.js.map

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

package/dist/services/pruning.service.d.ts

@@ -1,6 +1,6 @@
 import { BinaryDataService, InstanceSettings } from 'n8n-core';
 import { ExecutionRepository } from '../databases/repositories/execution.repository';
-import { Logger } from '../logger';
+import { Logger } from '../logging/logger.service';
 import { OrchestrationService } from './orchestration.service';
 export declare class PruningService {
     private readonly logger;

package/dist/services/pruning.service.js

@@ -20,7 +20,7 @@ const config_1 = __importDefault(require("../config"));
 const constants_1 = require("../constants");
 const execution_repository_1 = require("../databases/repositories/execution.repository");
 const on_shutdown_1 = require("../decorators/on-shutdown");
-const logger_1 = require("../logger");
+const logger_service_1 = require("../logging/logger.service");
 const orchestration_service_1 = require("./orchestration.service");
 let PruningService = class PruningService {
     constructor(logger, instanceSettings, executionRepository, binaryDataService, orchestrationService) {
@@ -138,7 +138,7 @@ __decorate([
 ], PruningService.prototype, "shutdown", null);
 exports.PruningService = PruningService = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_1.Logger,
+    __metadata("design:paramtypes", [logger_service_1.Logger,
         n8n_core_1.InstanceSettings,
         execution_repository_1.ExecutionRepository,
         n8n_core_1.BinaryDataService,

package/dist/services/pruning.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"pruning.service.js","sourceRoot":"","sources":["../../src/services/pruning.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAA+D;AAC/D,+CAA6C;AAC7C,mCAAiC;AAEjC,sDAA8B;AAC9B,2CAA2C;AAC3C,wFAAoF;AACpF,0DAAsD;AACtD,qCAAkC;AAElC,mEAA+D;AAGxD,IAAM,cAAc,GAApB,MAAM,cAAc;IAc1B,YACkB,MAAc,EACd,gBAAkC,EAClC,mBAAwC,EACxC,iBAAoC,EACpC,oBAA0C;QAJ1C,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,yBAAoB,GAApB,oBAAoB,CAAsB;QAlBpD,0BAAqB,GAAG,GAAG,CAAC;QAE5B,UAAK,GAA2B;YACvC,YAAY,EAAE,gBAAM,CAAC,MAAM,CAAC,0CAA0C,CAAC,GAAG,gBAAI,CAAC,MAAM;YACrF,YAAY,EAAE,gBAAM,CAAC,MAAM,CAAC,0CAA0C,CAAC,GAAG,gBAAI,CAAC,MAAM;SACrF,CAAC;QAMM,mBAAc,GAAG,KAAK,CAAC;IAQ5B,CAAC;IAKJ,IAAI;QACH,MAAM,EAAE,QAAQ,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAExE,IAAI,QAAQ;YAAE,IAAI,CAAC,YAAY,EAAE,CAAC;QAElC,IAAI,uBAAuB,EAAE,CAAC;YAC7B,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YAC1F,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1F,CAAC;IACF,CAAC;IAEO,gBAAgB;QACvB,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC3D,IAAI,CAAC,gBAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,kBAAM,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;YACjF,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,gBAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,IAAI,YAAY,KAAK,MAAM,IAAI,UAAU,EAAE,CAAC;YACtF,OAAO,KAAK,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAKD,YAAY;QACX,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAAE,OAAO;QAErC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YACvE,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAE/E,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC7B,CAAC;IAED,WAAW;QACV,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAAE,OAAO;QAErC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAE/E,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACzC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACxC,CAAC;IAEO,uBAAuB,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY;QAC/D,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,gBAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAErD,IAAI,CAAC,oBAAoB,GAAG,WAAW,CACtC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,wBAAwB,EAAE,EACjD,IAAI,CAAC,KAAK,CAAC,YAAY,CACvB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IAEO,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY;QAC5D,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,gBAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAErD,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1C,IAAI,CAAC,wBAAwB,EAAE;iBAC7B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;iBAC/C,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChB,IAAI,CAAC,oBAAoB,CAAC,CAAC,GAAG,gBAAI,CAAC,MAAM,CAAC,CAAC;gBAE3C,MAAM,YAAY,GACjB,KAAK,YAAY,KAAK;oBACrB,CAAC,CAAC,KAAK,CAAC,OAAO;oBACf,CAAC,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;gBAExD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;YACnF,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,MAAM,CAAC,CAAC;QAEX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAKD,KAAK,CAAC,wBAAwB;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,4BAA4B,EAAE,CAAC;QAE7E,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAClE,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpF,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAMO,KAAK,CAAC,wBAAwB;QACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,+BAA+B,EAAE,CAAC;QAE7E,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAEnD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAElE,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;QAChC,CAAC;QAED,IAAI,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;YAEtF,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAE7C,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAEzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE;gBAC/D,YAAY;gBACZ,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE;aAC1D,CAAC,CAAC;QACJ,CAAC;QAMD,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,IAAI,IAAI,CAAC,qBAAqB,CAAC;QAEvE,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IACjE,CAAC;CACD,CAAA;AAvKY,wCAAc;AA4H1B;IADC,IAAA,wBAAU,GAAE;;;;8CAIZ;yBA/HW,cAAc;IAD1B,IAAA,gBAAO,GAAE;qCAgBiB,eAAM;QACI,2BAAgB;QACb,0CAAmB;QACrB,4BAAiB;QACd,4CAAoB;GAnBhD,cAAc,CAuK1B"}
+{"version":3,"file":"pruning.service.js","sourceRoot":"","sources":["../../src/services/pruning.service.ts"],"names":[],"mappings":"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"}

package/dist/services/public-api-key.service.d.ts

@@ -0,0 +1,22 @@
+import { ApiKey } from '../databases/entities/api-key';
+import type { User } from '../databases/entities/user';
+import { ApiKeyRepository } from '../databases/repositories/api-key.repository';
+export declare const API_KEY_PREFIX = "n8n_api_";
+export declare class PublicApiKeyService {
+    private readonly apiKeyRepository;
+    constructor(apiKeyRepository: ApiKeyRepository);
+    createPublicApiKeyForUser(user: User): Promise<ApiKey>;
+    getRedactedApiKeysForUser(user: User): Promise<{
+        apiKey: string;
+        user: User;
+        userId: string;
+        label: string;
+        id: string;
+        createdAt: Date;
+        updatedAt: Date;
+    }[]>;
+    deleteApiKeyForUser(user: User, apiKeyId: string): Promise<void>;
+    getUserForApiKey(apiKey: string): Promise<User | null>;
+    redactApiKey(apiKey: string): string;
+    createApiKeyString: () => string;
+}

package/dist/services/public-api-key.service.js

@@ -0,0 +1,86 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PublicApiKeyService = exports.API_KEY_PREFIX = void 0;
+const node_crypto_1 = require("node:crypto");
+const typedi_1 = __importStar(require("typedi"));
+const api_key_1 = require("../databases/entities/api-key");
+const api_key_repository_1 = require("../databases/repositories/api-key.repository");
+const user_repository_1 = require("../databases/repositories/user.repository");
+exports.API_KEY_PREFIX = 'n8n_api_';
+let PublicApiKeyService = class PublicApiKeyService {
+    constructor(apiKeyRepository) {
+        this.apiKeyRepository = apiKeyRepository;
+        this.createApiKeyString = () => `${exports.API_KEY_PREFIX}${(0, node_crypto_1.randomBytes)(40).toString('hex')}`;
+    }
+    async createPublicApiKeyForUser(user) {
+        const apiKey = this.createApiKeyString();
+        await this.apiKeyRepository.upsert(this.apiKeyRepository.create({
+            userId: user.id,
+            apiKey,
+            label: 'My API Key',
+        }), ['apiKey']);
+        return await this.apiKeyRepository.findOneByOrFail({ apiKey });
+    }
+    async getRedactedApiKeysForUser(user) {
+        const apiKeys = await this.apiKeyRepository.findBy({ userId: user.id });
+        return apiKeys.map((apiKeyRecord) => ({
+            ...apiKeyRecord,
+            apiKey: this.redactApiKey(apiKeyRecord.apiKey),
+        }));
+    }
+    async deleteApiKeyForUser(user, apiKeyId) {
+        await this.apiKeyRepository.delete({ userId: user.id, id: apiKeyId });
+    }
+    async getUserForApiKey(apiKey) {
+        return await typedi_1.default.get(user_repository_1.UserRepository)
+            .createQueryBuilder('user')
+            .innerJoin(api_key_1.ApiKey, 'apiKey', 'apiKey.userId = user.id')
+            .where('apiKey.apiKey = :apiKey', { apiKey })
+            .select('user')
+            .getOne();
+    }
+    redactApiKey(apiKey) {
+        const keepLength = 5;
+        return (exports.API_KEY_PREFIX +
+            apiKey.slice(exports.API_KEY_PREFIX.length, exports.API_KEY_PREFIX.length + keepLength) +
+            '*'.repeat(apiKey.length - exports.API_KEY_PREFIX.length - keepLength));
+    }
+};
+exports.PublicApiKeyService = PublicApiKeyService;
+exports.PublicApiKeyService = PublicApiKeyService = __decorate([
+    (0, typedi_1.Service)(),
+    __metadata("design:paramtypes", [api_key_repository_1.ApiKeyRepository])
+], PublicApiKeyService);
+//# sourceMappingURL=public-api-key.service.js.map

package/dist/services/public-api-key.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public-api-key.service.js","sourceRoot":"","sources":["../../src/services/public-api-key.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA0C;AAC1C,iDAA4C;AAE5C,0DAAsD;AAEtD,oFAA+E;AAC/E,8EAA0E;AAE7D,QAAA,cAAc,GAAG,UAAU,CAAC;AAGlC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAkE/D,uBAAkB,GAAG,GAAG,EAAE,CAAC,GAAG,sBAAc,GAAG,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAlEf,CAAC;IAOnE,KAAK,CAAC,yBAAyB,CAAC,IAAU;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CACjC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,MAAM;YACN,KAAK,EAAE,YAAY;SACnB,CAAC,EACF,CAAC,QAAQ,CAAC,CACV,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAOD,KAAK,CAAC,yBAAyB,CAAC,IAAU;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACrC,GAAG,YAAY;YACf,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;SAC9C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAU,EAAE,QAAgB;QACrD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACpC,OAAO,MAAM,gBAAS,CAAC,GAAG,CAAC,gCAAc,CAAC;aACxC,kBAAkB,CAAC,MAAM,CAAC;aAC1B,SAAS,CAAC,gBAAM,EAAE,QAAQ,EAAE,yBAAyB,CAAC;aACtD,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC5C,MAAM,CAAC,MAAM,CAAC;aACd,MAAM,EAAE,CAAC;IACZ,CAAC;IAYD,YAAY,CAAC,MAAc;QAC1B,MAAM,UAAU,GAAG,CAAC,CAAC;QACrB,OAAO,CACN,sBAAc;YACd,MAAM,CAAC,KAAK,CAAC,sBAAc,CAAC,MAAM,EAAE,sBAAc,CAAC,MAAM,GAAG,UAAU,CAAC;YACvE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,sBAAc,CAAC,MAAM,GAAG,UAAU,CAAC,CAC9D,CAAC;IACH,CAAC;CAGD,CAAA;AApEY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,gBAAO,GAAE;qCAEsC,qCAAgB;GADnD,mBAAmB,CAoE/B"}

package/dist/services/redis-client.service.d.ts

@@ -1,12 +1,19 @@
 import { GlobalConfig } from '@n8n/config';
 import ioRedis from 'ioredis';
 import type { Cluster, RedisOptions } from 'ioredis';
-import { Logger } from '../logger';
+import { Logger } from '../logging/logger.service';
+import { TypedEmitter } from '../typed-emitter';
 import type { RedisClientType } from '../scaling/redis/redis.types';
-export declare class RedisClientService {
+type RedisEventMap = {
+    'connection-lost': number;
+    'connection-recovered': never;
+};
+export declare class RedisClientService extends TypedEmitter<RedisEventMap> {
     private readonly logger;
     private readonly globalConfig;
     private readonly clients;
+    private readonly config;
+    private lostConnection;
     constructor(logger: Logger, globalConfig: GlobalConfig);
     createClient(arg: {
         type: RedisClientType;
@@ -18,4 +25,8 @@ export declare class RedisClientService {
     private getOptions;
     private retryStrategy;
     private clusterNodes;
+    emit<Event extends keyof RedisEventMap>(event: Event, ...args: Array<RedisEventMap[Event]>): boolean;
+    private registerListeners;
+    private formatTimeout;
 }
+export {};

package/dist/services/redis-client.service.js

@@ -16,17 +16,38 @@ exports.RedisClientService = void 0;
 const config_1 = require("@n8n/config");
 const ioredis_1 = __importDefault(require("ioredis"));
 const typedi_1 = require("typedi");
-const logger_1 = require("../logger");
-let RedisClientService = class RedisClientService {
+const debounce_1 = require("../decorators/debounce");
+const logger_service_1 = require("../logging/logger.service");
+const typed_emitter_1 = require("../typed-emitter");
+let RedisClientService = class RedisClientService extends typed_emitter_1.TypedEmitter {
     constructor(logger, globalConfig) {
+        super();
         this.logger = logger;
         this.globalConfig = globalConfig;
         this.clients = new Set();
+        this.config = {
+            maxTimeout: this.globalConfig.queue.bull.redis.timeoutThreshold,
+            retryInterval: 1000,
+            resetLength: 30_000,
+        };
+        this.lostConnection = false;
+        this.registerListeners();
     }
     createClient(arg) {
         const client = this.clusterNodes().length > 0
             ? this.createClusterClient(arg)
             : this.createRegularClient(arg);
+        client.on('error', (error) => {
+            if ('code' in error && error.code === 'ECONNREFUSED')
+                return;
+            this.logger.error(`[Redis client] ${error.message}`, { error });
+        });
+        client.on('ready', () => {
+            if (this.lostConnection) {
+                this.emit('connection-recovered');
+                this.lostConnection = false;
+            }
+        });
         this.clients.add(client);
         return client;
     }
@@ -72,28 +93,26 @@ let RedisClientService = class RedisClientService {
         return options;
     }
     retryStrategy() {
-        const RETRY_INTERVAL = 500;
-        const RESET_LENGTH = 30_000;
-        const MAX_TIMEOUT = this.globalConfig.queue.bull.redis.timeoutThreshold;
         let lastAttemptTs = 0;
         let cumulativeTimeout = 0;
         return () => {
             const nowTs = Date.now();
-            if (nowTs - lastAttemptTs > RESET_LENGTH) {
+            if (nowTs - lastAttemptTs > this.config.resetLength) {
                 cumulativeTimeout = 0;
                 lastAttemptTs = nowTs;
             }
             else {
                 cumulativeTimeout += nowTs - lastAttemptTs;
                 lastAttemptTs = nowTs;
-                if (cumulativeTimeout > MAX_TIMEOUT) {
-                    this.logger.error(`[Redis] Unable to connect after max timeout of ${MAX_TIMEOUT} ms`);
-                    this.logger.error('Exiting process...');
+                if (cumulativeTimeout > this.config.maxTimeout) {
+                    const maxTimeout = Math.round(this.config.maxTimeout / 1000) + 's';
+                    this.logger.error(`Unable to connect to Redis after trying to connect for ${maxTimeout}`);
+                    this.logger.error('Exiting process due to Redis connection error');
                     process.exit(1);
                 }
             }
-            this.logger.warn('Redis unavailable - trying to reconnect...');
-            return RETRY_INTERVAL;
+            this.emit('connection-lost', cumulativeTimeout);
+            return this.config.retryInterval;
         };
     }
     clusterNodes() {
@@ -105,11 +124,40 @@ let RedisClientService = class RedisClientService {
             return { host, port: parseInt(port) };
         });
     }
+    emit(event, ...args) {
+        return super.emit(event, ...args);
+    }
+    registerListeners() {
+        const { maxTimeout: maxTimeoutMs, retryInterval: retryIntervalMs } = this.config;
+        const retryInterval = this.formatTimeout(retryIntervalMs);
+        const maxTimeout = this.formatTimeout(maxTimeoutMs);
+        this.on('connection-lost', (cumulativeTimeoutMs) => {
+            const cumulativeTimeout = this.formatTimeout(cumulativeTimeoutMs);
+            const reconnectionMsg = `Trying to reconnect in ${retryInterval}...`;
+            const timeoutDetails = `${cumulativeTimeout}/${maxTimeout}`;
+            this.logger.warn(`Lost Redis connection. ${reconnectionMsg} (${timeoutDetails})`);
+            this.lostConnection = true;
+        });
+        this.on('connection-recovered', () => {
+            this.logger.info('Recovered Redis connection');
+        });
+    }
+    formatTimeout(timeoutMs) {
+        const timeoutSeconds = timeoutMs / 1000;
+        const roundedTimeout = Math.round(timeoutSeconds * 10) / 10;
+        return roundedTimeout + 's';
+    }
 };
 exports.RedisClientService = RedisClientService;
+__decorate([
+    (0, debounce_1.Debounce)(1000),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Event, Object]),
+    __metadata("design:returntype", Boolean)
+], RedisClientService.prototype, "emit", null);
 exports.RedisClientService = RedisClientService = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_1.Logger,
+    __metadata("design:paramtypes", [logger_service_1.Logger,
         config_1.GlobalConfig])
 ], RedisClientService);
 //# sourceMappingURL=redis-client.service.js.map

package/dist/services/redis-client.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-client.service.js","sourceRoot":"","sources":["../../src/services/redis-client.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,sDAA8B;AAE9B,mCAAiC;AAEjC,qCAAkC;AAK3B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAG9B,YACkB,MAAc,EACd,YAA0B;QAD1B,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAc;QAJ3B,YAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;IAKrD,CAAC;IAEJ,YAAY,CAAC,GAA2D;QACvE,MAAM,MAAM,GACX,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,GAAG,CAAC;YAC7B,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEzB,OAAO,MAAM,CAAC;IACf,CAAC;IAMD,aAAa,CAAC,MAAc;QAC3B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,MAAM,IAAI,GAAG,CAAC;QAC1C,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAMO,mBAAmB,CAAC,EAC3B,IAAI,EACJ,YAAY,GAIZ;QACA,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;QAElD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;QAE1D,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACpB,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAE/E,OAAO,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEO,mBAAmB,CAAC,EAC3B,IAAI,EACJ,YAAY,GAIZ;QACA,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;QAElD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;QAEjF,OAAO,IAAI,iBAAO,CAAC,OAAO,CAAC,YAAY,EAAE;YACxC,YAAY,EAAE,OAAO;YACrB,oBAAoB,EAAE,IAAI,CAAC,aAAa,EAAE;SAC1C,CAAC,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,EAAE,YAAY,EAAmC;QACnE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;QAY3E,MAAM,OAAO,GAAiB;YAC7B,QAAQ;YACR,QAAQ;YACR,EAAE;YACF,gBAAgB,EAAE,KAAK;YACvB,oBAAoB,EAAE,IAAI;YAC1B,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE;YACnC,GAAG,YAAY;SACf,CAAC;QAEF,IAAI,GAAG;YAAE,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;QAE1B,OAAO,OAAO,CAAC;IAChB,CAAC;IASO,aAAa;QACpB,MAAM,cAAc,GAAG,GAAG,CAAC;QAC3B,MAAM,YAAY,GAAG,MAAM,CAAC;QAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;QAExE,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAE1B,OAAO,GAAG,EAAE;YACX,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEzB,IAAI,KAAK,GAAG,aAAa,GAAG,YAAY,EAAE,CAAC;gBAC1C,iBAAiB,GAAG,CAAC,CAAC;gBACtB,aAAa,GAAG,KAAK,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACP,iBAAiB,IAAI,KAAK,GAAG,aAAa,CAAC;gBAC3C,aAAa,GAAG,KAAK,CAAC;gBACtB,IAAI,iBAAiB,GAAG,WAAW,EAAE,CAAC;oBACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,WAAW,KAAK,CAAC,CAAC;oBACtF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;oBACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC;YACF,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;YAE/D,OAAO,cAAc,CAAC;QACvB,CAAC,CAAC;IACH,CAAC;IAEO,YAAY;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY;aACpD,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;aACxC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;CACD,CAAA;AApJY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,gBAAO,GAAE;qCAKiB,eAAM;QACA,qBAAY;GALhC,kBAAkB,CAoJ9B"}
+{"version":3,"file":"redis-client.service.js","sourceRoot":"","sources":["../../src/services/redis-client.service.ts"],"names":[],"mappings":"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"}

package/dist/services/user.service.d.ts

@@ -3,7 +3,7 @@ import type { User } from '../databases/entities/user';
 import { UserRepository } from '../databases/repositories/user.repository';
 import { EventService } from '../events/event.service';
 import type { Invitation, PublicUser } from '../interfaces';
-import { Logger } from '../logger';
+import { Logger } from '../logging/logger.service';
 import type { PostHogClient } from '../posthog';
 import type { UserRequest } from '../requests';
 import { UrlService } from '../services/url.service';

package/dist/services/user.service.js

@@ -15,7 +15,7 @@ const typedi_1 = require("typedi");
 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_1 = require("../logger");
+const logger_service_1 = require("../logging/logger.service");
 const url_service_1 = require("../services/url.service");
 const email_1 = require("../user-management/email");
 let UserService = class UserService {
@@ -47,7 +47,7 @@ let UserService = class UserService {
         await this.userRepository.save(user);
     }
     async toPublic(user, options) {
-        const { password, updatedAt, apiKey, authIdentities, ...rest } = user;
+        const { password, updatedAt, authIdentities, ...rest } = user;
         const ldapIdentity = authIdentities?.find((i) => i.providerType === 'ldap');
         let publicUser = {
             ...rest,
@@ -170,7 +170,7 @@ let UserService = class UserService {
 exports.UserService = UserService;
 exports.UserService = UserService = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_1.Logger,
+    __metadata("design:paramtypes", [logger_service_1.Logger,
         user_repository_1.UserRepository,
         email_1.UserManagementMailer,
         url_service_1.UrlService,

package/dist/services/user.service.js.map

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

package/dist/services/workflow-statistics.service.d.ts

@@ -1,7 +1,7 @@
 import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
 import { WorkflowStatisticsRepository } from '../databases/repositories/workflow-statistics.repository';
 import { EventService } from '../events/event.service';
-import { Logger } from '../logger';
+import { Logger } from '../logging/logger.service';
 import { UserService } from '../services/user.service';
 import { TypedEmitter } from '../typed-emitter';
 import { OwnershipService } from './ownership.service';

package/dist/services/workflow-statistics.service.js

@@ -13,7 +13,7 @@ exports.WorkflowStatisticsService = void 0;
 const typedi_1 = require("typedi");
 const workflow_statistics_repository_1 = require("../databases/repositories/workflow-statistics.repository");
 const event_service_1 = require("../events/event.service");
-const logger_1 = require("../logger");
+const logger_service_1 = require("../logging/logger.service");
 const user_service_1 = require("../services/user.service");
 const typed_emitter_1 = require("../typed-emitter");
 const ownership_service_1 = require("./ownership.service");
@@ -83,7 +83,7 @@ let WorkflowStatisticsService = class WorkflowStatisticsService extends typed_em
         const project = await this.ownershipService.getWorkflowProjectCached(workflowId);
         const owner = await this.ownershipService.getPersonalProjectOwnerCached(project.id);
         let metrics = {
-            userId: owner.id,
+            userId: owner?.id ?? '',
             project: project.id,
             workflowId,
             nodeType: node.type,
@@ -103,7 +103,7 @@ let WorkflowStatisticsService = class WorkflowStatisticsService extends typed_em
 exports.WorkflowStatisticsService = WorkflowStatisticsService;
 exports.WorkflowStatisticsService = WorkflowStatisticsService = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_1.Logger,
+    __metadata("design:paramtypes", [logger_service_1.Logger,
         workflow_statistics_repository_1.WorkflowStatisticsRepository,
         ownership_service_1.OwnershipService,
         user_service_1.UserService,

package/dist/services/workflow-statistics.service.js.map

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

package/dist/shutdown/shutdown.service.d.ts

@@ -1,6 +1,6 @@
 import type { Class } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
-import { Logger } from '../logger';
+import { Logger } from '../logging/logger.service';
 type HandlerFn = () => Promise<void> | void;
 export type ServiceClass = Class<Record<string, HandlerFn>>;
 export interface ShutdownHandler {

package/dist/shutdown/shutdown.service.js

@@ -13,7 +13,7 @@ exports.ShutdownService = exports.ComponentShutdownError = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const typedi_1 = require("typedi");
 const constants_1 = require("../constants");
-const logger_1 = require("../logger");
+const logger_service_1 = require("../logging/logger.service");
 class ComponentShutdownError extends n8n_workflow_1.ApplicationError {
     constructor(componentName, cause) {
         super('Failed to shutdown gracefully', {
@@ -88,6 +88,6 @@ let ShutdownService = class ShutdownService {
 exports.ShutdownService = ShutdownService;
 exports.ShutdownService = ShutdownService = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_1.Logger])
+    __metadata("design:paramtypes", [logger_service_1.Logger])
 ], ShutdownService);
 //# sourceMappingURL=shutdown.service.js.map

package/dist/shutdown/shutdown.service.js.map

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

package/dist/sso/saml/saml-validator.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMetadata = validateMetadata;
 exports.validateResponse = validateResponse;
 const typedi_1 = require("typedi");
-const logger_1 = require("../../logger");
+const logger_service_1 = require("../../logging/logger.service");
 let xml;
 let xmldsigCore;
 let xmlXenc;
@@ -36,7 +36,7 @@ let xmlProtocol;
 let xmllintWasm;
 async function loadSchemas() {
     if (!xml || xml.contents === '') {
-        typedi_1.Container.get(logger_1.Logger).debug('Loading XML schema files for SAML validation into memory');
+        typedi_1.Container.get(logger_service_1.Logger).debug('Loading XML schema files for SAML validation into memory');
         const f = await Promise.resolve().then(() => __importStar(require('./schema/xml.xsd')));
         xml = {
             fileName: 'xml.xsd',
@@ -81,12 +81,12 @@ async function loadSchemas() {
 }
 async function loadXmllintWasm() {
     if (xmllintWasm === undefined) {
-        typedi_1.Container.get(logger_1.Logger).debug('Loading xmllint-wasm library into memory');
+        typedi_1.Container.get(logger_service_1.Logger).debug('Loading xmllint-wasm library into memory');
         xmllintWasm = await Promise.resolve().then(() => __importStar(require('xmllint-wasm')));
     }
 }
 async function validateMetadata(metadata) {
-    const logger = typedi_1.Container.get(logger_1.Logger);
+    const logger = typedi_1.Container.get(logger_service_1.Logger);
     try {
         await loadXmllintWasm();
         await loadSchemas();
@@ -120,7 +120,7 @@ async function validateMetadata(metadata) {
     return false;
 }
 async function validateResponse(response) {
-    const logger = typedi_1.Container.get(logger_1.Logger);
+    const logger = typedi_1.Container.get(logger_service_1.Logger);
     try {
         await loadXmllintWasm();
         await loadSchemas();