n8n 2.40.4 → 2.41.0

package/dist/scheduling/system-tasks/system-task-job-registrar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"system-task-job-registrar.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-job-registrar.ts"],"names":[],"mappings":"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"}

package/dist/scheduling/system-tasks/system-task-run-observer.d.ts

@@ -0,0 +1,13 @@
+import type { SystemTask } from '@n8n/decorators';
+import { type Tracing } from 'n8n-core';
+import type { EventService } from '../../events/event.service';
+import type { SystemTaskMode } from '../../events/maps/system-task-metrics.event-map';
+export type SystemTaskRunOutcome = {
+    result: 'success' | 'aborted';
+    rejected: false;
+} | {
+    result: 'failure' | 'aborted';
+    rejected: true;
+    error: unknown;
+};
+export declare function observeSystemTaskRun(eventService: EventService, tracing: Tracing, task: Pick<SystemTask, 'name' | 'run'>, mode: SystemTaskMode, signal: AbortSignal): Promise<SystemTaskRunOutcome>;

package/dist/scheduling/system-tasks/system-task-run-observer.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.observeSystemTaskRun = observeSystemTaskRun;
+const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
+const emit_system_task_metric_1 = require("./emit-system-task-metric");
+const SYSTEM_TASK_ATTRIBUTES = {
+    name: 'n8n.system_task.name',
+    mode: 'n8n.system_task.mode',
+    result: 'n8n.system_task.result',
+};
+async function startRun(task, signal) {
+    await task.run(signal);
+}
+async function observeSystemTaskRun(eventService, tracing, task, mode, signal) {
+    const { name } = task;
+    const spanOptions = {
+        name: 'System task run',
+        op: 'system_task.run',
+        attributes: {
+            [SYSTEM_TASK_ATTRIBUTES.name]: name,
+            [SYSTEM_TASK_ATTRIBUTES.mode]: mode,
+        },
+    };
+    const startSpan = mode === 'in_memory'
+        ? tracing.startNewTraceSpan.bind(tracing)
+        : tracing.startSpan.bind(tracing);
+    return await startSpan(spanOptions, async (span) => {
+        const startedAt = performance.now();
+        (0, emit_system_task_metric_1.emitSystemTaskMetric)(eventService, 'system-task-run-started', { name, mode });
+        const outcome = await startRun(task, signal).then(() => ({
+            result: signal.aborted ? 'aborted' : 'success',
+            rejected: false,
+        }), (error) => ({
+            result: signal.aborted ? 'aborted' : 'failure',
+            rejected: true,
+            error,
+        }));
+        (0, emit_system_task_metric_1.emitSystemTaskMetric)(eventService, 'system-task-run-settled', {
+            name,
+            mode,
+            result: outcome.result,
+            durationMs: performance.now() - startedAt,
+        });
+        span.setAttribute(SYSTEM_TASK_ATTRIBUTES.result, outcome.result);
+        if (outcome.result === 'failure') {
+            span.setStatus({ code: 2, message: (0, ensure_error_1.ensureError)(outcome.error).message });
+        }
+        else {
+            span.setStatus({ code: 1 });
+        }
+        return outcome;
+    });
+}
+//# sourceMappingURL=system-task-run-observer.js.map

