n8n 1.61.0 → 1.62.1

package/dist/services/orchestration/webhook/handle-command-message-webhook.js

@@ -26,12 +26,9 @@ async function handleCommandMessageWebhook(messageString) {
             return message;
         }
         switch (message.command) {
-            case 'reloadLicense':
+            case 'reload-license':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 500)) {
-                    message.payload = {
-                        result: 'debounced',
-                    };
-                    return message;
+                    return { ...message, payload: { result: 'debounced' } };
                 }
                 if (isMainInstance && !config_1.default.getEnv('multiMainSetup.enabled')) {
                     logger.error('Received command to reload license via Redis, but this should not have happened and is not supported on the main instance yet.');
@@ -39,20 +36,14 @@ async function handleCommandMessageWebhook(messageString) {
                 }
                 await typedi_1.default.get(license_1.License).reload();
                 break;
-            case 'restartEventBus':
+            case 'restart-event-bus':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 200)) {
-                    message.payload = {
-                        result: 'debounced',
-                    };
-                    return message;
+                    return { ...message, payload: { result: 'debounced' } };
                 }
                 await typedi_1.default.get(message_event_bus_1.MessageEventBus).restart();
-            case 'reloadExternalSecretsProviders':
+            case 'reload-external-secrets-providers':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 200)) {
-                    message.payload = {
-                        result: 'debounced',
-                    };
-                    return message;
+                    return { ...message, payload: { result: 'debounced' } };
                 }
                 await typedi_1.default.get(external_secrets_manager_ee_1.ExternalSecretsManager).reloadAllProviders();
                 break;
@@ -62,13 +53,13 @@ async function handleCommandMessageWebhook(messageString) {
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 200)) {
                     return message;
                 }
-                const { packageName, packageVersion } = message.payload;
+                const { packageName } = message.payload;
                 const communityPackagesService = typedi_1.default.get(community_packages_service_1.CommunityPackagesService);
                 if (message.command === 'community-package-uninstall') {
                     await communityPackagesService.removeNpmPackage(packageName);
                 }
                 else {
-                    await communityPackagesService.installOrUpdateNpmPackage(packageName, packageVersion);
+                    await communityPackagesService.installOrUpdateNpmPackage(packageName, message.payload.packageVersion);
                 }
                 break;
             default:

package/dist/services/orchestration/webhook/handle-command-message-webhook.js.map

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

package/dist/services/orchestration/worker/handle-command-message-worker.js

@@ -11,14 +11,14 @@ const constants_1 = require("../../../constants");
 const message_event_bus_1 = require("../../../eventbus/message-event-bus/message-event-bus");
 const external_secrets_manager_ee_1 = require("../../../external-secrets/external-secrets-manager.ee");
 const license_1 = require("../../../license");
