github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-30 11:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cron): share cron schedule resolver

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-07 16:19:23 +00:00
parent 4204c96105
commit d01cb7b65f
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/cron/schedule.ts
View File

@@ -30,6 +30,22 @@ function resolveCachedCron(expr: string, timezone: string): Cron {
return next;
}
function resolveCronFromSchedule(schedule: {
tz?: string;
expr?: unknown;
cron?: unknown;
}): Cron | undefined {
const exprSource = typeof schedule.expr === "string" ? schedule.expr : schedule.cron;
if (typeof exprSource !== "string") {
throw new Error("invalid cron schedule: expr is required");
}
const expr = exprSource.trim();
if (!expr) {
return undefined;
}
return resolveCachedCron(expr, resolveCronTimezone(schedule.tz));
}
export function coerceFiniteScheduleNumber(value: unknown): number | undefined {
if (typeof value === "number") {
return Number.isFinite(value) ? value : undefined;
@@ -81,16 +97,10 @@ export function computeNextRunAtMs(schedule: CronSchedule, nowMs: number): numbe
return anchor + steps * everyMs;
}
const cronSchedule = schedule as { expr?: unknown; cron?: unknown };
const exprSource = typeof cronSchedule.expr === "string" ? cronSchedule.expr : cronSchedule.cron;
if (typeof exprSource !== "string") {
throw new Error("invalid cron schedule: expr is required");
}
const expr = exprSource.trim();
if (!expr) {
const cron = resolveCronFromSchedule(schedule as { tz?: string; expr?: unknown; cron?: unknown });
if (!cron) {
return undefined;
}
const cron = resolveCachedCron(expr, resolveCronTimezone(schedule.tz));
let next = cron.nextRun(new Date(nowMs));
if (!next) {
return undefined;
@@ -132,16 +142,10 @@ export function computePreviousRunAtMs(schedule: CronSchedule, nowMs: number): n
if (schedule.kind !== "cron") {
return undefined;
}
const cronSchedule = schedule as { expr?: unknown; cron?: unknown };
const exprSource = typeof cronSchedule.expr === "string" ? cronSchedule.expr : cronSchedule.cron;
if (typeof exprSource !== "string") {
throw new Error("invalid cron schedule: expr is required");
}
const expr = exprSource.trim();
if (!expr) {
const cron = resolveCronFromSchedule(schedule as { tz?: string; expr?: unknown; cron?: unknown });
if (!cron) {
return undefined;
}
const cron = resolveCachedCron(expr, resolveCronTimezone(schedule.tz));
const previousRuns = cron.previousRuns(1, new Date(nowMs));
const previous = previousRuns[0];
if (!previous) {