tweaks

README.md

@@ -104,10 +104,7 @@ export function ExampleRoom({ automation, context }: TServiceParams) {
 
       // check sun position
       if (automation.solar.isBetween("dawn", "dusk")) {
-
-        // create some reference points with dayjs
-        const [PM530, NOW] = automation.utils.shortTime(["PM5:30", "NOW"]);
-        return NOW.isBefore(PM530);
+        return automation.time.isBefore("PM5:30")
       }
       return false;
     },

package.json

@@ -25,8 +25,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@digital-alchemy/core": "^0.3.12",
-    "@digital-alchemy/hass": "^0.3.20",
+    "@digital-alchemy/core": "^0.3.15",
+    "@digital-alchemy/hass": "^0.3.24",
     "@digital-alchemy/synapse": "^0.3.5",
     "dayjs": "^1.11.10",
     "prom-client": "^15.1.1"

src/automation.module.ts

@@ -10,8 +10,8 @@ import {
   Room,
   SequenceWatcher,
   SolarCalculator,
+  Time,
 } from "./extensions";
-import { Utils } from "./extensions/utils.extension";
 
 export const LIB_AUTOMATION = CreateLibrary({
   configuration: {
@@ -73,7 +73,7 @@ export const LIB_AUTOMATION = CreateLibrary({
   depends: [LIB_HASS, LIB_SYNAPSE],
   name: "automation",
   // light depends circadian
-  priorityInit: ["utils", "circadian"],
+  priorityInit: ["time", "circadian"],
   services: {
     /**
      * # Aggressive Scenes extension
@@ -117,7 +117,7 @@ export const LIB_AUTOMATION = CreateLibrary({
     /**
      * Helper functions
      */
-    utils: Utils,
+    time: Time,
   },
 });
 

src/extensions/index.ts

@@ -5,3 +5,4 @@ export * from "./managed-switch.extension";
 export * from "./room.extension";
 export * from "./sequence-matcher.extension";
 export * from "./solar-calc.extension";
+export * from "./time.extension";

src/extensions/solar-calc.extension.ts

@@ -1,5 +1,7 @@
 import {
   CronExpression,
+  is,
+  NONE,
   TBlackHole,
   TContext,
   TServiceParams,
@@ -191,28 +193,25 @@ export function SolarCalculator({
   };
 
   solarReference.onEvent = ({
-    context,
     eventName,
     label,
     exec,
+    offset,
   }: OnSolarEvent) => {
-    event.on(eventName, async () => {
-      await internal.safeExec({
-        duration: undefined,
-        errors: undefined,
-        exec: async () => await exec(),
-        executions: undefined,
-        labels: { context, label },
-      });
+    scheduler.sliding({
+      exec: async () => await exec(),
+      label,
+      next: () => solarReference[eventName].add(offset ?? NONE, "ms"),
+      reset: CronExpression.EVERY_DAY_AT_MIDNIGHT,
     });
   };
 
   return solarReference as SolarReference;
 }
 
 type OnSolarEvent = {
-  context: TContext;
   label?: string;
+  offset?: number;
   eventName: SolarEvents;
   exec: () => TBlackHole;
 };

src/extensions/utils.extension.ts → src/extensions/time.extension.ts

@@ -1,11 +1,12 @@
-import { NONE, START } from "@digital-alchemy/core";
+import { NONE, sleep, START, TServiceParams } from "@digital-alchemy/core";
 import dayjs, { Dayjs } from "dayjs";
 
 type Digit = `${number}`;
 
 type TimeString = Digit | `${Digit}:${Digit}` | `${Digit}:${Digit}:${Digit}`;
 
-type ShortTime = `${AmPm}${ShortDigits}${ShortSuffix}` | "NOW" | "TOMORROW";
+export type TShortTime = `${AmPm}${ShortDigits}${ShortSuffix}`;
+type ShortTime = TShortTime | "NOW" | "TOMORROW";
 type ShortDigits =
   | "1"
   | "2"
@@ -33,9 +34,29 @@ type ShortSuffix = "" | ":00" | ":15" | ":30" | ":45";
 
 const SLICE_LENGTH = "AM".length;
 const ROLLOVER = 12;
-
-export function Utils() {
+export function Time({ automation }: TServiceParams) {
   return {
+    /**
+     * Fast time check
+     */
+    isAfter(time: TShortTime) {
+      const [NOW, target] = automation.time.shortTime(["NOW", time]);
+      return NOW.isAfter(target);
+    },
+    /**
+     * Fast time check
+     */
+    isBefore(time: TShortTime) {
+      const [NOW, target] = automation.time.shortTime(["NOW", time]);
+      return NOW.isBefore(target);
+    },
+    /**
+     * Fast time check
+     */
+    isBetween(start: TShortTime, end: TShortTime) {
+      const [NOW, START, END] = automation.time.shortTime(["NOW", start, end]);
+      return NOW.isBetween(START, END);
+    },
     /**
      * Quickly calculate reference points in time.
      * Times are in reference to 12AM/midnight this morning, and input in 24 hour format.
@@ -60,6 +81,7 @@ export function Utils() {
       const today = dayjs().format("YYYY-MM-DD");
       return times.map(i => dayjs(`${today} ${i}`).millisecond(NONE));
     },
+
     /**
      * Quickly calculate reference points in time.
      * Times are in reference to 12AM/midnight this morning.
@@ -97,5 +119,7 @@ export function Utils() {
         return dayjs(`${today} ${hour}:${minute}`).millisecond(NONE);
       });
     },
+
+    wait: (ms: number | Date) => sleep(ms),
   };
 }