@stacksjs/scheduler 0.59.11 → 0.61.1

package/dist/index.js

@@ -2,6 +2,22 @@
 // src/schedule.ts
 import {log} from "@stacksjs/cli";
 
+// src/job.ts
+import {spawn} from "child_process";
+
+// src/errors.ts
+class CronError extends Error {
+  constructor() {
+    super(...arguments);
+  }
+}
+
+class ExclusiveParametersError extends CronError {
+  constructor(param1, param2) {
+    super(`You can't specify both ${param1} and ${param2}`);
+  }
+}
+
 // src/time.ts
 import {DateTime} from "luxon";
 
@@ -81,19 +97,6 @@ var PRESETS = Object.freeze({
 var RE_WILDCARDS = /\*/g;
 var RE_RANGE = /^(\d+)(?:-(\d+))?(?:\/(\d+))?$/g;
 
-// src/errors.ts
-class CronError extends Error {
-  constructor() {
-    super(...arguments);
-  }
-}
-
-class ExclusiveParametersError extends CronError {
-  constructor(param1, param2) {
-    super(`You can't specify both ${param1} and ${param2}`);
-  }
-}
-
 // src/utils.ts
 function getRecordKeys(record) {
   return Object.keys(record);
@@ -192,14 +195,13 @@ class CronTime {
     }
     if (i === undefined || Number.isNaN(i) || i < 0) {
       return this.getNextDateFrom(date);
-    } else {
-      const dates = [];
-      for (;i > 0; i--) {
-        date = this.getNextDateFrom(date);
-        dates.push(date);
-      }
-      return dates;
     }
+    const dates = [];
+    for (;i > 0; i--) {
+      date = this.getNextDateFrom(date);
+      dates.push(date);
+    }
+    return dates;
   }
   getTimeout() {
     return Math.max(-1, this.sendAt().toMillis() - DateTime.local().toMillis());
@@ -323,7 +325,10 @@ class CronTime {
     return date;
   }
   _findPreviousDSTJump(date) {
-    let expectedMinute, expectedHour, actualMinute, actualHour;
+    let expectedMinute;
+    let expectedHour;
+    let actualMinute;
+    let actualHour;
     let maybeJumpingPoint = date;
     const iterationLimit = 1440;
     let iteration = 0;
@@ -344,10 +349,7 @@ class CronTime {
     const afterJumpingPoint = maybeJumpingPoint.plus({ minute: 1 }).set({ second: 0, millisecond: 0 });
     const beforeJumpingPoint = afterJumpingPoint.minus({ second: 1 });
     if (date.month + 1 in this.month && date.day in this.dayOfMonth && this._getWeekDay(date) in this.dayOfWeek) {
-      return [
-        this._checkTimeInSkippedRange(beforeJumpingPoint, afterJumpingPoint),
-        afterJumpingPoint
-      ];
+      return [this._checkTimeInSkippedRange(beforeJumpingPoint, afterJumpingPoint), afterJumpingPoint];
     }
     return [false, afterJumpingPoint];
   }
@@ -358,11 +360,11 @@ class CronTime {
     const isHourJump = startingMinute === 0 && afterJumpingPoint.minute === 0;
     if (hourRangeSize === 2 && isHourJump) {
       return startingHour in this.hour;
-    } else if (hourRangeSize === 1) {
+    }
+    if (hourRangeSize === 1) {
       return startingHour in this.hour && this._checkTimeInSkippedRangeSingleHour(startingMinute, afterJumpingPoint.minute);
-    } else {
-      return this._checkTimeInSkippedRangeMultiHour(startingHour, startingMinute, afterJumpingPoint.hour, afterJumpingPoint.minute);
     }
+    return this._checkTimeInSkippedRangeMultiHour(startingHour, startingMinute, afterJumpingPoint.hour, afterJumpingPoint.minute);
   }
   _checkTimeInSkippedRangeSingleHour(startMinute, endMinute) {
     for (let minute = startMinute;minute < endMinute; ++minute) {
@@ -381,10 +383,9 @@ class CronTime {
     const selectRange = (forHour) => {
       if (forHour === startHour)
         return firstHourMinuteRange;
-      else if (forHour === endHour)
+      if (forHour === endHour)
         return lastHourMinuteRange;
-      else
-        return middleHourMinuteRange;
+      return middleHourMinuteRange;
     };
     for (let hour = startHour;hour <= endHour; ++hour) {
       if (!(hour in this.hour))
@@ -487,7 +488,7 @@ class CronTime {
         if (unit === "dayOfWeek") {
           if (!typeObj[0] && !!typeObj[7])
             typeObj[0] = typeObj[7];
-          delete typeObj[7];
+          typeObj[7] = undefined;
         }
       } else {
         throw new CronError(`Field (${unit}) cannot be parsed`);
@@ -496,100 +497,8 @@ class CronTime {
   }
 }
 
-// src/schedule.ts
-function sendAt(cronTime) {
-  return new CronTime(cronTime).sendAt();
-}
-function timeout(cronTime) {
-  return new CronTime(cronTime).getTimeout();
-}
-
-class Schedule {
-  cronPattern = "";
-  timezone = "America/Los_Angeles";
-  task;
-  constructor(task) {
-    this.task = task;
-  }
-  everySecond() {
-    this.cronPattern = "* * * * * *";
-    return this;
-  }
-  everyMinute() {
-    this.cronPattern = "0 * * * * *";
-    return this;
-  }
-  everyTwoMinutes() {
-    this.cronPattern = "*/2 * * * * *";
-    return this;
-  }
-  everyFiveMinutes() {
-    this.cronPattern = "*/5 * * * *";
-    return this;
-  }
-  everyTenMinutes() {
-    this.cronPattern = "*/10 * * * *";
-    return this;
-  }
-  everyThirtyMinutes() {
-    this.cronPattern = "*/30 * * * *";
-    return this;
-  }
-  hourly() {
-    this.cronPattern = "0 0 * * * *";
-    return this;
-  }
-  daily() {
-    this.cronPattern = "0 0 0 * * *";
-    return this;
-  }
-  weekly() {
-    this.cronPattern = "0 0 0 * * 0";
-    return this;
-  }
-  monthly() {
-    this.cronPattern = "0 0 0 1 * *";
-    return this;
-  }
-  yearly() {
-    this.cronPattern = "0 0 0 1 1 *";
-    return this;
-  }
-  onDays(days) {
-    const dayPattern = days.join(",");
-    this.cronPattern = `0 0 0 * * ${dayPattern}`;
-    return this;
-  }
-  at(time2) {
-    const [hour, minute] = time2.split(":").map(Number);
-    this.cronPattern = `${minute} ${hour} * * *`;
-    return this;
-  }
-  setTimeZone(timezone) {
-    this.timezone = timezone;
-    return this;
-  }
-  start() {
-    new CronJob(this.cronPattern, this.task, null, true, this.timezone);
-    log.info(`Scheduled task with pattern: ${this.cronPattern} in timezone: ${this.timezone}`);
-  }
-  job(path) {
-    log.info(`Scheduling job: ${path}`);
-    return this;
-  }
-  action(path) {
-    log.info(`Scheduling action: ${path}`);
-    return this;
-  }
-  static command(cmd) {
-    this.cmd = cmd;
-    return this;
-  }
-}
-
 // src/job.ts
-import {spawn} from "child_process";
-class CronJob2 {
+class CronJob {
   cronTime;
   running = false;
   unrefTimeout = false;
@@ -624,12 +533,12 @@ class CronJob2 {
     if (params.timeZone != null && params.utcOffset != null)
       throw new ExclusiveParametersError("timeZone", "utcOffset");
     if (params.timeZone != null) {
-      return new CronJob2(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
-    } else if (params.utcOffset != null) {
-      return new CronJob2(params.cronTime, params.onTick, params.onComplete, params.start, null, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
-    } else {
-      return new CronJob2(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
+      return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
+    }
+    if (params.utcOffset != null) {
+      return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, null, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
     }
+    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
   }
   _fnWrap(cmd) {
     switch (typeof cmd) {
@@ -645,17 +554,17 @@ class CronJob2 {
       }
     }
   }
-  addCallback(callback2) {
-    if (typeof callback2 === "function")
-      this._callbacks.push(callback2);
+  addCallback(callback) {
+    if (typeof callback === "function")
+      this._callbacks.push(callback);
   }
-  setTime(time3) {
-    if (!(time3 instanceof CronTime))
+  setTime(time2) {
+    if (!(time2 instanceof CronTime))
       throw new CronError("time must be an instance of CronTime.");
     const wasRunning = this.running;
     this.stop();
-    this.cronTime = time3;
-    if (time3.realDate)
+    this.cronTime = time2;
+    if (time2.realDate)
       this.runOnce = true;
     if (wasRunning)
       this.start();
@@ -665,7 +574,9 @@ class CronJob2 {
   }
   fireOnTick() {
     try {
-      callback.call(this.context, this.onComplete);
+      for (const callback of this._callbacks) {
+        callback.call(this.context, this.onComplete);
+      }
     } catch (error) {
       if (this._errorHandler && error instanceof Error) {
         this._errorHandler(error);
@@ -681,17 +592,16 @@ class CronJob2 {
     if (this.running)
       return;
     const MAXDELAY = 2147483647;
-    let timeout2 = this.cronTime.getTimeout();
+    let timeout = this.cronTime.getTimeout();
     let remaining = 0;
     let startTime;
     const setCronTimeout = (t) => {
-      startTime = Date.now();
       this._timeout = setTimeout(callbackWrapper, t);
       if (this.unrefTimeout && typeof this._timeout.unref === "function")
         this._timeout.unref();
     };
     const callbackWrapper = () => {
-      const diff = startTime + timeout2 - Date.now();
+      const diff = startTime + timeout - Date.now();
       if (diff > 0) {
         let newTimeout = this.cronTime.getTimeout();
         if (newTimeout > diff)
@@ -701,12 +611,12 @@ class CronJob2 {
       if (remaining) {
         if (remaining > MAXDELAY) {
           remaining -= MAXDELAY;
-          timeout2 = MAXDELAY;
+          timeout = MAXDELAY;
         } else {
-          timeout2 = remaining;
+          timeout = remaining;
           remaining = 0;
         }
-        setCronTimeout(timeout2);
+        setCronTimeout(timeout);
       } else {
         this.lastExecution = new Date;
         this.running = false;
@@ -715,13 +625,13 @@ class CronJob2 {
         this.fireOnTick();
       }
     };
-    if (timeout2 >= 0) {
+    if (timeout >= 0) {
       this.running = true;
-      if (timeout2 > MAXDELAY) {
-        remaining = timeout2 - MAXDELAY;
-        timeout2 = MAXDELAY;
+      if (timeout > MAXDELAY) {
+        remaining = timeout - MAXDELAY;
+        timeout = MAXDELAY;
       }
-      setCronTimeout(timeout2);
+      setCronTimeout(timeout);
     } else {
       this.stop();
     }
@@ -738,6 +648,97 @@ class CronJob2 {
   }
 }
 
+// src/schedule.ts
+function sendAt(cronTime) {
+  return new CronTime(cronTime).sendAt();
+}
+function timeout(cronTime) {
+  return new CronTime(cronTime).getTimeout();
+}
+
+class Schedule {
+  cronPattern = "";
+  timezone = "America/Los_Angeles";
+  task;
+  constructor(task) {
+    this.task = task;
+  }
+  everySecond() {
+    this.cronPattern = "* * * * * *";
+    return this;
+  }
+  everyMinute() {
+    this.cronPattern = "0 * * * * *";
+    return this;
+  }
+  everyTwoMinutes() {
+    this.cronPattern = "*/2 * * * * *";
+    return this;
+  }
+  everyFiveMinutes() {
+    this.cronPattern = "*/5 * * * *";
+    return this;
+  }
+  everyTenMinutes() {
+    this.cronPattern = "*/10 * * * *";
+    return this;
+  }
+  everyThirtyMinutes() {
+    this.cronPattern = "*/30 * * * *";
+    return this;
+  }
+  hourly() {
+    this.cronPattern = "0 0 * * * *";
+    return this;
+  }
+  daily() {
+    this.cronPattern = "0 0 0 * * *";
+    return this;
+  }
+  weekly() {
+    this.cronPattern = "0 0 0 * * 0";
+    return this;
+  }
+  monthly() {
+    this.cronPattern = "0 0 0 1 * *";
+    return this;
+  }
+  yearly() {
+    this.cronPattern = "0 0 0 1 1 *";
+    return this;
+  }
+  onDays(days) {
+    const dayPattern = days.join(",");
+    this.cronPattern = `0 0 0 * * ${dayPattern}`;
+    return this;
+  }
+  at(time3) {
+    const [hour, minute] = time3.split(":").map(Number);
+    this.cronPattern = `${minute} ${hour} * * *`;
+    return this;
+  }
+  setTimeZone(timezone) {
+    this.timezone = timezone;
+    return this;
+  }
+  start() {
+    new CronJob(this.cronPattern, this.task, null, true, this.timezone);
+    log.info(`Scheduled task with pattern: ${this.cronPattern} in timezone: ${this.timezone}`);
+  }
+  job(path) {
+    log.info(`Scheduling job: ${path}`);
+    return this;
+  }
+  action(path) {
+    log.info(`Scheduling action: ${path}`);
+    return this;
+  }
+  static command(cmd) {
+    log.info(`Executing command: ${cmd}`);
+    return this;
+  }
+}
+
 // src/index.ts
 var src_default = Schedule;
 export {
@@ -746,5 +747,5 @@ export {
   src_default as default,
   Schedule,
   CronTime,
-  CronJob2 as BunCronJob
+  CronJob as BunCronJob
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/scheduler",
   "type": "module",
-  "version": "0.59.11",
+  "version": "0.61.1",
   "description": "The Stacks scheduler.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -54,9 +54,10 @@
     "luxon": "^3.4.4"
   },
   "devDependencies": {
-    "@fast-check/jest": "^1.8.0",
+    "@fast-check/jest": "^1.8.1",
     "@stacksjs/development": "latest",
+    "@types/luxon": "^3.4.2",
     "@types/sinon": "^17.0.3",
-    "sinon": "^17.0.1"
+    "sinon": "^18.0.0"
   }
 }