-const logger_1 = require("../../../logger");
+const logger_service_1 = require("../../../logging/logger.service");
 const constants_2 = require("../../../scaling/constants");
 const community_packages_service_1 = require("../../../services/community-packages.service");
 const helpers_1 = require("../helpers");
 async function getWorkerCommandReceivedHandler(messageString, options) {
     if (!messageString)
         return;
-    const logger = typedi_1.default.get(logger_1.Logger);
+    const logger = typedi_1.default.get(logger_service_1.Logger);
     let message;
     try {
         message = (0, n8n_workflow_1.jsonParse)(messageString);
@@ -33,12 +33,12 @@ async function getWorkerCommandReceivedHandler(messageString, options) {
             return;
         }
         switch (message.command) {
-            case 'getStatus':
+            case 'get-worker-status':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
                     return;
                 await options.publisher.publishWorkerResponse({
                     workerId: options.queueModeId,
-                    command: 'getStatus',
+                    command: 'get-worker-status',
                     payload: {
                         workerId: options.queueModeId,
                         runningJobsSummary: options.getRunningJobsSummary(),
@@ -59,22 +59,22 @@ async function getWorkerCommandReceivedHandler(messageString, options) {
                     },
                 });
                 break;
-            case 'getId':
+            case 'get-worker-id':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
                     return;
                 await options.publisher.publishWorkerResponse({
                     workerId: options.queueModeId,
-                    command: 'getId',
+                    command: 'get-worker-id',
                 });
                 break;
-            case 'restartEventBus':
+            case 'restart-event-bus':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
                     return;
                 try {
                     await typedi_1.default.get(message_event_bus_1.MessageEventBus).restart();
                     await options.publisher.publishWorkerResponse({
                         workerId: options.queueModeId,
-                        command: 'restartEventBus',
+                        command: 'restart-event-bus',
                         payload: {
                             result: 'success',
                         },
@@ -83,7 +83,7 @@ async function getWorkerCommandReceivedHandler(messageString, options) {
                 catch (error) {
                     await options.publisher.publishWorkerResponse({
                         workerId: options.queueModeId,
-                        command: 'restartEventBus',
+                        command: 'restart-event-bus',
                         payload: {
                             result: 'error',
                             error: error.message,
@@ -91,14 +91,14 @@ async function getWorkerCommandReceivedHandler(messageString, options) {
                     });
                 }
                 break;
-            case 'reloadExternalSecretsProviders':
+            case 'reload-external-secrets-providers':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
                     return;
                 try {
                     await typedi_1.default.get(external_secrets_manager_ee_1.ExternalSecretsManager).reloadAllProviders();
                     await options.publisher.publishWorkerResponse({
                         workerId: options.queueModeId,
-                        command: 'reloadExternalSecretsProviders',
+                        command: 'reload-external-secrets-providers',
                         payload: {
                             result: 'success',
                         },
@@ -107,7 +107,7 @@ async function getWorkerCommandReceivedHandler(messageString, options) {
                 catch (error) {
                     await options.publisher.publishWorkerResponse({
                         workerId: options.queueModeId,
-                        command: 'reloadExternalSecretsProviders',
+                        command: 'reload-external-secrets-providers',
                         payload: {
                             result: 'error',
                             error: error.message,
@@ -120,24 +120,20 @@ async function getWorkerCommandReceivedHandler(messageString, options) {
             case 'community-package-uninstall':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
                     return;
-                const { packageName, packageVersion } = message.payload;
+                const { packageName } = message.payload;
                 const communityPackagesService = typedi_1.default.get(community_packages_service_1.CommunityPackagesService);
                 if (message.command === 'community-package-uninstall') {
                     await communityPackagesService.removeNpmPackage(packageName);
                 }
                 else {
-                    await communityPackagesService.installOrUpdateNpmPackage(packageName, packageVersion);
+                    await communityPackagesService.installOrUpdateNpmPackage(packageName, message.payload.packageVersion);
                 }
                 break;
-            case 'reloadLicense':
+            case 'reload-license':
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
                     return;
                 await typedi_1.default.get(license_1.License).reload();
                 break;
-            case 'stopWorker':
-                if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
-                    return;
-                break;
             default:
                 if (message.command === 'relay-execution-lifecycle-event' ||
                     message.command === 'clear-test-webhooks') {

package/dist/services/orchestration/worker/handle-command-message-worker.js.map

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

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

@@ -1,8 +1,8 @@
 import { InstanceSettings } from 'n8n-core';
 import type { WorkflowActivateMode } from 'n8n-workflow';
-import { Logger } from '../logger';
+import type { PubSubCommandMap } from '../events/maps/pub-sub.event-map';
+import { Logger } from '../logging/logger.service';
 import { MultiMainSetup } from './orchestration/main/multi-main-setup.ee';
-import type { RedisServiceCommand } from '../scaling/redis/redis-service-commands';
 export declare class OrchestrationService {
     private readonly logger;
     readonly instanceSettings: InstanceSettings;
@@ -21,7 +21,7 @@ export declare class OrchestrationService {
     sanityCheck(): boolean;
     init(): Promise<void>;
     shutdown(): Promise<void>;
-    publish(command: RedisServiceCommand, data?: unknown): Promise<void>;
+    publish<CommandKey extends keyof PubSubCommandMap>(commandKey: CommandKey, payload?: PubSubCommandMap[CommandKey]): Promise<void>;
     getWorkerStatus(id?: string): Promise<void>;
     getWorkerIds(): Promise<void>;
     shouldAddWebhooks(activationMode: WorkflowActivateMode): boolean;

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":"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"}
+{"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