fix: infinity sync bug

reactive_home/src/composeables/useLightMapping.ts

@@ -26,6 +26,7 @@ export function useLightMapping({
       if (debug) {
         console.log(`automation_toggle(${newEntityState.entity_id}): value`);
       }
+      isDisabled.lastChanged = new Date();
       isDisabled.value = true;
     }
 
@@ -42,6 +43,7 @@ export function useLightMapping({
           `automation_toggle(${newEntityState.entity_id}): brightness`
         );
       }
+      isDisabledBrightness.lastChanged = new Date();
       isDisabledBrightness.value = true;
     }
   });
@@ -75,6 +77,7 @@ export function useLightMapping({
             `isDisabled(${entity.entity_id}): reset time=${newShouldReEnableSince}`
           );
         }
+        isDisabled.lastChanged = new Date();
         isDisabled.value = false;
       }
       if (newShouldReEnableSinceBrightness >= 0 && isDisabledBrightness) {
@@ -83,6 +86,7 @@ export function useLightMapping({
             `isDisabledBrightness(${entity.entity_id}): reset time=${newShouldReEnableSinceBrightness}`
           );
         }
+        isDisabledBrightness.lastChanged = new Date();
         isDisabledBrightness.value = false;
       }
     },

reactive_home/src/composeables/useNewBoolean.ts

@@ -6,6 +6,7 @@ import {
   watchPausable,
   extendRef,
   computed,
+  nextTick,
 } from "../dep.ts";
 import type { MessageBase, HassEntity, UnwrapNestedRefs } from "../dep.ts";
 import { connection } from "../hass/connection.ts";
@@ -50,6 +51,7 @@ export function useNewBoolean(state: FullfilledUseState, debug = false) {
   const { pause, resume } = watchPausable(
     localValue,
     (newLocalValue: typeof localValue.value) => {
+      console.log({ newLocalValue, entity: state.value.entity_id });
       updateHASSState(newLocalValue);
     }
   );
@@ -59,7 +61,7 @@ export function useNewBoolean(state: FullfilledUseState, debug = false) {
   // Incoming state changes from hass
   watch(
     () => state.value,
-    (newEntityState) => {
+    async (newEntityState) => {
       const contextIndex = skipContexts.findIndex(
         (value) => value === newEntityState.context.id
       );
@@ -71,12 +73,20 @@ export function useNewBoolean(state: FullfilledUseState, debug = false) {
       pause();
       localValue.value = stringBoolToBool(newEntityState.state);
       lastChanged.value = newEntityState.last_changed;
+      await nextTick();
       resume();
     }
   );
 
   const extendObject = {
-    lastChanged: computed(() => new Date(lastChanged.value)),
+    lastChanged: computed({
+      get() {
+        return new Date(lastChanged.value);
+      },
+      set(newValue) {
+        lastChanged.value = newValue.toISOString();
+      },
+    }),
   };
 
   return extendRef(localValue, extendObject) as typeof localValue &

reactive_home/src/composeables/useNewLight.ts

@@ -1,5 +1,11 @@
 import type { FullfilledUseState } from "./useState.ts";
-import { useDebounceFn, reactive, watch, watchPausable } from "../dep.ts";
+import {
+  useDebounceFn,
+  reactive,
+  watch,
+  watchPausable,
+  nextTick,
+} from "../dep.ts";
 import type { MessageBase, HassEntity } from "../dep.ts";
 import { connection } from "../hass/connection.ts";
 import { stringBoolToBool } from "../lib/util.ts";
@@ -73,9 +79,10 @@ export function useNewLight(state: FullfilledUseState, debug = false) {
   // Incoming state changes from hass
   watch(
     () => state.value,
-    (newEntityState) => {
+    async (newEntityState) => {
       pause();
       localValues.lastChanged = new Date(newEntityState.last_changed);
+      await nextTick();
       resume();
 
       const contextIndex = skipContexts.findIndex(
@@ -89,6 +96,7 @@ export function useNewLight(state: FullfilledUseState, debug = false) {
       pause();
       localValues.value = stringBoolToBool(newEntityState.state);
       localValues.brightness = getBrightnessFromAttribute(newEntityState);
+      await nextTick();
       resume();
     }
   );

reactive_home/src/dep.ts

@@ -26,7 +26,7 @@ export {
   watchPausable,
 } from "npm:@vueuse/[email protected]";
 
-export { watch } from "npm:@vue/[email protected]";
+export { watch, nextTick } from "npm:@vue/[email protected]";
 
 export { config as dotenvConfig } from "https://deno.land/x/[email protected]/mod.ts";
 

test-modules/lx.ts

@@ -0,0 +1,17 @@
+import { useState, computed } from "../mod.ts";
+
+/**
+ *
+ * @param entity Entity id
+ * @returns Computed lumen float value
+ */
+export function useLumen(entity: string) {
+  const state = useState(entity);
+
+  return computed(() => {
+    if (!state.value) {
+      return null;
+    }
+    return parseFloat(state.value.state);
+  });
+}

test-modules/script.arbeitszimmer.ts

@@ -9,7 +9,10 @@ import {
 
 const sunState = await useAsyncState("sun.sun");
 
-const epo = useNewBoolean(await useAsyncState("binary_sensor.occupancy_2"));
+const epo = useNewBoolean(
+  await useAsyncState("binary_sensor.occupancy_2"),
+  true
+);
 
 const motionEntrenceState = await useAsyncState(
   "binary_sensor.arbeitszimmer_eingang_bewegungsmelder_occupancy"

test-modules/script.flur.ts

@@ -0,0 +1,69 @@
+import {
+  computed,
+  useBrightness,
+  useAsyncState,
+  useNewBoolean,
+  useNewLight,
+  useLightMapping,
+  watch,
+} from "../mod.ts";
+import { useLumen } from "./lx.ts";
+
+const sunState = await useAsyncState("sun.sun");
+
+const motion1 = await useAsyncState(
+  "binary_sensor.0x00124b0025091116_occupancy"
+);
+const motion2 = await useAsyncState(
+  "binary_sensor.0x00124b0025090f28_occupancy"
+);
+
+const lx = useLumen("sensor.0xe0798dfffebf23d7_illuminance_lux");
+
+const lightState = await useAsyncState("light.flur_deckenlicht");
+
+const state = useNewLight(lightState, true);
+
+const lightShouldBeOn = computed(() => {
+  // Sun is above horizon, no light needed
+  if (sunState.value.state === "above_horizon") {
+    if (!lx.value || !state.value || lx.value > 22) {
+      if (!state.value) {
+        return false;
+      }
+    }
+  }
+
+  return motion1.value?.state === "on" || motion2.value?.state === "on";
+});
+
+watch(
+  lightShouldBeOn,
+  (lightShouldBeOn) => {
+    console.log({ lightShouldBeOn });
+  },
+  { immediate: true }
+);
+
+const brightness = useBrightness({
+  maxBrigthness: 140,
+});
+
+useLightMapping({
+  entity: state,
+  expectedValue: lightShouldBeOn,
+  expectedBrightness: brightness,
+  isDisabled: useNewBoolean(
+    await useAsyncState("input_boolean.flur_disableauto_state"),
+    true
+  ),
+  isDisabledBrightness: useNewBoolean(
+    await useAsyncState("input_boolean.flur_disableauto_brightness"),
+    true
+  ),
+  autoEnableTime: await useAsyncState("input_text.flur_disableauto_state_time"),
+  autoEnableTimeBrightness: await useAsyncState(
+    "input_text.flur_disableauto_brightness_time"
+  ),
+  debug: true,
+});