fix: some bugs

TheNoim · Jan 9, 2023 · 9ca2fa6 · 9ca2fa6
1 parent 0f2762f
commit 9ca2fa6
Show file tree

Hide file tree

Showing 7 changed files with 352 additions and 59 deletions.
diff --git a/deno.lock b/deno.lock
diff --git a/reactive_home/src/composeables/mapState.ts b/reactive_home/src/composeables/mapState.ts
@@ -53,10 +53,23 @@ export function mapState(config: MapStateConfig) {
     ],
     ([newValue, newLightValue], [oldValue, oldLightValue]) => {
       // Skip initial state
-      if (!oldValue || oldLightValue < 0 || newLightValue < 0) {
+      if (typeof oldValue !== "boolean" || typeof oldLightValue !== "number") {
+        if (config.debug) {
+          console.log(`computed_change(${config.entity}): skip `, {
+            newValue,
+            newLightValue,
+          });
+        }
         return;
       }
 
+      if (config.debug) {
+        console.log(`computed_change(${config.entity}): `, {
+          newValue,
+          newLightValue,
+        });
+      }
+
       if (newValue !== unref(config.desiredState)) {
         if (config.debug) {
           console.error(

diff --git a/reactive_home/src/composeables/useBoolean.ts b/reactive_home/src/composeables/useBoolean.ts
@@ -1,7 +1,7 @@
 import { useState } from "./useState.ts";
 import { computed, extendRef, refAutoReset } from "../dep.ts";
-import { auth, createApiCall } from "../hass/connection.ts";
-import type { Ref, UnwrapNestedRefs } from "../dep.ts";
+import { connection } from "../hass/connection.ts";
+import type { Ref, UnwrapNestedRefs, MessageBase, HassEntity } from "../dep.ts";
 
 /**
  * Switch device helper function. If a device supports only on and off, this can help manage this device as simple boolean.
@@ -12,30 +12,26 @@ import type { Ref, UnwrapNestedRefs } from "../dep.ts";
 export function useBoolean(entity: string, debug = false) {
   const state = useState(entity);
 
+  const localBool: Ref<null | boolean> = refAutoReset(null, 5000);
+
   async function set(newValue: boolean) {
-    const callServiceUrl = createApiCall(
-      `/api/services/${state.value?.entity_id?.split(".").at(0)}/turn_${
-        newValue ? "on" : "off"
-      }`
-    );
+    const payload = {
+      type: "call_service",
+      domain: (state.value?.entity_id ?? entity).split(".").at(0),
+      service: `turn_${newValue ? "on" : "off"}`,
+      target: {
+        entity_id: entity,
+      },
+    } satisfies MessageBase;
+
     if (debug) {
-      console.log(`call_service(${entity}): `, {
-        callServiceUrl: callServiceUrl,
-      });
+      console.log(`call_service(${entity}): `, payload);
     }
-    await fetch(callServiceUrl, {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        Authorization: `Bearer ${auth.accessToken}`,
-      },
-      body: JSON.stringify({
-        entity_id: entity,
-      }),
-    });
-  }
 
-  const localBool: Ref<null | boolean> = refAutoReset(null, 5000);
+    await connection.sendMessagePromise(payload);
+
+    localBool.value = null;
+  }
 
   const bool: Ref<boolean> = computed({
     get() {