n8n 2.33.4 → 2.34.1

package/dist/workflows/publication/published-workflow-trigger-deactivator.d.ts

@@ -1,6 +1,7 @@
 import { Logger } from '@n8n/backend-common';
 import { WorkflowsConfig } from '@n8n/config';
-import { ActiveWorkflowTriggers, ErrorReporter } from 'n8n-core';
+import { ActiveWorkflowTriggers, ErrorReporter, InstanceSettings } from 'n8n-core';
+import { EventService } from '../../events/event.service';
 import { WorkflowPublicationLifecycleLock } from '../../workflows/publication/workflow-publication-lifecycle-lock';
 import { WorkflowPublicationOutboxConsumer } from '../../workflows/publication/workflow-publication-outbox-consumer';
 export declare class PublishedWorkflowTriggerDeactivator {
@@ -10,7 +11,14 @@ export declare class PublishedWorkflowTriggerDeactivator {
     private readonly lifecycleLock;
     private readonly activeWorkflowTriggers;
     private readonly outboxConsumer;
-    constructor(logger: Logger, workflowsConfig: WorkflowsConfig, errorReporter: ErrorReporter, lifecycleLock: WorkflowPublicationLifecycleLock, activeWorkflowTriggers: ActiveWorkflowTriggers, outboxConsumer: WorkflowPublicationOutboxConsumer);
+    private readonly instanceSettings;
+    private readonly eventService;
+    private isShuttingDown;
+    private consecutiveLockSkipsByWorkflowId;
+    constructor(logger: Logger, workflowsConfig: WorkflowsConfig, errorReporter: ErrorReporter, lifecycleLock: WorkflowPublicationLifecycleLock, activeWorkflowTriggers: ActiveWorkflowTriggers, outboxConsumer: WorkflowPublicationOutboxConsumer, instanceSettings: InstanceSettings, eventService: EventService);
     deactivateAllNonWebhookTriggers(): Promise<void>;
-    private deactivateWorkflow;
+    sweepGhostTriggers(): Promise<number>;
+    private trackSkippedWhileLocked;
+    private deactivateWorkflows;
+    shutdown(): void;
 }

package/dist/workflows/publication/published-workflow-trigger-deactivator.js

@@ -12,51 +12,88 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublishedWorkflowTriggerDeactivator = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
-const constants_1 = require("@n8n/constants");
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
-const n8n_workflow_1 = require("n8n-workflow");
+const event_service_1 = require("../../events/event.service");
 const workflow_publication_lifecycle_lock_1 = require("../../workflows/publication/workflow-publication-lifecycle-lock");
 const workflow_publication_outbox_consumer_1 = require("../../workflows/publication/workflow-publication-outbox-consumer");
-const STEPDOWN_TEARDOWN_TIMEOUT_MS = 30 * constants_1.Time.seconds.toMilliseconds;
+const STUCK_LOCK_WARN_AFTER_PASSES = 3;
 let PublishedWorkflowTriggerDeactivator = class PublishedWorkflowTriggerDeactivator {
-    constructor(logger, workflowsConfig, errorReporter, lifecycleLock, activeWorkflowTriggers, outboxConsumer) {
+    constructor(logger, workflowsConfig, errorReporter, lifecycleLock, activeWorkflowTriggers, outboxConsumer, instanceSettings, eventService) {
         this.logger = logger;
         this.workflowsConfig = workflowsConfig;
         this.errorReporter = errorReporter;
         this.lifecycleLock = lifecycleLock;
         this.activeWorkflowTriggers = activeWorkflowTriggers;
         this.outboxConsumer = outboxConsumer;
+        this.instanceSettings = instanceSettings;
+        this.eventService = eventService;
+        this.isShuttingDown = false;
+        this.consecutiveLockSkipsByWorkflowId = new Map();
         this.logger = this.logger.scoped('workflow-publication');
     }
     async deactivateAllNonWebhookTriggers() {
         if (!this.workflowsConfig.useWorkflowPublicationService)
             return;
         this.outboxConsumer.stopPolling();
-        const workflowIds = new Set([
-            ...this.activeWorkflowTriggers.getNonWebhookTriggerWorkflowIds(),
-            ...this.lifecycleLock.getLockedWorkflowIds(),
-        ]);
-        const lockedWorkflowIds = [];
-        for (const workflowId of workflowIds) {
-            if (this.lifecycleLock.isLocked(workflowId)) {
-                lockedWorkflowIds.push(workflowId);
-                continue;
+        const workflowIds = this.activeWorkflowTriggers.getNonWebhookTriggerWorkflowIds();
+        await this.deactivateWorkflows(workflowIds);
+    }
+    async sweepGhostTriggers() {
+        if (this.instanceSettings.isLeader)
+            return 0;
+        const ghosts = [];
+        try {
+            const workflowIds = this.activeWorkflowTriggers.getNonWebhookTriggerWorkflowIds();
+            ghosts.push(...(await this.deactivateWorkflows(workflowIds)));
+            if (ghosts.length > 0) {
+                this.logger.warn(`Found ${ghosts.length} ghost workflows. Removed them.`, {
+                    workflowIds: ghosts,
+                });
+                this.eventService.emit('workflow-publication-ghost-trigger-sweep', {
+                    removedCount: ghosts.length,
+                });
             }
-            await this.deactivateWorkflow(workflowId);
         }
-        for (const workflowId of lockedWorkflowIds) {
-            await this.deactivateWorkflow(workflowId);
+        catch (error) {
+            this.errorReporter.error(error, { shouldBeLogged: true });
+        }
+        return ghosts.length;
+    }
+    trackSkippedWhileLocked(workflowId) {
+        const skips = (this.consecutiveLockSkipsByWorkflowId.get(workflowId) ?? 0) + 1;
+        if (skips === STUCK_LOCK_WARN_AFTER_PASSES) {
+            this.logger.warn(`Lifecycle lock for workflow "${workflowId}" still held after ${skips} teardown passes; its triggers cannot be torn down until the holder releases the lock`, { workflowId, passes: skips });
         }
+        this.consecutiveLockSkipsByWorkflowId.set(workflowId, skips);
     }
-    async deactivateWorkflow(workflowId) {
-        const { timedOut } = await this.lifecycleLock.runExclusiveOrTimeout(workflowId, async () => {
-            await this.activeWorkflowTriggers.remove(workflowId);
-        }, STEPDOWN_TEARDOWN_TIMEOUT_MS);
-        if (timedOut) {
-            this.errorReporter.error(new n8n_workflow_1.UnexpectedError(`Timed out waiting for an in-flight publication record for workflow "${workflowId}" before trigger teardown; tore down anyway`), { shouldBeLogged: true });
+    async deactivateWorkflows(workflowIds) {
+        const deactivatedWorkflows = [];
+        for (const workflowId of workflowIds) {
+            try {
+                if (this.lifecycleLock.isLocked(workflowId)) {
+                    this.trackSkippedWhileLocked(workflowId);
+                    continue;
+                }
+                this.consecutiveLockSkipsByWorkflowId.delete(workflowId);
+                const result = await this.lifecycleLock.runExclusive(workflowId, async () => {
+                    if (this.instanceSettings.isLeader && !this.isShuttingDown)
+                        return false;
+                    return await this.activeWorkflowTriggers.remove(workflowId);
+                });
+                if (result) {
+                    deactivatedWorkflows.push(workflowId);
+                }
+            }
+            catch (error) {
+                this.errorReporter.error(error, { shouldBeLogged: true });
+            }
         }
+        return deactivatedWorkflows;
+    }
+    shutdown() {
+        this.isShuttingDown = true;
     }
 };
 exports.PublishedWorkflowTriggerDeactivator = PublishedWorkflowTriggerDeactivator;
@@ -67,8 +104,14 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], PublishedWorkflowTriggerDeactivator.prototype, "deactivateAllNonWebhookTriggers", null);
+__decorate([
+    (0, decorators_1.OnShutdown)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], PublishedWorkflowTriggerDeactivator.prototype, "shutdown", null);
 exports.PublishedWorkflowTriggerDeactivator = PublishedWorkflowTriggerDeactivator = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.WorkflowsConfig, n8n_core_1.ErrorReporter, workflow_publication_lifecycle_lock_1.WorkflowPublicationLifecycleLock, n8n_core_1.ActiveWorkflowTriggers, workflow_publication_outbox_consumer_1.WorkflowPublicationOutboxConsumer])
+    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.WorkflowsConfig, n8n_core_1.ErrorReporter, workflow_publication_lifecycle_lock_1.WorkflowPublicationLifecycleLock, n8n_core_1.ActiveWorkflowTriggers, workflow_publication_outbox_consumer_1.WorkflowPublicationOutboxConsumer, n8n_core_1.InstanceSettings, event_service_1.EventService])
 ], PublishedWorkflowTriggerDeactivator);
 //# sourceMappingURL=published-workflow-trigger-deactivator.js.map

