npm - n8n - Versions diffs - 1.73.1 → 1.74.0 - Mend

n8n 1.73.1 → 1.74.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1090) hide show

package/dist/scaling/multi-main-setup.ee.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"multi-main-setup.ee.js","sourceRoot":"","sources":["../../src/scaling/multi-main-setup.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,~~uCAA4C~~;~~AAC5C~~,~~mCAAiC~~;~~AAEjC~~,sDAA8B;AAC9B,2CAAmC;AACnC,~~6DAAkD;AAClD,~~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~~gBAAO~~,GAAE;qCAGiB,~~uBAAM~~;QACI,2BAAgB;QACvB,6BAAS;QACA,yCAAkB;QACxB,qBAAY;GANhC,cAAc,CAoG1B"}
1	+ {"version":3,"file":"multi-main-setup.ee.js","sourceRoot":"","sources":["../../src/scaling/multi-main-setup.ee.ts"],"names":[],"mappings":"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"}

package/dist/scaling/pubsub/publisher.service.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
-import { InstanceSettings } from 'n8n-core';
-import { Logger } from '../../logging/logger.service';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { RedisClientService } from '../../services/redis-client.service';
 import type { PubSub } from './pubsub.types';
 export declare class Publisher {

package/dist/scaling/pubsub/publisher.service.js CHANGED Viewed

@@ -13,10 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Publisher = void 0;
+const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
-const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../../config"));
-const logger_service_1 = require("../../logging/logger.service");
 const redis_client_service_1 = require("../../services/redis-client.service");
 const constants_1 = require("../constants");
 let Publisher = class Publisher {
@@ -47,10 +46,11 @@ let Publisher = class Publisher {
         let msgName = msg.command;
         const metadata = { msg: msg.command, channel: 'n8n.commands' };
         if (msg.command === 'relay-execution-lifecycle-event') {
-            const { args, type } = msg.payload;
+            const { data, type } = msg.payload;
             msgName += ` (${type})`;
             metadata.type = type;
-            metadata.executionId = args.executionId;
+            if ('executionId' in data)
+                metadata.executionId = data.executionId;
         }
         this.logger.debug(`Published pubsub msg: ${msgName}`, metadata);
     }
@@ -74,8 +74,8 @@ let Publisher = class Publisher {
 };
 exports.Publisher = Publisher;
 exports.Publisher = Publisher = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         redis_client_service_1.RedisClientService,
         n8n_core_1.InstanceSettings])
 ], Publisher);

package/dist/scaling/pubsub/publisher.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;~~AACA~~,~~uCAA4C~~;~~AAC5C~~,~~mCAAiC~~;~~AAEjC~~,sDAA8B;AAC9B,~~6DAAkD;AAElD,~~0EAAqE;AAGrE,4CAAsE;AAM/D,IAAM,SAAS,GAAf,MAAM,SAAS;IAKrB,YACkB,MAAc,EACd,kBAAsC,EACtC,gBAAkC;QAFlC,WAAM,GAAN,MAAM,CAAQ;QACd,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAGnD,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO;YAAE,OAAO;QAEzD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QAExD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,GAAmB;QAEvC,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO;YAAE,OAAO;QAEzD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CACxB,cAAc,EACd,IAAI,CAAC,SAAS,CAAC;YACd,GAAG,GAAG;YACN,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;YACtC,QAAQ,EAAE,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;YAC7C,QAAQ,EAAE,CAAC,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;SAC9C,CAAC,CACF,CAAC;QAEF,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE1B,MAAM,QAAQ,GAAgB,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;QAE5E,IAAI,GAAG,CAAC,OAAO,KAAK,iCAAiC,EAAE,CAAC;YACvD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YACnC,OAAO,IAAI,KAAK,IAAI,GAAG,CAAC;YACxB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;~~QACzC~~,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;IACjE,CAAC;IAGD,KAAK,CAAC,qBAAqB,CAAC,GAA0B;QACrD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,QAAQ,6BAA6B,CAAC,CAAC;IAC3E,CAAC;IAQD,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,KAAa;QAC9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAEpD,OAAO,CAAC,CAAC,OAAO,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,GAAW;QAC3C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW;QACtB,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CAGD,CAAA;AA5FY,8BAAS;oBAAT,SAAS;IADrB,IAAA,~~gBAAO~~,GAAE;qCAOiB,~~uBAAM~~;QACM,yCAAkB;QACpB,2BAAgB;GARxC,SAAS,CA4FrB"}
1	+ {"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":"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"}

