@n8n/scheduler 0.2.3 → 0.3.0

package/dist/core/recurrence/kinds/cron.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateCron = validateCron;
+exports.resolvedTimezone = resolvedTimezone;
+exports.parseCron = parseCron;
+exports.cronNextRun = cronNextRun;
+exports.cronOccurrences = cronOccurrences;
+exports.resolveCron = resolveCron;
+const cron_parser_1 = require("cron-parser");
+const luxon_1 = require("luxon");
+const errors_1 = require("../../errors");
+const field_1 = require("../field");
+const CRON_FIELD_COUNT = 6;
+function validateCron(schedule) {
+    const expression = schedule.cronExpression;
+    if (typeof expression !== 'string') {
+        throw new errors_1.InvalidScheduleError(`${schedule.kind}.cronExpression must be a string, got ${JSON.stringify(expression)}`);
+    }
+    const fieldCount = expression.trim().split(/\s+/).length;
+    if (fieldCount !== CRON_FIELD_COUNT) {
+        throw new errors_1.InvalidScheduleError(`Cron expression must have ${CRON_FIELD_COUNT} fields (seconds included), got ${fieldCount}: ${JSON.stringify(expression)}`);
+    }
+    if (schedule.timezone !== null && !luxon_1.IANAZone.isValidZone(schedule.timezone)) {
+        throw new errors_1.InvalidScheduleError(`Unknown IANA timezone: ${JSON.stringify(schedule.timezone)}`);
+    }
+    try {
+        cron_parser_1.CronExpressionParser.parse(expression, { tz: schedule.timezone ?? 'UTC' });
+    }
+    catch (error) {
+        throw new errors_1.InvalidScheduleError(`Invalid cron expression ${JSON.stringify(expression)}: ${error.message}`);
+    }
+}
+function resolvedTimezone(schedule) {
+    if (schedule.timezone === null) {
+        throw new errors_1.InvalidScheduleError('Cron timezone must be resolved to a concrete zone before computing the next run, got null');
+    }
+    return schedule.timezone;
+}
+function parseCron(cronExpression, after, timezone) {
+    try {
+        return cron_parser_1.CronExpressionParser.parse(cronExpression, { currentDate: after, tz: timezone });
+    }
+    catch (error) {
+        throw new errors_1.InvalidScheduleError(`Failed to evaluate cron expression ${JSON.stringify(cronExpression)} in timezone ${JSON.stringify(timezone)}: ${error.message}`);
+    }
+}
+function cronNextRun(schedule, after) {
+    return parseCron(schedule.cronExpression, after, resolvedTimezone(schedule)).next().toDate();
+}
+function* cronOccurrences(schedule, first) {
+    const cursor = parseCron(schedule.cronExpression, first, resolvedTimezone(schedule));
+    yield first;
+    for (;;) {
+        yield cursor.next().toDate();
+    }
+}
+function resolveCron(job, defaultTimezone) {
+    return {
+        kind: 'cron',
+        cronExpression: (0, field_1.required)(job, 'cronExpression'),
+        timezone: job.timezone ?? defaultTimezone,
+    };
+}
+//# sourceMappingURL=cron.js.map

package/dist/core/recurrence/kinds/cron.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/cron.ts"],"names":[],"mappings":";;AAmBA,oCA4BC;AASD,4CAOC;AAaD,8BAYC;AASD,kCAEC;AAOD,0CAMC;AASD,kCAOC;AAhID,6CAAmD;AACnD,iCAAiC;AAGjC,yCAAoD;AAEpD,oCAAoC;AAGpC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAU3B,SAAgB,YAAY,CAAC,QAA8C;IAE1E,MAAM,UAAU,GAAY,QAAQ,CAAC,cAAc,CAAC;IACpD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,6BAAoB,CAC7B,GAAG,QAAQ,CAAC,IAAI,yCAAyC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CACrF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IACzD,IAAI,UAAU,KAAK,gBAAgB,EAAE,CAAC;QACrC,MAAM,IAAI,6BAAoB,CAC7B,6BAA6B,gBAAgB,mCAAmC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAC3H,CAAC;IACH,CAAC;IAGD,IAAI,QAAQ,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,gBAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,6BAAoB,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,CAAC;QACJ,kCAAoB,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC;IAC5E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,6BAAoB,CAC7B,2BAA2B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAM,KAAe,CAAC,OAAO,EAAE,CACpF,CAAC;IACH,CAAC;AACF,CAAC;AASD,SAAgB,gBAAgB,CAAC,QAA8C;IAC9E,IAAI,QAAQ,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAChC,MAAM,IAAI,6BAAoB,CAC7B,2FAA2F,CAC3F,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC,QAAQ,CAAC;AAC1B,CAAC;AAaD,SAAgB,SAAS,CACxB,cAA8B,EAC9B,KAAW,EACX,QAAgB;IAEhB,IAAI,CAAC;QACJ,OAAO,kCAAoB,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,6BAAoB,CAC7B,sCAAsC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAM,KAAe,CAAC,OAAO,EAAE,CAC3I,CAAC;IACH,CAAC;AACF,CAAC;AASD,SAAgB,WAAW,CAAC,QAA8C,EAAE,KAAW;IACtF,OAAO,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;AAC9F,CAAC;AAOD,QAAe,CAAC,CAAC,eAAe,CAAC,QAAsB,EAAE,KAAW;IACnE,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrF,MAAM,KAAK,CAAC;IACZ,SAAS,CAAC;QACT,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;AACF,CAAC;AASD,SAAgB,WAAW,CAAC,GAAiB,EAAE,eAAuB;IACrE,OAAO;QACN,IAAI,EAAE,MAAM;QAEZ,cAAc,EAAE,IAAA,gBAAQ,EAAC,GAAG,EAAE,gBAAgB,CAAmB;QACjE,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,eAAe;KACzC,CAAC;AACH,CAAC"}