package/dist/workflows/publication/published-workflow-trigger-deactivator.js.map

@@ -1 +1 @@
-{"version":3,"file":"published-workflow-trigger-deactivator.js","sourceRoot":"","sources":["../../../src/workflows/publication/published-workflow-trigger-deactivator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA8C;AAC9C,8CAAsC;AACtC,gDAA+D;AAC/D,gCAAkC;AAClC,uCAAiE;AACjE,+CAA+C;AAE/C,qHAA+G;AAC/G,uHAAiH;AAOjH,MAAM,4BAA4B,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAO/D,IAAM,mCAAmC,GAAzC,MAAM,mCAAmC;IAC/C,YACkB,MAAc,EACd,eAAgC,EAChC,aAA4B,EAC5B,aAA+C,EAC/C,sBAA8C,EAC9C,cAAiD;sBALjD,MAAM;+BACN,eAAe;6BACf,aAAa;6BACb,aAAa;sCACb,sBAAsB;8BACtB,cAAc;QAE/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAC1D,CAAC;IAOK,AAAN,KAAK,CAAC,+BAA+B;QACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,6BAA6B;YAAE,OAAO;QAEhE,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;QAIlC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC;YAC3B,GAAG,IAAI,CAAC,sBAAsB,CAAC,+BAA+B,EAAE;YAChE,GAAG,IAAI,CAAC,aAAa,CAAC,oBAAoB,EAAE;SAC5C,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAa,EAAE,CAAC;QAEvC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACtC,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC7C,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACnC,SAAS;YACV,CAAC;YACD,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;IACF,CAAC;IAQO,KAAK,CAAC,kBAAkB,CAAC,UAAkB;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAClE,UAAU,EACV,KAAK,IAAI,EAAE;YACV,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACtD,CAAC,EACD,4BAA4B,CAC5B,CAAC;QAEF,IAAI,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,aAAa,CAAC,KAAK,CACvB,IAAI,8BAAe,CAClB,uEAAuE,UAAU,6CAA6C,CAC9H,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,CACxB,CAAC;QACH,CAAC;IACF,CAAC;CACD,CAAA;;AAlDM;IAFL,IAAA,6BAAgB,GAAE;IAClB,IAAA,uBAAU,GAAE;;;;0FAyBZ;8CAzCW,mCAAmC;IAD/C,IAAA,YAAO,GAAE;qCAGiB,uBAAM,EACG,wBAAe,EACjB,wBAAa,EACb,sEAAgC,EACvB,iCAAsB,EAC9B,wEAAiC;GAPvD,mCAAmC,CAmE/C"}
+{"version":3,"file":"published-workflow-trigger-deactivator.js","sourceRoot":"","sources":["../../../src/workflows/publication/published-workflow-trigger-deactivator.ts"],"names":[],"mappings":"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"}

package/dist/workflows/publication/workflow-publication-lifecycle-lock.d.ts

@@ -1,13 +1,8 @@
 export declare class WorkflowPublicationLifecycleLock {
     private readonly stateByWorkflowId;
     isLocked(workflowId: string): boolean;
-    getLockedWorkflowIds(): string[];
     runExclusive<T>(workflowId: string, fn: () => Promise<T>): Promise<T>;
-    runExclusiveOrTimeout(workflowId: string, fn: () => Promise<void>, timeoutMs: number): Promise<{
-        timedOut: boolean;
-    }>;
     private getOrCreateState;
     private acquire;
     private release;
-    private acquireWithTimeout;
 }

package/dist/workflows/publication/workflow-publication-lifecycle-lock.js

@@ -15,9 +15,6 @@ let WorkflowPublicationLifecycleLock = class WorkflowPublicationLifecycleLock {
     isLocked(workflowId) {
         return this.stateByWorkflowId.has(workflowId);
     }
-    getLockedWorkflowIds() {
-        return Array.from(this.stateByWorkflowId.keys());
-    }
     async runExclusive(workflowId, fn) {
         await this.acquire(workflowId);
         try {
@@ -27,20 +24,6 @@ let WorkflowPublicationLifecycleLock = class WorkflowPublicationLifecycleLock {
             this.release(workflowId);
         }
     }
-    async runExclusiveOrTimeout(workflowId, fn, timeoutMs) {
-        const acquired = await this.acquireWithTimeout(workflowId, timeoutMs);
-        if (!acquired) {
-            await fn();
-            return { timedOut: true };
-        }
-        try {
-            await fn();
-        }
-        finally {
-            this.release(workflowId);
-        }
-        return { timedOut: false };
-    }
     getOrCreateState(workflowId) {
         let state = this.stateByWorkflowId.get(workflowId);
         if (!state) {
@@ -69,33 +52,6 @@ let WorkflowPublicationLifecycleLock = class WorkflowPublicationLifecycleLock {
             this.stateByWorkflowId.delete(workflowId);
         }
     }
-    async acquireWithTimeout(workflowId, timeoutMs) {
-        const state = this.getOrCreateState(workflowId);
-        if (!state.locked) {
-            state.locked = true;
-            return true;
-        }
-        return await new Promise((resolve) => {
-            let settled = false;
-            const waiter = () => {
-                if (settled)
-                    return;
-                settled = true;
-                clearTimeout(timer);
-                resolve(true);
-            };
-            const timer = setTimeout(() => {
-                if (settled)
-                    return;
-                settled = true;
-                const index = state.waiters.indexOf(waiter);
-                if (index !== -1)
-                    state.waiters.splice(index, 1);
-                resolve(false);
-            }, timeoutMs);
-            state.waiters.push(waiter);
-        });
-    }
 };
 exports.WorkflowPublicationLifecycleLock = WorkflowPublicationLifecycleLock;
 exports.WorkflowPublicationLifecycleLock = WorkflowPublicationLifecycleLock = __decorate([

package/dist/workflows/publication/workflow-publication-lifecycle-lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-publication-lifecycle-lock.js","sourceRoot":"","sources":["../../../src/workflows/publication/workflow-publication-lifecycle-lock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-publication-lifecycle-lock.js","sourceRoot":"","sources":["../../../src/workflows/publication/workflow-publication-lifecycle-lock.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gCAAkC;AA2B3B,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAAtC;QACW,sBAAiB,GAAG,IAAI,GAAG,EAA6B,CAAC;IAgD3E,CAAC;IA7CA,QAAQ,CAAC,UAAkB;QAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;IAGD,KAAK,CAAC,YAAY,CAAI,UAAkB,EAAE,EAAoB;QAC7D,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/B,IAAI,CAAC;YACJ,OAAO,MAAM,EAAE,EAAE,CAAC;QACnB,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1B,CAAC;IACF,CAAC;IAEO,gBAAgB,CAAC,UAAkB;QAC1C,IAAI,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,KAAK,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,UAAkB;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACnB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;YACpB,OAAO;QACR,CAAC;QAED,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,CAAC;IAGO,OAAO,CAAC,UAAkB;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,IAAI,EAAE,CAAC;YACV,IAAI,EAAE,CAAC;QACR,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;IACF,CAAC;CACD,CAAA;;2CAjDY,gCAAgC;IAD5C,IAAA,YAAO,GAAE;GACG,gCAAgC,CAiD5C"}

package/dist/workflows/publication/workflow-publication-outbox-consumer.js

@@ -70,6 +70,8 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
     async wakeUp() {
         if (!this.workflowsConfig.useWorkflowPublicationService)
             return;
+        if (!this.instanceSettings.isLeader)
+            return;
         this.startPolling();
         await this.drainPending();
     }
@@ -231,6 +233,7 @@ __decorate([
 ], WorkflowPublicationOutboxConsumer.prototype, "shutdown", null);
 __decorate([
     (0, decorators_1.OnPubSubEvent)('workflow-publish-wake-up', { instanceType: 'main', instanceRole: 'leader' }),
+    (0, decorators_1.OnLeaderTakeover)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)

package/dist/workflows/publication/workflow-publication-outbox-consumer.js.map

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

package/dist/workflows/publication/workflow-publication-reconciler.service.d.ts

@@ -4,6 +4,7 @@ import { WorkflowPublicationOutboxRepository, WorkflowPublicationTriggerStatusRe
 import { ActiveWorkflowTriggers, ErrorReporter, InstanceSettings, Tracing } from 'n8n-core';
 import { EventService } from '../../events/event.service';
 import { NonWebhookTriggerRegistrar } from '../../workflows/triggers/non-webhook-trigger-registrar';
+import { PublishedWorkflowTriggerDeactivator } from './published-workflow-trigger-deactivator';
 import { WorkflowPublicationLifecycleLock } from './workflow-publication-lifecycle-lock';
 import { WorkflowPublicationOutboxConsumer } from './workflow-publication-outbox-consumer';
 export declare class WorkflowPublicationReconciler {
@@ -19,15 +20,16 @@ export declare class WorkflowPublicationReconciler {
     private readonly lifecycleLock;
     private readonly workflowRepository;
     private readonly activeWorkflowTriggers;
+    private readonly publishedWorkflowTriggerDeactivator;
     private reconcileInterval;
     private isShuttingDown;
     private readonly logger;
-    constructor(logger: Logger, workflowsConfig: WorkflowsConfig, triggerStatusRepository: WorkflowPublicationTriggerStatusRepository, outboxRepository: WorkflowPublicationOutboxRepository, nonWebhookTriggerRegistrar: NonWebhookTriggerRegistrar, outboxConsumer: WorkflowPublicationOutboxConsumer, instanceSettings: InstanceSettings, errorReporter: ErrorReporter, tracing: Tracing, eventService: EventService, lifecycleLock: WorkflowPublicationLifecycleLock, workflowRepository: WorkflowRepository, activeWorkflowTriggers: ActiveWorkflowTriggers);
+    constructor(logger: Logger, workflowsConfig: WorkflowsConfig, triggerStatusRepository: WorkflowPublicationTriggerStatusRepository, outboxRepository: WorkflowPublicationOutboxRepository, nonWebhookTriggerRegistrar: NonWebhookTriggerRegistrar, outboxConsumer: WorkflowPublicationOutboxConsumer, instanceSettings: InstanceSettings, errorReporter: ErrorReporter, tracing: Tracing, eventService: EventService, lifecycleLock: WorkflowPublicationLifecycleLock, workflowRepository: WorkflowRepository, activeWorkflowTriggers: ActiveWorkflowTriggers, publishedWorkflowTriggerDeactivator: PublishedWorkflowTriggerDeactivator);
     init(): void;
     startReconciler(): void;
-    stopReconciler(): void;
     shutdown(): void;
     reconcile(): Promise<void>;
+    reconcileOnLeaderTakeover(): Promise<void>;
     private findSurplusWorkflowIds;
     private removeGhostTriggers;
     private findMissingActiveWorkflows;

package/dist/workflows/publication/workflow-publication-reconciler.service.js

@@ -19,10 +19,11 @@ const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const event_service_1 = require("../../events/event.service");
 const non_webhook_trigger_registrar_1 = require("../../workflows/triggers/non-webhook-trigger-registrar");
+const published_workflow_trigger_deactivator_1 = require("./published-workflow-trigger-deactivator");
 const workflow_publication_lifecycle_lock_1 = require("./workflow-publication-lifecycle-lock");
 const workflow_publication_outbox_consumer_1 = require("./workflow-publication-outbox-consumer");
 let WorkflowPublicationReconciler = class WorkflowPublicationReconciler {
-    constructor(logger, workflowsConfig, triggerStatusRepository, outboxRepository, nonWebhookTriggerRegistrar, outboxConsumer, instanceSettings, errorReporter, tracing, eventService, lifecycleLock, workflowRepository, activeWorkflowTriggers) {
+    constructor(logger, workflowsConfig, triggerStatusRepository, outboxRepository, nonWebhookTriggerRegistrar, outboxConsumer, instanceSettings, errorReporter, tracing, eventService, lifecycleLock, workflowRepository, activeWorkflowTriggers, publishedWorkflowTriggerDeactivator) {
         this.workflowsConfig = workflowsConfig;
         this.triggerStatusRepository = triggerStatusRepository;
         this.outboxRepository = outboxRepository;
@@ -35,12 +36,11 @@ let WorkflowPublicationReconciler = class WorkflowPublicationReconciler {
         this.lifecycleLock = lifecycleLock;
         this.workflowRepository = workflowRepository;
         this.activeWorkflowTriggers = activeWorkflowTriggers;
+        this.publishedWorkflowTriggerDeactivator = publishedWorkflowTriggerDeactivator;
         this.isShuttingDown = false;
         this.logger = logger.scoped('workflow-publication');
     }
     init() {
-        if (!this.instanceSettings.isLeader)
-            return;
         this.startReconciler();
         if (this.reconcileInterval)
             void this.reconcile();
@@ -54,32 +54,39 @@ let WorkflowPublicationReconciler = class WorkflowPublicationReconciler {
         this.reconcileInterval = setInterval(async () => await this.reconcile(), intervalSeconds * constants_1.Time.seconds.toMilliseconds);
         this.logger.debug(`Trigger reconciliation scheduled every ${intervalSeconds}s`);
     }
-    stopReconciler() {
-        clearInterval(this.reconcileInterval);
-        this.reconcileInterval = undefined;
-    }
     shutdown() {
         this.isShuttingDown = true;
-        this.stopReconciler();
+        clearInterval(this.reconcileInterval);
+        this.reconcileInterval = undefined;
     }
     async reconcile() {
-        if (!this.instanceSettings.isLeader || this.isShuttingDown)
+        if (this.isShuttingDown)
+            return;
+        if (!this.instanceSettings.isLeader) {
+            await this.publishedWorkflowTriggerDeactivator.sweepGhostTriggers();
             return;
+        }
         await this.tracing.startSpan({ name: 'Publication trigger reconciliation', op: 'publication.reconcile' }, async (span) => {
             const startedAt = Date.now();
             try {
                 const surplus = await this.removeGhostTriggers(await this.findSurplusWorkflowIds());
                 const missing = await this.republishWorkflows(await this.findMissingActiveWorkflows(), 'Re-publishing workflows with missing in-memory triggers');
                 const versionSkew = await this.republishWorkflows(await this.outboxRepository.findVersionSkewedWorkflowIds(), 'Re-enqueuing workflows whose published version diverged from the active version');
+                const statusDrift = await this.republishWorkflows(await this.outboxRepository.findTriggerStatusDriftedWorkflowIds(), 'Re-enqueuing workflows whose trigger-status rows lag the active version');
+                const unreported = await this.republishWorkflows(await this.outboxRepository.findUnreportedPublishedWorkflowIds(), 'Re-enqueuing published workflows that no publication reported trigger statuses for');
                 span.setAttribute('n8n.publication.deficient_workflows', missing);
                 span.setAttribute('n8n.publication.surplus_workflows', surplus);
                 span.setAttribute('n8n.publication.version_skewed_workflows', versionSkew);
+                span.setAttribute('n8n.publication.status_drifted_workflows', statusDrift);
+                span.setAttribute('n8n.publication.unreported_workflows', unreported);
                 span.setStatus({ code: 1 });
                 this.eventService.emit('workflow-publication-reconciliation', {
                     result: 'success',
                     deficientCount: missing,
                     surplusCount: surplus,
                     versionSkewCount: versionSkew,
+                    statusDriftCount: statusDrift,
+                    unreportedCount: unreported,
                     durationMs: Date.now() - startedAt,
                 });
             }
@@ -91,11 +98,18 @@ let WorkflowPublicationReconciler = class WorkflowPublicationReconciler {
                     deficientCount: 0,
                     surplusCount: 0,
                     versionSkewCount: 0,
+                    statusDriftCount: 0,
+                    unreportedCount: 0,
                     durationMs: Date.now() - startedAt,
                 });
             }
         });
     }
+    async reconcileOnLeaderTakeover() {
+        if (!this.reconcileInterval)
+            return;
+        await this.reconcile();
+    }
     async findSurplusWorkflowIds() {
         const registered = this.activeWorkflowTriggers.getNonWebhookTriggerWorkflowIds();
         if (registered.length === 0)
@@ -107,15 +121,20 @@ let WorkflowPublicationReconciler = class WorkflowPublicationReconciler {
     async removeGhostTriggers(workflowIds) {
         let surplusRepairs = 0;
         for (const workflowId of workflowIds) {
-            await this.lifecycleLock.runExclusive(workflowId, async () => {
-                const workflow = await this.workflowRepository.findOneBy({ id: workflowId });
-                if (workflow?.activeVersionId)
-                    return;
-                if (await this.outboxRepository.findInFlightByWorkflowId(workflowId))
-                    return;
-                await this.activeWorkflowTriggers.remove(workflowId);
-                surplusRepairs++;
-            });
+            try {
+                await this.lifecycleLock.runExclusive(workflowId, async () => {
+                    const workflow = await this.workflowRepository.findOneBy({ id: workflowId });
+                    if (workflow?.activeVersionId)
+                        return;
+                    if (await this.outboxRepository.findInFlightByWorkflowId(workflowId))
+                        return;
+                    await this.activeWorkflowTriggers.remove(workflowId);
+                    surplusRepairs++;
+                });
+            }
+            catch (error) {
+                this.errorReporter.error(error, { shouldBeLogged: true });
+            }
         }
         return surplusRepairs;
     }
@@ -151,25 +170,19 @@ let WorkflowPublicationReconciler = class WorkflowPublicationReconciler {
 };
 exports.WorkflowPublicationReconciler = WorkflowPublicationReconciler;
 __decorate([
-    (0, decorators_1.OnLeaderTakeover)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], WorkflowPublicationReconciler.prototype, "startReconciler", null);
-__decorate([
-    (0, decorators_1.OnLeaderStepdown)(),
+    (0, decorators_1.OnShutdown)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
-], WorkflowPublicationReconciler.prototype, "stopReconciler", null);
+], WorkflowPublicationReconciler.prototype, "shutdown", null);
 __decorate([
-    (0, decorators_1.OnShutdown)(),
+    (0, decorators_1.OnLeaderTakeover)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], WorkflowPublicationReconciler.prototype, "shutdown", null);
+    __metadata("design:returntype", Promise)
+], WorkflowPublicationReconciler.prototype, "reconcileOnLeaderTakeover", null);
 exports.WorkflowPublicationReconciler = WorkflowPublicationReconciler = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.WorkflowsConfig, db_1.WorkflowPublicationTriggerStatusRepository, db_1.WorkflowPublicationOutboxRepository, non_webhook_trigger_registrar_1.NonWebhookTriggerRegistrar, workflow_publication_outbox_consumer_1.WorkflowPublicationOutboxConsumer, n8n_core_1.InstanceSettings, n8n_core_1.ErrorReporter, n8n_core_1.Tracing, event_service_1.EventService, workflow_publication_lifecycle_lock_1.WorkflowPublicationLifecycleLock, db_1.WorkflowRepository, n8n_core_1.ActiveWorkflowTriggers])
+    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.WorkflowsConfig, db_1.WorkflowPublicationTriggerStatusRepository, db_1.WorkflowPublicationOutboxRepository, non_webhook_trigger_registrar_1.NonWebhookTriggerRegistrar, workflow_publication_outbox_consumer_1.WorkflowPublicationOutboxConsumer, n8n_core_1.InstanceSettings, n8n_core_1.ErrorReporter, n8n_core_1.Tracing, event_service_1.EventService, workflow_publication_lifecycle_lock_1.WorkflowPublicationLifecycleLock, db_1.WorkflowRepository, n8n_core_1.ActiveWorkflowTriggers, published_workflow_trigger_deactivator_1.PublishedWorkflowTriggerDeactivator])
 ], WorkflowPublicationReconciler);
 //# sourceMappingURL=workflow-publication-reconciler.service.js.map

package/dist/workflows/publication/workflow-publication-reconciler.service.js.map

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

package/dist/workflows/triggers/trigger-activation-retry.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTransientActivationError = void 0;
 exports.retryTriggerActivation = retryTriggerActivation;
 const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
+const sleep_1 = require("@n8n/utils/sleep");
 const n8n_workflow_1 = require("n8n-workflow");
 const constants_1 = require("../../constants");
 const isTransientActivationError = (error) => !(error instanceof n8n_workflow_1.WebhookPathTakenError);
@@ -17,7 +18,7 @@ async function retryTriggerActivation(activate, maxAttempts) {
             const isLastAttempt = attempt >= maxAttempts - 1;
             if (!(0, exports.isTransientActivationError)((0, ensure_error_1.ensureError)(error)) || isLastAttempt)
                 throw error;
-            await (0, n8n_workflow_1.sleep)(Math.min(constants_1.WORKFLOW_REACTIVATE_INITIAL_TIMEOUT * 2 ** attempt, constants_1.WORKFLOW_REACTIVATE_MAX_TIMEOUT));
+            await (0, sleep_1.sleep)(Math.min(constants_1.WORKFLOW_REACTIVATE_INITIAL_TIMEOUT * 2 ** attempt, constants_1.WORKFLOW_REACTIVATE_MAX_TIMEOUT));
         }
     }
 }

package/dist/workflows/triggers/trigger-activation-retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"trigger-activation-retry.js","sourceRoot":"","sources":["../../../src/workflows/triggers/trigger-activation-retry.ts"],"names":[],"mappings":";;;;AAAA,iEAA6D;AAC7D,+CAA4D;AAE5D,2CAAmG;AAK5F,MAAM,0BAA0B,GAAG,CAAC,KAAY,EAAW,EAAE,CACnE,CAAC,CAAC,KAAK,YAAY,oCAAqB,CAAC,CAAC;AAD9B,QAAA,0BAA0B,GAA1B,0BAA0B,CACI;AASpC,KAAK,iCACX,QAA6B,EAC7B,WAAmB;IAEnB,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC;YACJ,MAAM,QAAQ,EAAE,CAAC;YACjB,OAAO;QACR,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,aAAa,GAAG,OAAO,IAAI,WAAW,GAAG,CAAC,CAAC;YACjD,IAAI,CAAC,IAAA,QAAA,0BAA0B,EAAC,IAAA,0BAAW,EAAC,KAAK,CAAC,CAAC,IAAI,aAAa;gBAAE,MAAM,KAAK,CAAC;YAElF,MAAM,IAAA,oBAAK,EACV,IAAI,CAAC,GAAG,CACP,+CAAmC,GAAG,CAAC,IAAI,OAAO,EAClD,2CAA+B,CAC/B,CACD,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC"}
+{"version":3,"file":"trigger-activation-retry.js","sourceRoot":"","sources":["../../../src/workflows/triggers/trigger-activation-retry.ts"],"names":[],"mappings":";;;;AAAA,iEAA6D;AAC7D,4CAAyC;AACzC,+CAAqD;AAErD,2CAAmG;AAK5F,MAAM,0BAA0B,GAAG,CAAC,KAAY,EAAW,EAAE,CACnE,CAAC,CAAC,KAAK,YAAY,oCAAqB,CAAC,CAAC;AAD9B,QAAA,0BAA0B,GAA1B,0BAA0B,CACI;AASpC,KAAK,iCACX,QAA6B,EAC7B,WAAmB;IAEnB,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC;YACJ,MAAM,QAAQ,EAAE,CAAC;YACjB,OAAO;QACR,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,aAAa,GAAG,OAAO,IAAI,WAAW,GAAG,CAAC,CAAC;YACjD,IAAI,CAAC,IAAA,QAAA,0BAA0B,EAAC,IAAA,0BAAW,EAAC,KAAK,CAAC,CAAC,IAAI,aAAa;gBAAE,MAAM,KAAK,CAAC;YAElF,MAAM,IAAA,aAAK,EACV,IAAI,CAAC,GAAG,CACP,+CAAmC,GAAG,CAAC,IAAI,OAAO,EAClD,2CAA+B,CAC/B,CACD,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC"}

