LLM/moltbot
1
0
Fork 0
mirror of https://github.com/moltbot/moltbot.git synced 2026-03-20 07:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cron): dedupe next-run recompute paths

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-16 17:06:10 +00:00
parent 8a67016646
commit b991919755
2 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/cron/service.issue-17852-daily-skip.test.ts
View File

@@ -39,14 +39,8 @@ describe("issue #17852 - daily cron jobs should not skip days", () => {
};
}
it("recomputeNextRunsForMaintenance should NOT advance past-due nextRunAtMs", () => {
// Simulate: job scheduled for 3:00 AM, timer processing happens at 3:00:01
// The job was NOT executed in this tick (e.g., it became due between
// findDueJobs and the post-execution block).
const threeAM = Date.parse("2026-02-16T03:00:00.000Z");
const now = threeAM + 1_000; // 3:00:01
const job: CronJob = {
function createDailyThreeAmJob(threeAM: number): CronJob {
return {
id: "daily-job",
name: "daily 3am",
enabled: true,
@@ -56,9 +50,19 @@ describe("issue #17852 - daily cron jobs should not skip days", () => {
createdAtMs: threeAM - DAY_MS,
updatedAtMs: threeAM - DAY_MS,
state: {
nextRunAtMs: threeAM, // Past-due by 1 second
nextRunAtMs: threeAM,
},
};
}
it("recomputeNextRunsForMaintenance should NOT advance past-due nextRunAtMs", () => {
// Simulate: job scheduled for 3:00 AM, timer processing happens at 3:00:01
// The job was NOT executed in this tick (e.g., it became due between
// findDueJobs and the post-execution block).
const threeAM = Date.parse("2026-02-16T03:00:00.000Z");
const now = threeAM + 1_000; // 3:00:01
const job = createDailyThreeAmJob(threeAM);
const state = createMockState([job], now);
recomputeNextRunsForMaintenance(state);
@@ -75,19 +79,7 @@ describe("issue #17852 - daily cron jobs should not skip days", () => {
const threeAM = Date.parse("2026-02-16T03:00:00.000Z");
const now = threeAM + 1_000; // 3:00:01
const job: CronJob = {
id: "daily-job",
name: "daily 3am",
enabled: true,
schedule: { kind: "cron", expr: "0 3 * * *", tz: "UTC" },
payload: { kind: "systemEvent", text: "daily task" },
sessionTarget: "main",
createdAtMs: threeAM - DAY_MS,
updatedAtMs: threeAM - DAY_MS,
state: {
nextRunAtMs: threeAM, // Past-due by 1 second
},
};
const job = createDailyThreeAmJob(threeAM);
const state = createMockState([job], now);
recomputeNextRuns(state);

55
src/cron/service/jobs.ts
View File

@@ -192,6 +192,27 @@ function walkSchedulableJobs(
return changed;
}
function recomputeJobNextRunAtMs(params: { state: CronServiceState; job: CronJob; nowMs: number }) {
let changed = false;
try {
const newNext = computeJobNextRunAtMs(params.job, params.nowMs);
if (params.job.state.nextRunAtMs !== newNext) {
params.job.state.nextRunAtMs = newNext;
changed = true;
}
// Clear schedule error count on successful computation.
if (params.job.state.scheduleErrorCount) {
params.job.state.scheduleErrorCount = undefined;
changed = true;
}
} catch (err) {
if (recordScheduleComputeError({ state: params.state, job: params.job, err })) {
changed = true;
}
}
return changed;
}
export function recomputeNextRuns(state: CronServiceState): boolean {
return walkSchedulableJobs(state, ({ job, nowMs: now }) => {
let changed = false;
@@ -201,21 +222,8 @@ export function recomputeNextRuns(state: CronServiceState): boolean {
const nextRun = job.state.nextRunAtMs;
const isDueOrMissing = nextRun === undefined || now >= nextRun;
if (isDueOrMissing) {
try {
const newNext = computeJobNextRunAtMs(job, now);
if (job.state.nextRunAtMs !== newNext) {
job.state.nextRunAtMs = newNext;
changed = true;
}
// Clear schedule error count on successful computation.
if (job.state.scheduleErrorCount) {
job.state.scheduleErrorCount = undefined;
changed = true;
}
} catch (err) {
if (recordScheduleComputeError({ state, job, err })) {
changed = true;
}
if (recomputeJobNextRunAtMs({ state, job, nowMs: now })) {
changed = true;
}
}
return changed;
@@ -236,21 +244,8 @@ export function recomputeNextRunsForMaintenance(state: CronServiceState): boolea
// If a job was past-due but not found by findDueJobs, recomputing would
// cause it to be silently skipped.
if (job.state.nextRunAtMs === undefined) {
try {
const newNext = computeJobNextRunAtMs(job, now);
if (job.state.nextRunAtMs !== newNext) {
job.state.nextRunAtMs = newNext;
changed = true;
}
// Clear schedule error count on successful computation.
if (job.state.scheduleErrorCount) {
job.state.scheduleErrorCount = undefined;
changed = true;
}
} catch (err) {
if (recordScheduleComputeError({ state, job, err })) {
changed = true;
}
if (recomputeJobNextRunAtMs({ state, job, nowMs: now })) {
changed = true;
}
}
return changed;