package/dist/scheduling/system-tasks/system-task-run-observer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"system-task-run-observer.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-run-observer.ts"],"names":[],"mappings":";;;AACA,iEAA6D;AAM7D,uEAAiE;AAGjE,MAAM,sBAAsB,GAAG;IAC9B,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE,sBAAsB;IAC5B,MAAM,EAAE,wBAAwB;CACvB,CAAC;AAOX,KAAK,UAAU,QAAQ,CAAC,IAA6B,EAAE,MAAmB;IACzE,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAaM,KAAK,+BACX,YAA0B,EAC1B,OAAgB,EAChB,IAAsC,EACtC,IAAoB,EACpB,MAAmB;IAEnB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACtB,MAAM,WAAW,GAAG;QACnB,IAAI,EAAE,iBAAiB;QACvB,EAAE,EAAE,iBAAiB;QACrB,UAAU,EAAE;YACX,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI;YACnC,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI;SACnC;KACD,CAAC;IAIF,MAAM,SAAS,GACd,IAAI,KAAK,WAAW;QACnB,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;QACzC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEpC,OAAO,MAAM,SAAS,CAAC,WAAW,EAAE,KAAK,EAAE,IAAU,EAAE,EAAE;QACxD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QACpC,IAAA,8CAAoB,EAAC,YAAY,EAAE,yBAAyB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9E,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAChD,GAAyB,EAAE,CAAC,CAAC;YAC5B,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC9C,QAAQ,EAAE,KAAK;SACf,CAAC,EACF,CAAC,KAAc,EAAwB,EAAE,CAAC,CAAC;YAC1C,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC9C,QAAQ,EAAE,IAAI;YACd,KAAK;SACL,CAAC,CACF,CAAC;QACF,IAAA,8CAAoB,EAAC,YAAY,EAAE,yBAAyB,EAAE;YAC7D,IAAI;YACJ,IAAI;YACJ,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAEjE,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,GAAkB,EAAE,OAAO,EAAE,IAAA,0BAAW,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACzF,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,GAAe,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,OAAO,CAAC;IAChB,CAAC,CAAC,CAAC;AACJ,CAAC"}

package/dist/scheduling/system-tasks/system-task-runner.d.ts

@@ -1,26 +1,35 @@
 import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { SystemTaskMetadata } from '@n8n/decorators';
-import { ErrorReporter, InstanceSettings } from 'n8n-core';
+import { ErrorReporter, InstanceSettings, Tracing } from 'n8n-core';
+import { EventService } from '../../events/event.service';
 import { DurableScheduler } from '../durable-scheduler';