package/dist/workflows/triggers/workflow-trigger-activator.js

@@ -66,6 +66,11 @@ const trigger_count_service_1 = require("../../workflows/triggers/trigger-count.
 const trigger_execution_context_factory_1 = require("../../workflows/triggers/trigger-execution-context.factory");
 const webhook_trigger_registrar_1 = require("../../workflows/triggers/webhook-trigger-registrar");
 const workflow_static_data_service_1 = require("../../workflows/workflow-static-data.service");
+const PSEUDO_TRIGGER_NODE_TYPES = new Set([
+    n8n_workflow_1.MANUAL_TRIGGER_NODE_TYPE,
+    n8n_workflow_1.EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+    n8n_workflow_1.ERROR_TRIGGER_NODE_TYPE,
+]);
 let WorkflowTriggerActivator = class WorkflowTriggerActivator {
     constructor(logger, errorReporter, nodeTypes, workflowRepository, workflowStaticDataService, workflowsConfig, triggerExecutionContextFactory, webhookTriggerRegistrar, nonWebhookTriggerRegistrar, triggerCountService, activationErrorsService, tracing, eventService) {
         this.logger = logger;
@@ -106,7 +111,9 @@ let WorkflowTriggerActivator = class WorkflowTriggerActivator {
             active: false,
             nodeTypes: this.nodeTypes,
         });
-        const inMemoryNodeIds = new Set([...workflow.getPollNodes(), ...workflow.getTriggerNodes()].map((node) => node.id));
+        const inMemoryNodeIds = new Set([...workflow.getPollNodes(), ...workflow.getTriggerNodes()]
+            .filter((node) => !PSEUDO_TRIGGER_NODE_TYPES.has(node.type))
+            .map((node) => node.id));
         const kinds = new Map();
         for (const node of nodes) {
             kinds.set(node.id, inMemoryNodeIds.has(node.id) ? 'in-memory' : 'persisted');