n8n 2.27.4 → 2.28.1

package/dist/workflows/publication/workflow-publication-outbox-cleanup.service.js

@@ -0,0 +1,109 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __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.WorkflowPublicationOutboxCleanupService = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const config_1 = require("@n8n/config");
+const constants_1 = require("@n8n/constants");
+const db_1 = require("@n8n/db");
+const decorators_1 = require("@n8n/decorators");
+const di_1 = require("@n8n/di");
+const n8n_core_1 = require("n8n-core");
+let WorkflowPublicationOutboxCleanupService = class WorkflowPublicationOutboxCleanupService {
+    constructor(logger, workflowsConfig, outboxRepository, instanceSettings, tracing) {
+        this.workflowsConfig = workflowsConfig;
+        this.outboxRepository = outboxRepository;
+        this.instanceSettings = instanceSettings;
+        this.tracing = tracing;
+        this.isShuttingDown = false;
+        this.logger = logger.scoped('workflow-publication');
+    }
+    init() {
+        if (!this.instanceSettings.isLeader)
+            return;
+        this.startCleanup();
+        if (this.cleanupInterval)
+            void this.cleanup();
+    }
+    startCleanup() {
+        if (!this.workflowsConfig.useWorkflowPublicationService)
+            return;
+        if (this.isShuttingDown || this.cleanupInterval)
+            return;
+        const intervalSeconds = this.workflowsConfig.publicationOutboxCleanupIntervalSeconds;
+        this.cleanupInterval = setInterval(async () => await this.cleanup(), intervalSeconds * constants_1.Time.seconds.toMilliseconds);
+        this.logger.debug(`Outbox cleanup scheduled every ${intervalSeconds}s`);
+    }
+    stopCleanup() {
+        clearInterval(this.cleanupInterval);
+        this.cleanupInterval = undefined;
+    }
+    shutdown() {
+        this.isShuttingDown = true;
+        this.stopCleanup();
+    }
+    async cleanup() {
+        const completedRetentionSeconds = this.workflowsConfig.publicationOutboxCompletedRetentionHours * constants_1.Time.hours.toSeconds;
+        const failedRetentionSeconds = this.workflowsConfig.publicationOutboxFailedRetentionHours * constants_1.Time.hours.toSeconds;
+        const batchSize = this.workflowsConfig.publicationOutboxCleanupBatchSize;
+        await this.tracing.startSpan({ name: 'Publication outbox cleanup', op: 'publication.outbox.cleanup' }, async (span) => {
+            let totalDeleted = 0;
+            try {
+                let deleted;
+                do {
+                    deleted = await this.outboxRepository.deleteTerminalOlderThan(completedRetentionSeconds, failedRetentionSeconds, batchSize);
+                    totalDeleted += deleted;
+                } while (deleted >= batchSize && !this.isShuttingDown);
+                span.setStatus({ code: 1 });
+                if (totalDeleted > 0) {
+                    this.logger.debug('Cleaned up terminal workflow publication outbox records', {
+                        count: totalDeleted,
+                    });
+                }
+            }
+            catch (error) {
+                span.setStatus({ code: 2 });
+                this.logger.error('Failed to clean up workflow publication outbox records', { error });
+            }
+            finally {
+                span.setAttribute('n8n.publication.records_deleted', totalDeleted);
+            }
+        });
+    }
+};
+exports.WorkflowPublicationOutboxCleanupService = WorkflowPublicationOutboxCleanupService;
+__decorate([
+    (0, decorators_1.OnLeaderTakeover)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], WorkflowPublicationOutboxCleanupService.prototype, "startCleanup", null);
+__decorate([
+    (0, decorators_1.OnLeaderStepdown)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], WorkflowPublicationOutboxCleanupService.prototype, "stopCleanup", null);
+__decorate([
+    (0, decorators_1.OnShutdown)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], WorkflowPublicationOutboxCleanupService.prototype, "shutdown", null);
+exports.WorkflowPublicationOutboxCleanupService = WorkflowPublicationOutboxCleanupService = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [backend_common_1.Logger,
+        config_1.WorkflowsConfig,
+        db_1.WorkflowPublicationOutboxRepository,
+        n8n_core_1.InstanceSettings,
+        n8n_core_1.Tracing])
+], WorkflowPublicationOutboxCleanupService);
+//# sourceMappingURL=workflow-publication-outbox-cleanup.service.js.map