+import { SystemTaskJobRegistrar } from './system-task-job-registrar';
+import { SystemTaskScheduledJobOwner } from './system-task-scheduled-job-owner';
 export declare class SystemTaskRunner {
     private readonly metadata;
     private readonly durableScheduler;
+    private readonly jobRegistrar;
+    private readonly systemTaskOwner;
     private readonly globalConfig;
     private readonly instanceSettings;
     private readonly errorReporter;
+    private readonly eventService;
+    private readonly tracing;
     private readonly routedTasksByName;
     private readonly logger;
     private initialized;
     private timersStarted;
+    private timerGeneration;
     private isShuttingDown;
     private inMemoryRunsController;
     private readonly shutdownController;
-    constructor(logger: Logger, metadata: SystemTaskMetadata, durableScheduler: DurableScheduler, globalConfig: GlobalConfig, instanceSettings: InstanceSettings, errorReporter: ErrorReporter);
-    init(): void;
+    constructor(logger: Logger, metadata: SystemTaskMetadata, durableScheduler: DurableScheduler, jobRegistrar: SystemTaskJobRegistrar, systemTaskOwner: SystemTaskScheduledJobOwner, globalConfig: GlobalConfig, instanceSettings: InstanceSettings, errorReporter: ErrorReporter, eventService: EventService, tracing: Tracing);
+    init(): Promise<void>;
     startTimers(): void;
     stopTimers(): Promise<void>;
     private inMemoryTasks;
+    private durableTasks;
     private inFlightRuns;
     shutdown(): Promise<void>;
     private route;
@@ -29,5 +38,6 @@ export declare class SystemTaskRunner {
     private run;
     private runOnce;
     private scheduleRetry;
+    private emitSkipped;
     private reportFailure;
 }

package/dist/scheduling/system-tasks/system-task-runner.js

@@ -19,27 +19,37 @@ const scheduler_1 = require("@n8n/scheduler");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const node_assert_1 = require("node:assert");
+const event_service_1 = require("../../events/event.service");
 const durable_scheduler_1 = require("../durable-scheduler");
+const emit_system_task_metric_1 = require("./emit-system-task-metric");
 const system_task_handler_1 = require("./system-task-handler");
+const system_task_job_registrar_1 = require("./system-task-job-registrar");
+const system_task_run_observer_1 = require("./system-task-run-observer");
+const system_task_scheduled_job_owner_1 = require("./system-task-scheduled-job-owner");
 const system_task_timer_1 = require("./system-task-timer");
 const system_task_type_1 = require("./system-task-type");
 const MAX_RETRY_DELAY_SECONDS = Math.floor((2 ** 31 - 1) / constants_1.Time.seconds.toMilliseconds);
 let SystemTaskRunner = class SystemTaskRunner {
-    constructor(logger, metadata, durableScheduler, globalConfig, instanceSettings, errorReporter) {
+    constructor(logger, metadata, durableScheduler, jobRegistrar, systemTaskOwner, globalConfig, instanceSettings, errorReporter, eventService, tracing) {
         this.metadata = metadata;
         this.durableScheduler = durableScheduler;
+        this.jobRegistrar = jobRegistrar;
+        this.systemTaskOwner = systemTaskOwner;
         this.globalConfig = globalConfig;
         this.instanceSettings = instanceSettings;
         this.errorReporter = errorReporter;
+        this.eventService = eventService;
+        this.tracing = tracing;
         this.routedTasksByName = new Map();
         this.initialized = false;
         this.timersStarted = false;
+        this.timerGeneration = 0;
         this.isShuttingDown = false;
         this.inMemoryRunsController = new AbortController();
         this.shutdownController = new AbortController();
         this.logger = logger.scoped('system-tasks');
     }
-    init() {
+    async init() {
         (0, node_assert_1.strict)(this.instanceSettings.instanceRole !== 'unset', 'Instance role is not set');
         if (!this.initialized) {
             this.initialized = true;
@@ -47,12 +57,18 @@ let SystemTaskRunner = class SystemTaskRunner {
             if (this.instanceSettings.isLeader) {
                 this.startTimers();
             }
+            for (const { task } of this.durableTasks()) {
+                await this.jobRegistrar.provision(task);
+            }
+            await this.jobRegistrar.removeStale();
         }
     }
     startTimers() {
-        if (!this.isShuttingDown && !this.timersStarted) {
+        if (this.initialized && !this.isShuttingDown && !this.timersStarted) {
             this.timersStarted = true;
+            this.timerGeneration++;
             this.inMemoryRunsController = new AbortController();
+            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-timers-started', {});
             const from = new Date();
             const inMemoryTasks = this.inMemoryTasks();
             for (const routed of inMemoryTasks) {
@@ -67,6 +83,7 @@ let SystemTaskRunner = class SystemTaskRunner {
         }
     }
     async stopTimers() {
+        const generation = ++this.timerGeneration;
         this.timersStarted = false;
         this.inMemoryRunsController.abort();
         for (const routed of this.inMemoryTasks()) {
@@ -76,10 +93,16 @@ let SystemTaskRunner = class SystemTaskRunner {
         }
         this.logger.debug('Stopped the in-memory system task timers');
         await Promise.all(this.inFlightRuns());
+        if (generation === this.timerGeneration) {
+            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-timers-stopped', {});
+        }
     }
     inMemoryTasks() {
         return [...this.routedTasksByName.values()].filter((routed) => routed.timer !== undefined);
     }
+    durableTasks() {
+        return [...this.routedTasksByName.values()].filter((routed) => this.runsDurably(routed.task));
+    }
     inFlightRuns() {
         return [...this.routedTasksByName.values()].flatMap(({ inFlightRun }) => inFlightRun ? [inFlightRun.promise] : []);
     }
@@ -104,11 +127,19 @@ let SystemTaskRunner = class SystemTaskRunner {
                 extra: { name: task.name, retryDelaySeconds },
             });
         }
+        (0, decorators_1.resolveSystemTaskRunOptions)(task);
         const routed = { task, schedule: (0, decorators_1.resolveSystemTaskSchedule)(task) };
         this.routedTasksByName.set(task.name, routed);
+        const intervalSeconds = routed.schedule.kind === 'interval' ? routed.schedule.intervalSeconds : undefined;
         if (this.runsDurably(task)) {
-            this.durableScheduler.registerTaskHandler((0, system_task_type_1.systemTaskType)(task.name), new system_task_handler_1.SystemTaskHandler(task, this.shutdownController.signal, this.logger, (error) => this.reportFailure('A durable system task run failed', task, error)));
-            this.logger.warn('System task handed to the durable scheduler, which does not provision its occurrences yet, so it will not run', { name: task.name });
+            this.systemTaskOwner.declareDurable(task.name);
+            this.durableScheduler.registerTaskHandler((0, system_task_type_1.systemTaskType)(task.name), new system_task_handler_1.SystemTaskHandler(task, this.shutdownController.signal, this.logger, this.eventService, this.tracing, (error) => this.reportFailure('A durable system task run failed', task, error)));
+            this.logger.debug('System task will run on the durable scheduler', { name: task.name });
+            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-routed', {
+                name: task.name,
+                mode: 'durable',
+                intervalSeconds,
+            });
         }
         else {
             routed.timer = this.createTimer(routed);
@@ -116,6 +147,11 @@ let SystemTaskRunner = class SystemTaskRunner {
                 name: task.name,
                 schedule: routed.schedule,
             });
+            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-routed', {
+                name: task.name,
+                mode: 'in_memory',
+                intervalSeconds,
+            });
             if (this.timersStarted) {
                 routed.timer.start(new Date());
                 if (task.runOnTakeover) {
@@ -132,9 +168,24 @@ let SystemTaskRunner = class SystemTaskRunner {
     createTimer(routed) {
         const { task } = routed;
         const schedule = (0, scheduler_1.scheduleFromDefinition)(routed.schedule, this.globalConfig.generic.timezone);
-        return new system_task_timer_1.SystemTaskTimer(schedule, () => {
+        return new system_task_timer_1.SystemTaskTimer(schedule, (lagMs, coalesced) => {
+            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-fired', { name: task.name, lagMs });
+            if (coalesced > 0) {
+                this.emitSkipped(task, 'coalesced', coalesced);
+            }
             void this.run(routed);
-        }, (error) => this.reportFailure('Could not plan a system task schedule, so the task will not run', task, error));
+        }, (error) => {
+            this.reportFailure('Could not plan a system task schedule, so the task will not run', task, error);
+            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-scheduling-failed', {
+                name: task.name,
+                mode: 'in_memory',
+            });
+        }, (fireAt) => {
+            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-next-run-planned', {
+                name: task.name,
+                nextRunAtMs: fireAt.getTime(),
+            });
+        });
     }
     async run(routed) {
         const { task } = routed;
@@ -145,6 +196,7 @@ let SystemTaskRunner = class SystemTaskRunner {
                     name: task.name,
                 });
             }
+            this.emitSkipped(task, 'overlap');
         }
         else {
             clearTimeout(routed.retryTimer);
@@ -162,15 +214,23 @@ let SystemTaskRunner = class SystemTaskRunner {
         }
     }
     async runOnce(routed) {
+        const { task } = routed;
+        if (task.durable && (await this.jobRegistrar.isProvisioned(task.name))) {
+            this.logger.debug('Skipped an in-memory system task run, its durable job is provisioned', {
+                name: task.name,
+            });
+            this.emitSkipped(task, 'provisioned_elsewhere');
+            return;
+        }
         const { signal } = this.inMemoryRunsController;
-        try {
-            await routed.task.run(signal);
+        if (signal.aborted) {
+            this.emitSkipped(task, 'aborted');
+            return;
         }
-        catch (error) {
-            if (!signal.aborted) {
-                this.reportFailure('A system task run failed', routed.task, error);
-                this.scheduleRetry(routed);
-            }
+        const outcome = await (0, system_task_run_observer_1.observeSystemTaskRun)(this.eventService, this.tracing, task, 'in_memory', signal);
+        if (outcome.result === 'failure') {
+            this.reportFailure('A system task run failed', task, outcome.error);
+            this.scheduleRetry(routed);
         }
     }
     scheduleRetry(routed) {
@@ -183,6 +243,16 @@ let SystemTaskRunner = class SystemTaskRunner {
             void this.run(routed);
         }, retryDelaySeconds * constants_1.Time.seconds.toMilliseconds);
         routed.retryTimer.unref();
+        (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-retry-scheduled', {
+            name: routed.task.name,
+        });
+    }
+    emitSkipped(task, reason, count) {
+        (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-run-skipped', {
+            name: task.name,
+            reason,
+            ...(count === undefined ? {} : { count }),
+        });
     }
     reportFailure(message, task, error) {
         this.logger.error(message, { name: task.name, error });
@@ -214,6 +284,6 @@ __decorate([
 ], SystemTaskRunner.prototype, "shutdown", null);
 exports.SystemTaskRunner = SystemTaskRunner = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, decorators_1.SystemTaskMetadata, durable_scheduler_1.DurableScheduler, config_1.GlobalConfig, n8n_core_1.InstanceSettings, n8n_core_1.ErrorReporter])
