n8n 1.59.2 → 1.60.0

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":";;;;;AAYA,kEAgFC;AA5FD,uCAA4C;AAC5C,oDAA+B;AAC/B,qCAAiC;AAEjC,sDAA8B;AAC9B,sFAAiF;AACjF,gGAAwF;AACxF,uCAAoC;AACpC,sFAAiF;AAEjF,wCAAyF;AAElF,KAAK,UAAU,2BAA2B,CAAC,aAAqB;IACtE,MAAM,WAAW,GAAG,gBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,gBAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC;IAC/E,MAAM,OAAO,GAAG,IAAA,4CAAkC,EAAC,aAAa,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,gBAAS,CAAC,GAAG,CAAC,gBAAM,CAAC,CAAC;IAErC,IAAI,OAAO,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,CACX,uDAAuD,OAAO,CAAC,OAAO,SAAS,OAAO,CAAC,QAAQ,EAAE,CACjG,CAAC;QAEF,IACC,OAAO,CAAC,QAAQ,KAAK,WAAW;YAChC,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EAC1D,CAAC;YAEF,MAAM,CAAC,KAAK,CACX,4BAA4B,OAAO,CAAC,OAAO,sCAAsC,CACjF,CAAC;YACF,OAAO,OAAO,CAAC;QAChB,CAAC;QAED,QAAQ,OAAO,CAAC,OAAO,EAAE,CAAC;YACzB,KAAK,eAAe;gBACnB,IAAI,CAAC,IAAA,iCAAuB,EAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;oBAC5C,OAAO,CAAC,OAAO,GAAG;wBACjB,MAAM,EAAE,WAAW;qBACnB,CAAC;oBACF,OAAO,OAAO,CAAC;gBAChB,CAAC;gBAED,IAAI,cAAc,IAAI,CAAC,gBAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,EAAE,CAAC;oBAEhE,MAAM,CAAC,KAAK,CACX,gIAAgI,CAChI,CAAC;oBACF,OAAO,OAAO,CAAC;gBAChB,CAAC;gBACD,MAAM,gBAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM;YACP,KAAK,iBAAiB;gBACrB,IAAI,CAAC,IAAA,iCAAuB,EAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;oBAC5C,OAAO,CAAC,OAAO,GAAG;wBACjB,MAAM,EAAE,WAAW;qBACnB,CAAC;oBACF,OAAO,OAAO,CAAC;gBAChB,CAAC;gBACD,MAAM,gBAAS,CAAC,GAAG,CAAC,mCAAe,CAAC,CAAC,OAAO,EAAE,CAAC;YAChD,KAAK,gCAAgC;gBACpC,IAAI,CAAC,IAAA,iCAAuB,EAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;oBAC5C,OAAO,CAAC,OAAO,GAAG;wBACjB,MAAM,EAAE,WAAW;qBACnB,CAAC;oBACF,OAAO,OAAO,CAAC;gBAChB,CAAC;gBACD,MAAM,gBAAS,CAAC,GAAG,CAAC,oDAAsB,CAAC,CAAC,kBAAkB,EAAE,CAAC;gBACjE,MAAM;YACP,KAAK,2BAA2B,CAAC;YACjC,KAAK,0BAA0B,CAAC;YAChC,KAAK,6BAA6B;gBACjC,IAAI,CAAC,IAAA,iCAAuB,EAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;oBAC5C,OAAO,OAAO,CAAC;gBAChB,CAAC;gBACD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;gBACxD,MAAM,wBAAwB,GAAG,gBAAS,CAAC,GAAG,CAAC,qDAAwB,CAAC,CAAC;gBACzE,IAAI,OAAO,CAAC,OAAO,KAAK,6BAA6B,EAAE,CAAC;oBACvD,MAAM,wBAAwB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;gBAC9D,CAAC;qBAAM,CAAC;oBACP,MAAM,wBAAwB,CAAC,yBAAyB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;gBACvF,CAAC;gBACD,MAAM;YAEP;gBACC,MAAM;QACR,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,OAAO;AACR,CAAC"}

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