package/dist/core/recurrence/kinds/interval.d.ts

@@ -0,0 +1,5 @@
+import type { IntervalSchedule, ScheduledJob } from '../../types';
+export declare function validateInterval(schedule: IntervalSchedule): void;
+export declare function intervalNextRun(schedule: IntervalSchedule, after: Date): Date;
+export declare function intervalOccurrences(schedule: IntervalSchedule, first: Date): Generator<Date>;
+export declare function resolveInterval(job: ScheduledJob): IntervalSchedule;

package/dist/core/recurrence/kinds/interval.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateInterval = validateInterval;
+exports.intervalNextRun = intervalNextRun;
+exports.intervalOccurrences = intervalOccurrences;
+exports.resolveInterval = resolveInterval;
+const constants_1 = require("@n8n/constants");
+const errors_1 = require("../../errors");
+const field_1 = require("../field");
+function validateInterval(schedule) {
+    if (!Number.isInteger(schedule.intervalSeconds) || schedule.intervalSeconds <= 0) {
+        throw new errors_1.InvalidScheduleError(`interval.intervalSeconds must be a positive integer, got ${JSON.stringify(schedule.intervalSeconds)}`);
+    }
+}
+function intervalNextRun(schedule, after) {
+    return new Date(after.getTime() + schedule.intervalSeconds * constants_1.Time.seconds.toMilliseconds);
+}
+function* intervalOccurrences(schedule, first) {
+    let previous = first;
+    yield previous;
+    for (;;) {
+        previous = intervalNextRun(schedule, previous);
+        yield previous;
+    }
+}
+function resolveInterval(job) {
+    return { kind: 'interval', intervalSeconds: (0, field_1.required)(job, 'intervalSeconds') };
+}
+//# sourceMappingURL=interval.js.map

package/dist/core/recurrence/kinds/interval.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interval.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/interval.ts"],"names":[],"mappings":";;AAWA,4CAMC;AASD,0CAEC;AAOD,kDAOC;AAQD,0CAEC;AApDD,8CAAsC;AAEtC,yCAAoD;AAEpD,oCAAoC;AAOpC,SAAgB,gBAAgB,CAAC,QAA0B;IAC1D,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,QAAQ,CAAC,eAAe,IAAI,CAAC,EAAE,CAAC;QAClF,MAAM,IAAI,6BAAoB,CAC7B,4DAA4D,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CACtG,CAAC;IACH,CAAC;AACF,CAAC;AASD,SAAgB,eAAe,CAAC,QAA0B,EAAE,KAAW;IACtE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,eAAe,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3F,CAAC;AAOD,QAAe,CAAC,CAAC,mBAAmB,CAAC,QAA0B,EAAE,KAAW;IAC3E,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,QAAQ,CAAC;IACf,SAAS,CAAC;QACT,QAAQ,GAAG,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC/C,MAAM,QAAQ,CAAC;IAChB,CAAC;AACF,CAAC;AAQD,SAAgB,eAAe,CAAC,GAAiB;IAChD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,IAAA,gBAAQ,EAAC,GAAG,EAAE,iBAAiB,CAAC,EAAE,CAAC;AAChF,CAAC"}

package/dist/core/recurrence/kinds/one-off.d.ts

@@ -0,0 +1,5 @@
+import type { OneOffSchedule, ScheduledJob } from '../../types';
+export declare function validateOneOff(schedule: OneOffSchedule): void;
+export declare function oneOffNextRun(schedule: OneOffSchedule, after: Date): Date | null;
+export declare function oneOffOccurrences(first: Date): Generator<Date>;
+export declare function resolveOneOff(job: ScheduledJob): OneOffSchedule;

package/dist/core/recurrence/kinds/one-off.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOneOff = validateOneOff;
+exports.oneOffNextRun = oneOffNextRun;
+exports.oneOffOccurrences = oneOffOccurrences;
+exports.resolveOneOff = resolveOneOff;
+const errors_1 = require("../../errors");
+const field_1 = require("../field");
+function validateOneOff(schedule) {
+    const fireAt = schedule.fireAt;
+    if (!(fireAt instanceof Date) || Number.isNaN(fireAt.getTime())) {
+        throw new errors_1.InvalidScheduleError('one_off.fireAt must be a valid Date');
+    }
+}
+function oneOffNextRun(schedule, after) {
+    return after.getTime() < schedule.fireAt.getTime() ? schedule.fireAt : null;
+}
+function* oneOffOccurrences(first) {
+    yield first;
+}
+function resolveOneOff(job) {
+    return { kind: 'one_off', fireAt: (0, field_1.required)(job, 'fireAt') };
+}
+//# sourceMappingURL=one-off.js.map