package/dist/workflows/publication/workflow-publication-outbox-cleanup.service.js.map

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

package/dist/workflows/publication/workflow-publication-outbox-consumer.d.ts

@@ -1,8 +1,9 @@
 import { Logger } from '@n8n/backend-common';
 import { WorkflowsConfig } from '@n8n/config';
 import { WorkflowPublicationOutbox, WorkflowPublicationOutboxRepository } from '@n8n/db';
-import { ErrorReporter, InstanceSettings } from 'n8n-core';
+import { ErrorReporter, InstanceSettings, Tracing } from 'n8n-core';
 import { PublicationStatusReporter } from '../../workflows/publication/publication-status-reporter';
+import { WorkflowPublicationLifecycleLock } from '../../workflows/publication/workflow-publication-lifecycle-lock';
 import { WorkflowPublicationApplier } from '../../workflows/publication/workflow-publication-applier';
 export declare class WorkflowPublicationOutboxConsumer {
     private readonly logger;
@@ -12,16 +13,22 @@ export declare class WorkflowPublicationOutboxConsumer {
     private readonly applier;
     private readonly reporter;
     private readonly instanceSettings;
+    private readonly lifecycleLock;
+    private readonly tracing;
     private pollTimeout;
     private isPolling;
     private isShuttingDown;
-    constructor(logger: Logger, workflowsConfig: WorkflowsConfig, errorReporter: ErrorReporter, outboxRepository: WorkflowPublicationOutboxRepository, applier: WorkflowPublicationApplier, reporter: PublicationStatusReporter, instanceSettings: InstanceSettings);
-    init(): void;
+    private activeDrain;
+    constructor(logger: Logger, workflowsConfig: WorkflowsConfig, errorReporter: ErrorReporter, outboxRepository: WorkflowPublicationOutboxRepository, applier: WorkflowPublicationApplier, reporter: PublicationStatusReporter, instanceSettings: InstanceSettings, lifecycleLock: WorkflowPublicationLifecycleLock, tracing: Tracing);
+    init(): Promise<void>;
     startPolling(): void;
     stopPolling(): void;
-    shutdown(): void;
+    shutdown(): Promise<void>;
+    wakeUp(): Promise<void>;
     private schedulePollCycle;
     private pollCycle;
+    drainPending(): Promise<number>;
+    private runDrain;
     private shouldKeepPolling;
     processRecord(record: WorkflowPublicationOutbox): Promise<void>;
 }

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

@@ -18,9 +18,10 @@ const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const publication_status_reporter_1 = require("../../workflows/publication/publication-status-reporter");
+const workflow_publication_lifecycle_lock_1 = require("../../workflows/publication/workflow-publication-lifecycle-lock");
 const workflow_publication_applier_1 = require("../../workflows/publication/workflow-publication-applier");
 let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer {
-    constructor(logger, workflowsConfig, errorReporter, outboxRepository, applier, reporter, instanceSettings) {
+    constructor(logger, workflowsConfig, errorReporter, outboxRepository, applier, reporter, instanceSettings, lifecycleLock, tracing) {
         this.logger = logger;
         this.workflowsConfig = workflowsConfig;
         this.errorReporter = errorReporter;
@@ -28,14 +29,18 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
         this.applier = applier;
         this.reporter = reporter;
         this.instanceSettings = instanceSettings;
+        this.lifecycleLock = lifecycleLock;
+        this.tracing = tracing;
         this.isPolling = false;
         this.isShuttingDown = false;
+        this.activeDrain = null;
         this.logger = this.logger.scoped('workflow-publication');
     }
-    init() {
-        if (this.instanceSettings.isLeader) {
-            this.startPolling();
-        }
+    async init() {
+        if (!this.instanceSettings.isLeader)
+            return;
+        this.startPolling();
+        await this.drainPending();
     }
     startPolling() {
         if (!this.workflowsConfig.useWorkflowPublicationService || this.isShuttingDown)
@@ -54,9 +59,16 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
             this.logger.debug('Stopped outbox polling');
         }
     }
-    shutdown() {
+    async shutdown() {
         this.isShuttingDown = true;
         this.stopPolling();
+        await this.activeDrain;
+    }
+    async wakeUp() {
+        if (!this.workflowsConfig.useWorkflowPublicationService)
+            return;
+        this.startPolling();
+        await this.drainPending();
     }
     schedulePollCycle() {
         clearTimeout(this.pollTimeout);
@@ -74,60 +86,106 @@ let WorkflowPublicationOutboxConsumer = class WorkflowPublicationOutboxConsumer
         }, this.workflowsConfig.publicationOutboxPollIntervalMs);
     }
     async pollCycle() {
-        let processed = 0;
-        while (this.shouldKeepPolling()) {
-            const record = await this.outboxRepository.claimNextPendingRecord();
-            if (!record)
-                break;
-            await this.processRecord(record);
-            processed++;
+        const processed = await this.drainPending();
+        if (processed > 1) {
+            this.logger.debug(`Processed ${processed} workflow publication outbox records in this cycle`);
         }
-        if (processed > 0) {
-            this.logger.debug(`Processed ${processed} workflow publication outbox record(s)`);
+    }
+    async drainPending() {
+        if (this.activeDrain)
+            return await this.activeDrain;
+        const drain = this.runDrain();
+        this.activeDrain = drain;
+        try {
+            return await drain;
         }
+        finally {
+            this.activeDrain = null;
+        }
+    }
+    async runDrain() {
+        return await this.tracing.startSpan({ name: 'Publication outbox drain', op: 'publication.outbox.drain' }, async (span) => {
+            let processed = 0;
+            while (this.shouldKeepPolling()) {
+                const record = await this.outboxRepository.claimNextPendingRecord();
+                if (!record)
+                    break;
+                await this.processRecord(record);
+                processed++;
+            }
+            span.setAttribute('n8n.publication.records_processed', processed);
+            span.setStatus({ code: 1 });
+            return processed;
+        });
     }
     shouldKeepPolling() {
         return this.isPolling && !this.isShuttingDown;
     }
     async processRecord(record) {
-        let result;
-        try {
-            result = await this.applier.apply(record);
-        }
-        catch (error) {
-            const cause = (0, n8n_workflow_1.ensureError)(error);
-            result = {
-                type: 'failed',
-                error: new n8n_workflow_1.UnexpectedError(`Unexpected: ${cause.message}`, { cause }),
-            };
-        }
-        try {
-            await this.reporter.report(record, result);
-        }
-        catch (reportError) {
-            this.errorReporter.error(reportError, { shouldBeLogged: true });
-        }
+        await this.tracing.startSpan({
+            name: 'Publication outbox record',
+            op: 'publication.outbox.process_record',
+            attributes: {
+                ...this.tracing.pickWorkflowAttributes({ id: record.workflowId }),
+                'n8n.publication.outbox_id': record.id,
+                'n8n.publication.published_version_id': record.publishedVersionId,
+            },
+        }, async (span) => {
+            await this.lifecycleLock.runExclusive(record.workflowId, async () => {
+                if (!this.instanceSettings.isLeader) {
+                    await this.outboxRepository.returnToPending(record.id);
+                    this.logger.debug('Returned publication outbox record to queue: no longer leader', {
+                        outboxId: record.id,
+                        workflowId: record.workflowId,
+                    });
+                    return;
+                }
+                this.logger.debug('Started processing workflow publication outbox record', {
+                    outboxId: record.id,
+                    workflowId: record.workflowId,
+                    publishedVersionId: record.publishedVersionId,
+                });
+                let result;
+                try {
+                    result = await this.applier.apply(record);
+                }
+                catch (error) {
+                    const cause = (0, n8n_workflow_1.ensureError)(error);
+                    result = {
+                        type: 'failed',
+                        error: new n8n_workflow_1.UnexpectedError(`Unexpected: ${cause.message}`, { cause }),
+                    };
+                }
+                try {
+                    await this.reporter.report(record, result);
+                }
+                catch (reportError) {
+                    this.errorReporter.error(reportError, { shouldBeLogged: true });
+                }
+                this.logger.debug('Finished processing workflow publication outbox record', {
+                    outboxId: record.id,
+                    workflowId: record.workflowId,
+                    result: result.type,
+                });
+                span.setAttribute('n8n.publication.result', result.type);
+            });
+            span.setStatus({ code: 1 });
+        });
     }
 };
 exports.WorkflowPublicationOutboxConsumer = WorkflowPublicationOutboxConsumer;
 __decorate([
-    (0, decorators_1.OnLeaderTakeover)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], WorkflowPublicationOutboxConsumer.prototype, "startPolling", null);
-__decorate([
-    (0, decorators_1.OnLeaderStepdown)(),
+    (0, decorators_1.OnShutdown)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], WorkflowPublicationOutboxConsumer.prototype, "stopPolling", null);
+    __metadata("design:returntype", Promise)
+], WorkflowPublicationOutboxConsumer.prototype, "shutdown", null);
 __decorate([
-    (0, decorators_1.OnShutdown)(),
+    (0, decorators_1.OnPubSubEvent)('workflow-publish-wake-up', { instanceType: 'main', instanceRole: 'leader' }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], WorkflowPublicationOutboxConsumer.prototype, "shutdown", null);
+    __metadata("design:returntype", Promise)
+], WorkflowPublicationOutboxConsumer.prototype, "wakeUp", null);
 exports.WorkflowPublicationOutboxConsumer = WorkflowPublicationOutboxConsumer = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [backend_common_1.Logger,
@@ -136,6 +194,8 @@ exports.WorkflowPublicationOutboxConsumer = WorkflowPublicationOutboxConsumer =
         db_1.WorkflowPublicationOutboxRepository,
         workflow_publication_applier_1.WorkflowPublicationApplier,
         publication_status_reporter_1.PublicationStatusReporter,
-        n8n_core_1.InstanceSettings])
+        n8n_core_1.InstanceSettings,
+        workflow_publication_lifecycle_lock_1.WorkflowPublicationLifecycleLock,
+        n8n_core_1.Tracing])
 ], WorkflowPublicationOutboxConsumer);
 //# sourceMappingURL=workflow-publication-outbox-consumer.js.map

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/triggers/non-webhook-trigger-registrar.d.ts