+    __metadata("design:paramtypes", [backend_common_1.Logger, decorators_1.SystemTaskMetadata, durable_scheduler_1.DurableScheduler, system_task_job_registrar_1.SystemTaskJobRegistrar, system_task_scheduled_job_owner_1.SystemTaskScheduledJobOwner, config_1.GlobalConfig, n8n_core_1.InstanceSettings, n8n_core_1.ErrorReporter, event_service_1.EventService, n8n_core_1.Tracing])
 ], SystemTaskRunner);
 //# sourceMappingURL=system-task-runner.js.map

package/dist/scheduling/system-tasks/system-task-runner.js.map

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

package/dist/scheduling/system-tasks/system-task-scheduled-job-owner.d.ts

@@ -0,0 +1,13 @@
+import type { ScheduledJobOwner } from '@n8n/db';
+import { ScheduledJobRepository } from '@n8n/db';
+import type { ScheduledJobOwnerResolver } from '@n8n/scheduler';
+export declare class SystemTaskScheduledJobOwner implements ScheduledJobOwnerResolver {
+    private readonly jobs;
+    readonly ownerType: "system-task";
+    private readonly durableTaskNames;
+    constructor(jobs: ScheduledJobRepository);
+    owner(taskName: string): ScheduledJobOwner;
+    declareDurable(taskName: string): void;
+    findExisting(ownerIds: string[]): Promise<Set<string>>;
+    isAlive(ownerId: string, payload: Record<string, unknown>): boolean;
+}

