n8n 1.60.1 → 1.62.0

package/dist/services/orchestration/main/handle-command-message-main.d.ts

@@ -1 +1,159 @@
-export declare function handleCommandMessageMain(messageString: string): Promise<import("../../redis/redis-service-commands").RedisServiceCommandObject | undefined>;
+export declare function handleCommandMessageMain(messageString: string): Promise<{
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "reload-license";
+    payload?: never | undefined;
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "restart-event-bus";
+    payload?: never | undefined;
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "reload-external-secrets-providers";
+    payload?: never | undefined;
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "community-package-install";
+    payload: {
+        packageName: string;
+        packageVersion: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "community-package-update";
+    payload: {
+        packageName: string;
+        packageVersion: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "community-package-uninstall";
+    payload: {
+        packageName: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "get-worker-id";
+    payload?: never | undefined;
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "get-worker-status";
+    payload?: never | undefined;
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "add-webhooks-triggers-and-pollers";
+    payload: {
+        workflowId: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "remove-triggers-and-pollers";
+    payload: {
+        workflowId: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "display-workflow-activation";
+    payload: {
+        workflowId: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "display-workflow-deactivation";
+    payload: {
+        workflowId: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "display-workflow-activation-error";
+    payload: {
+        workflowId: string;
+        errorMessage: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "relay-execution-lifecycle-event";
+    payload: {
+        type: import("@n8n/api-types").PushType;
+        args: Record<string, unknown>;
+        pushRef: string;
+    };
+} | {
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "clear-test-webhooks";
+    payload: {
+        webhookKey: string;
+        workflowEntity: import("../../../interfaces").IWorkflowDb;
+        pushRef: string;
+    };
+} | {
+    payload: {
+        result: string;
+    };
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "reload-license";
+} | {
+    payload: {
+        result: string;
+    };
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "restart-event-bus";
+} | {
+    payload: {
+        result: string;
+    };
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "reload-external-secrets-providers";
+} | {
+    payload: {
+        result: string;
+    };
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "add-webhooks-triggers-and-pollers";
+} | {
+    payload: {
+        result: string;
+    };
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "remove-triggers-and-pollers";
+} | {
+    payload: {
+        result: string;
+    };
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "display-workflow-activation";
+} | {
+    payload: {
+        result: string;
+    };
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "display-workflow-deactivation";
+} | {
+    payload: {
+        result: string;
+    };
+    senderId: string;
+    targets?: string[] | undefined;
+    command: "display-workflow-activation-error";
+} | undefined>;

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

@@ -12,7 +12,7 @@ const workflow_repository_1 = require("../../../databases/repositories/workflow.
 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 push_1 = require("../../../push");
 const community_packages_service_1 = require("../../../services/community-packages.service");
 const orchestration_service_1 = require("../../../services/orchestration.service");
@@ -22,7 +22,7 @@ async function handleCommandMessageMain(messageString) {
     const queueModeId = config_1.default.getEnv('redis.queueModeId');
     const isMainInstance = typedi_1.Container.get(n8n_core_1.InstanceSettings).instanceType === 'main';
     const message = (0, helpers_1.messageToRedisServiceCommandObject)(messageString);
-    const logger = typedi_1.Container.get(logger_1.Logger);
+    const logger = typedi_1.Container.get(logger_service_1.Logger);
     if (message) {
         logger.debug(`RedisCommandHandler(main): Received command message ${message.command} from ${message.senderId}`);
         const selfSendingAllowed = [
@@ -37,32 +37,23 @@ async function handleCommandMessageMain(messageString) {
         }
         const push = typedi_1.Container.get(push_1.Push);
         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')) {
                     return message;
                 }
                 await typedi_1.Container.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.Container.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.Container.get(external_secrets_manager_ee_1.ExternalSecretsManager).reloadAllProviders();
                 break;
@@ -72,19 +63,18 @@ async function handleCommandMessageMain(messageString) {
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 200)) {
                     return message;
                 }
-                const { packageName, packageVersion } = message.payload;
+                const { packageName } = message.payload;
                 const communityPackagesService = typedi_1.Container.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 'add-webhooks-triggers-and-pollers': {
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 100)) {
-                    message.payload = { result: 'debounced' };
-                    return message;
+                    return { ...message, payload: { result: 'debounced' } };
                 }
                 const orchestrationService = typedi_1.Container.get(orchestration_service_1.OrchestrationService);
                 if (orchestrationService.isFollower)
@@ -106,7 +96,7 @@ async function handleCommandMessageMain(messageString) {
                             workflowId,
                             errorMessage: error.message,
                         });
-                        await typedi_1.Container.get(orchestration_service_1.OrchestrationService).publish('workflow-failed-to-activate', {
+                        await typedi_1.Container.get(orchestration_service_1.OrchestrationService).publish('display-workflow-activation-error', {
                             workflowId,
                             errorMessage: error.message,
                         });
@@ -116,8 +106,7 @@ async function handleCommandMessageMain(messageString) {
             }
             case 'remove-triggers-and-pollers': {
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 100)) {
-                    message.payload = { result: 'debounced' };
-                    return message;
+                    return { ...message, payload: { result: 'debounced' } };
                 }
                 const orchestrationService = typedi_1.Container.get(orchestration_service_1.OrchestrationService);
                 if (orchestrationService.isFollower)
@@ -134,8 +123,7 @@ async function handleCommandMessageMain(messageString) {
             }
             case 'display-workflow-activation': {
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 100)) {
-                    message.payload = { result: 'debounced' };
-                    return message;
+                    return { ...message, payload: { result: 'debounced' } };
                 }
                 const { workflowId } = message.payload ?? {};
                 if (typeof workflowId !== 'string')
@@ -145,8 +133,7 @@ async function handleCommandMessageMain(messageString) {
             }
             case 'display-workflow-deactivation': {
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 100)) {
-                    message.payload = { result: 'debounced' };
-                    return message;
+                    return { ...message, payload: { result: 'debounced' } };
                 }
                 const { workflowId } = message.payload ?? {};
                 if (typeof workflowId !== 'string')
@@ -154,10 +141,9 @@ async function handleCommandMessageMain(messageString) {
                 push.broadcast('workflowDeactivated', { workflowId });
                 break;
             }
-            case 'workflow-failed-to-activate': {
+            case 'display-workflow-activation-error': {
                 if (!(0, helpers_1.debounceMessageReceiver)(message, 100)) {
-                    message.payload = { result: 'debounced' };
-                    return message;
+                    return { ...message, payload: { result: 'debounced' } };
                 }
                 const { workflowId, errorMessage } = message.payload ?? {};
                 if (typeof workflowId !== 'string' || typeof errorMessage !== 'string')

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

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

package/dist/services/orchestration/main/handle-worker-response-message-main.d.ts

@@ -1,98 +1,28 @@
-import type { WorkerStatus } from '@n8n/api-types';
 import type { MainResponseReceivedHandlerOptions } from './types';
-export declare function handleWorkerResponseMessageMain(messageString: string, options: MainResponseReceivedHandlerOptions): Promise<({
+export declare function handleWorkerResponseMessageMain(messageString: string, options: MainResponseReceivedHandlerOptions): Promise<{
     workerId: string;
-} & {
-    senderId: string;
-    command: Exclude<import("../../redis/redis-service-commands").RedisServiceCommand, "relay-execution-lifecycle-event" | "clear-test-webhooks" | "community-package-install" | "community-package-update" | "community-package-uninstall">;
-    payload?: {
-        [key: string]: string | number | boolean | string[] | number[] | boolean[];
-    };
-} & {
-    targets?: string[];
-}) | ({
-    workerId: string;
-} & {
-    senderId: string;
-    command: "relay-execution-lifecycle-event";
-    payload: {
-        type: import("@n8n/api-types").PushType;
-        args: Record<string, unknown>;
-        pushRef: string;
-    };
-} & {
-    targets?: string[];
-}) | ({
-    workerId: string;
-} & {
-    senderId: string;
-    command: "clear-test-webhooks";
-    payload: {
-        webhookKey: string;
-        workflowEntity: import("../../../interfaces").IWorkflowDb;
-        pushRef: string;
-    };
-} & {
-    targets?: string[];
-}) | ({
-    workerId: string;
-} & {
-    senderId: string;
-    command: "community-package-install" | "community-package-update" | "community-package-uninstall";
-    payload: {
-        packageName: string;
-        packageVersion: string;
-    };
-} & {
-    targets?: string[];
-}) | ({
-    workerId: string;
-} & {
-    command: "getStatus";
-    payload: WorkerStatus;
-} & {
-    targets?: string[];
-}) | ({
-    workerId: string;
-} & {
-    command: "getId";
-} & {
-    targets?: string[];
-}) | ({
-    workerId: string;
-} & {
-    command: "restartEventBus";
+    targets?: string[] | undefined;
+    command: "restart-event-bus";
     payload: {
         result: "success" | "error";
         error?: string;
     };
-} & {
-    targets?: string[];
-}) | ({
+} | {
     workerId: string;
-} & {
-    command: "reloadExternalSecretsProviders";
+    targets?: string[] | undefined;
+    command: "reload-external-secrets-providers";
     payload: {
         result: "success" | "error";
         error?: string;
     };
-} & {
-    targets?: string[];
-}) | ({
+} | {
     workerId: string;
-} & {
-    command: "stopWorker";
-} & {
-    targets?: string[];
-}) | ({
+    targets?: string[] | undefined;
+    command: "get-worker-id";
+    payload?: never | undefined;
+} | {
     workerId: string;
-} & {
-    command: "workflowActiveStateChanged";
-    payload: {
-        oldState: boolean;
-        newState: boolean;
-        workflowId: string;
-    };
-} & {
-    targets?: string[];
-}) | undefined>;
+    targets?: string[] | undefined;
+    command: "get-worker-status";
+    payload: import("@n8n/api-types").WorkerStatus;
+} | undefined>;

package/dist/services/orchestration/main/handle-worker-response-message-main.js

@@ -6,30 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleWorkerResponseMessageMain = handleWorkerResponseMessageMain;
 const n8n_workflow_1 = require("n8n-workflow");
 const typedi_1 = __importDefault(require("typedi"));
-const logger_1 = require("../../../logger");
-const redis_constants_1 = require("../../../services/redis/redis-constants");
+const logger_service_1 = require("../../../logging/logger.service");
+const constants_1 = require("../../../scaling/constants");
 const push_1 = require("../../../push");
 async function handleWorkerResponseMessageMain(messageString, options) {
     const workerResponse = (0, n8n_workflow_1.jsonParse)(messageString, {
         fallbackValue: null,
     });
     if (!workerResponse) {
-        typedi_1.default.get(logger_1.Logger).debug(`Received invalid message via channel ${redis_constants_1.WORKER_RESPONSE_REDIS_CHANNEL}: "${messageString}"`);
+        typedi_1.default.get(logger_service_1.Logger).debug(`Received invalid message via channel ${constants_1.WORKER_RESPONSE_PUBSUB_CHANNEL}: "${messageString}"`);
         return;
     }
     if (workerResponse.targets && !workerResponse.targets.includes(options.queueModeId))
         return;
     switch (workerResponse.command) {
-        case 'getStatus':
+        case 'get-worker-status':
             typedi_1.default.get(push_1.Push).broadcast('sendWorkerStatusMessage', {
                 workerId: workerResponse.workerId,
                 status: workerResponse.payload,
             });
             break;
-        case 'getId':
+        case 'get-worker-id':
             break;
         default:
-            typedi_1.default.get(logger_1.Logger).debug(`Received worker response ${workerResponse.command} from ${workerResponse.workerId}`);
+            typedi_1.default.get(logger_service_1.Logger).debug(`Received worker response ${workerResponse.command} from ${workerResponse.workerId}`);
     }
     return workerResponse;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"handle-worker-response-message-main.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/handle-worker-response-message-main.ts"],"names":[],"mappings":";;;;;AAWA,0EAiCC;AA3CD,+CAAyC;AACzC,oDAA+B;AAE/B,qCAAkC;AAClC,sEAAiF;AAGjF,wCAAqC;AAG9B,KAAK,UAAU,+BAA+B,CACpD,aAAqB,EACrB,OAA2C;IAE3C,MAAM,cAAc,GAAG,IAAA,wBAAS,EAA0C,aAAa,EAAE;QACxF,aAAa,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc,EAAE,CAAC;QACrB,gBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC,KAAK,CAC1B,wCAAwC,+CAA6B,MAAM,aAAa,GAAG,CAC3F,CAAC;QACF,OAAO;IACR,CAAC;IAED,IAAI,cAAc,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;QAAE,OAAO;IAE5F,QAAQ,cAAc,CAAC,OAAO,EAAE,CAAC;QAChC,KAAK,WAAW;YACf,gBAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,SAAS,CAAC,yBAAyB,EAAE;gBACxD,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,MAAM,EAAE,cAAc,CAAC,OAAuB;aAC9C,CAAC,CAAC;YACH,MAAM;QACP,KAAK,OAAO;YACX,MAAM;QACP;YACC,gBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC,KAAK,CAC1B,4BAA4B,cAAc,CAAC,OAAO,SAAS,cAAc,CAAC,QAAQ,EAAE,CACpF,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CAAC;AACvB,CAAC"}
+{"version":3,"file":"handle-worker-response-message-main.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/handle-worker-response-message-main.ts"],"names":[],"mappings":";;;;;AAUA,0EAiCC;AA3CD,+CAAyC;AACzC,oDAA+B;AAE/B,6DAAkD;AAClD,mDAAqE;AAIrE,wCAAqC;AAE9B,KAAK,UAAU,+BAA+B,CACpD,aAAqB,EACrB,OAA2C;IAE3C,MAAM,cAAc,GAAG,IAAA,wBAAS,EAA+B,aAAa,EAAE;QAC7E,aAAa,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc,EAAE,CAAC;QACrB,gBAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC,KAAK,CAC1B,wCAAwC,0CAA8B,MAAM,aAAa,GAAG,CAC5F,CAAC;QACF,OAAO;IACR,CAAC;IAED,IAAI,cAAc,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;QAAE,OAAO;IAE5F,QAAQ,cAAc,CAAC,OAAO,EAAE,CAAC;QAChC,KAAK,mBAAmB;YACvB,gBAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,SAAS,CAAC,yBAAyB,EAAE;gBACxD,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,MAAM,EAAE,cAAc,CAAC,OAAO;aAC9B,CAAC,CAAC;YACH,MAAM;QACP,KAAK,eAAe;YACnB,MAAM;QACP;YACC,gBAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC,KAAK,CAC1B,4BAA4B,cAAc,CAAC,OAAO,SAAS,cAAc,CAAC,QAAQ,EAAE,CACpF,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CAAC;AACvB,CAAC"}

package/dist/services/orchestration/main/multi-main-setup.ee.d.ts

@@ -1,7 +1,7 @@
 import { InstanceSettings } from 'n8n-core';
-import { Logger } from '../../../logger';
+import { Logger } from '../../../logging/logger.service';
 import { Publisher } from '../../../scaling/pubsub/publisher.service';
-import { RedisClientService } from '../../../services/redis/redis-client.service';
+import { RedisClientService } from '../../../services/redis-client.service';
 import { TypedEmitter } from '../../../typed-emitter';
 type MultiMainEvents = {
     'leader-stepdown': never;

package/dist/services/orchestration/main/multi-main-setup.ee.js

@@ -18,9 +18,9 @@ const n8n_workflow_1 = require("n8n-workflow");
 const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../../../config"));
 const constants_1 = require("../../../constants");
-const logger_1 = require("../../../logger");
+const logger_service_1 = require("../../../logging/logger.service");
 const publisher_service_1 = require("../../../scaling/pubsub/publisher.service");
-const redis_client_service_1 = require("../../../services/redis/redis-client.service");
+const redis_client_service_1 = require("../../../services/redis-client.service");
 const typed_emitter_1 = require("../../../typed-emitter");
 let MultiMainSetup = class MultiMainSetup extends typed_emitter_1.TypedEmitter {
     constructor(logger, instanceSettings, publisher, redisClientService) {
@@ -91,7 +91,7 @@ let MultiMainSetup = class MultiMainSetup extends typed_emitter_1.TypedEmitter {
 exports.MultiMainSetup = MultiMainSetup;
 exports.MultiMainSetup = MultiMainSetup = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_1.Logger,
+    __metadata("design:paramtypes", [logger_service_1.Logger,
         n8n_core_1.InstanceSettings,
         publisher_service_1.Publisher,
         redis_client_service_1.RedisClientService])

package/dist/services/orchestration/main/multi-main-setup.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"multi-main-setup.ee.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/multi-main-setup.ee.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multi-main-setup.ee.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/multi-main-setup.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAA4C;AAC5C,+CAAmE;AACnE,mCAAiC;AAEjC,sDAA8B;AAC9B,2CAAmC;AACnC,6DAAkD;AAClD,0EAA+D;AAC/D,0EAAqE;AACrE,mDAA+C;AAQxC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,4BAA6B;IAChE,YACkB,MAAc,EACd,gBAAkC,EAClC,SAAoB,EACpB,kBAAsC;QAEvD,KAAK,EAAE,CAAC;QALS,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,cAAS,GAAT,SAAS,CAAW;QACpB,uBAAkB,GAAlB,kBAAkB,CAAoB;QAWvC,iBAAY,GAAG,gBAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IARpE,CAAC;IAED,IAAI,UAAU;QACb,OAAO,gBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC3C,CAAC;IAQD,KAAK,CAAC,IAAI;QACT,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS,GAAG,WAAW,GAAG,uBAAuB,CAAC;QAEvD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7B,IAAI,CAAC,mBAAmB,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YACjD,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1B,CAAC,EAAE,gBAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,GAAG,gBAAI,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAExC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAE3C,IAAI,QAAQ;YAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAEO,KAAK,CAAC,WAAW;QACxB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,QAAQ,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,UAAU,2BAA2B,CAAC,CAAC;YAE9E,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAEtE,OAAO;QACR,CAAC;QAED,IAAI,QAAQ,IAAI,QAAQ,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,UAAU,+BAA+B,QAAQ,GAAG,CAAC,CAAC;YAE7F,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gBACpC,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC;gBAEvC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAE7B,iCAAa,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YAC5E,CAAC;YAED,OAAO;QACR,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,gBAAgB,IAAI,CAAC,UAAU,qDAAqD,CACpF,CAAC;YAEF,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC;YAKvC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAE7B,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC9B,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,eAAe;QAE5B,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAEhG,IAAI,kBAAkB,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,UAAU,+BAA+B,CAAC,CAAC;YAElF,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;YAErC,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAKtE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC;QACxC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;CACD,CAAA;AAxGY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,gBAAO,GAAE;qCAGiB,uBAAM;QACI,2BAAgB;QACvB,6BAAS;QACA,yCAAkB;GAL5C,cAAc,CAwG1B"}

package/dist/services/orchestration/main/orchestration.handler.main.service.js

@@ -15,7 +15,6 @@ const subscriber_service_1 = require("../../../scaling/pubsub/subscriber.service
 const handle_command_message_main_1 = require("./handle-command-message-main");
 const handle_worker_response_message_main_1 = require("./handle-worker-response-message-main");
 const orchestration_handler_base_service_1 = require("../../orchestration.handler.base.service");
-const redis_constants_1 = require("../../redis/redis-constants");
 let OrchestrationHandlerMainService = class OrchestrationHandlerMainService extends orchestration_handler_base_service_1.OrchestrationHandlerService {
     constructor(subscriber) {
         super();
@@ -24,14 +23,10 @@ let OrchestrationHandlerMainService = class OrchestrationHandlerMainService exte
     async initSubscriber(options) {
         await this.subscriber.subscribe('n8n.commands');
         await this.subscriber.subscribe('n8n.worker-response');
-        this.subscriber.addMessageHandler(async (channel, messageString) => {
-            if (channel === redis_constants_1.WORKER_RESPONSE_REDIS_CHANNEL) {
-                await (0, handle_worker_response_message_main_1.handleWorkerResponseMessageMain)(messageString, options);
-            }
-            else if (channel === redis_constants_1.COMMAND_REDIS_CHANNEL) {
-                await (0, handle_command_message_main_1.handleCommandMessageMain)(messageString);
-            }
+        this.subscriber.setMessageHandler('n8n.worker-response', async (message) => {
+            await (0, handle_worker_response_message_main_1.handleWorkerResponseMessageMain)(message, options);
         });
+        this.subscriber.setMessageHandler('n8n.commands', handle_command_message_main_1.handleCommandMessageMain);
     }
 };
 exports.OrchestrationHandlerMainService = OrchestrationHandlerMainService;

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

@@ -1 +1 @@
-{"version":3,"file":"orchestration.handler.main.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/orchestration.handler.main.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,4EAAiE;AAEjE,+EAAyE;AACzE,+FAAwF;AAExF,iGAAuF;AACvF,iEAAmG;AAG5F,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,gEAA2B;IAC/E,YAA6B,UAAsB;QAClD,KAAK,EAAE,CAAC;QADoB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA2C;QAC/D,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAEvD,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAe,EAAE,aAAqB,EAAE,EAAE;YAClF,IAAI,OAAO,KAAK,+CAA6B,EAAE,CAAC;gBAC/C,MAAM,IAAA,qEAA+B,EAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YAC/D,CAAC;iBAAM,IAAI,OAAO,KAAK,uCAAqB,EAAE,CAAC;gBAC9C,MAAM,IAAA,sDAAwB,EAAC,aAAa,CAAC,CAAC;YAC/C,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAjBY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,gBAAO,GAAE;qCAEgC,+BAAU;GADvC,+BAA+B,CAiB3C"}
+{"version":3,"file":"orchestration.handler.main.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/orchestration.handler.main.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,4EAAiE;AAEjE,+EAAyE;AACzE,+FAAwF;AAExF,iGAAuF;AAGhF,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,gEAA2B;IAC/E,YAA6B,UAAsB;QAClD,KAAK,EAAE,CAAC;QADoB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA2C;QAC/D,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAEvD,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,EAAE,OAAe,EAAE,EAAE;YAClF,MAAM,IAAA,qEAA+B,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,cAAc,EAAE,sDAAwB,CAAC,CAAC;IAC7E,CAAC;CACD,CAAA;AAfY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,gBAAO,GAAE;qCAEgC,+BAAU;GADvC,+BAA+B,CAe3C"}