n8n 1.59.3 → 1.60.0

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

@@ -1,21 +1,21 @@
-import type { NextFunction, Response } from 'express';
-import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
 import type { FindManyOptions, FindOneOptions, FindOptionsWhere } from '@n8n/typeorm';
+import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
+import RudderStack, { type constructorOptions } from '@rudderstack/rudder-sdk-node';
+import type { NextFunction, Response } from 'express';
 import { AuthService } from '../auth/auth.service';
 import type { AuthUser } from '../databases/entities/auth-user';
+import type { CredentialsEntity } from '../databases/entities/credentials-entity';
+import type { Settings } from '../databases/entities/settings';
 import type { User } from '../databases/entities/user';
-import { UserRepository } from '../databases/repositories/user.repository';
-import { SettingsRepository } from '../databases/repositories/settings.repository';
-import { WorkflowRepository } from '../databases/repositories/workflow.repository';
-import { CredentialsRepository } from '../databases/repositories/credentials.repository';
 import type { WorkflowEntity } from '../databases/entities/workflow-entity';
-import type { CredentialsEntity } from '../databases/entities/credentials-entity';
 import { AuthUserRepository } from '../databases/repositories/auth-user.repository';
-import type { Settings } from '../databases/entities/settings';
-import { UserService } from '../services/user.service';
-import type { AuthenticatedRequest } from '../requests';
+import { CredentialsRepository } from '../databases/repositories/credentials.repository';
+import { SettingsRepository } from '../databases/repositories/settings.repository';
+import { UserRepository } from '../databases/repositories/user.repository';
+import { WorkflowRepository } from '../databases/repositories/workflow.repository';
 import type { Invitation } from '../interfaces';
