jm2 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jm2",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Job Manager 2 - A simple yet powerful job scheduler combining cron and at functionality",
   "type": "module",
   "main": "src/cli/index.js",

package/src/daemon/scheduler.js

@@ -133,7 +133,21 @@ export class Scheduler {
     // Calculate next run time for active jobs
     let nextRun = null;
     if (job.status === JobStatus.ACTIVE) {
-      nextRun = this.calculateNextRun(job, new Date());
+      // Check if there's a stored nextRun that is in the past (missed execution)
+      const storedNextRun = job.nextRun || job.nextRunISO;
+      if (storedNextRun) {
+        const storedDate = new Date(storedNextRun);
+        const now = new Date();
+        // If stored nextRun is in the past and it's a cron job, keep it so tick() will detect it as overdue
+        if (storedDate < now && job.type === JobType.CRON) {
+          nextRun = storedDate;
+        }
+      }
+      
+      // If nextRun wasn't set from stored value, calculate a new one
+      if (!nextRun) {
+        nextRun = this.calculateNextRun(job, new Date());
+      }
     }
 
     this.jobs.set(job.id, {
@@ -193,6 +207,34 @@ export class Scheduler {
     return nextRun;
   }
 
+  /**
+   * Find periodic jobs that are overdue (nextRun is in the past)
+   * This handles system sleep/wake scenarios where jobs should have run while asleep
+   * @param {Date} now - Current time
+   * @returns {Array} Array of overdue job IDs
+   */
+  findOverduePeriodicJobs(now) {
+    const overdueJobs = [];
+
+    for (const [id, job] of this.jobs) {
+      if (
+        job.status === JobStatus.ACTIVE &&
+        job.type === JobType.CRON &&
+        job.cron &&
+        job.nextRun
+      ) {
+        const timeSinceNextRun = now.getTime() - job.nextRun.getTime();
+        const isOverdue = timeSinceNextRun > this.checkIntervalMs * 2;
+
+        if (isOverdue) {
+          overdueJobs.push(id);
+        }
+      }
+    }
+
+    return overdueJobs;
+  }
+
   /**
    * Recalculate next run times for periodic jobs that have drifted into the past
    * This handles system sleep/wake scenarios where nextRun becomes stale
@@ -321,8 +363,27 @@ export class Scheduler {
 
     const nowDate = new Date();
 
-    // Recalculate next run for periodic jobs that have drifted into the past
-    // This handles system sleep/wake scenarios
+    // Check for overdue jobs BEFORE recalculating next run times
+    // This ensures jobs that should have run while system was asleep get executed
+    const overdueJobIds = this.findOverduePeriodicJobs(nowDate);
+    if (overdueJobIds.length > 0) {
+      this.logger.info(`Found ${overdueJobIds.length} overdue job(s) to execute after system wake`);
+      for (const jobId of overdueJobIds) {
+        const job = this.jobs.get(jobId);
+        if (job) {
+          this.logger.info(`Executing overdue job ${jobId} (${job.name || 'unnamed'})`);
+          // Execute immediately without waiting for the normal due jobs check
+          this.executeJob(job);
+          // Calculate next run from the original scheduled time to maintain cadence
+          const originalNextRun = job.nextRun ? new Date(job.nextRun) : new Date();
+          const nextRun = this.calculateNextRunAfterExecution(job, originalNextRun);
+          this.updateJobNextRun(jobId, nextRun);
+        }
+      }
+    }
+
+    // Recalculate next run for any remaining periodic jobs that have drifted into the past
+    // This handles edge cases and ensures nextRun times are in the future
     this.recalculateStalePeriodicJobs(nowDate);
 
     const dueJobs = this.getDueJobs();
@@ -535,6 +596,14 @@ export class Scheduler {
       ...job,
       nextRun: job.nextRun ? job.nextRun.toISOString() : null,
     }));
+    
+    // Safety check: don't persist empty jobs array if we had jobs before
+    // This prevents accidental data loss during startup/shutdown
+    if (jobsArray.length === 0 && this.jobs.size > 0) {
+      this.logger.error('BUG: Attempted to save empty jobs array but jobs Map is not empty!');
+      return;
+    }
+    
     saveJobs(jobsArray);
   }