improved compat with synapse switches (#11)

Digital-Alchemy-TS · Jun 7, 2024 · ba70439 · ba70439
1 parent ae8a486
commit ba70439
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 58 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@digital-alchemy/automation",
   "repository": "https://github.com/Digital-Alchemy-TS/automation",
   "homepage": "https://docs.digital-alchemy.app/Automation",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "scripts": {
     "build": "rm -rf dist/; tsc",
     "lint": "eslint src",
@@ -25,9 +25,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@digital-alchemy/core": "^0.3.16",
-    "@digital-alchemy/hass": "^0.3.30",
-    "@digital-alchemy/synapse": "^0.3.6",
+    "@digital-alchemy/core": "^0.3.17",
+    "@digital-alchemy/hass": "^0.3.31",
+    "@digital-alchemy/synapse": "^0.3.8",
     "dayjs": "^1.11.10",
     "prom-client": "^15.1.1"
   },

diff --git a/src/extensions/managed-switch.extension.ts b/src/extensions/managed-switch.extension.ts
@@ -8,7 +8,12 @@ import {
 
 import { ManagedSwitchOptions, PickASwitch } from "../helpers";
 
-export function ManagedSwitch({ logger, hass, scheduler }: TServiceParams) {
+export function ManagedSwitch({
+  logger,
+  hass,
+  scheduler,
+  lifecycle,
+}: TServiceParams) {
   /**
    * Logic runner for the state enforcer
    */
@@ -54,49 +59,49 @@ export function ManagedSwitch({ logger, hass, scheduler }: TServiceParams) {
     shouldBeOn,
     onUpdate = [],
   }: ManagedSwitchOptions) {
-    logger.trace(
-      { context, entity_id, name: ManageSwitch },
-      `setting up managed switch`,
-    );
-    const entityList = is.array(entity_id) ? entity_id : [entity_id];
+    lifecycle.onReady(() => {
+      logger.trace(
+        { context, entity_id, name: ManageSwitch },
+        `setting up managed switch`,
+      );
+      const entityList = is.array(entity_id) ? entity_id : [entity_id];
 
-    // * Check if there should be a change
-    const update = async () => {
-      const expected = shouldBeOn();
-      if (!is.boolean(expected)) {
-        if (!is.undefined(expected)) {
-          logger.error(
-            { context, entity_id, expected, name: ManageSwitch },
-            `Invalid value from switch manage function`,
-          );
+      // * Check if there should be a change
+      const update = async () => {
+        const expected = shouldBeOn();
+        if (!is.boolean(expected)) {
+          if (!is.undefined(expected)) {
+            logger.error(
+              { context, entity_id, expected, name: ManageSwitch },
+              `Invalid value from switch manage function`,
+            );
+            return;
+          }
           return;
         }
-        return;
-      }
-      await updateEntities(expected, entityList, context);
-    };
+        await updateEntities(expected, entityList, context);
+      };
 
-    // * Always run on a schedule
-    scheduler.cron({ exec: async () => await update(), schedule });
+      // * Always run on a schedule
+      scheduler.cron({ exec: async () => await update(), schedule });
 
-    // * Update when relevant things update
-    if (!is.empty(onUpdate)) {
-      [onUpdate].flat().forEach(i => {
-        if (is.object(i) && !("entity_id" in i)) {
-          const onUpdate = i.onUpdate;
-          if (!is.function(onUpdate)) {
+      // * Update when relevant things update
+      if (!is.empty(onUpdate)) {
+        [onUpdate].flat().forEach(i => {
+          if (is.object(i) && !("entity_id" in i)) {
+            const onUpdate = i.onUpdate;
+            if (!is.function(onUpdate)) {
+              return;
+            }
+            i.onUpdate(async () => await update());
             return;
           }
-          i.onUpdate(async () => {
-            await update();
-          });
-          return;
-        }
-        hass.entity
-          .byId(is.object(i) ? i.entity_id : i)
-          .onUpdate(async () => await update());
-      });
-    }
+          hass.entity
+            .byId(is.object(i) ? i.entity_id : i)
+            .onUpdate(async () => await update());
+        });
+      }
+    });
   }
   return ManageSwitch;
 }
diff --git a/src/helpers/managed-switch.helper.ts b/src/helpers/managed-switch.helper.ts
@@ -4,12 +4,20 @@ import { PICK_ENTITY } from "@digital-alchemy/hass";
 export type PickASwitch =
   | PICK_ENTITY<"switch">
   | { entity_id: PICK_ENTITY<"switch"> };
+
 type EntityUpdate =
   | PICK_ENTITY
   | { entity_id: PICK_ENTITY }
   | {
       onUpdate: (callback: () => TBlackHole) => void;
-      state: unknown;
+      /**
+       * Hass entity compat
+       */
+      state?: unknown;
+      /**
+       * Synapse entity compat
+       */
+      is_on?: boolean;
       name: string;
     };