chore: Update cron dependency

fix(time): Fix breaking changes from cron package
zachowj · Dec 20, 2023 · 5cf6d5b · 5cf6d5b
1 parent 135b587
commit 5cf6d5b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "axios": "1.6.0",
     "bonjour": "3.5.0",
     "compare-versions": "6.1.0",
-    "cron": "2.4.0",
+    "cron": "3.1.6",
     "debug": "4.3.4",
     "flat": "5.0.2",
     "geolib": "3.3.4",

diff --git a/src/nodes/time/TimeController.ts b/src/nodes/time/TimeController.ts
@@ -21,7 +21,7 @@ export default class TimeController extends ExposeAsController {
     #cronjob: CronJob | null = null;
 
     #createCronjob(crontab: string | Date) {
-        this.#cronjob = new CronJob({
+        this.#cronjob = CronJob.from({
             cronTime: crontab,
             onTick: async () => {
                 try {
@@ -56,7 +56,7 @@ export default class TimeController extends ExposeAsController {
         }
     }
 
-    #formatDate(d: Date) {
+    #formatDate(d?: Date) {
         return formatDate({
             date: d,
             options: {
@@ -114,7 +114,7 @@ export default class TimeController extends ExposeAsController {
             thursday: 4,
             friday: 5,
             saturday: 6,
-        };
+        } as const;
 
         const selectedDays = Object.keys(days).reduce((acc, day) => {
             if (this.node.config[day as keyof TimeNodeProperties]) {
@@ -146,7 +146,10 @@ export default class TimeController extends ExposeAsController {
 
         if (this.node.config.repeatDaily) {
             const sentTime = this.#formatDate(now);
-            const nextTime = this.#formatDate(this.#cronjob?.nextDates());
+            // convert luxon to date
+            const nextTime = this.#formatDate(
+                this.#cronjob?.nextDate().toJSDate()
+            );
             this.status.setSuccess([
                 'ha-time.status.sent_and_next',
                 {
@@ -220,7 +223,7 @@ export default class TimeController extends ExposeAsController {
 
         this.#createCronjob(crontab);
 
-        const nextTime = this.#formatDate(this.#cronjob?.nextDates());
+        const nextTime = this.#formatDate(this.#cronjob?.nextDate().toJSDate());
         this.status.setText(RED._('ha-time.status.next_at', { nextTime }));
     }
 }