package/dist/core/recurrence/kinds/one-off.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"one-off.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/one-off.ts"],"names":[],"mappings":";;AASA,wCAKC;AAQD,sCAEC;AAOD,8CAEC;AAQD,sCAEC;AA3CD,yCAAoD;AAEpD,oCAAoC;AAOpC,SAAgB,cAAc,CAAC,QAAwB;IACtD,MAAM,MAAM,GAAY,QAAQ,CAAC,MAAM,CAAC;IACxC,IAAI,CAAC,CAAC,MAAM,YAAY,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,6BAAoB,CAAC,qCAAqC,CAAC,CAAC;IACvE,CAAC;AACF,CAAC;AAQD,SAAgB,aAAa,CAAC,QAAwB,EAAE,KAAW;IAClE,OAAO,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7E,CAAC;AAOD,QAAe,CAAC,CAAC,iBAAiB,CAAC,KAAW;IAC7C,MAAM,KAAK,CAAC;AACb,CAAC;AAQD,SAAgB,aAAa,CAAC,GAAiB;IAC9C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAA,gBAAQ,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;AAC7D,CAAC"}

package/dist/core/recurrence/kinds/recurring-cron.d.ts

@@ -0,0 +1,7 @@
+import type { RecurringCronSchedule, ScheduledJob } from '../../types';
+export declare function validateRecurringCron(schedule: RecurringCronSchedule): void;
+export declare function isOnCadence(previousFire: Date, candidate: Date, schedule: RecurringCronSchedule, timezone: string): boolean;
+export declare function recurringCronNextRun(schedule: RecurringCronSchedule, after: Date): Date;
+export declare function recurringCronFirstRun(schedule: RecurringCronSchedule, from: Date): Date;
+export declare function recurringCronOccurrences(schedule: RecurringCronSchedule, first: Date): Generator<Date>;
+export declare function resolveRecurringCron(job: ScheduledJob, defaultTimezone: string): RecurringCronSchedule;

package/dist/core/recurrence/kinds/recurring-cron.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateRecurringCron = validateRecurringCron;
+exports.isOnCadence = isOnCadence;
+exports.recurringCronNextRun = recurringCronNextRun;
+exports.recurringCronFirstRun = recurringCronFirstRun;
+exports.recurringCronOccurrences = recurringCronOccurrences;
+exports.resolveRecurringCron = resolveRecurringCron;
+const constants_1 = require("@n8n/constants");
+const errors_1 = require("../../errors");
+const field_1 = require("../field");
+const periods_1 = require("../periods");
+const cron_1 = require("./cron");
+const MAX_RECURRENCE_CANDIDATES = 10_000;
+function validateRecurringCron(schedule) {
+    (0, cron_1.validateCron)(schedule);
+    if (!constants_1.RecurringCronUnitList.includes(schedule.recurrenceUnit)) {
+        throw new errors_1.InvalidScheduleError(`recurring_cron.recurrenceUnit must be one of ${constants_1.RecurringCronUnitList.join(', ')}, got ${JSON.stringify(schedule.recurrenceUnit)}`);
+    }
+    if (!Number.isInteger(schedule.recurrenceSize) || schedule.recurrenceSize < 2) {
+        throw new errors_1.InvalidScheduleError(`recurring_cron.recurrenceSize must be an integer of at least 2 (a stride of 1 is a plain cron), got ${JSON.stringify(schedule.recurrenceSize)}`);
+    }
+}
+function isOnCadence(previousFire, candidate, schedule, timezone) {
+    const elapsed = (0, periods_1.periodsBetween)(previousFire, candidate, schedule.recurrenceUnit, timezone);
+    return elapsed === 0 || elapsed >= schedule.recurrenceSize;
+}
+function advanceToOnCadence(cursor, schedule, previousFire, timezone) {
+    for (let scanned = 0; scanned < MAX_RECURRENCE_CANDIDATES; scanned++) {
+        const candidate = cursor.next().toDate();
+        if (isOnCadence(previousFire, candidate, schedule, timezone)) {
+            return candidate;
+        }
+    }
+    throw new errors_1.InvalidScheduleError(`No fire of cron expression ${JSON.stringify(schedule.cronExpression)} lands on the every-${schedule.recurrenceSize}-${schedule.recurrenceUnit} cadence within ${MAX_RECURRENCE_CANDIDATES} candidates`);
+}
+function recurringCronNextRun(schedule, after) {
+    const timezone = (0, cron_1.resolvedTimezone)(schedule);
+    const cursor = (0, cron_1.parseCron)(schedule.cronExpression, after, timezone);
+    return advanceToOnCadence(cursor, schedule, after, timezone);
+}
+function recurringCronFirstRun(schedule, from) {
+    return (0, cron_1.cronNextRun)(schedule, from);
+}
+function* recurringCronOccurrences(schedule, first) {
+    const timezone = (0, cron_1.resolvedTimezone)(schedule);
+    const cursor = (0, cron_1.parseCron)(schedule.cronExpression, first, timezone);
+    let previous = first;
+    yield previous;
+    for (;;) {
+        previous = advanceToOnCadence(cursor, schedule, previous, timezone);
+        yield previous;
+    }
+}
+function resolveRecurringCron(job, defaultTimezone) {
+    return {
+        kind: 'recurring_cron',
+        cronExpression: (0, field_1.required)(job, 'cronExpression'),
+        timezone: job.timezone ?? defaultTimezone,
+        recurrenceUnit: (0, field_1.required)(job, 'recurrenceUnit'),
+        recurrenceSize: (0, field_1.required)(job, 'recurrenceSize'),
+    };
+}
+//# sourceMappingURL=recurring-cron.js.map