@@ -1,4 +1,7 @@
+import { Subscriber } from '../../../scaling/pubsub/subscriber.service';
 import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
 export declare class OrchestrationHandlerWebhookService extends OrchestrationHandlerService {
+    private readonly subscriber;
+    constructor(subscriber: Subscriber);
     initSubscriber(): Promise<void>;
 }

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

@@ -5,17 +5,24 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __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.OrchestrationHandlerWebhookService = void 0;
 const typedi_1 = require("typedi");
-const redis_constants_1 = require("../../redis/redis-constants");
-const orchestration_handler_base_service_1 = require("../../orchestration.handler.base.service");
+const subscriber_service_1 = require("../../../scaling/pubsub/subscriber.service");
 const handle_command_message_webhook_1 = require("./handle-command-message-webhook");
+const orchestration_handler_base_service_1 = require("../../orchestration.handler.base.service");
+const redis_constants_1 = require("../../redis/redis-constants");
 let OrchestrationHandlerWebhookService = class OrchestrationHandlerWebhookService extends orchestration_handler_base_service_1.OrchestrationHandlerService {
+    constructor(subscriber) {
+        super();
+        this.subscriber = subscriber;
+    }
     async initSubscriber() {
-        this.redisSubscriber = await this.redisService.getPubSubSubscriber();
-        await this.redisSubscriber.subscribeToCommandChannel();
-        this.redisSubscriber.addMessageHandler('OrchestrationMessageReceiver', async (channel, messageString) => {
+        await this.subscriber.subscribe('n8n.commands');
+        this.subscriber.addMessageHandler(async (channel, messageString) => {
             if (channel === redis_constants_1.COMMAND_REDIS_CHANNEL) {
                 await (0, handle_command_message_webhook_1.handleCommandMessageWebhook)(messageString);
             }
@@ -24,6 +31,7 @@ let OrchestrationHandlerWebhookService = class OrchestrationHandlerWebhookServic
 };
 exports.OrchestrationHandlerWebhookService = OrchestrationHandlerWebhookService;
 exports.OrchestrationHandlerWebhookService = OrchestrationHandlerWebhookService = __decorate([
-    (0, typedi_1.Service)()
+    (0, typedi_1.Service)(),
+    __metadata("design:paramtypes", [subscriber_service_1.Subscriber])
 ], OrchestrationHandlerWebhookService);
 //# sourceMappingURL=orchestration.handler.webhook.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"orchestration.handler.webhook.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/webhook/orchestration.handler.webhook.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAAiC;AACjC,iEAAoE;AACpE,iGAAuF;AACvF,qFAA+E;AAGxE,IAAM,kCAAkC,GAAxC,MAAM,kCAAmC,SAAQ,gEAA2B;IAClF,KAAK,CAAC,cAAc;QACnB,IAAI,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAErE,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,EAAE,CAAC;QAEvD,IAAI,CAAC,eAAe,CAAC,iBAAiB,CACrC,8BAA8B,EAC9B,KAAK,EAAE,OAAe,EAAE,aAAqB,EAAE,EAAE;YAChD,IAAI,OAAO,KAAK,uCAAqB,EAAE,CAAC;gBACvC,MAAM,IAAA,4DAA2B,EAAC,aAAa,CAAC,CAAC;YAClD,CAAC;QACF,CAAC,CACD,CAAC;IACH,CAAC;CACD,CAAA;AAfY,gFAAkC;6CAAlC,kCAAkC;IAD9C,IAAA,gBAAO,GAAE;GACG,kCAAkC,CAe9C"}
+{"version":3,"file":"orchestration.handler.webhook.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/webhook/orchestration.handler.webhook.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,4EAAiE;AAEjE,qFAA+E;AAC/E,iGAAuF;AACvF,iEAAoE;AAG7D,IAAM,kCAAkC,GAAxC,MAAM,kCAAmC,SAAQ,gEAA2B;IAClF,YAA6B,UAAsB;QAClD,KAAK,EAAE,CAAC;QADoB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAEhD,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAe,EAAE,aAAqB,EAAE,EAAE;YAClF,IAAI,OAAO,KAAK,uCAAqB,EAAE,CAAC;gBACvC,MAAM,IAAA,4DAA2B,EAAC,aAAa,CAAC,CAAC;YAClD,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAdY,gFAAkC;6CAAlC,kCAAkC;IAD9C,IAAA,gBAAO,GAAE;qCAEgC,+BAAU;GADvC,kCAAkC,CAc9C"}

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

@@ -11,13 +11,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrchestrationWebhookService = void 0;
 const typedi_1 = require("typedi");
-const orchestration_service_1 = require("../../orchestration.service");
 const config_1 = __importDefault(require("../../../config"));
+const orchestration_service_1 = require("../../orchestration.service");
 let OrchestrationWebhookService = class OrchestrationWebhookService extends orchestration_service_1.OrchestrationService {
     sanityCheck() {
         return (this.isInitialized &&
             config_1.default.get('executions.mode') === 'queue' &&
-            config_1.default.get('generic.instanceType') === 'webhook');
+            this.instanceSettings.instanceType === 'webhook');
     }
 };
 exports.OrchestrationWebhookService = OrchestrationWebhookService;

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

@@ -1 +1 @@
-{"version":3,"file":"orchestration.webhook.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/webhook/orchestration.webhook.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AACjC,uEAAmE;AACnE,sDAA8B;AAGvB,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,4CAAoB;IACpE,WAAW;QACV,OAAO,CACN,IAAI,CAAC,aAAa;YAClB,gBAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,OAAO;YACzC,gBAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,SAAS,CAChD,CAAC;IACH,CAAC;CACD,CAAA;AARY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,gBAAO,GAAE;GACG,2BAA2B,CAQvC"}
+{"version":3,"file":"orchestration.webhook.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/webhook/orchestration.webhook.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,sDAA8B;AAE9B,uEAAmE;AAG5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,4CAAoB;IACpE,WAAW;QACV,OAAO,CACN,IAAI,CAAC,aAAa;YAClB,gBAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,OAAO;YACzC,IAAI,CAAC,gBAAgB,CAAC,YAAY,KAAK,SAAS,CAChD,CAAC;IACH,CAAC;CACD,CAAA;AARY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,gBAAO,GAAE;GACG,2BAA2B,CAQvC"}

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

@@ -1,43 +1,20 @@
 "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 __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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkerCommandReceivedHandler = getWorkerCommandReceivedHandler;
 const n8n_workflow_1 = require("n8n-workflow");
+const node_os_1 = __importDefault(require("node:os"));
 const typedi_1 = __importDefault(require("typedi"));
-const redis_constants_1 = require("../../../services/redis/redis-constants");
-const os = __importStar(require("os"));
-const license_1 = require("../../../license");
+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 helpers_1 = require("../helpers");
+const license_1 = require("../../../license");
 const logger_1 = require("../../../logger");
-const constants_1 = require("../../../constants");
 const community_packages_service_1 = require("../../../services/community-packages.service");
+const redis_constants_1 = require("../../../services/redis/redis-constants");
+const helpers_1 = require("../helpers");
 function getWorkerCommandReceivedHandler(options) {
     return async (channel, messageString) => {
         if (channel === redis_constants_1.COMMAND_REDIS_CHANNEL) {
@@ -61,21 +38,21 @@ function getWorkerCommandReceivedHandler(options) {
                     case 'getStatus':
                         if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
                             return;
-                        await options.redisPublisher.publishToWorkerChannel({
+                        await options.publisher.publishWorkerResponse({
                             workerId: options.queueModeId,
                             command: 'getStatus',
                             payload: {
                                 workerId: options.queueModeId,
                                 runningJobsSummary: options.getRunningJobsSummary(),
-                                freeMem: os.freemem(),
-                                totalMem: os.totalmem(),
+                                freeMem: node_os_1.default.freemem(),
+                                totalMem: node_os_1.default.totalmem(),
                                 uptime: process.uptime(),
-                                loadAvg: os.loadavg(),
+                                loadAvg: node_os_1.default.loadavg(),
                                 cpus: (0, helpers_1.getOsCpuString)(),
-                                arch: os.arch(),
-                                platform: os.platform(),
-                                hostname: os.hostname(),
-                                interfaces: Object.values(os.networkInterfaces()).flatMap((interfaces) => (interfaces ?? [])?.map((net) => ({
+                                arch: node_os_1.default.arch(),
+                                platform: node_os_1.default.platform(),
+                                hostname: node_os_1.default.hostname(),
+                                interfaces: Object.values(node_os_1.default.networkInterfaces()).flatMap((interfaces) => (interfaces ?? [])?.map((net) => ({
                                     family: net.family,
                                     address: net.address,
                                     internal: net.internal,
@@ -87,7 +64,7 @@ function getWorkerCommandReceivedHandler(options) {
                     case 'getId':
                         if (!(0, helpers_1.debounceMessageReceiver)(message, 500))
                             return;
-                        await options.redisPublisher.publishToWorkerChannel({
+                        await options.publisher.publishWorkerResponse({
                             workerId: options.queueModeId,
                             command: 'getId',
                         });
@@ -97,7 +74,7 @@ function getWorkerCommandReceivedHandler(options) {
                             return;
                         try {
                             await typedi_1.default.get(message_event_bus_1.MessageEventBus).restart();
-                            await options.redisPublisher.publishToWorkerChannel({
+                            await options.publisher.publishWorkerResponse({
                                 workerId: options.queueModeId,
                                 command: 'restartEventBus',
                                 payload: {
@@ -106,7 +83,7 @@ function getWorkerCommandReceivedHandler(options) {
                             });
                         }
                         catch (error) {
-                            await options.redisPublisher.publishToWorkerChannel({
+                            await options.publisher.publishWorkerResponse({
                                 workerId: options.queueModeId,
                                 command: 'restartEventBus',
                                 payload: {
@@ -121,7 +98,7 @@ function getWorkerCommandReceivedHandler(options) {
                             return;
                         try {
                             await typedi_1.default.get(external_secrets_manager_ee_1.ExternalSecretsManager).reloadAllProviders();
-                            await options.redisPublisher.publishToWorkerChannel({
+                            await options.publisher.publishWorkerResponse({
                                 workerId: options.queueModeId,
                                 command: 'reloadExternalSecretsProviders',
                                 payload: {
@@ -130,7 +107,7 @@ function getWorkerCommandReceivedHandler(options) {
                             });
                         }
                         catch (error) {
-                            await options.redisPublisher.publishToWorkerChannel({
+                            await options.publisher.publishWorkerResponse({
                                 workerId: options.queueModeId,
                                 command: 'reloadExternalSecretsProviders',
                                 payload: {

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/worker/orchestration.handler.worker.service.d.ts

@@ -1,5 +1,8 @@
-import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
+import { Subscriber } from '../../../scaling/pubsub/subscriber.service';
 import type { WorkerCommandReceivedHandlerOptions } from './types';
+import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
 export declare class OrchestrationHandlerWorkerService extends OrchestrationHandlerService {
+    private readonly subscriber;
+    constructor(subscriber: Subscriber);
     initSubscriber(options: WorkerCommandReceivedHandlerOptions): Promise<void>;
 }

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

@@ -5,20 +5,28 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __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.OrchestrationHandlerWorkerService = void 0;
 const typedi_1 = require("typedi");
-const orchestration_handler_base_service_1 = require("../../orchestration.handler.base.service");
+const subscriber_service_1 = require("../../../scaling/pubsub/subscriber.service");
 const handle_command_message_worker_1 = require("./handle-command-message-worker");
+const orchestration_handler_base_service_1 = require("../../orchestration.handler.base.service");
 let OrchestrationHandlerWorkerService = class OrchestrationHandlerWorkerService extends orchestration_handler_base_service_1.OrchestrationHandlerService {
+    constructor(subscriber) {
+        super();
+        this.subscriber = subscriber;
+    }
     async initSubscriber(options) {
-        this.redisSubscriber = await this.redisService.getPubSubSubscriber();
-        await this.redisSubscriber.subscribeToCommandChannel();
-        this.redisSubscriber.addMessageHandler('WorkerCommandReceivedHandler', (0, handle_command_message_worker_1.getWorkerCommandReceivedHandler)(options));
+        await this.subscriber.subscribe('n8n.commands');
+        this.subscriber.addMessageHandler((0, handle_command_message_worker_1.getWorkerCommandReceivedHandler)(options));
     }
 };
 exports.OrchestrationHandlerWorkerService = OrchestrationHandlerWorkerService;
 exports.OrchestrationHandlerWorkerService = OrchestrationHandlerWorkerService = __decorate([
-    (0, typedi_1.Service)()
+    (0, typedi_1.Service)(),
+    __metadata("design:paramtypes", [subscriber_service_1.Subscriber])
 ], OrchestrationHandlerWorkerService);
 //# sourceMappingURL=orchestration.handler.worker.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"orchestration.handler.worker.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/worker/orchestration.handler.worker.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAAiC;AACjC,iGAAuF;AACvF,mFAAkF;AAI3E,IAAM,iCAAiC,GAAvC,MAAM,iCAAkC,SAAQ,gEAA2B;IACjF,KAAK,CAAC,cAAc,CAAC,OAA4C;QAChE,IAAI,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAErE,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,EAAE,CAAC;QACvD,IAAI,CAAC,eAAe,CAAC,iBAAiB,CACrC,8BAA8B,EAC9B,IAAA,+DAA+B,EAAC,OAAO,CAAC,CACxC,CAAC;IACH,CAAC;CACD,CAAA;AAVY,8EAAiC;4CAAjC,iCAAiC;IAD7C,IAAA,gBAAO,GAAE;GACG,iCAAiC,CAU7C"}
+{"version":3,"file":"orchestration.handler.worker.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/worker/orchestration.handler.worker.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,4EAAiE;AAEjE,mFAAkF;AAElF,iGAAuF;AAGhF,IAAM,iCAAiC,GAAvC,MAAM,iCAAkC,SAAQ,gEAA2B;IACjF,YAA6B,UAAsB;QAClD,KAAK,EAAE,CAAC;QADoB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA4C;QAChE,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAA,+DAA+B,EAAC,OAAO,CAAC,CAAC,CAAC;IAC7E,CAAC;CACD,CAAA;AATY,8EAAiC;4CAAjC,iCAAiC;IAD7C,IAAA,gBAAO,GAAE;qCAEgC,+BAAU;GADvC,iCAAiC,CAS7C"}

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

@@ -11,13 +11,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrchestrationWorkerService = void 0;
 const typedi_1 = require("typedi");
-const orchestration_service_1 = require("../../orchestration.service");
 const config_1 = __importDefault(require("../../../config"));
+const orchestration_service_1 = require("../../orchestration.service");
 let OrchestrationWorkerService = class OrchestrationWorkerService extends orchestration_service_1.OrchestrationService {
     sanityCheck() {
         return (this.isInitialized &&
             config_1.default.get('executions.mode') === 'queue' &&
-            config_1.default.get('generic.instanceType') === 'worker');
+            this.instanceSettings.instanceType === 'worker');
     }
 };
 exports.OrchestrationWorkerService = OrchestrationWorkerService;

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

@@ -1 +1 @@
-{"version":3,"file":"orchestration.worker.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/worker/orchestration.worker.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AACjC,uEAAmE;AACnE,sDAA8B;AAGvB,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,4CAAoB;IACnE,WAAW;QACV,OAAO,CACN,IAAI,CAAC,aAAa;YAClB,gBAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,OAAO;YACzC,gBAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,QAAQ,CAC/C,CAAC;IACH,CAAC;CACD,CAAA;AARY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,gBAAO,GAAE;GACG,0BAA0B,CAQtC"}
+{"version":3,"file":"orchestration.worker.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/worker/orchestration.worker.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,sDAA8B;AAE9B,uEAAmE;AAG5D,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,4CAAoB;IACnE,WAAW;QACV,OAAO,CACN,IAAI,CAAC,aAAa;YAClB,gBAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,OAAO;YACzC,IAAI,CAAC,gBAAgB,CAAC,YAAY,KAAK,QAAQ,CAC/C,CAAC;IACH,CAAC;CACD,CAAA;AARY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,gBAAO,GAAE;GACG,0BAA0B,CAQtC"}

package/dist/services/orchestration/worker/types.d.ts

@@ -1,9 +1,9 @@
+import type { RunningJobSummary } from '@n8n/api-types';
 import type { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
-import type { RedisServicePubSubPublisher } from '../../redis/redis-service-pub-sub-publisher';
-import type { RunningJobSummary } from '../../../scaling/scaling.types';
+import type { Publisher } from '../../../scaling/pubsub/publisher.service';
 export interface WorkerCommandReceivedHandlerOptions {
     queueModeId: string;
-    redisPublisher: RedisServicePubSubPublisher;
+    publisher: Publisher;
     getRunningJobIds: () => Array<string | number>;
     getRunningJobsSummary: () => RunningJobSummary[];
 }

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

@@ -1,12 +1,7 @@
-import { RedisService } from './redis.service';
-import type { RedisServicePubSubSubscriber } from './redis/redis-service-pub-sub-subscriber';
-import type { WorkerCommandReceivedHandlerOptions } from './orchestration/worker/types';
 import type { MainResponseReceivedHandlerOptions } from './orchestration/main/types';
+import type { WorkerCommandReceivedHandlerOptions } from './orchestration/worker/types';
 export declare abstract class OrchestrationHandlerService {
     protected initialized: boolean;
-    redisSubscriber: RedisServicePubSubSubscriber;
-    readonly redisService: RedisService;
-    constructor();
     init(): Promise<void>;
     initWithOptions(options: WorkerCommandReceivedHandlerOptions | MainResponseReceivedHandlerOptions): Promise<void>;
     shutdown(): Promise<void>;

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

@@ -1,15 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrchestrationHandlerService = void 0;
-const typedi_1 = __importDefault(require("typedi"));
-const redis_service_1 = require("./redis.service");
 class OrchestrationHandlerService {
     constructor() {
         this.initialized = false;
-        this.redisService = typedi_1.default.get(redis_service_1.RedisService);
     }
     async init() {
         await this.initSubscriber();
@@ -20,7 +14,6 @@ class OrchestrationHandlerService {
         this.initialized = true;
     }
     async shutdown() {
-        await this.redisSubscriber?.destroy();
         this.initialized = false;
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"orchestration.handler.base.service.js","sourceRoot":"","sources":["../../src/services/orchestration.handler.base.service.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA+B;AAC/B,mDAA+C;AAK/C,MAAsB,2BAA2B;IAOhD;QANU,gBAAW,GAAG,KAAK,CAAC;QAO7B,IAAI,CAAC,YAAY,GAAG,gBAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,OAAiF;QAEjF,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC1B,CAAC;CAKD;AA/BD,kEA+BC"}
+{"version":3,"file":"orchestration.handler.base.service.js","sourceRoot":"","sources":["../../src/services/orchestration.handler.base.service.ts"],"names":[],"mappings":";;;AAGA,MAAsB,2BAA2B;IAAjD;QACW,gBAAW,GAAG,KAAK,CAAC;IAqB/B,CAAC;IAnBA,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,OAAiF;QAEjF,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC1B,CAAC;CAKD;AAtBD,kEAsBC"}

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

@@ -1,29 +1,26 @@
+import { InstanceSettings } from 'n8n-core';
+import type { WorkflowActivateMode } from 'n8n-workflow';
 import { Logger } from '../logger';
-import type { RedisServicePubSubPublisher } from './redis/redis-service-pub-sub-publisher';
-import type { RedisServiceCommand } from './redis/redis-service-commands';
-import { RedisService } from './redis.service';
 import { MultiMainSetup } from './orchestration/main/multi-main-setup.ee';
-import type { WorkflowActivateMode } from 'n8n-workflow';
-import { InstanceSettings } from 'n8n-core';
+import type { RedisServiceCommand } from './redis/redis-service-commands';
 export declare class OrchestrationService {
     private readonly logger;
-    private readonly instanceSettings;
-    private readonly redisService;
+    readonly instanceSettings: InstanceSettings;
     readonly multiMainSetup: MultiMainSetup;
-    constructor(logger: Logger, instanceSettings: InstanceSettings, redisService: RedisService, multiMainSetup: MultiMainSetup);
+    constructor(logger: Logger, instanceSettings: InstanceSettings, multiMainSetup: MultiMainSetup);
+    private publisher;
+    private subscriber;
     protected isInitialized: boolean;
     private isMultiMainSetupLicensed;
     setMultiMainSetupLicensed(newState: boolean): void;
     get isMultiMainSetupEnabled(): boolean;
     get isSingleMainSetup(): boolean;
-    redisPublisher: RedisServicePubSubPublisher;
     get instanceId(): string;
     get isLeader(): boolean;
     get isFollower(): boolean;
     sanityCheck(): boolean;
     init(): Promise<void>;
     shutdown(): Promise<void>;
-    protected initPublisher(): Promise<void>;
     publish(command: RedisServiceCommand, data?: unknown): Promise<void>;
     getWorkerStatus(id?: string): Promise<void>;
     getWorkerIds(): Promise<void>;

package/dist/services/orchestration.service.js

@@ -1,10 +1,33 @@
 "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);
 };
@@ -13,17 +36,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrchestrationService = void 0;
-const typedi_1 = require("typedi");
-const logger_1 = require("../logger");
+const n8n_core_1 = require("n8n-core");
+const typedi_1 = __importStar(require("typedi"));
 const config_1 = __importDefault(require("../config"));
-const redis_service_1 = require("./redis.service");
+const logger_1 = require("../logger");
 const multi_main_setup_ee_1 = require("./orchestration/main/multi-main-setup.ee");
-const n8n_core_1 = require("n8n-core");
 let OrchestrationService = class OrchestrationService {
-    constructor(logger, instanceSettings, redisService, multiMainSetup) {
+    constructor(logger, instanceSettings, multiMainSetup) {
         this.logger = logger;
         this.instanceSettings = instanceSettings;
-        this.redisService = redisService;
         this.multiMainSetup = multiMainSetup;
         this.isInitialized = false;
         this.isMultiMainSetupLicensed = false;
@@ -34,7 +55,7 @@ let OrchestrationService = class OrchestrationService {
     get isMultiMainSetupEnabled() {
         return (config_1.default.getEnv('executions.mode') === 'queue' &&
             config_1.default.getEnv('multiMainSetup.enabled') &&
-            config_1.default.getEnv('generic.instanceType') === 'main' &&
+            this.instanceSettings.instanceType === 'main' &&
             this.isMultiMainSetupLicensed);
     }
     get isSingleMainSetup() {
@@ -55,8 +76,12 @@ let OrchestrationService = class OrchestrationService {
     async init() {
         if (this.isInitialized)
             return;
-        if (config_1.default.get('executions.mode') === 'queue')
-            await this.initPublisher();
+        if (config_1.default.get('executions.mode') === 'queue') {
+            const { Publisher } = await Promise.resolve().then(() => __importStar(require('../scaling/pubsub/publisher.service')));
+            this.publisher = typedi_1.default.get(Publisher);
+            const { Subscriber } = await Promise.resolve().then(() => __importStar(require('../scaling/pubsub/subscriber.service')));
+            this.subscriber = typedi_1.default.get(Subscriber);
+        }
         if (this.isMultiMainSetupEnabled) {
             await this.multiMainSetup.init();
         }
@@ -70,25 +95,23 @@ let OrchestrationService = class OrchestrationService {
             return;
         if (this.isMultiMainSetupEnabled)
             await this.multiMainSetup.shutdown();
-        await this.redisPublisher.destroy();
+        this.publisher.shutdown();
+        this.subscriber.shutdown();
         this.isInitialized = false;
     }
-    async initPublisher() {
-        this.redisPublisher = await this.redisService.getPubSubPublisher();
-    }
     async publish(command, data) {
         if (!this.sanityCheck())
             return;
         const payload = data;
         this.logger.debug(`[Instance ID ${this.instanceId}] Publishing command "${command}"`, payload);
-        await this.redisPublisher.publishToCommandChannel({ command, payload });
+        await this.publisher.publishCommand({ command, payload });
     }
     async getWorkerStatus(id) {
         if (!this.sanityCheck())
             return;
         const command = 'getStatus';
         this.logger.debug(`Sending "${command}" to command channel`);
-        await this.redisPublisher.publishToCommandChannel({
+        await this.publisher.publishCommand({
             command,
             targets: id ? [id] : undefined,
         });
@@ -98,7 +121,7 @@ let OrchestrationService = class OrchestrationService {
             return;
         const command = 'getId';
         this.logger.debug(`Sending "${command}" to command channel`);
-        await this.redisPublisher.publishToCommandChannel({ command });
+        await this.publisher.publishCommand({ command });
     }
     shouldAddWebhooks(activationMode) {
         if (activationMode === 'init')
@@ -116,7 +139,6 @@ exports.OrchestrationService = OrchestrationService = __decorate([
     (0, typedi_1.Service)(),
     __metadata("design:paramtypes", [logger_1.Logger,
         n8n_core_1.InstanceSettings,
-        redis_service_1.RedisService,
         multi_main_setup_ee_1.MultiMainSetup])
 ], OrchestrationService);
 //# sourceMappingURL=orchestration.service.js.map

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/ownership.service.d.ts

@@ -1,11 +1,11 @@
-import { CacheService } from '../services/cache/cache.service';
-import { SharedWorkflowRepository } from '../databases/repositories/shared-workflow.repository';
-import { UserRepository } from '../databases/repositories/user.repository';
-import type { ListQuery } from '../requests';
 import type { Project } from '../databases/entities/project';
-import { ProjectRepository } from '../databases/repositories/project.repository';
 import type { User } from '../databases/entities/user';
 import { ProjectRelationRepository } from '../databases/repositories/project-relation.repository';
+import { ProjectRepository } from '../databases/repositories/project.repository';
+import { SharedWorkflowRepository } from '../databases/repositories/shared-workflow.repository';
+import { UserRepository } from '../databases/repositories/user.repository';
+import type { ListQuery } from '../requests';
+import { CacheService } from '../services/cache/cache.service';
 export declare class OwnershipService {
     private cacheService;
     private userRepository;
@@ -14,7 +14,7 @@ export declare class OwnershipService {
     private sharedWorkflowRepository;
     constructor(cacheService: CacheService, userRepository: UserRepository, projectRepository: ProjectRepository, projectRelationRepository: ProjectRelationRepository, sharedWorkflowRepository: SharedWorkflowRepository);
     getWorkflowProjectCached(workflowId: string): Promise<Project>;
-    getProjectOwnerCached(projectId: string): Promise<User | null>;
+    getPersonalProjectOwnerCached(projectId: string): Promise<User | null>;
     addOwnedByAndSharedWith(rawWorkflow: ListQuery.Workflow.WithSharing): ListQuery.Workflow.WithOwnedByAndSharedWith;
     addOwnedByAndSharedWith(rawCredential: ListQuery.Credentials.WithSharing): ListQuery.Credentials.WithOwnedByAndSharedWith;
     getInstanceOwner(): Promise<User>;

package/dist/services/ownership.service.js

@@ -11,11 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnershipService = void 0;
 const typedi_1 = require("typedi");
-const cache_service_1 = require("../services/cache/cache.service");
+const project_relation_repository_1 = require("../databases/repositories/project-relation.repository");
+const project_repository_1 = require("../databases/repositories/project.repository");
 const shared_workflow_repository_1 = require("../databases/repositories/shared-workflow.repository");
 const user_repository_1 = require("../databases/repositories/user.repository");
-const project_repository_1 = require("../databases/repositories/project.repository");
-const project_relation_repository_1 = require("../databases/repositories/project-relation.repository");
+const cache_service_1 = require("../services/cache/cache.service");
 let OwnershipService = class OwnershipService {
     constructor(cacheService, userRepository, projectRepository, projectRelationRepository, sharedWorkflowRepository) {
         this.cacheService = cacheService;
@@ -35,7 +35,7 @@ let OwnershipService = class OwnershipService {
         void this.cacheService.setHash('workflow-project', { [workflowId]: sharedWorkflow.project });
         return sharedWorkflow.project;
     }
-    async getProjectOwnerCached(projectId) {
+    async getPersonalProjectOwnerCached(projectId) {
         const cachedValue = await this.cacheService.getHashValue('project-owner', projectId);
         if (cachedValue)
             this.userRepository.create(cachedValue);