-import RudderStack, { type constructorOptions } from '@rudderstack/rudder-sdk-node';
+import type { AuthenticatedRequest } from '../requests';
+import { UserService } from '../services/user.service';
 export declare class HooksService {
     private readonly userService;
     private readonly authService;

package/dist/services/hooks.service.js

@@ -13,15 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HooksService = void 0;
+const rudder_sdk_node_1 = __importDefault(require("@rudderstack/rudder-sdk-node"));
 const typedi_1 = require("typedi");
 const auth_service_1 = require("../auth/auth.service");
-const user_repository_1 = require("../databases/repositories/user.repository");
+const auth_user_repository_1 = require("../databases/repositories/auth-user.repository");
+const credentials_repository_1 = require("../databases/repositories/credentials.repository");
 const settings_repository_1 = require("../databases/repositories/settings.repository");
+const user_repository_1 = require("../databases/repositories/user.repository");
 const workflow_repository_1 = require("../databases/repositories/workflow.repository");
-const credentials_repository_1 = require("../databases/repositories/credentials.repository");
-const auth_user_repository_1 = require("../databases/repositories/auth-user.repository");
 const user_service_1 = require("../services/user.service");
-const rudder_sdk_node_1 = __importDefault(require("@rudderstack/rudder-sdk-node"));
 let HooksService = class HooksService {
     constructor(userService, authService, userRepository, settingsRepository, workflowRepository, credentialsRepository, authUserRepository) {
         this.userService = userService;

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

@@ -1 +1 @@
-{"version":3,"file":"hooks.service.js","sourceRoot":"","sources":["../../src/services/hooks.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAiC;AAMjC,sDAAkD;AAGlD,8EAA0E;AAC1E,sFAAkF;AAClF,sFAAkF;AAClF,4FAAwF;AAGxF,wFAAmF;AAEnF,0DAAsD;AAGtD,mFAAoF;AAO7E,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,WAAwB,EACxB,WAAwB,EACxB,cAA8B,EAC9B,kBAAsC,EACtC,kBAAsC,EACtC,qBAA4C,EAC5C,kBAAsC;QANtC,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;IACrD,CAAC;IAKJ,KAAK,CAAC,WAAW,CAAC,KAAW,EAAE,UAAwB;QACtD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;IAMD,WAAW,CAAC,GAAa,EAAE,IAAc;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAOD,KAAK,CAAC,WAAW,CAAC,MAAgC;QACjD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAC,IAAU;QACxB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,MAAkC,EAAE,GAAqC;QAC7F,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,MAAuC;QAC3D,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,gBAAgB,CAAC,MAA0C;QAChE,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAMD,KAAK,CAAC,aAAa,CAAC,MAAiC;QACpD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,GAAyB,EAAE,GAAa,EAAE,IAAkB;QAChF,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,oBAAoB,CAAC,GAAW,EAAE,OAA2B;QAC5D,OAAO,IAAI,yBAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IAMD,aAAa;QACZ,OAAO;YACN,IAAI,EAAE,IAAI,CAAC,cAAc;YACzB,QAAQ,EAAE,IAAI,CAAC,kBAAkB;YACjC,WAAW,EAAE,IAAI,CAAC,qBAAqB;YACvC,QAAQ,EAAE,IAAI,CAAC,kBAAkB;SACjC,CAAC;IACH,CAAC;CACD,CAAA;AAlGY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,gBAAO,GAAE;qCAGsB,0BAAW;QACX,0BAAW;QACR,gCAAc;QACV,wCAAkB;QAClB,wCAAkB;QACf,8CAAqB;QACxB,yCAAkB;GAR5C,YAAY,CAkGxB"}
+{"version":3,"file":"hooks.service.js","sourceRoot":"","sources":["../../src/services/hooks.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,mFAAoF;AAEpF,mCAAiC;AAEjC,sDAAkD;AAMlD,wFAAmF;AACnF,4FAAwF;AACxF,sFAAkF;AAClF,8EAA0E;AAC1E,sFAAkF;AAGlF,0DAAsD;AAO/C,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,WAAwB,EACxB,WAAwB,EACxB,cAA8B,EAC9B,kBAAsC,EACtC,kBAAsC,EACtC,qBAA4C,EAC5C,kBAAsC;QANtC,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;IACrD,CAAC;IAKJ,KAAK,CAAC,WAAW,CAAC,KAAW,EAAE,UAAwB;QACtD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;IAMD,WAAW,CAAC,GAAa,EAAE,IAAc;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAOD,KAAK,CAAC,WAAW,CAAC,MAAgC;QACjD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAC,IAAU;QACxB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,MAAkC,EAAE,GAAqC;QAC7F,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,MAAuC;QAC3D,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,gBAAgB,CAAC,MAA0C;QAChE,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAMD,KAAK,CAAC,aAAa,CAAC,MAAiC;QACpD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,GAAyB,EAAE,GAAa,EAAE,IAAkB;QAChF,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,oBAAoB,CAAC,GAAW,EAAE,OAA2B;QAC5D,OAAO,IAAI,yBAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IAMD,aAAa;QACZ,OAAO;YACN,IAAI,EAAE,IAAI,CAAC,cAAc;YACzB,QAAQ,EAAE,IAAI,CAAC,kBAAkB;YACjC,WAAW,EAAE,IAAI,CAAC,qBAAqB;YACvC,QAAQ,EAAE,IAAI,CAAC,kBAAkB;SACjC,CAAC;IACH,CAAC;CACD,CAAA;AAlGY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,gBAAO,GAAE;qCAGsB,0BAAW;QACX,0BAAW;QACR,gCAAc;QACV,wCAAkB;QAClB,wCAAkB;QACf,8CAAqB;QACxB,yCAAkB;GAR5C,YAAY,CAkGxB"}

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

@@ -1,7 +1,7 @@
-import { Logger } from '../logger';
+import { WorkflowEntity } from '../databases/entities/workflow-entity';
 import { CredentialsRepository } from '../databases/repositories/credentials.repository';
 import { TagRepository } from '../databases/repositories/tag.repository';
-import { WorkflowEntity } from '../databases/entities/workflow-entity';
+import { Logger } from '../logger';
 export declare class ImportService {
     private readonly logger;
     private readonly credentialsRepository;

package/dist/services/import.service.js

@@ -35,15 +35,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportService = void 0;
 const typedi_1 = require("typedi");
 const uuid_1 = require("uuid");
-const logger_1 = require("../logger");
-const Db = __importStar(require("../db"));
-const credentials_repository_1 = require("../databases/repositories/credentials.repository");
-const tag_repository_1 = require("../databases/repositories/tag.repository");
-const shared_workflow_1 = require("../databases/entities/shared-workflow");
-const workflow_helpers_1 = require("../workflow-helpers");
 const project_1 = require("../databases/entities/project");
+const shared_workflow_1 = require("../databases/entities/shared-workflow");
 const workflow_entity_1 = require("../databases/entities/workflow-entity");
 const workflow_tag_mapping_1 = require("../databases/entities/workflow-tag-mapping");
+const credentials_repository_1 = require("../databases/repositories/credentials.repository");
+const tag_repository_1 = require("../databases/repositories/tag.repository");
+const Db = __importStar(require("../db"));
+const logger_1 = require("../logger");
+const workflow_helpers_1 = require("../workflow-helpers");
 let ImportService = class ImportService {
     constructor(logger, credentialsRepository, tagRepository) {
         this.logger = logger;

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

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

package/dist/services/jwt.service.js

@@ -13,10 +13,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JwtService = void 0;
-const typedi_1 = require("typedi");
 const crypto_1 = require("crypto");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const n8n_core_1 = require("n8n-core");
+const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../config"));
 let JwtService = class JwtService {
     constructor({ encryptionKey }) {

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

@@ -1 +1 @@
-{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../src/services/jwt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,mCAAoC;AACpC,gEAA+B;AAC/B,uCAA4C;AAC5C,sDAA8B;AAGvB,IAAM,UAAU,GAAhB,MAAM,UAAU;IAGtB,YAAY,EAAE,aAAa,EAAoB;QAFtC,cAAS,GAAG,gBAAM,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAG9D,IAAI,CAAC,SAAS,GAAG,gBAAM,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAIrB,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClD,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACpE,gBAAM,CAAC,GAAG,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACxD,CAAC;IACF,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,UAA2B,EAAE;QAClD,OAAO,sBAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,KAAa;QACnB,OAAO,sBAAG,CAAC,MAAM,CAAC,KAAK,CAAe,CAAC;IACxC,CAAC;IAED,MAAM,CAAiB,KAAa,EAAE,UAA6B,EAAE;QACpE,OAAO,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAM,CAAC;IACxD,CAAC;CACD,CAAA;AA7BY,gCAAU;qBAAV,UAAU;IADtB,IAAA,gBAAO,GAAE;qCAIsB,2BAAgB;GAHnC,UAAU,CA6BtB"}
+{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../src/services/jwt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAoC;AACpC,gEAA+B;AAC/B,uCAA4C;AAC5C,mCAAiC;AAEjC,sDAA8B;AAGvB,IAAM,UAAU,GAAhB,MAAM,UAAU;IAGtB,YAAY,EAAE,aAAa,EAAoB;QAFtC,cAAS,GAAG,gBAAM,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAG9D,IAAI,CAAC,SAAS,GAAG,gBAAM,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAIrB,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClD,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACpE,gBAAM,CAAC,GAAG,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACxD,CAAC;IACF,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,UAA2B,EAAE;QAClD,OAAO,sBAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,KAAa;QACnB,OAAO,sBAAG,CAAC,MAAM,CAAC,KAAK,CAAe,CAAC;IACxC,CAAC;IAED,MAAM,CAAiB,KAAa,EAAE,UAA6B,EAAE;QACpE,OAAO,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAM,CAAC;IACxD,CAAC;CACD,CAAA;AA7BY,gCAAU;qBAAV,UAAU;IADtB,IAAA,gBAAO,GAAE;qCAIsB,2BAAgB;GAHnC,UAAU,CA6BtB"}

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

@@ -1,5 +1,5 @@
-import { WorkflowRepository } from '../databases/repositories/workflow.repository';
 import { CredentialsRepository } from '../databases/repositories/credentials.repository';
+import { WorkflowRepository } from '../databases/repositories/workflow.repository';
 export declare class NamingService {
     private readonly workflowRepository;
     private readonly credentialsRepository;

package/dist/services/naming.service.js

@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NamingService = void 0;
 const typedi_1 = require("typedi");
-const workflow_repository_1 = require("../databases/repositories/workflow.repository");
 const credentials_repository_1 = require("../databases/repositories/credentials.repository");
+const workflow_repository_1 = require("../databases/repositories/workflow.repository");
 let NamingService = class NamingService {
     constructor(workflowRepository, credentialsRepository) {
         this.workflowRepository = workflowRepository;

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

@@ -1 +1 @@
-{"version":3,"file":"naming.service.js","sourceRoot":"","sources":["../../src/services/naming.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AACjC,sFAAkF;AAClF,4FAAwF;AAGjF,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YACkB,kBAAsC,EACtC,qBAA4C;QAD5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,0BAAqB,GAArB,qBAAqB,CAAuB;IAC3D,CAAC;IAEJ,KAAK,CAAC,qBAAqB,CAAC,aAAqB;QAChD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,aAAqB;QAClD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAC9D,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,aAAqB,EAAE,MAAiC;QACnF,MAAM,UAAU,GAAG,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;QAEhG,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAE/D,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,aAAa,CAAC;QAE7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE5D,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAChD,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,aAAa,GAAG,CAAC,CAAC;YAEvD,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEtC,IAAI,KAAK,CAAC,SAAS,CAAC;gBAAE,OAAO,GAAG,CAAC;YAEjC,IAAI,SAAS,GAAG,GAAG;gBAAE,GAAG,GAAG,SAAS,CAAC;YAErC,OAAO,GAAG,CAAC;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QAEN,OAAO,CAAC,aAAa,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;CACD,CAAA;AArCY,sCAAa;wBAAb,aAAa;IADzB,IAAA,gBAAO,GAAE;qCAG6B,wCAAkB;QACf,8CAAqB;GAHlD,aAAa,CAqCzB"}
+{"version":3,"file":"naming.service.js","sourceRoot":"","sources":["../../src/services/naming.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,4FAAwF;AACxF,sFAAkF;AAG3E,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YACkB,kBAAsC,EACtC,qBAA4C;QAD5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,0BAAqB,GAArB,qBAAqB,CAAuB;IAC3D,CAAC;IAEJ,KAAK,CAAC,qBAAqB,CAAC,aAAqB;QAChD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,aAAqB;QAClD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAC9D,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,aAAqB,EAAE,MAAiC;QACnF,MAAM,UAAU,GAAG,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;QAEhG,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAE/D,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,aAAa,CAAC;QAE7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE5D,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAChD,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,aAAa,GAAG,CAAC,CAAC;YAEvD,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEtC,IAAI,KAAK,CAAC,SAAS,CAAC;gBAAE,OAAO,GAAG,CAAC;YAEjC,IAAI,SAAS,GAAG,GAAG;gBAAE,GAAG,GAAG,SAAS,CAAC;YAErC,OAAO,GAAG,CAAC;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QAEN,OAAO,CAAC,aAAa,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;CACD,CAAA;AArCY,sCAAa;wBAAb,aAAa;IADzB,IAAA,gBAAO,GAAE;qCAG6B,wCAAkB;QACf,8CAAqB;GAHlD,aAAa,CAqCzB"}

package/dist/services/orchestration/helpers.js

@@ -1,36 +1,16 @@
 "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.messageToRedisServiceCommandObject = messageToRedisServiceCommandObject;
 exports.debounceMessageReceiver = debounceMessageReceiver;
 exports.getOsCpuString = getOsCpuString;
-const typedi_1 = require("typedi");
 const n8n_workflow_1 = require("n8n-workflow");
+const node_os_1 = __importDefault(require("node:os"));
+const typedi_1 = require("typedi");
 const logger_1 = require("../../logger");
 const redis_constants_1 = require("../redis/redis-constants");
-const os = __importStar(require("os"));
 function messageToRedisServiceCommandObject(messageString) {
     if (!messageString)
         return;
@@ -55,7 +35,7 @@ function debounceMessageReceiver(message, timeout = 100) {
     return true;
 }
 function getOsCpuString() {
-    const cpus = os.cpus();
+    const cpus = node_os_1.default.cpus();
     if (cpus.length === 0)
         return 'no CPU info';
     return `${cpus.length}x ${cpus[0].model} - speed: ${cpus[0].speed}`;

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/services/orchestration/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAWA,gFAYC;AAID,0DAQC;AAED,wCAIC;AAzCD,mCAAmC;AACnC,+CAAyC;AACzC,qCAAkC;AAElC,8DAAiE;AACjE,uCAAyB;AAMzB,SAAgB,kCAAkC,CAAC,aAAqB;IACvE,IAAI,CAAC,aAAa;QAAE,OAAO;IAC3B,IAAI,OAAkC,CAAC;IACvC,IAAI,CAAC;QACJ,OAAO,GAAG,IAAA,wBAAS,EAA4B,aAAa,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACR,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC,KAAK,CAC1B,wCAAwC,uCAAqB,MAAM,aAAa,GAAG,CACnF,CAAC;QACF,OAAO;IACR,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,YAAY,GAAoC,EAAE,CAAC;AAEzD,SAAgB,uBAAuB,CAAC,OAAkC,EAAE,UAAkB,GAAG;IAChG,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,gBAAgB,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,gBAAgB,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;QAC9E,OAAO,KAAK,CAAC;IACd,CAAC;IACD,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;IACpC,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAgB,cAAc;IAC7B,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;IACvB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,aAAa,CAAC;IAC5C,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;AACrE,CAAC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/services/orchestration/helpers.ts"],"names":[],"mappings":";;;;;AAaA,gFAYC;AAID,0DAQC;AAED,wCAIC;AA3CD,+CAAyC;AACzC,sDAAyB;AACzB,mCAAmC;AAEnC,qCAAkC;AAElC,8DAAiE;AAOjE,SAAgB,kCAAkC,CAAC,aAAqB;IACvE,IAAI,CAAC,aAAa;QAAE,OAAO;IAC3B,IAAI,OAAkC,CAAC;IACvC,IAAI,CAAC;QACJ,OAAO,GAAG,IAAA,wBAAS,EAA4B,aAAa,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACR,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC,KAAK,CAC1B,wCAAwC,uCAAqB,MAAM,aAAa,GAAG,CACnF,CAAC;QACF,OAAO;IACR,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,YAAY,GAAoC,EAAE,CAAC;AAEzD,SAAgB,uBAAuB,CAAC,OAAkC,EAAE,UAAkB,GAAG;IAChG,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,gBAAgB,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,gBAAgB,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;QAC9E,OAAO,KAAK,CAAC;IACd,CAAC;IACD,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;IACpC,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAgB,cAAc;IAC7B,MAAM,IAAI,GAAG,iBAAE,CAAC,IAAI,EAAE,CAAC;IACvB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,aAAa,CAAC;IAC5C,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;AACrE,CAAC"}

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

@@ -4,22 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleCommandMessageMain = handleCommandMessageMain;
+const n8n_core_1 = require("n8n-core");
 const typedi_1 = require("typedi");
-const helpers_1 = require("../helpers");
+const active_workflow_manager_1 = require("../../../active-workflow-manager");
 const config_1 = __importDefault(require("../../../config"));
+const workflow_repository_1 = require("../../../databases/repositories/workflow.repository");
 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 active_workflow_manager_1 = require("../../../active-workflow-manager");
 const push_1 = require("../../../push");
-const test_webhooks_1 = require("../../../webhooks/test-webhooks");
-const orchestration_service_1 = require("../../../services/orchestration.service");
-const workflow_repository_1 = require("../../../databases/repositories/workflow.repository");
 const community_packages_service_1 = require("../../../services/community-packages.service");
+const orchestration_service_1 = require("../../../services/orchestration.service");
+const test_webhooks_1 = require("../../../webhooks/test-webhooks");
+const helpers_1 = require("../helpers");
 async function handleCommandMessageMain(messageString) {
     const queueModeId = config_1.default.getEnv('redis.queueModeId');
-    const isMainInstance = config_1.default.getEnv('generic.instanceType') === 'main';
+    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);
     if (message) {

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,3 +1,4 @@
+import type { WorkerStatus } from '@n8n/api-types';
 import type { MainResponseReceivedHandlerOptions } from './types';
 export declare function handleWorkerResponseMessageMain(messageString: string, options: MainResponseReceivedHandlerOptions): Promise<({
     workerId: string;
@@ -15,7 +16,7 @@ export declare function handleWorkerResponseMessageMain(messageString: string, o
     senderId: string;
     command: "relay-execution-lifecycle-event";
     payload: {
-        type: import("../../../interfaces").IPushDataType;
+        type: import("@n8n/api-types").PushType;
         args: Record<string, unknown>;
         pushRef: string;
     };
@@ -48,7 +49,7 @@ export declare function handleWorkerResponseMessageMain(messageString: string, o
     workerId: string;
 } & {
     command: "getStatus";
-    payload: import("../../../interfaces").IPushDataWorkerStatusPayload;
+    payload: WorkerStatus;
 } & {
     targets?: string[];
 }) | ({

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

@@ -7,8 +7,8 @@ exports.handleWorkerResponseMessageMain = handleWorkerResponseMessageMain;
 const n8n_workflow_1 = require("n8n-workflow");
 const typedi_1 = __importDefault(require("typedi"));
 const logger_1 = require("../../../logger");
-const push_1 = require("../../../push");
 const redis_constants_1 = require("../../../services/redis/redis-constants");
+const push_1 = require("../../../push");
 async function handleWorkerResponseMessageMain(messageString, options) {
     const workerResponse = (0, n8n_workflow_1.jsonParse)(messageString, {
         fallbackValue: null,

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":";;;;;AAQA,0EAiCC;AAzCD,+CAAyC;AACzC,oDAA+B;AAC/B,qCAAkC;AAClC,wCAAqC;AAErC,sEAAiF;AAG1E,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,OAAO;aAC9B,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":";;;;;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"}

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

@@ -1,6 +1,6 @@
 import { InstanceSettings } from 'n8n-core';
 import { Logger } from '../../../logger';
-import { RedisServicePubSubPublisher } from '../../../services/redis/redis-service-pub-sub-publisher';
+import { Publisher } from '../../../scaling/pubsub/publisher.service';
 import { RedisClientService } from '../../../services/redis/redis-client.service';
 import { TypedEmitter } from '../../../typed-emitter';
 type MultiMainEvents = {
@@ -10,9 +10,9 @@ type MultiMainEvents = {
 export declare class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
     private readonly logger;
     private readonly instanceSettings;
-    private readonly redisPublisher;
+    private readonly publisher;
     private readonly redisClientService;
-    constructor(logger: Logger, instanceSettings: InstanceSettings, redisPublisher: RedisServicePubSubPublisher, redisClientService: RedisClientService);
+    constructor(logger: Logger, instanceSettings: InstanceSettings, publisher: Publisher, redisClientService: RedisClientService);
     get instanceId(): string;
     private leaderKey;
     private readonly leaderKeyTtl;
@@ -21,6 +21,6 @@ export declare class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
     shutdown(): Promise<void>;
     private checkLeader;
     private tryBecomeLeader;
-    fetchLeaderKey(): Promise<string | null | undefined>;
+    fetchLeaderKey(): Promise<string | null>;
 }
 export {};

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

@@ -13,21 +13,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiMainSetup = void 0;
-const config_1 = __importDefault(require("../../../config"));
-const typedi_1 = require("typedi");
-const constants_1 = require("../../../constants");
 const n8n_core_1 = require("n8n-core");
 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 redis_service_pub_sub_publisher_1 = require("../../../services/redis/redis-service-pub-sub-publisher");
+const publisher_service_1 = require("../../../scaling/pubsub/publisher.service");
 const redis_client_service_1 = require("../../../services/redis/redis-client.service");
 const typed_emitter_1 = require("../../../typed-emitter");
 let MultiMainSetup = class MultiMainSetup extends typed_emitter_1.TypedEmitter {
-    constructor(logger, instanceSettings, redisPublisher, redisClientService) {
+    constructor(logger, instanceSettings, publisher, redisClientService) {
         super();
         this.logger = logger;
         this.instanceSettings = instanceSettings;
-        this.redisPublisher = redisPublisher;
+        this.publisher = publisher;
         this.redisClientService = redisClientService;
         this.leaderKeyTtl = config_1.default.getEnv('multiMainSetup.ttl');
     }
@@ -47,13 +47,13 @@ let MultiMainSetup = class MultiMainSetup extends typed_emitter_1.TypedEmitter {
         clearInterval(this.leaderCheckInterval);
         const { isLeader } = this.instanceSettings;
         if (isLeader)
-            await this.redisPublisher.clear(this.leaderKey);
+            await this.publisher.clear(this.leaderKey);
     }
     async checkLeader() {
-        const leaderId = await this.redisPublisher.get(this.leaderKey);
+        const leaderId = await this.publisher.get(this.leaderKey);
         if (leaderId === this.instanceId) {
             this.logger.debug(`[Instance ID ${this.instanceId}] Leader is this instance`);
-            await this.redisPublisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
+            await this.publisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
             return;
         }
         if (leaderId && leaderId !== this.instanceId) {
@@ -73,11 +73,11 @@ let MultiMainSetup = class MultiMainSetup extends typed_emitter_1.TypedEmitter {
         }
     }
     async tryBecomeLeader() {
-        const keySetSuccessfully = await this.redisPublisher.setIfNotExists(this.leaderKey, this.instanceId);
+        const keySetSuccessfully = await this.publisher.setIfNotExists(this.leaderKey, this.instanceId);
         if (keySetSuccessfully) {
             this.logger.debug(`[Instance ID ${this.instanceId}] Leader is now this instance`);
             this.instanceSettings.markAsLeader();
-            await this.redisPublisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
+            await this.publisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
             this.emit('leader-takeover');
         }
         else {
@@ -85,7 +85,7 @@ let MultiMainSetup = class MultiMainSetup extends typed_emitter_1.TypedEmitter {
         }
     }
     async fetchLeaderKey() {
-        return await this.redisPublisher.get(this.leaderKey);
+        return await this.publisher.get(this.leaderKey);
     }
 };
 exports.MultiMainSetup = MultiMainSetup;
@@ -93,7 +93,7 @@ exports.MultiMainSetup = MultiMainSetup = __decorate([
     (0, typedi_1.Service)(),
     __metadata("design:paramtypes", [logger_1.Logger,
         n8n_core_1.InstanceSettings,
-        redis_service_pub_sub_publisher_1.RedisServicePubSubPublisher,
+        publisher_service_1.Publisher,
         redis_client_service_1.RedisClientService])
 ], MultiMainSetup);
 //# sourceMappingURL=multi-main-setup.ee.js.map

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

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

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

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

@@ -5,19 +5,26 @@ 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.OrchestrationHandlerMainService = void 0;
 const typedi_1 = require("typedi");
-const redis_constants_1 = require("../../redis/redis-constants");
-const handle_worker_response_message_main_1 = require("./handle-worker-response-message-main");
+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();
+        this.subscriber = subscriber;
+    }
     async initSubscriber(options) {
-        this.redisSubscriber = await this.redisService.getPubSubSubscriber();
-        await this.redisSubscriber.subscribeToCommandChannel();
-        await this.redisSubscriber.subscribeToWorkerResponseChannel();
-        this.redisSubscriber.addMessageHandler('OrchestrationMessageReceiver', async (channel, messageString) => {
+        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);
             }
@@ -29,6 +36,7 @@ let OrchestrationHandlerMainService = class OrchestrationHandlerMainService exte
 };
 exports.OrchestrationHandlerMainService = OrchestrationHandlerMainService;
 exports.OrchestrationHandlerMainService = OrchestrationHandlerMainService = __decorate([
-    (0, typedi_1.Service)()
+    (0, typedi_1.Service)(),
+    __metadata("design:paramtypes", [subscriber_service_1.Subscriber])
 ], OrchestrationHandlerMainService);
 //# sourceMappingURL=orchestration.handler.main.service.js.map

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;AACjC,iEAAmG;AACnG,+FAAwF;AACxF,+EAAyE;AACzE,iGAAuF;AAIhF,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,gEAA2B;IAC/E,KAAK,CAAC,cAAc,CAAC,OAA2C;QAC/D,IAAI,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAErE,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,EAAE,CAAC;QACvD,MAAM,IAAI,CAAC,eAAe,CAAC,gCAAgC,EAAE,CAAC;QAE9D,IAAI,CAAC,eAAe,CAAC,iBAAiB,CACrC,8BAA8B,EAC9B,KAAK,EAAE,OAAe,EAAE,aAAqB,EAAE,EAAE;YAChD,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,CACD,CAAC;IACH,CAAC;CACD,CAAA;AAlBY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,gBAAO,GAAE;GACG,+BAA+B,CAkB3C"}
+{"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"}

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

@@ -1,5 +1,5 @@
-import type { RedisServicePubSubPublisher } from '../../../services/redis/redis-service-pub-sub-publisher';
+import type { Publisher } from '../../../scaling/pubsub/publisher.service';
 export type MainResponseReceivedHandlerOptions = {
     queueModeId: string;
-    redisPublisher: RedisServicePubSubPublisher;
+    publisher: Publisher;
 };

package/dist/services/orchestration/pubsub/pubsub-message-map.d.ts

@@ -1,5 +1,5 @@
-import type { IPushDataType, IWorkflowDb } from '../../../interfaces';
-import type { RunningJobSummary } from '../../../scaling/scaling.types';
+import type { PushType, WorkerStatus } from '@n8n/api-types';
+import type { IWorkflowDb } from '../../../interfaces';
 export type PubSubMessageMap = {
     'reload-license': never;
     'restart-event-bus': {
@@ -24,24 +24,7 @@ export type PubSubMessageMap = {
         packageVersion: string;
     };
     'get-worker-id': never;
-    'get-worker-status': {
-        workerId: string;
-        runningJobsSummary: RunningJobSummary[];
-        freeMem: number;
-        totalMem: number;
-        uptime: number;
-        loadAvg: number[];
-        cpus: string;
-        arch: string;
-        platform: NodeJS.Platform;
-        hostname: string;
-        interfaces: Array<{
-            family: 'IPv4' | 'IPv6';
-            address: string;
-            internal: boolean;
-        }>;
-        version: string;
-    };
+    'get-worker-status': WorkerStatus;
     'add-webhooks-triggers-and-pollers': {
         workflowId: string;
     };
@@ -59,7 +42,7 @@ export type PubSubMessageMap = {
         errorMessage: string;
     };
     'relay-execution-lifecycle-event': {
-        type: IPushDataType;
+        type: PushType;
         args: Record<string, unknown>;
         pushRef: string;
     };

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

@@ -4,17 +4,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleCommandMessageWebhook = handleCommandMessageWebhook;
-const external_secrets_manager_ee_1 = require("../../../external-secrets/external-secrets-manager.ee");
-const license_1 = require("../../../license");
-const message_event_bus_1 = require("../../../eventbus/message-event-bus/message-event-bus");
+const n8n_core_1 = require("n8n-core");
 const typedi_1 = __importDefault(require("typedi"));
 const winston_1 = require("winston");
-const helpers_1 = require("../helpers");
 const config_1 = __importDefault(require("../../../config"));
+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 community_packages_service_1 = require("../../../services/community-packages.service");
+const helpers_1 = require("../helpers");
 async function handleCommandMessageWebhook(messageString) {
     const queueModeId = config_1.default.getEnv('redis.queueModeId');
-    const isMainInstance = config_1.default.getEnv('generic.instanceType') === 'main';
+    const isMainInstance = typedi_1.default.get(n8n_core_1.InstanceSettings).instanceType === 'main';
     const message = (0, helpers_1.messageToRedisServiceCommandObject)(messageString);
     const logger = typedi_1.default.get(winston_1.Logger);
     if (message) {