@@ -1,6 +1,6 @@
 import { Logger } from '@n8n/backend-common';
 import type { WorkflowEntity } from '@n8n/db';
-import { ActiveWorkflowTriggers, type IGetExecutePollFunctions, type IGetExecuteTriggerFunctions } from 'n8n-core';
+import { ActiveWorkflowTriggers, Tracing, type IGetExecutePollFunctions, type IGetExecuteTriggerFunctions } from 'n8n-core';
 import type { INode, IWorkflowBase, IWorkflowExecuteAdditionalData, Workflow, WorkflowActivateMode, WorkflowExecuteMode, WorkflowId } from 'n8n-workflow';
 import type { TriggerFailureHandler } from '../../workflows/triggers/trigger-execution-context.factory';
 import { TriggerExecutionContextFactory } from '../../workflows/triggers/trigger-execution-context.factory';
@@ -12,7 +12,6 @@ export interface NonWebhookTriggerRegistrationContext {
     onTriggerFailure: TriggerFailureHandler;
 }
 export interface PreparedNonWebhookTriggerRegistration {
-    dbWorkflow: WorkflowEntity;
     activationMode: WorkflowActivateMode;
     executionMode: WorkflowExecuteMode;
     additionalData: IWorkflowExecuteAdditionalData;
@@ -23,17 +22,17 @@ export declare class NonWebhookTriggerRegistrar {
     private readonly logger;
     private readonly activeWorkflowTriggers;
     private readonly triggerExecutionContextFactory;
-    constructor(logger: Logger, activeWorkflowTriggers: ActiveWorkflowTriggers, triggerExecutionContextFactory: TriggerExecutionContextFactory);
+    private readonly tracing;
+    constructor(logger: Logger, activeWorkflowTriggers: ActiveWorkflowTriggers, triggerExecutionContextFactory: TriggerExecutionContextFactory, tracing: Tracing);
     getTriggerNodeIds(workflow: Workflow): string[];
     getRegisteredTriggerNodeIds(workflowId: WorkflowId): Set<string>;
     createRegistrationContext(dbWorkflow: WorkflowEntity, { activationMode, executionMode, additionalData, resolveWorkflowData, onTriggerFailure, }: NonWebhookTriggerRegistrationContext): {
-        dbWorkflow: WorkflowEntity;
         activationMode: WorkflowActivateMode;
         executionMode: "error" | "trigger" | "webhook" | "agent" | "retry" | "manual" | "cli" | "integrated" | "internal" | "evaluation" | "chat";
         additionalData: IWorkflowExecuteAdditionalData;
         getTriggerFunctions: IGetExecuteTriggerFunctions;
         getPollFunctions: IGetExecutePollFunctions;
     };
-    register(workflow: Workflow, { dbWorkflow, activationMode, executionMode, additionalData, getTriggerFunctions, getPollFunctions, }: PreparedNonWebhookTriggerRegistration, nodeId: INode['id']): Promise<void>;
+    register(workflow: Workflow, { activationMode, executionMode, additionalData, getTriggerFunctions, getPollFunctions, }: PreparedNonWebhookTriggerRegistration, nodeId: INode['id']): Promise<void>;
     deregister(workflowId: WorkflowId, nodeId: INode['id']): Promise<void>;
 }

package/dist/workflows/triggers/non-webhook-trigger-registrar.js

@@ -14,13 +14,13 @@ const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const trigger_execution_context_factory_1 = require("../../workflows/triggers/trigger-execution-context.factory");
-const workflow_formatter_1 = require("../../workflows/workflow.formatter");
 let NonWebhookTriggerRegistrar = class NonWebhookTriggerRegistrar {
-    constructor(logger, activeWorkflowTriggers, triggerExecutionContextFactory) {
+    constructor(logger, activeWorkflowTriggers, triggerExecutionContextFactory, tracing) {
         this.logger = logger;
         this.activeWorkflowTriggers = activeWorkflowTriggers;
         this.triggerExecutionContextFactory = triggerExecutionContextFactory;
-        this.logger = this.logger.scoped(['workflow-activation']);
+        this.tracing = tracing;
+        this.logger = this.logger.scoped('workflow-publication');
     }
     getTriggerNodeIds(workflow) {
         return [...workflow.getTriggerNodes(), ...workflow.getPollNodes()].map((node) => node.id);
@@ -32,7 +32,6 @@ let NonWebhookTriggerRegistrar = class NonWebhookTriggerRegistrar {
         const getTriggerFunctions = this.triggerExecutionContextFactory.getExecuteTriggerFunctions(dbWorkflow, additionalData, executionMode, activationMode, resolveWorkflowData, onTriggerFailure);
         const getPollFunctions = this.triggerExecutionContextFactory.getExecutePollFunctions(dbWorkflow, additionalData, executionMode, activationMode, resolveWorkflowData);
         return {
-            dbWorkflow,
             activationMode,
             executionMode,
             additionalData,
@@ -40,12 +39,33 @@ let NonWebhookTriggerRegistrar = class NonWebhookTriggerRegistrar {
             getPollFunctions,
         };
     }
-    async register(workflow, { dbWorkflow, activationMode, executionMode, additionalData, getTriggerFunctions, getPollFunctions, }, nodeId) {
-        await this.activeWorkflowTriggers.addTriggers(workflow.id, workflow, [nodeId], additionalData, executionMode, activationMode, getTriggerFunctions, getPollFunctions);
-        this.logger.debug(`Added non-webhook trigger "${nodeId}" for workflow ${(0, workflow_formatter_1.formatWorkflow)(dbWorkflow)}`);
+    async register(workflow, { activationMode, executionMode, additionalData, getTriggerFunctions, getPollFunctions, }, nodeId) {
+        await this.tracing.startSpan({
+            name: 'Non-webhook trigger register',
+            op: 'publication.non_webhook.register',
+            attributes: {
+                ...this.tracing.pickWorkflowAttributes({ id: workflow.id, name: workflow.name }),
+                ...this.tracing.pickNodeAttributes({ id: nodeId }),
+                'n8n.publication.activation_mode': activationMode,
+                'n8n.publication.execution_mode': executionMode,
+            },
+        }, async (span) => {
+            await this.activeWorkflowTriggers.addTriggers(workflow.id, workflow, [nodeId], additionalData, executionMode, activationMode, getTriggerFunctions, getPollFunctions);
+            span.setStatus({ code: 1 });
+        });
     }
     async deregister(workflowId, nodeId) {
-        await this.activeWorkflowTriggers.removeTriggers(workflowId, new Set([nodeId]));
+        await this.tracing.startSpan({
+            name: 'Non-webhook trigger deregister',
+            op: 'publication.non_webhook.deregister',
+            attributes: {
+                ...this.tracing.pickWorkflowAttributes({ id: workflowId }),
+                ...this.tracing.pickNodeAttributes({ id: nodeId }),
+            },
+        }, async (span) => {
+            await this.activeWorkflowTriggers.removeTriggers(workflowId, new Set([nodeId]));
+            span.setStatus({ code: 1 });
+        });
     }
 };
 exports.NonWebhookTriggerRegistrar = NonWebhookTriggerRegistrar;
@@ -53,6 +73,7 @@ exports.NonWebhookTriggerRegistrar = NonWebhookTriggerRegistrar = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [backend_common_1.Logger,
         n8n_core_1.ActiveWorkflowTriggers,
-        trigger_execution_context_factory_1.TriggerExecutionContextFactory])
+        trigger_execution_context_factory_1.TriggerExecutionContextFactory,
+        n8n_core_1.Tracing])
 ], NonWebhookTriggerRegistrar);
 //# sourceMappingURL=non-webhook-trigger-registrar.js.map