package/dist/scheduling/system-tasks/system-task-scheduled-job-owner.js

@@ -0,0 +1,51 @@
+"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.SystemTaskScheduledJobOwner = void 0;
+const constants_1 = require("@n8n/constants");
+const db_1 = require("@n8n/db");
+const di_1 = require("@n8n/di");
+const system_task_version_stamp_1 = require("./system-task-version-stamp");
+let SystemTaskScheduledJobOwner = class SystemTaskScheduledJobOwner {
+    constructor(jobs) {
+        this.jobs = jobs;
+        this.ownerType = constants_1.ScheduledJobOwnerType.SystemTask;
+        this.durableTaskNames = new Set();
+    }
+    owner(taskName) {
+        return { ownerType: this.ownerType, ownerId: taskName, ownerMemberId: null };
+    }
+    declareDurable(taskName) {
+        this.durableTaskNames.add(taskName);
+    }
+    async findExisting(ownerIds) {
+        const existing = new Set(ownerIds.filter((name) => this.durableTaskNames.has(name)));
+        const undeclared = ownerIds.filter((name) => !existing.has(name));
+        if (undeclared.length > 0) {
+            const rows = await this.jobs.findPayloadsByOwnerIds(this.ownerType, undeclared);
+            for (const { ownerId, payload } of rows) {
+                if (this.isAlive(ownerId, payload)) {
+                    existing.add(ownerId);
+                }
+            }
+        }
+        return existing;
+    }
+    isAlive(ownerId, payload) {
+        return this.durableTaskNames.has(ownerId) || (0, system_task_version_stamp_1.stampedByNewerVersion)(payload);
+    }
+};
+exports.SystemTaskScheduledJobOwner = SystemTaskScheduledJobOwner;
+exports.SystemTaskScheduledJobOwner = SystemTaskScheduledJobOwner = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [db_1.ScheduledJobRepository])
+], SystemTaskScheduledJobOwner);
+//# sourceMappingURL=system-task-scheduled-job-owner.js.map

