npm - n8n - Versions diffs - 2.41.2 → 2.42.0 - Mend

n8n 2.41.2 → 2.42.0

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

Files changed (1376) hide show

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

	@@ -1 +1 @@
1	- {"version":3,"file":"system-task-job-registrar.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-job-registrar.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA2C;AAE3C,gCAAiD;AAEjD,gDAAyF;AACzF,gCAAkC;AAClC,8CAA2E;AAC3E,uCAAyC;AAEzC,0DAAsD;AAEtD,wEAAmE;AAEnE,uEAAiE;AACjE,uFAAgF;AAChF,yDAAoD;AACpD,2EAA2D;~~AAU3D~~,oCACC,IAAgB,EAChB,eAA4C,EAC5C,eAAuB,EACvB,GAAS;IAET,MAAM,QAAQ,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,IAAA,6BAAiB,EAAC,IAAA,kCAAsB,EAAC,QAAQ,EAAE,eAAe,CAAC,EAAE,GAAG,CAAC,CAAC;~~IAC7F~~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"}
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.js CHANGED Viewed

@@ -21,9 +21,7 @@ async function observeSystemTaskRun(eventService, tracing, task, mode, signal) {
             [SYSTEM_TASK_ATTRIBUTES.mode]: mode,
         },
     };
-    const startSpan = mode === 'in_memory'
-        ? tracing.startNewTraceSpan.bind(tracing)
-        : tracing.startSpan.bind(tracing);
+    const startSpan = mode === 'durable' ? tracing.startSpan.bind(tracing) : tracing.startNewTraceSpan.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 });

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

	@@ -1 +1 @@
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"}
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,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEhG,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 CHANGED Viewed

@@ -16,28 +16,24 @@ export declare class SystemTaskRunner {
     private readonly errorReporter;
     private readonly eventService;
     private readonly tracing;
-    private readonly routedTasksByName;
+    private readonly registeredNames;
+    private readonly durableTasks;
     private readonly logger;
+    private readonly leaderTaskRunner;
+    private readonly instanceTaskRunner;
     private initialized;
-    private timersStarted;
-    private timerGeneration;
     private isShuttingDown;
-    private inMemoryRunsController;
     private readonly shutdownController;
     constructor(logger: Logger, metadata: SystemTaskMetadata, durableScheduler: DurableScheduler, jobRegistrar: SystemTaskJobRegistrar, systemTaskOwner: SystemTaskScheduledJobOwner, globalConfig: GlobalConfig, instanceSettings: InstanceSettings, errorReporter: ErrorReporter, eventService: EventService, tracing: Tracing);
+    private createLeaderTaskRunner;
+    private createInstanceTaskRunner;
     init(): Promise<void>;
-    startTimers(): void;
-    stopTimers(): Promise<void>;
-    private inMemoryTasks;
-    private durableTasks;
-    private inFlightRuns;
+    startLeaderTimers(): void;
+    stopLeaderTimers(): Promise<void>;
     shutdown(): Promise<void>;
     private route;
+    private handOverToDurableScheduler;
+    private isProvisionedElsewhere;
     private runsDurably;
-    private createTimer;
-    private run;
-    private runOnce;
-    private scheduleRetry;
-    private emitSkipped;
     private reportFailure;
 }

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