package/dist/workflows/triggers/non-webhook-trigger-registrar.js.map

@@ -1 +1 @@
-{"version":3,"file":"non-webhook-trigger-registrar.js","sourceRoot":"","sources":["../../../src/workflows/triggers/non-webhook-trigger-registrar.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAE7C,gCAAkC;AAClC,uCAIkB;AAYlB,8GAAwG;AACxG,uEAAgE;AAuBzD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACtC,YACkB,MAAc,EACd,sBAA8C,EAC9C,8BAA8D;QAF9D,WAAM,GAAN,MAAM,CAAQ;QACd,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,mCAA8B,GAA9B,8BAA8B,CAAgC;QAE/E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC3D,CAAC;IAKD,iBAAiB,CAAC,QAAkB;QACnC,OAAO,CAAC,GAAG,QAAQ,CAAC,eAAe,EAAE,EAAE,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC;IAMD,2BAA2B,CAAC,UAAsB;QACjD,OAAO,IAAI,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC;IAC5E,CAAC;IAKD,yBAAyB,CACxB,UAA0B,EAC1B,EACC,cAAc,EACd,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,gBAAgB,GACsB;QAEvC,MAAM,mBAAmB,GAAG,IAAI,CAAC,8BAA8B,CAAC,0BAA0B,CACzF,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,gBAAgB,CAChB,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAI,CAAC,8BAA8B,CAAC,uBAAuB,CACnF,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,mBAAmB,CACnB,CAAC;QAEF,OAAO;YACN,UAAU;YACV,cAAc;YACd,aAAa;YACb,cAAc;YACd,mBAAmB;YACnB,gBAAgB;SAChB,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,QAAQ,CACb,QAAkB,EAClB,EACC,UAAU,EACV,cAAc,EACd,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,gBAAgB,GACuB,EACxC,MAAmB;QAEnB,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAC5C,QAAQ,CAAC,EAAE,EACX,QAAQ,EACR,CAAC,MAAM,CAAC,EACR,cAAc,EACd,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,gBAAgB,CAChB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,8BAA8B,MAAM,kBAAkB,IAAA,mCAAc,EAAC,UAAU,CAAC,EAAE,CAClF,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,UAAU,CAAC,UAAsB,EAAE,MAAmB;QAC3D,MAAM,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC;CACD,CAAA;AArGY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,YAAO,GAAE;qCAGiB,uBAAM;QACU,iCAAsB;QACd,kEAA8B;GAJpE,0BAA0B,CAqGtC"}
+{"version":3,"file":"non-webhook-trigger-registrar.js","sourceRoot":"","sources":["../../../src/workflows/triggers/non-webhook-trigger-registrar.ts"],"names":[],"mappings":"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"}

package/dist/workflows/triggers/trigger-activation-retry.d.ts

@@ -0,0 +1,2 @@
+export declare const isTransientActivationError: (error: Error) => boolean;
+export declare function retryTriggerActivation(activate: () => Promise<void>, maxAttempts: number): Promise<void>;

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTransientActivationError = void 0;
+exports.retryTriggerActivation = retryTriggerActivation;
+const n8n_workflow_1 = require("n8n-workflow");
+const constants_1 = require("../../constants");
+const isTransientActivationError = (error) => !(error instanceof n8n_workflow_1.WebhookPathTakenError);
+exports.isTransientActivationError = isTransientActivationError;
+async function retryTriggerActivation(activate, maxAttempts) {
+    for (let attempt = 0;; attempt++) {
+        try {
+            await activate();
+            return;
+        }
+        catch (error) {
+            const isLastAttempt = attempt >= maxAttempts - 1;
+            if (!(0, exports.isTransientActivationError)((0, n8n_workflow_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));
+        }
+    }
+}
+//# sourceMappingURL=trigger-activation-retry.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trigger-activation-retry.js","sourceRoot":"","sources":["../../../src/workflows/triggers/trigger-activation-retry.ts"],"names":[],"mappings":";;;AAiBA,wDAoBC;AArCD,+CAAyE;AAEzE,2CAAmG;AAK5F,MAAM,0BAA0B,GAAG,CAAC,KAAY,EAAW,EAAE,CACnE,CAAC,CAAC,KAAK,YAAY,oCAAqB,CAAC,CAAC;AAD9B,QAAA,0BAA0B,8BACI;AASpC,KAAK,UAAU,sBAAsB,CAC3C,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,kCAA0B,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"}

package/dist/workflows/triggers/webhook-trigger-registrar.d.ts

@@ -1,7 +1,7 @@
 import { Logger } from '@n8n/backend-common';
 import type { IWebhookData, IWorkflowExecuteAdditionalData, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
 import { Workflow } from 'n8n-workflow';
-import { ErrorReporter } from 'n8n-core';
+import { ErrorReporter, Tracing } from 'n8n-core';
 import { WebhookService } from '../../webhooks/webhook.service';
 import { WorkflowStaticDataService } from '../../workflows/workflow-static-data.service';
 export interface WebhookTriggerRegistrationOptions {
@@ -19,7 +19,8 @@ export declare class WebhookTriggerRegistrar {
     private readonly errorReporter;
     private readonly webhookService;
     private readonly workflowStaticDataService;
-    constructor(logger: Logger, errorReporter: ErrorReporter, webhookService: WebhookService, workflowStaticDataService: WorkflowStaticDataService);
+    private readonly tracing;
+    constructor(logger: Logger, errorReporter: ErrorReporter, webhookService: WebhookService, workflowStaticDataService: WorkflowStaticDataService, tracing: Tracing);
     getWebhookTriggers(workflow: Workflow, additionalData: IWorkflowExecuteAdditionalData): IWebhookData[];
     register({ workflow, webhookData, mode, activation }: WebhookTriggerRegistrationOptions): Promise<void>;
     deregister({ workflow, webhookData }: WebhookTriggerDeregistrationOptions): Promise<string>;