package/dist/core/recurrence/kinds/recurring-cron.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recurring-cron.js","sourceRoot":"","sources":["../../../../src/core/recurrence/kinds/recurring-cron.ts"],"names":[],"mappings":"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"}

package/dist/core/recurrence/next-run.d.ts

@@ -1,2 +1,4 @@
 import type { Schedule } from '../types';
 export declare function computeNextRunAt(schedule: Schedule, after: Date): Date | null;
+export declare function computeFirstRunAt(schedule: Schedule, from: Date): Date | null;
+export declare function occurrencesFrom(schedule: Schedule, first: Date): Generator<Date>;

package/dist/core/recurrence/next-run.js

@@ -1,40 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computeNextRunAt = computeNextRunAt;
-const cron_parser_1 = require("cron-parser");
+exports.computeFirstRunAt = computeFirstRunAt;
+exports.occurrencesFrom = occurrencesFrom;
 const errors_1 = require("../errors");
+const cron_1 = require("./kinds/cron");
+const interval_1 = require("./kinds/interval");
+const one_off_1 = require("./kinds/one-off");
+const recurring_cron_1 = require("./kinds/recurring-cron");
 const validate_1 = require("./validate");
-const MS_PER_SECOND = 1000;
-function cronNextRun(schedule, after, timezone) {
-    try {
-        const it = cron_parser_1.CronExpressionParser.parse(schedule.cronExpression, {
-            currentDate: after,
-            tz: timezone,
-        });
-        return it.next().toDate();
-    }
-    catch (error) {
-        throw new errors_1.InvalidScheduleError(`Failed to evaluate cron expression ${JSON.stringify(schedule.cronExpression)} in timezone ${JSON.stringify(timezone)}: ${error.message}`);
+function computeNextRunAt(schedule, after) {
+    (0, validate_1.validateSchedule)(schedule);
+    switch (schedule.kind) {
+        case 'cron':
+            return (0, cron_1.cronNextRun)(schedule, after);
+        case 'recurring_cron':
+            return (0, recurring_cron_1.recurringCronNextRun)(schedule, after);
+        case 'interval':
+            return (0, interval_1.intervalNextRun)(schedule, after);
+        case 'one_off':
+            return (0, one_off_1.oneOffNextRun)(schedule, after);
+        default: {
+            const exhaustive = schedule;
+            throw new errors_1.InvalidScheduleError(`Unknown schedule kind: ${JSON.stringify(exhaustive.kind)}`);
+        }
     }
 }
-function intervalNextRun(schedule, after) {
-    return new Date(after.getTime() + schedule.intervalSeconds * MS_PER_SECOND);
-}
-function oneOffNextRun(schedule, after) {
-    return after.getTime() < schedule.fireAt.getTime() ? schedule.fireAt : null;
+function computeFirstRunAt(schedule, from) {
+    if (schedule.kind === 'recurring_cron') {
+        (0, validate_1.validateSchedule)(schedule);
+        return (0, recurring_cron_1.recurringCronFirstRun)(schedule, from);
+    }
+    return computeNextRunAt(schedule, from);
 }
-function computeNextRunAt(schedule, after) {
+function* occurrencesFrom(schedule, first) {
     (0, validate_1.validateSchedule)(schedule);
     switch (schedule.kind) {
         case 'cron':
-            if (schedule.timezone === null) {
-                throw new errors_1.InvalidScheduleError('Cron timezone must be resolved to a concrete zone before computing the next run, got null');
-            }
-            return cronNextRun(schedule, after, schedule.timezone);
+            yield* (0, cron_1.cronOccurrences)(schedule, first);
+            return;
+        case 'recurring_cron':
+            yield* (0, recurring_cron_1.recurringCronOccurrences)(schedule, first);
+            return;
         case 'interval':
-            return intervalNextRun(schedule, after);
+            yield* (0, interval_1.intervalOccurrences)(schedule, first);
+            return;
         case 'one_off':
-            return oneOffNextRun(schedule, after);
+            yield* (0, one_off_1.oneOffOccurrences)(first);
+            return;
         default: {
             const exhaustive = schedule;
             throw new errors_1.InvalidScheduleError(`Unknown schedule kind: ${JSON.stringify(exhaustive.kind)}`);

package/dist/core/recurrence/next-run.js.map

@@ -1 +1 @@
-{"version":3,"file":"next-run.js","sourceRoot":"","sources":["../../../src/core/recurrence/next-run.ts"],"names":[],"mappings":";;AAwDA,4CAsBC;AA9ED,6CAAmD;AAEnD,sCAAiD;AAEjD,yCAA8C;AAE9C,MAAM,aAAa,GAAG,IAAI,CAAC;AAU3B,SAAS,WAAW,CAAC,QAAsB,EAAE,KAAW,EAAE,QAAgB;IACzE,IAAI,CAAC;QACJ,MAAM,EAAE,GAAG,kCAAoB,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,EAAE;YAC9D,WAAW,EAAE,KAAK;YAClB,EAAE,EAAE,QAAQ;SACZ,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,6BAAoB,CAC7B,sCAAsC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAM,KAAe,CAAC,OAAO,EAAE,CACpJ,CAAC;IACH,CAAC;AACF,CAAC;AAOD,SAAS,eAAe,CAAC,QAA0B,EAAE,KAAW;IAC/D,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,eAAe,GAAG,aAAa,CAAC,CAAC;AAC7E,CAAC;AAGD,SAAS,aAAa,CAAC,QAAwB,EAAE,KAAW;IAC3D,OAAO,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7E,CAAC;AAcD,SAAgB,gBAAgB,CAAC,QAAkB,EAAE,KAAW;IAC/D,IAAA,2BAAgB,EAAC,QAAQ,CAAC,CAAC;IAE3B,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM;YACV,IAAI,QAAQ,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAChC,MAAM,IAAI,6BAAoB,CAC7B,2FAA2F,CAC3F,CAAC;YACH,CAAC;YACD,OAAO,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACxD,KAAK,UAAU;YACd,OAAO,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACzC,KAAK,SAAS;YACb,OAAO,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO,CAAC,CAAC,CAAC;YACT,MAAM,UAAU,GAAU,QAAQ,CAAC;YACnC,MAAM,IAAI,6BAAoB,CAC7B,0BAA0B,IAAI,CAAC,SAAS,CAAE,UAAuB,CAAC,IAAI,CAAC,EAAE,CACzE,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC"}
+{"version":3,"file":"next-run.js","sourceRoot":"","sources":["../../../src/core/recurrence/next-run.ts"],"names":[],"mappings":";;AAgCA,4CAuBC;AAYD,8CAMC;AAkBD,0CAuBC;AAlHD,sCAAiD;AAEjD,uCAA4D;AAC5D,+CAAwE;AACxE,6CAAmE;AACnE,2DAIgC;AAChC,yCAA8C;AAsB9C,SAAgB,gBAAgB,CAAC,QAAkB,EAAE,KAAW;IAC/D,IAAA,2BAAgB,EAAC,QAAQ,CAAC,CAAC;IAE3B,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM;YACV,OAAO,IAAA,kBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACrC,KAAK,gBAAgB;YACpB,OAAO,IAAA,qCAAoB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC9C,KAAK,UAAU;YACd,OAAO,IAAA,0BAAe,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACzC,KAAK,SAAS;YACb,OAAO,IAAA,uBAAa,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAIvC,OAAO,CAAC,CAAC,CAAC;YACT,MAAM,UAAU,GAAU,QAAQ,CAAC;YACnC,MAAM,IAAI,6BAAoB,CAC7B,0BAA0B,IAAI,CAAC,SAAS,CAAE,UAAuB,CAAC,IAAI,CAAC,EAAE,CACzE,CAAC;QACH,CAAC;IAEF,CAAC;AACF,CAAC;AAYD,SAAgB,iBAAiB,CAAC,QAAkB,EAAE,IAAU;IAC/D,IAAI,QAAQ,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QACxC,IAAA,2BAAgB,EAAC,QAAQ,CAAC,CAAC;QAC3B,OAAO,IAAA,sCAAqB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC;AAkBD,QAAe,CAAC,CAAC,eAAe,CAAC,QAAkB,EAAE,KAAW;IAC/D,IAAA,2BAAgB,EAAC,QAAQ,CAAC,CAAC;IAE3B,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM;YACV,KAAK,CAAC,CAAC,IAAA,sBAAe,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACxC,OAAO;QACR,KAAK,gBAAgB;YACpB,KAAK,CAAC,CAAC,IAAA,yCAAwB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACjD,OAAO;QACR,KAAK,UAAU;YACd,KAAK,CAAC,CAAC,IAAA,8BAAmB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC5C,OAAO;QACR,KAAK,SAAS;YACb,KAAK,CAAC,CAAC,IAAA,2BAAiB,EAAC,KAAK,CAAC,CAAC;YAChC,OAAO;QACR,OAAO,CAAC,CAAC,CAAC;YACT,MAAM,UAAU,GAAU,QAAQ,CAAC;YACnC,MAAM,IAAI,6BAAoB,CAC7B,0BAA0B,IAAI,CAAC,SAAS,CAAE,UAAuB,CAAC,IAAI,CAAC,EAAE,CACzE,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC"}

package/dist/core/recurrence/periods.d.ts

@@ -0,0 +1,2 @@
+import { RecurringCronUnit } from '@n8n/constants';
+export declare function periodsBetween(from: Date, to: Date, unit: RecurringCronUnit, timezone: string): number;

package/dist/core/recurrence/periods.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.periodsBetween = periodsBetween;
+const constants_1 = require("@n8n/constants");
+const luxon_1 = require("luxon");
+function periodsBetween(from, to, unit, timezone) {
+    const start = luxon_1.DateTime.fromJSDate(from, { zone: timezone });
+    const end = luxon_1.DateTime.fromJSDate(to, { zone: timezone });
+    switch (unit) {
+        case constants_1.RecurringCronUnit.Hours:
+            return (calendarDaysBetween(start.startOf('day'), end.startOf('day')) * 24 + end.hour - start.hour);
+        case constants_1.RecurringCronUnit.Days:
+            return calendarDaysBetween(start.startOf('day'), end.startOf('day'));
+        case constants_1.RecurringCronUnit.Weeks:
+            return calendarDaysBetween(startOfSundayWeek(start), startOfSundayWeek(end)) / 7;
+        case constants_1.RecurringCronUnit.Months:
+            return end.year * 12 + end.month - (start.year * 12 + start.month);
+        default: {
+            const exhaustive = unit;
+            return exhaustive;
+        }
+    }
+}
+function calendarDaysBetween(startOfFromDay, startOfToDay) {
+    return Math.round(startOfToDay.diff(startOfFromDay, 'days').days);
+}
+function startOfSundayWeek(instant) {
+    return instant.startOf('day').minus({ days: instant.weekday % 7 });
+}
+//# sourceMappingURL=periods.js.map

package/dist/core/recurrence/periods.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"periods.js","sourceRoot":"","sources":["../../../src/core/recurrence/periods.ts"],"names":[],"mappings":";;AAmBA,wCAyBC;AA5CD,8CAAmD;AACnD,iCAAiC;AAkBjC,SAAgB,cAAc,CAC7B,IAAU,EACV,EAAQ,EACR,IAAuB,EACvB,QAAgB;IAEhB,MAAM,KAAK,GAAG,gBAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5D,MAAM,GAAG,GAAG,gBAAQ,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAExD,QAAQ,IAAI,EAAE,CAAC;QACd,KAAK,6BAAiB,CAAC,KAAK;YAC3B,OAAO,CACN,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAC1F,CAAC;QACH,KAAK,6BAAiB,CAAC,IAAI;YAC1B,OAAO,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACtE,KAAK,6BAAiB,CAAC,KAAK;YAC3B,OAAO,mBAAmB,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClF,KAAK,6BAAiB,CAAC,MAAM;YAC5B,OAAO,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QACpE,OAAO,CAAC,CAAC,CAAC;YACT,MAAM,UAAU,GAAU,IAAI,CAAC;YAC/B,OAAO,UAAU,CAAC;QACnB,CAAC;IACF,CAAC;AACF,CAAC;AAUD,SAAS,mBAAmB,CAAC,cAAwB,EAAE,YAAsB;IAC5E,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC;AAOD,SAAS,iBAAiB,CAAC,OAAiB;IAE3C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC;AACpE,CAAC"}

package/dist/core/recurrence/resolve.d.ts

@@ -0,0 +1,2 @@
+import type { Schedule, ScheduledJob } from '../types';
+export declare function resolveSchedule(job: ScheduledJob, defaultTimezone: string): Schedule;

package/dist/core/recurrence/resolve.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSchedule = resolveSchedule;
+const errors_1 = require("../errors");
+const cron_1 = require("./kinds/cron");
+const interval_1 = require("./kinds/interval");
+const one_off_1 = require("./kinds/one-off");
+const recurring_cron_1 = require("./kinds/recurring-cron");
+function resolveSchedule(job, defaultTimezone) {
+    switch (job.kind) {
+        case 'cron':
+            return (0, cron_1.resolveCron)(job, defaultTimezone);
+        case 'recurring_cron':
+            return (0, recurring_cron_1.resolveRecurringCron)(job, defaultTimezone);
+        case 'interval':
+            return (0, interval_1.resolveInterval)(job);
+        case 'one_off':
+            return (0, one_off_1.resolveOneOff)(job);
+        default: {
+            const exhaustive = job.kind;
+            throw new errors_1.CorruptStorageRowError(`scheduled_job ${job.id} has unknown kind '${String(exhaustive)}'`);
+        }
+    }
+}
+//# sourceMappingURL=resolve.js.map

package/dist/core/recurrence/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/core/recurrence/resolve.ts"],"names":[],"mappings":";;AAoBA,0CAiBC;AArCD,sCAAmD;AAEnD,uCAA2C;AAC3C,+CAAmD;AACnD,6CAAgD;AAChD,2DAA8D;AAe9D,SAAgB,eAAe,CAAC,GAAiB,EAAE,eAAuB;IACzE,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,MAAM;YACV,OAAO,IAAA,kBAAW,EAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC1C,KAAK,gBAAgB;YACpB,OAAO,IAAA,qCAAoB,EAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACnD,KAAK,UAAU;YACd,OAAO,IAAA,0BAAe,EAAC,GAAG,CAAC,CAAC;QAC7B,KAAK,SAAS;YACb,OAAO,IAAA,uBAAa,EAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,CAAC,CAAC,CAAC;YACT,MAAM,UAAU,GAAU,GAAG,CAAC,IAAI,CAAC;YACnC,MAAM,IAAI,+BAAsB,CAC/B,iBAAiB,GAAG,CAAC,EAAE,sBAAsB,MAAM,CAAC,UAAU,CAAC,GAAG,CAClE,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC"}

package/dist/core/recurrence/validate.js

@@ -1,50 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateSchedule = validateSchedule;
-const cron_parser_1 = require("cron-parser");
-const luxon_1 = require("luxon");
 const errors_1 = require("../errors");
-const CRON_FIELD_COUNT = 6;
-function validateCron(schedule) {
-    const expression = schedule.cronExpression;
-    if (typeof expression !== 'string') {
-        throw new errors_1.InvalidScheduleError(`cron.cronExpression must be a string, got ${JSON.stringify(expression)}`);
-    }
-    const fieldCount = expression.trim().split(/\s+/).length;
-    if (fieldCount !== CRON_FIELD_COUNT) {
-        throw new errors_1.InvalidScheduleError(`Cron expression must have ${CRON_FIELD_COUNT} fields (seconds included), got ${fieldCount}: ${JSON.stringify(expression)}`);
-    }
-    if (schedule.timezone !== null && !luxon_1.IANAZone.isValidZone(schedule.timezone)) {
-        throw new errors_1.InvalidScheduleError(`Unknown IANA timezone: ${JSON.stringify(schedule.timezone)}`);
-    }
-    try {
-        cron_parser_1.CronExpressionParser.parse(expression, {
-            tz: schedule.timezone ?? 'UTC',
-        });
-    }
-    catch (error) {
-        throw new errors_1.InvalidScheduleError(`Invalid cron expression ${JSON.stringify(expression)}: ${error.message}`);
-    }
-}
-function validateInterval(schedule) {
-    if (!Number.isInteger(schedule.intervalSeconds) || schedule.intervalSeconds <= 0) {
-        throw new errors_1.InvalidScheduleError(`interval.intervalSeconds must be a positive integer, got ${JSON.stringify(schedule.intervalSeconds)}`);
-    }
-}
-function validateOneOff(schedule) {
-    const fireAt = schedule.fireAt;
-    if (!(fireAt instanceof Date) || Number.isNaN(fireAt.getTime())) {
-        throw new errors_1.InvalidScheduleError('one_off.fireAt must be a valid Date');
-    }
-}
+const cron_1 = require("./kinds/cron");
+const interval_1 = require("./kinds/interval");
+const one_off_1 = require("./kinds/one-off");
+const recurring_cron_1 = require("./kinds/recurring-cron");
 function validateSchedule(schedule) {
     switch (schedule.kind) {
         case 'cron':
-            return validateCron(schedule);
+            return (0, cron_1.validateCron)(schedule);
+        case 'recurring_cron':
+            return (0, recurring_cron_1.validateRecurringCron)(schedule);
         case 'interval':
-            return validateInterval(schedule);
+            return (0, interval_1.validateInterval)(schedule);
         case 'one_off':
-            return validateOneOff(schedule);
+            return (0, one_off_1.validateOneOff)(schedule);
         default: {
             const exhaustive = schedule;
             throw new errors_1.InvalidScheduleError(`Unknown schedule kind: ${JSON.stringify(exhaustive.kind)}`);

package/dist/core/recurrence/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/core/recurrence/validate.ts"],"names":[],"mappings":";;AA8DA,4CAeC;AA7ED,6CAAmD;AACnD,iCAAiC;AAEjC,sCAAiD;AAIjD,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B,SAAS,YAAY,CAAC,QAAsB;IAG3C,MAAM,UAAU,GAAY,QAAQ,CAAC,cAAc,CAAC;IACpD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,6BAAoB,CAC7B,6CAA6C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CACzE,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IACzD,IAAI,UAAU,KAAK,gBAAgB,EAAE,CAAC;QACrC,MAAM,IAAI,6BAAoB,CAC7B,6BAA6B,gBAAgB,mCAAmC,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAC3H,CAAC;IACH,CAAC;IAGD,IAAI,QAAQ,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,gBAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,6BAAoB,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,CAAC;QACJ,kCAAoB,CAAC,KAAK,CAAC,UAAU,EAAE;YACtC,EAAE,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK;SAC9B,CAAC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,6BAAoB,CAC7B,2BAA2B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAM,KAAe,CAAC,OAAO,EAAE,CACpF,CAAC;IACH,CAAC;AACF,CAAC;AAED,SAAS,gBAAgB,CAAC,QAA0B;IACnD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,QAAQ,CAAC,eAAe,IAAI,CAAC,EAAE,CAAC;QAClF,MAAM,IAAI,6BAAoB,CAC7B,4DAA4D,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CACtG,CAAC;IACH,CAAC;AACF,CAAC;AAED,SAAS,cAAc,CAAC,QAAwB;IAC/C,MAAM,MAAM,GAAY,QAAQ,CAAC,MAAM,CAAC;IACxC,IAAI,CAAC,CAAC,MAAM,YAAY,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,6BAAoB,CAAC,qCAAqC,CAAC,CAAC;IACvE,CAAC;AACF,CAAC;AAOD,SAAgB,gBAAgB,CAAC,QAAkB;IAClD,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM;YACV,OAAO,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC/B,KAAK,UAAU;YACd,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACnC,KAAK,SAAS;YACb,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;QACjC,OAAO,CAAC,CAAC,CAAC;YACT,MAAM,UAAU,GAAU,QAAQ,CAAC;YACnC,MAAM,IAAI,6BAAoB,CAC7B,0BAA0B,IAAI,CAAC,SAAS,CAAE,UAAuB,CAAC,IAAI,CAAC,EAAE,CACzE,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/core/recurrence/validate.ts"],"names":[],"mappings":";;AAaA,4CAiBC;AA9BD,sCAAiD;AAEjD,uCAA4C;AAC5C,+CAAoD;AACpD,6CAAiD;AACjD,2DAA+D;AAQ/D,SAAgB,gBAAgB,CAAC,QAAkB;IAClD,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM;YACV,OAAO,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAC/B,KAAK,gBAAgB;YACpB,OAAO,IAAA,sCAAqB,EAAC,QAAQ,CAAC,CAAC;QACxC,KAAK,UAAU;YACd,OAAO,IAAA,2BAAgB,EAAC,QAAQ,CAAC,CAAC;QACnC,KAAK,SAAS;YACb,OAAO,IAAA,wBAAc,EAAC,QAAQ,CAAC,CAAC;QACjC,OAAO,CAAC,CAAC,CAAC;YACT,MAAM,UAAU,GAAU,QAAQ,CAAC;YACnC,MAAM,IAAI,6BAAoB,CAC7B,0BAA0B,IAAI,CAAC,SAAS,CAAE,UAAuB,CAAC,IAAI,CAAC,EAAE,CACzE,CAAC;QACH,CAAC;IACF,CAAC;AACF,CAAC"}

package/dist/core/retention/prune.d.ts

@@ -4,4 +4,4 @@ export interface RetentionSummary {
     deleted: number;
     drained: boolean;
 }
-export declare function prune(store: RetentionStore, options?: RetentionOptions): Promise<RetentionSummary>;
+export declare function prune(store: RetentionStore, options?: RetentionOptions, signal?: AbortSignal): Promise<RetentionSummary>;

package/dist/core/retention/prune.js

@@ -2,22 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prune = prune;
 const constants_1 = require("@n8n/constants");
-const enums_1 = require("../enums");
 const errors_1 = require("../errors");
 const options_1 = require("./options");
 function retentionWindows(options) {
     return [
         {
-            statuses: [enums_1.ScheduledTaskStatus.Succeeded, enums_1.ScheduledTaskStatus.Cancelled],
+            statuses: [constants_1.ScheduledTaskStatus.Succeeded, constants_1.ScheduledTaskStatus.Cancelled],
             olderThanSeconds: options.retentionSeconds,
         },
         {
-            statuses: [enums_1.ScheduledTaskStatus.Failed, enums_1.ScheduledTaskStatus.Missed],
+            statuses: [constants_1.ScheduledTaskStatus.Failed, constants_1.ScheduledTaskStatus.Missed],
             olderThanSeconds: options.failedRetentionSeconds,
         },
     ];
 }
-async function prune(store, options = options_1.DEFAULT_RETENTION_OPTIONS) {
+async function prune(store, options = options_1.DEFAULT_RETENTION_OPTIONS, signal) {
     if (!Number.isInteger(options.batchSize) || options.batchSize <= 0) {
         throw new errors_1.InvalidRetentionOptionsError(`batchSize must be a positive integer, got ${options.batchSize}`);
     }
@@ -25,26 +24,29 @@ async function prune(store, options = options_1.DEFAULT_RETENTION_OPTIONS) {
         deleted: 0,
         budget: options.maxBatchesPerPass,
         drained: true,
-    });
+    }, signal);
     return { deleted, drained };
 }
-async function pruneWindows(store, windows, options, state) {
+async function pruneWindows(store, windows, options, state, signal) {
     const [window, ...rest] = windows;
     if (window === undefined) {
         return state;
     }
     const windowBudget = state.budget <= 0 ? 0 : Math.max(state.budget - rest.length, 1);
-    const pruned = await pruneWindow(store, window, options.batchSize, windowBudget);
+    const pruned = await pruneWindow(store, window, options.batchSize, windowBudget, signal);
     return await pruneWindows(store, rest, options, {
         deleted: state.deleted + pruned.deleted,
         budget: state.budget - pruned.batches,
         drained: state.drained && pruned.drained,
-    });
+    }, signal);
 }
-async function pruneWindow(store, window, batchSize, budget) {
+async function pruneWindow(store, window, batchSize, budget, signal) {
     let deleted = 0;
     let batches = 0;
     while (batches < budget) {
+        if (signal?.aborted === true) {
+            return { deleted, batches, drained: false };
+        }
         const affected = await store.deleteFinishedOlderThan({
             statuses: window.statuses,
             olderThanMs: window.olderThanSeconds * constants_1.Time.seconds.toMilliseconds,

package/dist/core/retention/prune.js.map

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

package/dist/core/retention/store.d.ts

@@ -1,4 +1,4 @@
-import type { TerminalTaskStatus } from '../enums';
+import type { TerminalTaskStatus } from '@n8n/constants';
 export interface RetentionBatch {
     statuses: TerminalTaskStatus[];
     olderThanMs: number;

package/dist/core/scheduler.d.ts

@@ -0,0 +1,16 @@
+import type { TaskHandler } from './executor';
+import type { MaterializerSummary } from './materializer';
+import type { ReapResult } from './reaper';
+import type { RetentionSummary } from './retention';
+import type { ClaimedTask } from './types';
+export interface Scheduler {
+    registerTaskHandler(taskType: string, handler: TaskHandler): void;
+    start(): void;
+    stop(): Promise<void>;
+}
+export interface SchedulerPasses {
+    materialize(signal?: AbortSignal): Promise<MaterializerSummary>;
+    execute(signal?: AbortSignal): Promise<ClaimedTask[]>;
+    reap(signal?: AbortSignal): Promise<ReapResult>;
+    prune(signal?: AbortSignal): Promise<RetentionSummary>;
+}

package/dist/core/scheduler.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=scheduler.js.map

package/dist/core/scheduler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/core/scheduler.ts"],"names":[],"mappings":""}