package/dist/scheduling/system-tasks/system-task-scheduled-job-owner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"system-task-scheduled-job-owner.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-scheduled-job-owner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAuD;AAEvD,gCAAiD;AACjD,gCAAkC;AAGlC,2EAAoE;AAS7D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAKvC,YAA6B,IAA4B;QAA5B,SAAI,GAAJ,IAAI,CAAwB;QAJhD,cAAS,GAAG,iCAAqB,CAAC,UAAU,CAAC;QAErC,qBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEM,CAAC;IAG7D,KAAK,CAAC,QAAgB;QACrB,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;IAC9E,CAAC;IAGD,cAAc,CAAC,QAAgB;QAC9B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAkB;QACpC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAChF,KAAK,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC;gBACzC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;oBACpC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACvB,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAGD,OAAO,CAAC,OAAe,EAAE,OAAgC;QACxD,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAA,iDAAqB,EAAC,OAAO,CAAC,CAAC;IAC7E,CAAC;CACD,CAAA;;sCAnCY,2BAA2B;IADvC,IAAA,YAAO,GAAE;qCAM0B,2BAAsB;GAL7C,2BAA2B,CAmCvC"}

package/dist/scheduling/system-tasks/system-task-timer.d.ts

@@ -3,11 +3,13 @@ export declare class SystemTaskTimer {
     private readonly schedule;
     private readonly onFire;
     private readonly onPlanError;
+    private readonly onPlan;
     private readonly now;
     private timer;
-    constructor(schedule: Schedule, onFire: () => void, onPlanError: (error: Error) => void, now?: () => number);
+    constructor(schedule: Schedule, onFire: (lagMs: number, coalesced: number) => void, onPlanError: (error: Error) => void, onPlan: (fireAt: Date) => void, now?: () => number);
     start(from: Date): void;
     stop(): void;
     private arm;
+    private countOccurrencesUpTo;
     private waitFor;
 }

package/dist/scheduling/system-tasks/system-task-timer.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SystemTaskTimer = void 0;
+const constants_1 = require("@n8n/constants");
 const scheduler_1 = require("@n8n/scheduler");
 const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const n8n_workflow_1 = require("n8n-workflow");
 const MAX_TIMEOUT_MS = 2 ** 31 - 1;