@@ -12,10 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SystemTaskRunner = 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 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");
@@ -24,11 +22,9 @@ 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 in_memory_system_task_runner_1 = require("./in-memory-system-task-runner");
 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, jobRegistrar, systemTaskOwner, globalConfig, instanceSettings, errorReporter, eventService, tracing) {
         this.metadata = metadata;
@@ -40,219 +36,128 @@ let SystemTaskRunner = class SystemTaskRunner {
         this.errorReporter = errorReporter;
         this.eventService = eventService;
         this.tracing = tracing;
-        this.routedTasksByName = new Map();
+        this.registeredNames = new Set();
+        this.durableTasks = [];
         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');
+        this.leaderTaskRunner = this.createLeaderTaskRunner();
+        this.instanceTaskRunner = this.createInstanceTaskRunner();
+    }
+    createLeaderTaskRunner() {
+        return new in_memory_system_task_runner_1.InMemorySystemTaskRunner('leader_timer', this.logger, this.eventService, this.tracing, this.globalConfig.generic.timezone, {
+            reportFailure: this.reportFailure.bind(this),
+            onStart: () => (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-timers-started', {}),
+            onStop: () => (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-timers-stopped', {}),
+        });
+    }
+    createInstanceTaskRunner() {
+        return new in_memory_system_task_runner_1.InMemorySystemTaskRunner('instance_timer', this.logger, this.eventService, this.tracing, this.globalConfig.generic.timezone, { reportFailure: this.reportFailure.bind(this) });
     }
     async init() {
-        (0, node_assert_1.strict)(this.instanceSettings.instanceRole !== 'unset', 'Instance role is not set');
-        if (!this.initialized) {
-            this.initialized = true;
-            this.metadata.subscribe((taskClass) => this.route(taskClass));
+        if (this.initialized) {
+            return;
+        }
+        const isMain = this.instanceSettings.instanceType === 'main';
+        if (isMain) {
+            (0, node_assert_1.strict)(this.instanceSettings.instanceRole !== 'unset', 'Instance role is not set');
+        }
+        this.initialized = true;
+        this.instanceTaskRunner.start(new Date());
+        this.metadata.subscribe((taskClass) => this.route(taskClass));
+        if (isMain) {
             if (this.instanceSettings.isLeader) {
-                this.startTimers();
+                this.startLeaderTimers();
             }
-            for (const { task } of this.durableTasks()) {
+            for (const task of this.durableTasks) {
                 await this.jobRegistrar.provision(task);
             }
             await this.jobRegistrar.removeStale();
         }
     }
-    startTimers() {
-        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) {
-                routed.timer.start(from);
-                if (routed.task.runOnTakeover) {
-                    void this.run(routed);
-                }
-            }
-            this.logger.debug('Started the in-memory system task timers', {
-                count: inMemoryTasks.length,
-            });
-        }
-    }
-    async stopTimers() {
-        const generation = ++this.timerGeneration;
-        this.timersStarted = false;
-        this.inMemoryRunsController.abort();
-        for (const routed of this.inMemoryTasks()) {
-            routed.timer.stop();
-            clearTimeout(routed.retryTimer);
-            routed.retryTimer = undefined;
+    startLeaderTimers() {
+        if (this.initialized && !this.isShuttingDown) {
+            this.leaderTaskRunner.start(new Date());
         }
-        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] : []);
+    async stopLeaderTimers() {
+        await this.leaderTaskRunner.stop();
     }
     async shutdown() {
         this.isShuttingDown = true;
         this.shutdownController.abort();
-        await this.stopTimers();
+        await Promise.all([this.leaderTaskRunner.stop(), this.instanceTaskRunner.stop()]);
     }
     route(taskClass) {
         const task = di_1.Container.get(taskClass);
-        if (this.routedTasksByName.has(task.name)) {
+        if (this.registeredNames.has(task.name)) {
             throw new n8n_workflow_1.UnexpectedError('A system task name is registered more than once', {
                 extra: { name: task.name },
             });
         }
-        const { retryDelaySeconds } = task;
-        if (retryDelaySeconds !== undefined &&
-            (!Number.isInteger(retryDelaySeconds) ||
-                retryDelaySeconds < 1 ||
-                retryDelaySeconds > MAX_RETRY_DELAY_SECONDS)) {
-            throw new n8n_workflow_1.UnexpectedError('A system task declares an out-of-range retry delay', {
-                extra: { name: task.name, retryDelaySeconds },
+        this.registeredNames.add(task.name);
+        (0, decorators_1.validateSystemTask)(task);
+        const { placement } = task;
+        if (!runsOn(placement, this.instanceSettings.instanceType)) {
+            this.logger.debug('System task does not run on this kind of instance', {
+                name: task.name,
+                placement,
             });
+            return;
         }
-        (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.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', {
+        const schedule = (0, decorators_1.resolveSystemTaskSchedule)(task);
+        if (placement.scope === 'instance') {
+            this.logger.debug('System task will run on a per-instance timer', {
                 name: task.name,
-                mode: 'durable',
-                intervalSeconds,
+                schedule,
             });
+            this.instanceTaskRunner.add(task, schedule);
+        }
+        else if (this.runsDurably(placement)) {
+            this.handOverToDurableScheduler(task, schedule);
         }
         else {
-            routed.timer = this.createTimer(routed);
             this.logger.debug('System task will run on an in-memory timer', {
                 name: task.name,
-                schedule: routed.schedule,
+                schedule,
             });
-            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-routed', {
-                name: task.name,
-                mode: 'in_memory',
-                intervalSeconds,
+            this.leaderTaskRunner.add(task, schedule, {
+                runOnStart: placement.runOnTakeover,
+                shouldSkipRun: placement.durable
+                    ? async () => await this.isProvisionedElsewhere(task)
+                    : undefined,
             });
-            if (this.timersStarted) {
-                routed.timer.start(new Date());
-                if (task.runOnTakeover) {
-                    void this.run(routed);
-                }
-            }
         }
     }
-    runsDurably(task) {
-        return (task.durable &&
-            this.globalConfig.scheduler.enabledForSystemTasks &&
-            this.durableScheduler.isActive());
-    }
-    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, (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);
-            (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(),
-            });
+    handOverToDurableScheduler(task, schedule) {
+        this.durableTasks.push(task);
+        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: schedule.kind === 'interval' ? schedule.intervalSeconds : undefined,
         });
     }
-    async run(routed) {
-        const { task } = routed;
-        if (routed.inFlightRun) {
-            if (!routed.inFlightRun.skipWarned) {
-                routed.inFlightRun.skipWarned = true;
-                this.logger.warn('Skipped a system task occurrence, its previous run is still going', {
-                    name: task.name,
-                });
-            }
-            this.emitSkipped(task, 'overlap');
-        }
-        else {
-            clearTimeout(routed.retryTimer);
-            routed.retryTimer = undefined;
-            const inFlightRun = {
-                promise: this.runOnce(routed).finally(() => {
-                    if (routed.inFlightRun === inFlightRun) {
-                        routed.inFlightRun = undefined;
-                    }
-                }),
-                skipWarned: false,
-            };
-            routed.inFlightRun = inFlightRun;
-            await inFlightRun.promise;
-        }
-    }
-    async runOnce(routed) {
-        const { task } = routed;
-        if (task.durable && (await this.jobRegistrar.isProvisioned(task.name))) {
+    async isProvisionedElsewhere(task) {
+        const provisioned = await this.jobRegistrar.isProvisioned(task.name);
+        if (provisioned) {
             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;
-        if (signal.aborted) {
-            this.emitSkipped(task, 'aborted');
-            return;
-        }
-        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);
+            (0, emit_system_task_metric_1.emitSystemTaskMetric)(this.eventService, 'system-task-run-skipped', {
+                name: task.name,
+                reason: 'provisioned_elsewhere',
+            });
         }
+        return provisioned;
     }
-    scheduleRetry(routed) {
-        const { retryDelaySeconds, effects } = routed.task;
-        if (retryDelaySeconds === undefined || effects === 'non-idempotent' || !this.timersStarted) {
-            return;
-        }
-        clearTimeout(routed.retryTimer);
-        routed.retryTimer = setTimeout(() => {
-            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 }),
-        });
+    runsDurably(placement) {
+        return (placement.durable &&
+            this.globalConfig.scheduler.enabledForSystemTasks &&
+            this.durableScheduler.isActive());
     }
     reportFailure(message, task, error) {
         this.logger.error(message, { name: task.name, error });
@@ -269,13 +174,13 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
-], SystemTaskRunner.prototype, "startTimers", null);
+], SystemTaskRunner.prototype, "startLeaderTimers", null);
 __decorate([
     (0, decorators_1.OnLeaderStepdown)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
-], SystemTaskRunner.prototype, "stopTimers", null);
+], SystemTaskRunner.prototype, "stopLeaderTimers", null);
 __decorate([
     (0, decorators_1.OnShutdown)(),
     __metadata("design:type", Function),
@@ -286,4 +191,9 @@ exports.SystemTaskRunner = SystemTaskRunner = __decorate([
     (0, di_1.Service)(),
     __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);
+function runsOn(placement, instanceType) {
+    return placement.scope === 'cluster'
+        ? instanceType === 'main'
+        : placement.instanceTypes.includes(instanceType);
+}
 //# sourceMappingURL=system-task-runner.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"system-task-runner.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA2C;~~AAC3C~~,~~8CAAsC;AAEtC,~~gDAOyB;AACzB,gCAA6C;AAC7C,~~8CAAwD;AACxD,~~uCAAoE;AACpE,+CAA+C;AAC/C,6CAAqC;AAErC,0DAAsD;~~AAGtD~~,4DAAwD;AACxD,uEAAiE;AACjE,+DAA0D;AAC1D,2EAAqE;AACrE,~~yEAAkE;AAClE,~~uFAAgF;AAChF,~~2DAAsD~~;~~AACtD~~,yDAAoD;~~AAMpD~~,~~MAAM,uBAAuB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AA0BjF,~~IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;~~IAuB5B~~,YACC,MAAc,EACG,QAA4B,EAC5B,gBAAkC,EAClC,YAAoC,EACpC,eAA4C,EAC5C,YAA0B,EAC1B,gBAAkC,EAClC,aAA4B,EAC5B,YAA0B,EAC1B,OAAgB;QARhB,aAAQ,GAAR,QAAQ,CAAoB;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAwB;QACpC,oBAAe,GAAf,eAAe,CAA6B;QAC5C,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAAS;~~QAhCjB~~,~~sBAAiB~~,GAAG,IAAI,GAAG,~~EAAsB~~,CAAC;~~QAI3D~~,~~gBAAW~~,~~GAAG~~,~~KAAK~~,CAAC;~~QAEpB~~,~~kBAAa~~,GAAG,KAAK,CAAC;~~QAQtB,oBAAe,GAAG,CAAC,CAAC;~~QAEpB,mBAAc,GAAG,KAAK,CAAC;~~QAEvB~~,~~2BAAsB,GAAG,IAAI,eAAe,EAAE,CAAC;QAEtC,~~uBAAkB,GAAG,IAAI,eAAe,EAAE,CAAC;QAc3D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;~~IAC7C~~,~~CAAC;IASD,KAAK,CAAC,~~IAAI~~;QACT~~,~~IAAA,oBAAM,EAAC,IAAI,~~CAAC,gBAAgB,~~CAAC~~,~~YAAY,KAAK,OAAO,EAAE,0BAA0B,CAAC,CAAC;QAEnF,~~IAAI,CAAC,~~IAAI~~,~~CAAC,WAAW,~~EAAE,CAAC;~~YACvB~~,IAAI,CAAC,~~WAAW~~,GAAG,IAAI,CAAC~~;YAExB~~,~~IAAI~~,~~CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,SAAS,~~EAAE,~~EAAE,~~CAAC,~~IAAI,~~CAAC,~~KAAK,CAAC,SAAS,CAAC,CAAC,CAAC~~;~~YAE9D~~,~~IAAI~~,IAAI,~~CAAC~~,~~gBAAgB~~,~~CAAC~~,~~QAAQ~~,~~EAAE,CAAC;gBACpC,~~IAAI,CAAC,~~WAAW,EAAE,CAAC;YACpB,CAAC;YAED,KAAK,~~MAAM,~~EAAE~~,IAAI,~~EAAE,IAAI,IAAI,~~CAAC,YAAY,~~EAAE~~,~~EAAE,CAAC;gBAC5C,MAAM,~~IAAI,CAAC,~~YAAY~~,~~CAAC~~,~~SAAS,CAAC,~~IAAI,CAAC,~~CAAC;YACzC,CAAC;YACD,MAAM,IAAI,CAAC,~~YAAY,CAAC,~~WAAW~~,~~EAAE,~~CAAC~~;QACvC~~,~~CAAC;IACF~~,~~CAAC~~;~~IASD~~,~~WAAW;QACV~~,~~IAAI~~,IAAI,CAAC,~~WAAW~~,~~IAAI,~~CAAC,IAAI,CAAC,~~cAAc,~~IAAI,CAAC,~~IAAI~~,~~CAAC~~,~~aAAa~~,EAAE,CAAC~~;YACrE~~,~~IAAI~~,~~CAAC~~,~~aAAa~~,~~GAAG,~~IAAI,CAAC~~;YAC1B~~,~~IAAI~~,~~CAAC~~,~~eAAe~~,EAAE,CAAC;~~YACvB~~,~~IAAI~~,~~CAAC~~,~~sBAAsB,~~GAAG,~~IAAI,eAAe,~~EAAE,CAAC~~;YACpD~~,IAAA,8CAAoB,EAAC,IAAI,CAAC,YAAY,EAAE,4BAA4B,EAAE,EAAE,CAAC,CAAC;~~YAC1E~~,~~MAAM~~,~~IAAI~~,~~GAAG~~,IAAI,~~IAAI~~,~~EAAE~~,~~CAAC;YACxB~~,~~MAAM~~,~~aAAa,GAAG,~~IAAI,CAAC,~~aAAa~~,~~EAAE~~,CAAC~~;YAC3C~~,~~KAAK~~,~~MAAM~~,~~MAAM,~~IAAI,~~aAAa~~,~~EAAE~~,~~CAAC;gBACpC~~,~~MAAM~~,CAAC,~~KAAK~~,CAAC,~~KAAK~~,CAAC,~~IAAI~~,~~CAAC~~,~~CAAC;gBACzB~~,~~IAAI~~,~~MAAM~~,~~CAAC,~~IAAI,CAAC,aAAa,~~EAAE,~~CAAC~~;oBAC/B~~,~~KAAK,~~IAAI,CAAC,~~GAAG~~,CAAC,~~MAAM~~,~~CAAC~~,CAAC;~~gBACvB~~,CAAC;~~YACF~~,~~CAAC;YACD,IAAI,CAAC,MAAM,CAAC,~~KAAK,CAAC,~~0CAA0C,EAAE~~;~~gBAC7D~~,~~KAAK~~,~~EAAE~~,~~aAAa,~~CAAC,~~MAAM;aAC3B~~,~~CAAC~~,CAAC;~~QACJ~~,~~CAAC~~;~~IACF~~,CAAC;~~IAGK~~,~~AAAN~~,~~KAAK,CAAC,UAAU;QACf,~~MAAM,~~UAAU,~~GAAG,~~EAAE,~~IAAI,CAAC,~~eAAe~~,CAAC~~;QAC1C~~,~~IAAI~~,~~CAAC~~,~~aAAa~~,~~GAAG,KAAK,~~CAAC;~~QAC3B~~,IAAI,~~CAAC~~,~~sBAAsB,CAAC,KAAK,~~EAAE,CAAC;~~QACpC~~,~~KAAK~~,~~MAAM~~,~~MAAM~~,IAAI,~~IAAI,~~CAAC,~~aAAa~~,~~EAAE,EAAE,~~CAAC~~;YAC3C~~,~~MAAM~~,~~CAAC,~~KAAK,~~CAAC~~,~~IAAI,~~EAAE,~~CAAC;YACpB~~,~~YAAY,~~CAAC,~~MAAM,~~CAAC,~~UAAU,~~CAAC~~,CAAC~~;~~YAChC~~,~~MAAM~~,CAAC,~~UAAU~~,GAAG,~~SAAS~~,CAAC;~~QAC/B~~,~~CAAC;QACD,~~IAAI,CAAC,~~MAAM~~,CAAC,KAAK,CAAC,~~0CAA0C~~,~~CAAC~~,~~CAAC;QAC9D~~,~~MAAM,OAAO,~~CAAC,~~GAAG,~~CAAC,IAAI,CAAC,~~YAAY~~,~~EAAE,~~CAAC,CAAC~~;QACvC~~,~~IAAI,UAAU,KAAK,IAAI,~~CAAC,~~eAAe~~,EAAE,CAAC~~;YACzC~~,~~IAAA,8CAAoB,EAAC,~~IAAI,CAAC,~~YAAY~~,~~EAAE~~,~~4BAA4B~~,~~EAAE,EAAE,~~CAAC,CAAC~~;QAC3E~~,CAAC;~~IACF~~,~~CAAC;IAEO~~,~~aAAa;QACpB~~,~~OAAO~~,CAAC,~~GAAG~~,IAAI,CAAC,~~iBAAiB~~,CAAC,~~MAAM~~,EAAE,CAAC,~~CAAC~~,~~MAAM,CACjD,~~CAAC,~~MAAM~~,~~EAAqD,~~EAAE,CAAC,~~MAAM,~~CAAC,KAAK,~~KAAK~~,~~SAAS~~,~~CACzF~~,~~CAAC;IACH~~,CAAC~~;IAEO~~,YAAY~~;QACnB~~,~~OAAO~~,CAAC,~~GAAG~~,IAAI,CAAC,~~iBAAiB~~,CAAC,~~MAAM~~,~~EAAE,~~CAAC,CAAC,~~MAAM,~~CAAC,CAAC,MAAM,~~EAAE~~,~~EAAE,~~CAAC,~~IAAI~~,CAAC,WAAW,~~CAAC~~,~~MAAM,~~CAAC,~~IAAI,~~CAAC~~,CAAC,CAAC~~;~~IAC/F~~,CAAC;~~IAEO~~,~~YAAY~~;~~QACnB~~,~~OAAO~~,CAAC,~~GAAG~~,IAAI,CAAC,~~iBAAiB~~,CAAC,~~MAAM~~,EAAE,CAAC,CAAC,~~OAAO~~,CAAC,CAAC,~~EAAE~~,~~WAAW~~,EAAE,~~EAAE,EAAE,CACvE,WAAW,~~CAAC,CAAC,CAAC,CAAC,~~WAAW~~,CAAC,~~OAAO~~,~~CAAC~~,~~CAAC~~,CAAC,CAAC,EAAE,~~CACxC,~~CAAC;~~IACH~~,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ;QACb,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,IAAI,CAAC,~~UAAU~~,EAAE,CAAC;~~IACzB~~,CAAC;~~IAsBO~~,KAAK,CAAC,SAA0B;QACvC,MAAM,IAAI,GAAG,cAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEtC,IAAI,IAAI,CAAC,~~iBAAiB~~,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;~~YAC3C~~,MAAM,IAAI,8BAAe,CAAC,iDAAiD,EAAE;gBAC5E,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;aAC1B,CAAC,CAAC;QACJ,CAAC;~~QAED~~,~~MAAM,EAAE,iBAAiB,EAAE,GAAG,~~IAAI,CAAC~~;QACnC~~,~~IACC~~,~~iBAAiB,KAAK,SAAS;YAC/B,~~CAAC,~~CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC;gBACpC,iBAAiB,~~GAAG,CAAC~~;gBACrB~~,~~iBAAiB,GAAG,uBAAuB,CAAC,EAC5C,CAAC;YACF,MAAM,~~IAAI,~~8BAAe,~~CAAC,~~oDAAoD,EAAE;gBAC/E,KAAK,EAAE,EAAE,~~IAAI,~~EAAE,IAAI,~~CAAC,~~IAAI,EAAE,iBAAiB,EAAE;aAC7C,~~CAAC~~,CAAC~~;~~QACJ~~,~~CAAC;QAED,~~IAAA,~~wCAA2B,~~EAAC,IAAI,CAAC,CAAC;~~QAElC~~,MAAM,~~MAAM,GAAe,~~EAAE,~~IAAI~~,EAAE,~~QAAQ~~,~~EAAE,IAAA,sCAAyB,EAAC,~~IAAI,CAAC~~,EAAE,CAAC~~;~~QAC/E~~,IAAI,CAAC,~~iBAAiB~~,CAAC,~~GAAG~~,~~CAAC~~,IAAI,CAAC,~~IAAI~~,~~EAAE,MAAM,~~CAAC,~~CAAC;QAC9C~~,~~MAAM,eAAe,GACpB,MAAM,~~CAAC,~~QAAQ~~,CAAC,IAAI,~~KAAK,UAAU,~~CAAC,~~CAAC,CAAC,~~MAAM,CAAC,~~QAAQ~~,CAAC,~~eAAe~~,~~CAAC,CAAC,CAAC,SAAS,CAAC~~;~~QAEnF~~,IAAI,~~IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,~~EAAE,~~CAAC;YAC5B,~~IAAI,CAAC,~~eAAe,CAAC,cAAc,CAAC,~~IAAI,~~CAAC~~,~~IAAI,~~CAAC,CAAC;~~YAC/C~~,~~IAAI~~,CAAC,~~gBAAgB~~,~~CAAC~~,~~mBAAmB~~,~~CACxC,~~IAAA,~~iCAAc~~,EAAC,IAAI,CAAC,~~IAAI,~~CAAC,~~EACzB,~~IAAI,~~uCAAiB~~,~~CACpB~~,~~IAAI~~,~~EACJ~~,~~IAAI~~,~~CAAC~~,~~kBAAkB,~~CAAC,~~MAAM,EAC9B,~~IAAI,CAAC,MAAM,~~EACX~~,~~IAAI~~,CAAC,~~YAAY~~,~~EACjB~~,IAAI,~~CAAC,OAAO,EACZ,CAAC,KAAK,~~EAAE,~~EAAE,CAAC,~~IAAI,CAAC,~~aAAa,CAAC,kCAAkC,EAAE,~~IAAI,~~EAAE~~,~~KAAK,~~CAAC,~~CAC9E,CACD,~~CAAC;~~YACF~~,IAAI,CAAC,~~MAAM~~,CAAC,~~KAAK~~,CAAC~~,+CAA+C~~,~~EAAE,EAAE,~~IAAI,EAAE,~~IAAI~~,CAAC,~~IAAI,EAAE,~~CAAC,CAAC;~~YACxF~~,~~IAAA~~,~~8CAAoB~~,~~EAAC~~,~~IAAI~~,CAAC,~~YAAY~~,EAAE,~~oBAAoB,EAAE~~;~~gBAC7D~~,IAAI,~~EAAE~~,~~IAAI~~,CAAC,IAAI~~;gBACf~~,~~IAAI,~~EAAE,~~SAAS;gBACf~~,~~eAAe;aACf,~~CAAC,CAAC;~~QACJ~~,CAAC;aAAM,CAAC;YACP,~~MAAM,CAAC,KAAK,GAAG,~~IAAI,CAAC,~~WAAW,CAAC,~~MAAM,CAAC,~~CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,~~KAAK,CAAC,4CAA4C,EAAE;gBAC/D,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ~~,EAAE,MAAM,CAAC,QAAQ~~;~~aACzB~~,CAAC,CAAC;YACH,~~IAAA,8CAAoB,EAAC,~~IAAI,CAAC,~~YAAY~~,~~EAAE~~,~~oBAAoB~~,~~EAAE;gBAC7D~~,IAAI,EAAE,~~IAAI~~,~~CAAC,IAAI~~;~~gBACf~~,~~IAAI~~,EAAE,~~WAAW;gBACjB~~,~~eAAe;aACf,~~CAAC,~~CAAC~~;~~YAEH~~,~~IAAI,IAAI,CAAC,~~aAAa,EAAE,CAAC;~~gBACxB~~,~~MAAM,~~CAAC,~~KAAK,~~CAAC,KAAK,~~CAAC,~~IAAI,~~IAAI,~~EAAE,CAAC,~~CAAC;gBAC/B~~,IAAI,~~IAAI,~~CAAC,~~aAAa~~,~~EAAE,~~CAAC~~;oBACxB~~,~~KAAK,~~IAAI,CAAC,~~GAAG,~~CAAC,~~MAAM,~~CAAC,~~CAAC~~;~~gBACvB~~,CAAC~~;YACF~~,CAAC;~~QACF~~,CAAC;IACF,CAAC;IAEO,~~WAAW~~,CAAC,IAAgB~~;QACnC~~,~~OAAO~~,~~CACN,IAAI,CAAC,OAAO~~;~~YACZ~~,IAAI,CAAC,YAAY,CAAC,~~SAAS~~,CAAC,~~qBAAqB;YACjD,~~IAAI,CAAC,~~gBAAgB,~~CAAC~~,QAAQ,EAAE,CAChC,CAAC~~;~~IACH~~,~~CAAC;IAEO~~,~~WAAW,~~CAAC,~~MAAkB;QACrC~~,~~MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,~~CAAC~~;QACxB~~,~~MAAM~~,~~QAAQ,GAAG,IAAA,kCAAsB,EAAC,MAAM,~~CAAC,~~QAAQ,EAAE,~~IAAI,CAAC,~~YAAY~~,CAAC,~~OAAO,~~CAAC~~,QAAQ,CAAC,CAAC~~;~~QAE7F~~,~~OAAO,~~IAAI,~~mCAAe~~,~~CACzB~~,~~QAAQ,EACR,~~CAAC,~~KAAK~~,~~EAAE~~,~~SAAS,EAAE,EAAE;YACpB,~~IAAA,~~8CAAoB~~,EAAC,IAAI,CAAC,~~YAAY~~,~~EAAE~~,~~mBAAmB~~,~~EAAE~~,~~EAAE~~,~~IAAI~~,~~EAAE,~~IAAI,~~CAAC~~,IAAI,~~EAAE,KAAK,EAAE,~~CAAC,~~CAAC;YACzF~~,~~IAAI,SAAS,GAAG,~~CAAC,~~EAAE~~,~~CAAC;gBACnB~~,IAAI,CAAC,~~WAAW~~,~~CAAC~~,IAAI,~~EAAE,WAAW,EAAE,SAAS,~~CAAC,~~CAAC;YAChD~~,~~CAAC;YACD~~,~~KAAK,~~IAAI,CAAC,~~GAAG~~,~~CAAC~~,~~MAAM,~~CAAC,~~CAAC;QACvB,CAAC,EACD,CAAC,~~KAAK,EAAE,EAAE~~;YACT~~,~~IAAI,~~CAAC,~~aAAa,CACjB,iEAAiE,EACjE,~~IAAI,~~EACJ,KAAK,CACL,~~CAAC~~;YACF~~,~~IAAA~~,~~8CAAoB,EAAC,IAAI,~~CAAC,~~YAAY~~,EAAE~~,+BAA+B~~,~~EAAE;gBACxE,~~IAAI,EAAE,~~IAAI~~,CAAC,~~IAAI;gBACf~~,~~IAAI~~,~~EAAE,WAAW;aACjB,~~CAAC~~,CAAC~~;~~QACJ~~,~~CAAC~~,~~EACD,~~CAAC,MAAM,~~EAAE~~,~~EAAE;YACV~~,~~IAAA,8CAAoB,EAAC,IAAI,~~CAAC,~~YAAY,~~EAAE,~~8BAA8B,~~EAAE~~;gBACvE~~,IAAI,EAAE,IAAI,CAAC,IAAI~~;gBACf~~,~~WAAW,~~EAAE,~~MAAM,~~CAAC,~~OAAO,EAAE;aAC7B,~~CAAC~~,CAAC~~;~~QACJ~~,~~CAAC~~,~~CACD~~,~~CAAC;IACH~~,~~CAAC;IAOO,KAAK,CAAC,GAAG,CAAC,MAAkB;QACnC,MAAM,EAAE,~~IAAI,~~EAAE,GAAG,MAAM,~~CAAC~~;QAExB~~,~~IAAI~~,~~MAAM,CAAC,WAAW,~~EAAE,~~CAAC;YACxB~~,~~IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,~~EAAE~~,CAAC~~;~~gBACpC~~,~~MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,~~IAAI,~~CAAC;gBACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,~~EAAE~~;oBACrF~~,IAAI,~~EAAE,IAAI,~~CAAC,IAAI;~~iBACf~~,~~CAAC,CAAC;YACJ,CAAC;YACD,~~IAAI,~~CAAC,WAAW,CAAC,IAAI,~~EAAE,SAAS~~,CAAC,CAAC~~;~~QACnC~~,~~CAAC;aAAM~~,~~CAAC;YAEP~~,~~YAAY~~,CAAC,~~MAAM~~,~~CAAC~~,UAAU,CAAC,CAAC~~;YAChC~~,~~MAAM,~~CAAC,~~UAAU~~,~~GAAG,SAAS,~~CAAC~~;YAE9B~~,~~MAAM~~,~~WAAW,GAAgB;gBAChC,OAAO,EAAE,IAAI,~~CAAC,~~OAAO,~~CAAC,~~MAAM,~~CAAC,~~CAAC,OAAO,CAAC,GAAG,EAAE;oBAC1C,IAAI,MAAM,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;wBACxC,MAAM,CAAC,WAAW,GAAG,~~SAAS~~,CAAC~~;~~oBAChC~~,CAAC~~;gBACF~~,CAAC~~,CAAC~~;~~gBACF~~,~~UAAU,EAAE,KAAK;aACjB,~~CAAC;~~YACF,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;YAEjC,MAAM,WAAW,CAAC,OAAO,CAAC;QAC3B,CAAC;IACF,CAAC;~~IAEO,KAAK,CAAC,~~OAAO~~,CAAC,~~MAAkB~~;~~QACvC~~,MAAM,~~EAAE~~,~~IAAI,EAAE,~~GAAG,MAAM,~~CAAC;QACxB,~~IAAI,~~IAAI,~~CAAC,~~OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,~~YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;~~YACxE~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sEAAsE,EAAE;gBACzF,IAAI,EAAE,IAAI,CAAC,IAAI;aACf,CAAC,CAAC;YACH,~~IAAI~~,~~CAAC~~,~~WAAW~~,~~CAAC,~~IAAI,~~EAAE,uBAAuB,~~CAAC,~~CAAC;YAChD~~,~~OAAO;QACR~~,~~CAAC;QAED~~,~~MAAM,~~EAAE,~~MAAM~~,EAAE,~~GAAG,~~IAAI,CAAC,~~sBAAsB,CAAC~~;~~QAC/C~~,~~IAAI,~~MAAM,~~CAAC,OAAO,~~EAAE,~~CAAC~~;~~YACpB~~,~~IAAI,~~CAAC,~~WAAW,~~CAAC~~,IAAI,EAAE,SAAS,CAAC,CAAC~~;~~YAClC~~,~~OAAO;QACR,~~CAAC;QACD,~~MAAM,~~OAAO,~~GAAG,MAAM,IAAA,+CAAoB,EACzC,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,EACZ,IAAI,EACJ,~~WAAW,~~EACX,MAAM,CACN,~~CAAC;~~QACF~~,~~IAAI,OAAO,~~CAAC~~,MAAM,KAAK,SAAS,EAAE,CAAC~~;~~YAClC,IAAI,CAAC,aAAa,CAAC,0BAA0B,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YACpE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;~~IAEO,~~aAAa~~,CAAC,~~MAAkB~~;~~QACvC~~,~~MAAM,EAAE,iBAAiB,EAAE,~~OAAO,~~EAAE~~,~~GAAG,MAAM,CAAC,IAAI,CAAC;QACnD,IAAI,iBAAiB,KAAK,~~SAAS,~~IAAI,OAAO,KAAK,gBAAgB,IAAI,~~CAAC,~~IAAI,CAAC,aAAa,EAAE,CAAC;YAC5F,~~OAAO;~~QACR~~,~~CAAC;QAED,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAChC,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE;YACnC,KAAK,~~IAAI,CAAC,~~GAAG,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC,EAAE,iBAAiB,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACpD,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAA,8CAAoB,EAAC,IAAI,CAAC,~~YAAY,~~EAAE,6BAA6B,EAAE;YACtE,IAAI,EAAE,MAAM,~~CAAC,~~IAAI~~,CAAC,~~IAAI~~;~~SACtB~~,~~CAAC,CAAC;IACJ,CAAC;IAEO,WAAW,CAClB,IAA8B,EAC9B,MAA4B,EAC5B,KAAc;QAEd,IAAA,8CAAoB,EAAC,~~IAAI,CAAC,~~YAAY~~,~~EAAE,yBAAyB,EAAE;YAClE,IAAI,EAAE,IAAI,~~CAAC,~~IAAI;YACf~~,~~MAAM;YACN,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,~~EAAE,~~CAAC~~,CAAC~~,CAAC,EAAE,KAAK,EAAE,CAAC~~;~~SACzC~~,CAAC~~,CAAC~~;~~IACJ,CAAC;~~IAEO,aAAa,CAAC,OAAe,EAAE,IAA8B,EAAE,KAAc;QACpF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE;YAC/B,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE;YAChC,cAAc,EAAE,KAAK;YACrB,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;~~AAhSA~~;IADC,IAAA,6BAAgB,GAAE;;;;~~mDAmBlB~~;AAGK;IADL,IAAA,6BAAgB,GAAE;;;;~~kDAelB~~;~~AAmBK~~;IADL,IAAA,uBAAU,GAAE;;;;gDAKZ;~~2BAjIW~~,gBAAgB;IAD5B,IAAA,YAAO,GAAE;~~qCAyBA~~,uBAAM,EACa,+BAAkB,EACV,oCAAgB,EACpB,kDAAsB,EACnB,6DAA2B,EAC9B,qBAAY,EACR,2BAAgB,EACnB,wBAAa,EACd,4BAAY,EACjB,kBAAO;~~GAjCtB~~,gBAAgB,~~CAuW5B~~"}
1	+ {"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-timer.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export declare class SystemTaskTimer {
     start(from: Date): void;
     stop(): void;
     private arm;
+    private nextOccurrence;
     private countOccurrencesUpTo;
     private waitFor;
 }

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

@@ -26,9 +26,7 @@ class SystemTaskTimer {
     arm(after, isFirst) {
         let next;
         try {
-            next = isFirst
-                ? (0, scheduler_1.computeFirstRunAt)(this.schedule, after)
-                : (0, scheduler_1.computeNextRunAt)(this.schedule, after);
+            next = this.nextOccurrence(after, isFirst);
         }
         catch (error) {
             this.timer = undefined;
@@ -57,6 +55,18 @@ class SystemTaskTimer {
         this.onPlan(next);
         return 0;
     }
+    nextOccurrence(after, isFirst) {
+        if (this.schedule.kind === 'interval') {
+            const intervalMs = this.schedule.intervalSeconds * constants_1.Time.seconds.toMilliseconds;
+            if (!(intervalMs > 0)) {
+                throw new n8n_workflow_1.UnexpectedError('A system task interval is not positive');
+            }
+            return new Date(after.getTime() + intervalMs);
+        }
+        return isFirst
+            ? (0, scheduler_1.computeFirstRunAt)(this.schedule, after)
+            : (0, scheduler_1.computeNextRunAt)(this.schedule, after);
+    }
     countOccurrencesUpTo(first, untilMs) {
         const firstMs = first.getTime();
         if (untilMs < firstMs) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"system-task-timer.js","sourceRoot":"","sources":["../../../src/scheduling/system-tasks/system-task-timer.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAEtC,8CAAqE;AACrE,iEAA6D;AAC7D,+CAA+C;AAM/C,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAQnC,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAerC;IAGC,YACkB,QAAkB,EAClB,MAAkD,EAClD,WAAmC,EACnC,MAA8B,EAC9B,GAAG,GAAiB,IAAI,CAAC,GAAG;wBAJ5B,QAAQ;sBACR,MAAM;2BACN,WAAW;sBACX,MAAM;mBACN,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~~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"}
1	+ {"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/security-audit/constants.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-import type { Risk } from '../security-audit/types';
-export declare const RISK_CATEGORIES: Risk.Category[];
+export declare const RISK_CATEGORIES: ("credentials" | "database" | "filesystem" | "instance" | "nodes")[];
 export declare const SQL_NODE_TYPES_WITH_QUERY_PARAMS: Set<string>;
 export declare const SQL_NODE_TYPES: Set<string>;
 export declare const WEBHOOK_NODE_TYPE = "n8n-nodes-base.webhook";

package/dist/security-audit/constants.js CHANGED Viewed

@@ -1,13 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NPM_PACKAGE_URL = exports.COMMUNITY_NODES_RISKS_URL = exports.DB_QUERY_PARAMS_DOCS_URL = exports.ENV_VARS_DOCS_URL = exports.INSTANCE_REPORT = exports.NODES_REPORT = exports.FILESYSTEM_REPORT = exports.CREDENTIALS_REPORT = exports.DATABASE_REPORT = exports.OFFICIAL_RISKY_NODE_TYPES = exports.FILESYSTEM_INTERACTION_NODE_TYPES = exports.WEBHOOK_VALIDATOR_NODE_TYPES = exports.WEBHOOK_NODE_TYPE = exports.SQL_NODE_TYPES = exports.SQL_NODE_TYPES_WITH_QUERY_PARAMS = exports.RISK_CATEGORIES = void 0;
-exports.RISK_CATEGORIES = [
-    'credentials',
-    'database',
-    'nodes',
-    'instance',
-    'filesystem',
-];
+const api_types_1 = require("@n8n/api-types");
+exports.RISK_CATEGORIES = [...api_types_1.SECURITY_AUDIT_CATEGORIES];
 exports.SQL_NODE_TYPES_WITH_QUERY_PARAMS = new Set([
     'n8n-nodes-base.postgres',
     'n8n-nodes-base.crateDb',

package/dist/security-audit/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/security-audit/constants.ts"],"names":[],"mappings":";;;~~AAMa~~,QAAA,eAAe,~~GAAoB;IAC/C~~,~~aAAa;IACb~~,~~UAAU;IACV~~,~~OAAO;IACP~~,~~UAAU;IACV~~,~~YAAY;CACZ,~~CAAC;~~AAMW~~,QAAA,gCAAgC,GAAG,IAAI,GAAG,CAAC;IACvD,yBAAyB;IACzB,wBAAwB;IACxB,wBAAwB;IACxB,4BAA4B;CAC5B,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,IAAI,GAAG,CAAC;IACrC,GAAG,QAAA,gCAAgC;IACnC,sBAAsB;IACtB,6BAA6B;IAC7B,0BAA0B;CAC1B,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAG,wBAAwB,CAAC;AAE7C,QAAA,4BAA4B,GAAG,IAAI,GAAG,CAAC;IACnD,mBAAmB;IACnB,uBAAuB;IACvB,qBAAqB;IACrB,yBAAyB;IACzB,6BAA6B;CAC7B,CAAC,CAAC;AAEU,QAAA,iCAAiC,GAAG,IAAI,GAAG,CAAC;IACxD,wBAAwB;IACxB,+BAA+B;IAC/B,gCAAgC;IAChC,gCAAgC;IAChC,gCAAgC;CAChC,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAI,GAAG,CAAC;IAChD,+BAA+B;IAC/B,qBAAqB;IACrB,yBAAyB;IACzB,6BAA6B;IAC7B,4BAA4B;IAC5B,oBAAoB;IACpB,oBAAoB;CACpB,CAAC,CAAC;AAMU,QAAA,eAAe,GAAG;IAC9B,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE;QACT,sBAAsB,EAAE,oDAAoD;QAC5E,2BAA2B,EAAE,uDAAuD;QACpF,mBAAmB,EAAE,+CAA+C;KACpE;CACQ,CAAC;AAEE,QAAA,kBAAkB,GAAG;IACjC,IAAI,EAAE,aAAa;IACnB,QAAQ,EAAE;QACT,oBAAoB,EAAE,sCAAsC;QAC5D,uBAAuB,EAAE,6CAA6C;QACtE,2BAA2B,EAAE,qDAAqD;KAClF;CACQ,CAAC;AAEE,QAAA,iBAAiB,GAAG;IAChC,IAAI,EAAE,YAAY;IAClB,QAAQ,EAAE;QACT,4BAA4B,EAAE,yCAAyC;KACvE;CACQ,CAAC;AAEE,QAAA,YAAY,GAAG;IAC3B,IAAI,EAAE,OAAO;IACb,QAAQ,EAAE;QACT,oBAAoB,EAAE,sBAAsB;QAC5C,eAAe,EAAE,iBAAiB;QAClC,YAAY,EAAE,cAAc;KAC5B;CACQ,CAAC;AAEE,QAAA,eAAe,GAAG;IAC9B,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE;QACT,oBAAoB,EAAE,kCAAkC;QACxD,iBAAiB,EAAE,mBAAmB;QACtC,iBAAiB,EAAE,mBAAmB;KACtC;CACQ,CAAC;AAME,QAAA,iBAAiB,GAAG,kEAAkE,CAAC;AAEvF,QAAA,wBAAwB,GACpC,iGAAiG,CAAC;AAEtF,QAAA,yBAAyB,GAAG,wDAAwD,CAAC;AAErF,QAAA,eAAe,GAAG,+BAA+B,CAAC"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/security-audit/constants.ts"],"names":[],"mappings":";;;AAAA,8CAA2D;AAM9C,QAAA,eAAe,GAAG,CAAC,GAAG,qCAAyB,CAAC,CAAC;AAMjD,QAAA,gCAAgC,GAAG,IAAI,GAAG,CAAC;IACvD,yBAAyB;IACzB,wBAAwB;IACxB,wBAAwB;IACxB,4BAA4B;CAC5B,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,IAAI,GAAG,CAAC;IACrC,GAAG,QAAA,gCAAgC;IACnC,sBAAsB;IACtB,6BAA6B;IAC7B,0BAA0B;CAC1B,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAG,wBAAwB,CAAC;AAE7C,QAAA,4BAA4B,GAAG,IAAI,GAAG,CAAC;IACnD,mBAAmB;IACnB,uBAAuB;IACvB,qBAAqB;IACrB,yBAAyB;IACzB,6BAA6B;CAC7B,CAAC,CAAC;AAEU,QAAA,iCAAiC,GAAG,IAAI,GAAG,CAAC;IACxD,wBAAwB;IACxB,+BAA+B;IAC/B,gCAAgC;IAChC,gCAAgC;IAChC,gCAAgC;CAChC,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAI,GAAG,CAAC;IAChD,+BAA+B;IAC/B,qBAAqB;IACrB,yBAAyB;IACzB,6BAA6B;IAC7B,4BAA4B;IAC5B,oBAAoB;IACpB,oBAAoB;CACpB,CAAC,CAAC;AAMU,QAAA,eAAe,GAAG;IAC9B,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE;QACT,sBAAsB,EAAE,oDAAoD;QAC5E,2BAA2B,EAAE,uDAAuD;QACpF,mBAAmB,EAAE,+CAA+C;KACpE;CACQ,CAAC;AAEE,QAAA,kBAAkB,GAAG;IACjC,IAAI,EAAE,aAAa;IACnB,QAAQ,EAAE;QACT,oBAAoB,EAAE,sCAAsC;QAC5D,uBAAuB,EAAE,6CAA6C;QACtE,2BAA2B,EAAE,qDAAqD;KAClF;CACQ,CAAC;AAEE,QAAA,iBAAiB,GAAG;IAChC,IAAI,EAAE,YAAY;IAClB,QAAQ,EAAE;QACT,4BAA4B,EAAE,yCAAyC;KACvE;CACQ,CAAC;AAEE,QAAA,YAAY,GAAG;IAC3B,IAAI,EAAE,OAAO;IACb,QAAQ,EAAE;QACT,oBAAoB,EAAE,sBAAsB;QAC5C,eAAe,EAAE,iBAAiB;QAClC,YAAY,EAAE,cAAc;KAC5B;CACQ,CAAC;AAEE,QAAA,eAAe,GAAG;IAC9B,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE;QACT,oBAAoB,EAAE,kCAAkC;QACxD,iBAAiB,EAAE,mBAAmB;QACtC,iBAAiB,EAAE,mBAAmB;KACtC;CACQ,CAAC;AAME,QAAA,iBAAiB,GAAG,kEAAkE,CAAC;AAEvF,QAAA,wBAAwB,GACpC,iGAAiG,CAAC;AAEtF,QAAA,yBAAyB,GAAG,wDAAwD,CAAC;AAErF,QAAA,eAAe,GAAG,+BAA+B,CAAC"}

package/dist/security-audit/types.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import type { IWorkflowBase } from 'n8n-workflow';
+import type { RISK_CATEGORIES } from '../security-audit/constants';
 export declare namespace Risk {
-    export type Category = 'database' | 'credentials' | 'nodes' | 'instance' | 'filesystem';
+    export type Category = (typeof RISK_CATEGORIES)[number];
     type CredLocation = {
         kind: 'credential';
         id: string;
@@ -66,9 +67,9 @@ export declare namespace n8n {
         description: string;
         documentationUrl: string;
         hasBreakingChange: boolean;
-        hasSecurityFix: boolean;
-        hasSecurityIssue: boolean;
-        securityIssueFixVersion: string;
+        hasSecurityFix: boolean | null;
+        hasSecurityIssue: boolean | null;
+        securityIssueFixVersion: string | null;
     };
 }
 export interface RiskReporter {

package/dist/services/ai-gateway.service.d.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { InstanceSettings } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, INode } from 'n8n-workflow';
 import { License } from '../license';
 import { OwnershipService } from '../services/ownership.service';
-import { UrlService } from '../services/url.service';
+import { UrlService } from '@n8n/backend-services';
 export type AiGatewayAvailability = {
     available: true;
     config: AiGatewayConfigDto;