package/dist/scaling/pubsub/pubsub-handler.d.ts CHANGED Viewed

@@ -3,13 +3,13 @@ import { ActiveWorkflowManager } from '../../active-workflow-manager';
 import { WorkflowRepository } from '../../databases/repositories/workflow.repository';
 import { MessageEventBus } from '../../eventbus/message-event-bus/message-event-bus';
 import { EventService } from '../../events/event.service';
-import { ExternalSecretsManager } from '../../external-secrets/external-secrets-manager.ee';
+import { ExternalSecretsManager } from '../../external-secrets.ee/external-secrets-manager.ee';
 import { License } from '../../license';
 import { Push } from '../../push';
 import { Publisher } from '../../scaling/pubsub/publisher.service';
 import { CommunityPackagesService } from '../../services/community-packages.service';
 import { TestWebhooks } from '../../webhooks/test-webhooks';
-import { WorkerStatusService } from '../worker-status.service';
+import { WorkerStatusService } from '../worker-status.service.ee';
 export declare class PubSubHandler {
     private readonly eventService;
     private readonly instanceSettings;

package/dist/scaling/pubsub/pubsub-handler.js CHANGED Viewed

@@ -10,21 +10,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PubSubHandler = void 0;
+const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
-const typedi_1 = require("typedi");
 const active_workflow_manager_1 = require("../../active-workflow-manager");
 const workflow_repository_1 = require("../../databases/repositories/workflow.repository");
 const message_event_bus_1 = require("../../eventbus/message-event-bus/message-event-bus");
 const event_service_1 = require("../../events/event.service");
-const external_secrets_manager_ee_1 = require("../../external-secrets/external-secrets-manager.ee");
+const external_secrets_manager_ee_1 = require("../../external-secrets.ee/external-secrets-manager.ee");
 const license_1 = require("../../license");
 const push_1 = require("../../push");
 const publisher_service_1 = require("../../scaling/pubsub/publisher.service");
 const community_packages_service_1 = require("../../services/community-packages.service");
 const utils_1 = require("../../utils");
 const test_webhooks_1 = require("../../webhooks/test-webhooks");
-const worker_status_service_1 = require("../worker-status.service");
+const worker_status_service_ee_1 = require("../worker-status.service.ee");
 let PubSubHandler = class PubSubHandler {
     constructor(eventService, instanceSettings, license, eventbus, externalSecretsManager, communityPackagesService, publisher, workerStatusService, activeWorkflowManager, push, workflowRepository, testWebhooks) {
         this.eventService = eventService;
@@ -55,7 +55,7 @@ let PubSubHandler = class PubSubHandler {
                     await this.activeWorkflowManager.add(workflowId, 'activate', undefined, {
                         shouldPublish: false,
                     });
-                    this.push.broadcast('workflowActivated', { workflowId });
+                    this.push.broadcast({ type: 'workflowActivated', data: { workflowId } });
                     await this.publisher.publishCommand({
                         command: 'display-workflow-activation',
                         payload: { workflowId },
@@ -65,7 +65,10 @@ let PubSubHandler = class PubSubHandler {
                     const error = (0, n8n_workflow_1.ensureError)(e);
                     const { message } = error;
                     await this.workflowRepository.update(workflowId, { active: false });
-                    this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage: message });
+                    this.push.broadcast({
+                        type: 'workflowFailedToActivate',
+                        data: { workflowId, errorMessage: message },
+                    });
                     await this.publisher.publishCommand({
                         command: 'display-workflow-activation-error',
                         payload: { workflowId, errorMessage: message },
@@ -77,22 +80,22 @@ let PubSubHandler = class PubSubHandler {
                     return;
                 await this.activeWorkflowManager.removeActivationError(workflowId);
                 await this.activeWorkflowManager.removeWorkflowTriggersAndPollers(workflowId);
-                this.push.broadcast('workflowDeactivated', { workflowId });
+                this.push.broadcast({ type: 'workflowDeactivated', data: { workflowId } });
                 await this.publisher.publishCommand({
                     command: 'display-workflow-deactivation',
                     payload: { workflowId },
                 });
             },
-            'display-workflow-activation': async ({ workflowId }) => this.push.broadcast('workflowActivated', { workflowId }),
-            'display-workflow-deactivation': async ({ workflowId }) => this.push.broadcast('workflowDeactivated', { workflowId }),
-            'display-workflow-activation-error': async ({ workflowId, errorMessage }) => this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage }),
-            'relay-execution-lifecycle-event': async ({ type, args, pushRef }) => {
-                if (!this.push.getBackend().hasPushRef(pushRef))
+            'display-workflow-activation': async ({ workflowId }) => this.push.broadcast({ type: 'workflowActivated', data: { workflowId } }),
+            'display-workflow-deactivation': async ({ workflowId }) => this.push.broadcast({ type: 'workflowDeactivated', data: { workflowId } }),
+            'display-workflow-activation-error': async ({ workflowId, errorMessage }) => this.push.broadcast({ type: 'workflowFailedToActivate', data: { workflowId, errorMessage } }),
+            'relay-execution-lifecycle-event': async ({ pushRef, ...pushMsg }) => {
+                if (!this.push.hasPushRef(pushRef))
                     return;
-                this.push.send(type, args, pushRef);
+                this.push.send(pushMsg, pushRef);
             },
             'clear-test-webhooks': async ({ webhookKey, workflowEntity, pushRef }) => {
-                if (!this.push.getBackend().hasPushRef(pushRef))
+                if (!this.push.hasPushRef(pushRef))
                     return;
                 this.testWebhooks.clearTimeout(webhookKey);
                 const workflow = this.testWebhooks.toWorkflow(workflowEntity);
@@ -119,9 +122,12 @@ let PubSubHandler = class PubSubHandler {
                 this.setupHandlers({
                     ...this.commonHandlers,
                     ...this.multiMainHandlers,
-                    'response-to-get-worker-status': async (payload) => this.push.broadcast('sendWorkerStatusMessage', {
-                        workerId: payload.senderId,
-                        status: payload,
+                    'response-to-get-worker-status': async (payload) => this.push.broadcast({
+                        type: 'sendWorkerStatusMessage',
+                        data: {
+                            workerId: payload.senderId,
+                            status: payload,
+                        },
                     }),
                 });
                 break;
@@ -139,7 +145,7 @@ let PubSubHandler = class PubSubHandler {
 };
 exports.PubSubHandler = PubSubHandler;
 exports.PubSubHandler = PubSubHandler = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [event_service_1.EventService,
         n8n_core_1.InstanceSettings,
         license_1.License,
@@ -147,7 +153,7 @@ exports.PubSubHandler = PubSubHandler = __decorate([
         external_secrets_manager_ee_1.ExternalSecretsManager,
         community_packages_service_1.CommunityPackagesService,
         publisher_service_1.Publisher,
-        worker_status_service_1.WorkerStatusService,
+        worker_status_service_ee_1.WorkerStatusService,
         active_workflow_manager_1.ActiveWorkflowManager,
         push_1.Push,
         workflow_repository_1.WorkflowRepository,

package/dist/scaling/pubsub/pubsub-handler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pubsub-handler.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/pubsub-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA4C;AAC5C,+CAA2C;~~AAC3C~~,~~mCAAiC;AAEjC,~~uEAAkE;AAClE,sFAAkF;AAClF,sFAAiF;AACjF,0DAAsD;AAEtD,~~gGAAwF~~;~~AACxF~~,uCAAoC;AACpC,iCAA8B;AAC9B,0EAA+D;AAC/D,sFAAiF;AACjF,mCAAsC;AACtC,4DAAwD;AAGxD,~~oEAA+D~~;~~AAMxD~~,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YACkB,YAA0B,EAC1B,gBAAkC,EAClC,OAAgB,EAChB,QAAyB,EACzB,sBAA8C,EAC9C,wBAAkD,EAClD,SAAoB,EACpB,mBAAwC,EACxC,qBAA4C,EAC5C,IAAU,EACV,kBAAsC,EACtC,YAA0B;QAX1B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,YAAO,GAAP,OAAO,CAAS;QAChB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,cAAS,GAAT,SAAS,CAAW;QACpB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,SAAI,GAAJ,IAAI,CAAM;QACV,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;~~QAkDpC~~,mBAAc,GAElB;YACH,gBAAgB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACzD,mBAAmB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC9D,mCAAmC,EAAE,KAAK,IAAI,EAAE,CAC/C,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,EAAE;YACvD,2BAA2B,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,EAAE,CACtE,MAAM,IAAI,CAAC,wBAAwB,CAAC,yBAAyB,CAAC,WAAW,EAAE,cAAc,CAAC;YAC3F,0BAA0B,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,EAAE,CACrE,MAAM,IAAI,CAAC,wBAAwB,CAAC,yBAAyB,CAAC,WAAW,EAAE,cAAc,CAAC;YAC3F,6BAA6B,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CACxD,MAAM,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,WAAW,CAAC;SAClE,CAAC;QAEM,sBAAiB,GAIrB;YACH,mCAAmC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;gBAC7D,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAU;oBAAE,OAAO;gBAE7C,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE;wBACvE,aAAa,EAAE,KAAK;qBACpB,CAAC,CAAC;oBAEH,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;~~oBAEzD~~,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;wBACnC,OAAO,EAAE,6BAA6B;wBACtC,OAAO,EAAE,EAAE,UAAU,EAAE;qBACvB,CAAC,CAAC;gBACJ,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACZ,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,CAAC,CAAC,CAAC;oBAC7B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;oBAE1B,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oBAEpE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;~~oBAEvF~~,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;wBACnC,OAAO,EAAE,mCAAmC;wBAC5C,OAAO,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE;qBAC9C,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;YACD,6BAA6B,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;gBACvD,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAU;oBAAE,OAAO;gBAE7C,MAAM,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;gBACnE,MAAM,IAAI,CAAC,qBAAqB,CAAC,gCAAgC,CAAC,UAAU,CAAC,CAAC;gBAE9E,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;~~gBAG3D~~,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;oBACnC,OAAO,EAAE,+BAA+B;oBACxC,OAAO,EAAE,EAAE,UAAU,EAAE;iBACvB,CAAC,CAAC;YACJ,CAAC;YACD,6BAA6B,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CACvD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,CAAC;~~YACzD~~,+BAA+B,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CACzD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,UAAU,EAAE,CAAC;~~YAC3D~~,mCAAmC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE,CAC3E,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;~~YAC9E~~,iCAAiC,EAAE,KAAK,EAAE,EAAE,~~IAAI~~,EAAE,~~IAAI~~,~~EAAE,~~OAAO,EAAE,EAAE,EAAE;gBACpE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,~~EAAE,~~CAAC,~~UAAU,CAAC,~~OAAO,CAAC;oBAAE,OAAO;~~gBAExD~~,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,~~IAAI~~,EAAE,~~IAAI,EAAE,~~OAAO,CAAC,CAAC;~~YACrC~~,CAAC;YACD,qBAAqB,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE;gBACxE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,~~EAAE,~~CAAC,~~UAAU,CAAC,~~OAAO,CAAC;oBAAE,OAAO;~~gBAExD~~,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gBAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;gBAE9D,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACtD,CAAC;SACD,CAAC;~~IAnIC~~,CAAC;IAEJ,IAAI;QACH,QAAQ,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;YAC5C,KAAK,SAAS;gBACb,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACxC,MAAM;YACP,KAAK,QAAQ;gBACZ,IAAI,CAAC,aAAa,CAAC;oBAClB,GAAG,IAAI,CAAC,cAAc;oBACtB,mBAAmB,EAAE,KAAK,IAAI,EAAE,CAC/B,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC;wBAC1C,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;wBACtC,QAAQ,EAAE,+BAA+B;wBACzC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE;qBAClD,CAAC;iBACH,CAAC,CAAC;gBACH,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,CAAC,aAAa,CAAC;oBAClB,GAAG,IAAI,CAAC,cAAc;oBACtB,GAAG,IAAI,CAAC,iBAAiB;oBACzB,+BAA+B,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAClD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,yBAAyB,EAAE;~~wBAC9C~~,QAAQ,EAAE,OAAO,CAAC,QAAQ;~~wBAC1B~~,MAAM,EAAE,OAAO;~~qBACf~~,CAAC;iBACH,CAAC,CAAC;gBAEH,MAAM;YACP;gBACC,IAAA,mBAAW,EAAC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAClD,CAAC;IACF,CAAC;IAEO,aAAa,CACpB,GAEC;QAED,KAAK,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAEtD,EAAE,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC/C,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;~~CAqFD~~,CAAA;~~AAlJY~~,sCAAa;wBAAb,aAAa;IADzB,IAAA,~~gBAAO~~,GAAE;qCAGuB,4BAAY;QACR,2BAAgB;QACzB,iBAAO;QACN,mCAAe;QACD,oDAAsB;QACpB,qDAAwB;QACvC,6BAAS;QACC,~~2CAAmB~~;QACjB,+CAAqB;QACtC,WAAI;QACU,wCAAkB;QACxB,4BAAY;GAbhC,aAAa,~~CAkJzB~~"}
1	+ {"version":3,"file":"pubsub-handler.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/pubsub-handler.ts"],"names":[],"mappings":"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"}

package/dist/scaling/pubsub/subscriber.service.d.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { EventService } from '../../events/event.service';
-import { Logger } from '../../logging/logger.service';
 import { RedisClientService } from '../../services/redis-client.service';
 import type { PubSub } from './pubsub.types';
 export declare class Subscriber {

package/dist/scaling/pubsub/subscriber.service.js CHANGED Viewed

@@ -13,13 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Subscriber = void 0;
+const di_1 = require("@n8n/di");
 const debounce_1 = __importDefault(require("lodash/debounce"));
 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 event_service_1 = require("../../events/event.service");
-const logger_service_1 = require("../../logging/logger.service");
 const redis_client_service_1 = require("../../services/redis-client.service");
 let Subscriber = class Subscriber {
     constructor(logger, redisClientService, eventService, instanceSettings) {
@@ -81,10 +80,11 @@ let Subscriber = class Subscriber {
         let msgName = 'command' in msg ? msg.command : msg.response;
         const metadata = { msg: msgName, channel };
         if ('command' in msg && msg.command === 'relay-execution-lifecycle-event') {
-            const { args, type } = msg.payload;
+            const { data, type } = msg.payload;
             msgName += ` (${type})`;
             metadata.type = type;
-            metadata.executionId = args.executionId;
+            if ('executionId' in data)
+                metadata.executionId = data.executionId;
         }
         this.logger.debug(`Received pubsub msg: ${msgName}`, metadata);
         return msg;
@@ -92,8 +92,8 @@ let Subscriber = class Subscriber {
 };
 exports.Subscriber = Subscriber;
 exports.Subscriber = Subscriber = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         redis_client_service_1.RedisClientService,
         event_service_1.EventService,
         n8n_core_1.InstanceSettings])

package/dist/scaling/pubsub/subscriber.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"subscriber.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/subscriber.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;~~AACA~~,+DAAuC;AACvC,~~uCAA4C~~;~~AAC5C~~,+CAAyC;~~AACzC~~,~~mCAAiC;AAEjC,~~sDAA8B;AAC9B,0DAAsD;AACtD,~~6DAAkD;AAElD,~~0EAAqE;AAQ9D,IAAM,UAAU,GAAhB,MAAM,UAAU;IAGtB,YACkB,MAAc,EACd,kBAAsC,EACtC,YAA0B,EAC1B,gBAAkC;QAHlC,WAAM,GAAN,MAAM,CAAQ;QACd,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAGnD,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO;YAAE,OAAO;QAEzD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QAExD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAEhF,MAAM,SAAS,GAAG,CAAC,GAA2C,EAAE,EAAE;YACjE,MAAM,SAAS,GAAG,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;YAChE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,CAAC,CAAC;QAEF,MAAM,kBAAkB,GAAG,IAAA,kBAAQ,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAEpD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAuB,EAAE,GAAG,EAAE,EAAE;YAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,GAAG;gBAAE,OAAO;YACjB,IAAI,GAAG,CAAC,QAAQ;gBAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;;gBACrC,SAAS,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAuB;QACtC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC9C,IAAI,KAAK,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1E,OAAO;YACR,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,GAAW,EAAE,OAAuB;QACxD,MAAM,GAAG,GAAG,IAAA,wBAAS,EAAgD,GAAG,EAAE;YACzE,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBACtD,GAAG,EAAE,GAAG;gBACR,OAAO;aACP,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAEzC,IACC,SAAS,IAAI,GAAG;YAChB,CAAC,GAAG,CAAC,QAAQ;YACb,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAC1E,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;QAED,IAAI,OAAO,GAAG,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;QAE5D,MAAM,QAAQ,GAAgB,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAExD,IAAI,SAAS,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,KAAK,iCAAiC,EAAE,CAAC;YAC3E,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YACnC,OAAO,IAAI,KAAK,IAAI,GAAG,CAAC;YACxB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;~~QACzC~~,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;QAE/D,OAAO,GAAG,CAAC;IACZ,CAAC;CACD,CAAA;AAzFY,gCAAU;qBAAV,UAAU;IADtB,IAAA,~~gBAAO~~,GAAE;qCAKiB,~~uBAAM~~;QACM,yCAAkB;QACxB,4BAAY;QACR,2BAAgB;GAPxC,UAAU,CAyFtB"}
1	+ {"version":3,"file":"subscriber.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/subscriber.service.ts"],"names":[],"mappings":"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"}

package/dist/scaling/scaling.service.d.ts CHANGED Viewed

@@ -1,9 +1,8 @@
 import { GlobalConfig } from '@n8n/config';
-import { ErrorReporter, InstanceSettings } from 'n8n-core';
+import { ErrorReporter, InstanceSettings, Logger } from 'n8n-core';
 import { ActiveExecutions } from '../active-executions';
 import { ExecutionRepository } from '../databases/repositories/execution.repository';
 import { EventService } from '../events/event.service';
-import { Logger } from '../logging/logger.service';
 import { OrchestrationService } from '../services/orchestration.service';
 import { JobProcessor } from './job-processor';
 import type { Job, JobData, JobStatus, JobId } from './scaling.types';

package/dist/scaling/scaling.service.js CHANGED Viewed

@@ -47,10 +47,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScalingService = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
-const node_assert_1 = require("node:assert");
-const typedi_1 = __importStar(require("typedi"));
+const node_assert_1 = __importStar(require("node:assert"));
 const active_executions_1 = require("../active-executions");
 const config_2 = __importDefault(require("../config"));
 const constants_1 = require("../constants");
@@ -58,7 +58,6 @@ const execution_repository_1 = require("../databases/repositories/execution.repo
 const on_shutdown_1 = require("../decorators/on-shutdown");
 const max_stalled_count_error_1 = require("../errors/max-stalled-count.error");
 const event_service_1 = require("../events/event.service");
-const logger_service_1 = require("../logging/logger.service");
 const orchestration_service_1 = require("../services/orchestration.service");
 const utils_1 = require("../utils");
 const constants_2 = require("./constants");
@@ -84,7 +83,7 @@ let ScalingService = class ScalingService {
     async setupQueue() {
         const { default: BullQueue } = await Promise.resolve().then(() => __importStar(require('bull')));
         const { RedisClientService } = await Promise.resolve().then(() => __importStar(require('../services/redis-client.service')));
-        const service = typedi_1.default.get(RedisClientService);
+        const service = di_1.Container.get(RedisClientService);
         const bullPrefix = this.globalConfig.queue.bull.prefix;
         const prefix = service.toValidPrefix(bullPrefix);
         this.queue = new BullQueue(constants_2.QUEUE_NAME, {
@@ -193,7 +192,8 @@ let ScalingService = class ScalingService {
         try {
             if (await job.isActive()) {
                 await job.progress({ kind: 'abort-job' });
-                this.logger.debug('Stopped active job', props);
+                await job.discard();
+                await job.moveToFailed(new n8n_workflow_1.ExecutionCancelledError(job.data.executionId), true);
                 return true;
             }
             await job.remove();
@@ -201,8 +201,15 @@ let ScalingService = class ScalingService {
             return true;
         }
         catch (error) {
-            await job.progress({ kind: 'abort-job' });
-            this.logger.error('Failed to stop job', { ...props, error });
+            (0, node_assert_1.default)(error instanceof Error);
+            this.logger.error('Failed to stop job', {
+                ...props,
+                error: {
+                    message: error.message,
+                    name: error.name,
+                    stack: error.stack,
+                },
+            });
             return false;
         }
     }
@@ -391,8 +398,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ScalingService.prototype, "stop", null);
 exports.ScalingService = ScalingService = __decorate([
-    (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [logger_service_1.Logger,
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [n8n_core_1.Logger,
         n8n_core_1.ErrorReporter,
         active_executions_1.ActiveExecutions,
         job_processor_1.JobProcessor,

package/dist/scaling/scaling.service.js.map CHANGED Viewed

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

package/dist/scaling/scaling.types.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ export type JobId = Job['id'];
 export type JobData = {
     executionId: string;
     loadStaticData: boolean;
+    pushRef?: string;
 };
 export type JobResult = {
     success: boolean;

package/dist/scaling/worker-server.d.ts CHANGED Viewed

@@ -1,8 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { CredentialsOverwrites } from '../credentials-overwrites';
 import { ExternalHooks } from '../external-hooks';
-import { Logger } from '../logging/logger.service';
 import { PrometheusMetricsService } from '../metrics/prometheus-metrics.service';
 import { RedisClientService } from '../services/redis-client.service';
 export type WorkerServerEndpointsConfig = {

package/dist/scaling/worker-server.js CHANGED Viewed

@@ -47,17 +47,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerServer = void 0;
 const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
 const express_1 = __importDefault(require("express"));
 const n8n_core_1 = require("n8n-core");
 const node_assert_1 = require("node:assert");
 const node_http_1 = __importDefault(require("node:http"));
-const typedi_1 = require("typedi");
 const credentials_overwrites_1 = require("../credentials-overwrites");
 const Db = __importStar(require("../db"));
 const credentials_overwrites_already_set_error_1 = require("../errors/credentials-overwrites-already-set.error");
 const non_json_body_error_1 = require("../errors/non-json-body.error");
 const external_hooks_1 = require("../external-hooks");
-const logger_service_1 = require("../logging/logger.service");
 const prometheus_metrics_service_1 = require("../metrics/prometheus-metrics.service");
 const middlewares_1 = require("../middlewares");
 const ResponseHelper = __importStar(require("../response-helper"));
@@ -136,9 +135,9 @@ let WorkerServer = class WorkerServer {
 };
 exports.WorkerServer = WorkerServer;
 exports.WorkerServer = WorkerServer = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [config_1.GlobalConfig,
-        logger_service_1.Logger,
+        n8n_core_1.Logger,
         credentials_overwrites_1.CredentialsOverwrites,
         external_hooks_1.ExternalHooks,
         n8n_core_1.InstanceSettings,

package/dist/scaling/worker-server.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"worker-server.js","sourceRoot":"","sources":["../../src/scaling/worker-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2C;~~AAE3C~~,sDAA8B;AAC9B,~~uCAA4C~~;~~AAC5C~~,6CAA+C;AAC/C,0DAA6B;~~AAE7B~~,~~mCAAiC;AAEjC,~~qEAAiE;AACjE,yCAA2B;AAC3B,gHAAyG;AACzG,sEAAgE;AAChE,qDAAiD;AAEjD,~~6DAAkD;AAClD,~~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~~gBAAO~~,GAAE;qCAeuB,qBAAY;QAClB,~~uBAAM~~;QACS,8CAAqB;QAC7B,8BAAa;QACV,2BAAgB;QACR,qDAAwB;QAC9B,yCAAkB;GApB5C,YAAY,CAqHxB"}
1	+ {"version":3,"file":"worker-server.js","sourceRoot":"","sources":["../../src/scaling/worker-server.ts"],"names":[],"mappings":"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"}

package/dist/scaling/{worker-status.service.js → worker-status.service.ee.js} RENAMED Viewed

@@ -13,9 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerStatusService = void 0;
+const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const node_os_1 = __importDefault(require("node:os"));
-const typedi_1 = require("typedi");
 const constants_1 = require("../constants");
 const job_processor_1 = require("./job-processor");
 let WorkerStatusService = class WorkerStatusService {
@@ -52,8 +52,8 @@ let WorkerStatusService = class WorkerStatusService {
 };
 exports.WorkerStatusService = WorkerStatusService;
 exports.WorkerStatusService = WorkerStatusService = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [job_processor_1.JobProcessor,
         n8n_core_1.InstanceSettings])
 ], WorkerStatusService);
-//# sourceMappingURL=worker-status.service.js.map
+//# sourceMappingURL=worker-status.service.ee.js.map

package/dist/scaling/worker-status.service.ee.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"worker-status.service.ee.js","sourceRoot":"","sources":["../../src/scaling/worker-status.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gCAAkC;AAClC,uCAA4C;AAC5C,sDAAyB;AAEzB,2CAA0C;AAE1C,mDAA+C;AAGxC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YACkB,YAA0B,EAC1B,gBAAkC;QADlC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAkB;IACjD,CAAC;IAEJ,cAAc;QACb,OAAO;YACN,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;YACtC,kBAAkB,EAAE,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE;YAC7D,OAAO,EAAE,iBAAE,CAAC,OAAO,EAAE;YACrB,QAAQ,EAAE,iBAAE,CAAC,QAAQ,EAAE;YACvB,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;YACxB,OAAO,EAAE,iBAAE,CAAC,OAAO,EAAE;YACrB,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE;YAC3B,IAAI,EAAE,iBAAE,CAAC,IAAI,EAAE;YACf,QAAQ,EAAE,iBAAE,CAAC,QAAQ,EAAE;YACvB,QAAQ,EAAE,iBAAE,CAAC,QAAQ,EAAE;YACvB,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAE,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CACxE,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACjC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,QAAQ,EAAE,GAAG,CAAC,QAAQ;aACtB,CAAC,CAAC,CACH;YACD,OAAO,EAAE,uBAAW;SACpB,CAAC;IACH,CAAC;IAEO,cAAc;QACrB,MAAM,IAAI,GAAG,iBAAE,CAAC,IAAI,EAAE,CAAC;QAEvB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,aAAa,CAAC;QAE5C,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IACrE,CAAC;CACD,CAAA;AApCY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,YAAO,GAAE;qCAGuB,4BAAY;QACR,2BAAgB;GAHxC,mBAAmB,CAoC/B"}

package/dist/{secrets-helpers.d.ts → secrets-helpers.ee.d.ts} RENAMED Viewed

@@ -1,5 +1,5 @@
 import type { SecretsHelpersBase } from 'n8n-workflow';
-import { ExternalSecretsManager } from './external-secrets/external-secrets-manager.ee';
+import { ExternalSecretsManager } from './external-secrets.ee/external-secrets-manager.ee';
 export declare class SecretsHelper implements SecretsHelpersBase {
     private service;
     constructor(service: ExternalSecretsManager);

package/dist/{secrets-helpers.js → secrets-helpers.ee.js} RENAMED Viewed

@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecretsHelper = void 0;
-const typedi_1 = require("typedi");
-const external_secrets_manager_ee_1 = require("./external-secrets/external-secrets-manager.ee");
+const di_1 = require("@n8n/di");
+const external_secrets_manager_ee_1 = require("./external-secrets.ee/external-secrets-manager.ee");
 let SecretsHelper = class SecretsHelper {
     constructor(service) {
         this.service = service;
@@ -45,7 +45,7 @@ let SecretsHelper = class SecretsHelper {
 };
 exports.SecretsHelper = SecretsHelper;
 exports.SecretsHelper = SecretsHelper = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [external_secrets_manager_ee_1.ExternalSecretsManager])
 ], SecretsHelper);
-//# sourceMappingURL=secrets-helpers.js.map
+//# sourceMappingURL=secrets-helpers.ee.js.map

package/dist/secrets-helpers.ee.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"secrets-helpers.ee.js","sourceRoot":"","sources":["../src/secrets-helpers.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAGlC,mGAA2F;AAGpF,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YAAoB,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;IAAG,CAAC;IAEvD,KAAK,CAAC,MAAM;QACX,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3B,CAAC;IACF,CAAC;IAED,SAAS,CAAC,QAAgB,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS,CAAC,QAAgB,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,WAAW,CAAC,QAAgB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IAC9C,CAAC;IAED,WAAW,CAAC,QAAgB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACpD,CAAC;CACD,CAAA;AAnCY,sCAAa;wBAAb,aAAa;IADzB,IAAA,YAAO,GAAE;qCAEoB,oDAAsB;GADvC,aAAa,CAmCzB"}

package/dist/security-audit/risk-reporters/credentials-risk-reporter.js CHANGED Viewed

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CredentialsRiskReporter = void 0;
 const config_1 = require("@n8n/config");
-const typedi_1 = require("typedi");
+const di_1 = require("@n8n/di");
 const credentials_repository_1 = require("../../databases/repositories/credentials.repository");
 const execution_data_repository_1 = require("../../databases/repositories/execution-data.repository");
 const execution_repository_1 = require("../../databases/repositories/execution.repository");
@@ -123,7 +123,7 @@ let CredentialsRiskReporter = class CredentialsRiskReporter {
 };
 exports.CredentialsRiskReporter = CredentialsRiskReporter;
 exports.CredentialsRiskReporter = CredentialsRiskReporter = __decorate([
-    (0, typedi_1.Service)(),
+    (0, di_1.Service)(),
     __metadata("design:paramtypes", [credentials_repository_1.CredentialsRepository,
         execution_repository_1.ExecutionRepository,
         execution_data_repository_1.ExecutionDataRepository,