+const MAX_WALKED_OCCURRENCES = 1_000;
 class SystemTaskTimer {
-    constructor(schedule, onFire, onPlanError, now = Date.now) {
+    constructor(schedule, onFire, onPlanError, onPlan, now = Date.now) {
         this.schedule = schedule;
         this.onFire = onFire;
         this.onPlanError = onPlanError;
+        this.onPlan = onPlan;
         this.now = now;
     }
     start(from) {
@@ -30,24 +33,44 @@ class SystemTaskTimer {
         catch (error) {
             this.timer = undefined;
             this.onPlanError((0, ensure_error_1.ensureError)(error));
-            return;
+            return 0;
         }
         if (next === null) {
             this.timer = undefined;
-            return;
+            this.onPlanError(new n8n_workflow_1.UnexpectedError('A system task schedule has no next occurrence'));
+            return 0;
         }
         const fireAtMs = next.getTime();
         if (!Number.isFinite(fireAtMs)) {
             this.timer = undefined;
             this.onPlanError(new n8n_workflow_1.UnexpectedError('A system task schedule plans past the representable date range'));
-            return;
+            return 0;
         }
-        const delayMs = fireAtMs - this.now();
+        const nowMs = this.now();
+        const delayMs = fireAtMs - nowMs;
         if (delayMs < 0) {
-            this.arm(new Date(this.now()), true);
-            return;
+            const coalesced = this.countOccurrencesUpTo(next, nowMs);
+            this.arm(new Date(nowMs), true);
+            return coalesced;
         }
         this.waitFor(next, delayMs);
+        this.onPlan(next);
+        return 0;
+    }
+    countOccurrencesUpTo(first, untilMs) {
+        const firstMs = first.getTime();
+        if (untilMs < firstMs) {
+            return 0;
+        }
+        if (this.schedule.kind === 'interval') {
+            const intervalMs = this.schedule.intervalSeconds * constants_1.Time.seconds.toMilliseconds;
+            return Math.floor((untilMs - firstMs) / intervalMs) + 1;
+        }
+        let count = 0;
+        for (let next = first; next !== null && next.getTime() <= untilMs && count < MAX_WALKED_OCCURRENCES; next = (0, scheduler_1.computeNextRunAt)(this.schedule, next)) {
+            count++;
+        }
+        return count;
     }
     waitFor(fireAt, delayMs) {
         if (delayMs > MAX_TIMEOUT_MS) {
@@ -55,8 +78,9 @@ class SystemTaskTimer {
         }
         else {
             this.timer = setTimeout(() => {
-                this.arm(fireAt, false);
-                this.onFire();
+                const lagMs = Math.max(0, this.now() - fireAt.getTime());
+                const coalesced = this.arm(fireAt, false);
+                this.onFire(lagMs, coalesced);
             }, Math.max(0, delayMs));
         }
         this.timer.unref();

package/dist/scheduling/system-tasks/system-task-timer.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-task-timer.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-timer.ts"],"names":[],"mappings":";;;AACA,8CAAqE;AACrE,iEAA6D;AAC7D,+CAA+C;AAM/C,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAanC;IAGC,YACkB,QAAkB,EAClB,MAAkB,EAClB,WAAmC,EACnC,GAAG,GAAiB,IAAI,CAAC,GAAG;wBAH5B,QAAQ;sBACR,MAAM;2BACN,WAAW;mBACX,GAAG;IAClB,CAAC;IAEJ,KAAK,CAAC,IAAU;QACf,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,IAAI;QACH,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IACxB,CAAC;IAEO,GAAG,CAAC,KAAW,EAAE,OAAgB;QACxC,IAAI,IAAiB,CAAC;QACtB,IAAI,CAAC;YACJ,IAAI,GAAG,OAAO;gBACb,CAAC,CAAC,IAAA,6BAAiB,EAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC;gBACzC,CAAC,CAAC,IAAA,4BAAgB,EAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,IAAI,CAAC,WAAW,CAAC,IAAA,0BAAW,EAAC,KAAK,CAAC,CAAC,CAAC;YACrC,OAAO;QACR,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAEhC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,IAAI,CAAC,WAAW,CACf,IAAI,8BAAe,CAAC,gEAAgE,CAAC,CACrF,CAAC;YACF,OAAO;QACR,CAAC;QAED,MAAM,OAAO,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEtC,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACrC,OAAO;QACR,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEO,OAAO,CAAC,MAAY,EAAE,OAAe;QAC5C,IAAI,OAAO,GAAG,cAAc,EAAE,CAAC;YAC9B,IAAI,CAAC,KAAK,GAAG,UAAU,CACtB,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EACzD,cAAc,CACd,CAAC;QACH,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,KAAK,GAAG,UAAU,CACtB,GAAG,EAAE;gBACJ,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACxB,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CACpB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;CACD"}
+{"version":3,"file":"system-task-timer.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-timer.ts"],"names":[],"mappings":"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"}

package/dist/scheduling/system-tasks/system-task-version-stamp.d.ts

@@ -0,0 +1,5 @@
+export type SystemTaskJobPayload = {
+    n8nVersion: string;
+};
+export declare function versionStamp(): SystemTaskJobPayload;
+export declare function stampedByNewerVersion(payload: Record<string, unknown>): boolean;

package/dist/scheduling/system-tasks/system-task-version-stamp.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.versionStamp = versionStamp;
+exports.stampedByNewerVersion = stampedByNewerVersion;
+const semver_1 = require("semver");
+const constants_1 = require("../../constants");
+function versionStamp() {
+    return { n8nVersion: constants_1.N8N_VERSION };
+}
+function stampedByNewerVersion(payload) {
+    const { n8nVersion } = payload;
+    return (typeof n8nVersion === 'string' && (0, semver_1.valid)(n8nVersion) !== null && (0, semver_1.gt)(n8nVersion, constants_1.N8N_VERSION));
+}
+//# sourceMappingURL=system-task-version-stamp.js.map

package/dist/scheduling/system-tasks/system-task-version-stamp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"system-task-version-stamp.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-version-stamp.ts"],"names":[],"mappings":";;;;AAAA,mCAAmC;AAEnC,2CAA0C;AAK1C;IACC,OAAO,EAAE,UAAU,EAAE,uBAAW,EAAE,CAAC;AACpC,CAAC;AAGD,+BAAsC,OAAgC;IACrE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC/B,OAAO,CACN,OAAO,UAAU,KAAK,QAAQ,IAAI,IAAA,cAAK,EAAC,UAAU,CAAC,KAAK,IAAI,IAAI,IAAA,WAAE,EAAC,UAAU,EAAE,uBAAW,CAAC,CAC3F,CAAC;AACH,CAAC"}

package/dist/server.d.ts

@@ -11,7 +11,6 @@ import './controllers/change-email.controller';
 import './controllers/ai.controller';
 import './controllers/ai-preference.controller';
 import './controllers/dynamic-node-parameters.controller';
-import './controllers/instance-ai-examples.controller';
 import './controllers/invitation.controller';
 import './controllers/me.controller';
 import './controllers/node-types.controller';

package/dist/server.js

@@ -82,7 +82,6 @@ require("./controllers/change-email.controller");
 require("./controllers/ai.controller");
 require("./controllers/ai-preference.controller");
 require("./controllers/dynamic-node-parameters.controller");
-require("./controllers/instance-ai-examples.controller");
 require("./controllers/invitation.controller");
 require("./controllers/me.controller");
 require("./controllers/node-types.controller");
@@ -144,7 +143,7 @@ let Server = class Server extends abstract_server_1.AbstractServer {
         this.endpointPresetCredentials = this.globalConfig.credentials.overwrite.endpoint;
         await super.start();
         this.logger.debug(`Server ID: ${this.instanceSettings.hostId}`);
-        if (backend_common_1.inDevelopment && process.env.N8N_DEV_RELOAD === 'true') {
+        if (process.env.N8N_DEV_RELOAD === 'true') {
             void this.loadNodesAndCredentials.setupHotReload();
         }
         this.markAsReady();
@@ -157,6 +156,9 @@ let Server = class Server extends abstract_server_1.AbstractServer {
         if (constants_2.inE2ETests) {
             await import('./controllers/e2e.controller.js');
         }
+        if (process.env.N8N_DEV_RELOAD === 'true') {
+            await import('./controllers/dev.controller.js');
+        }
         if ((0, helpers_1.isMfaFeatureEnabled)()) {
             await di_1.Container.get(mfa_service_1.MfaService).init();
             await import('./controllers/mfa.controller.js');