@riddix/hamh 2.1.0-alpha.482 → 2.1.0-alpha.484

package/dist/backend/cli.js

@@ -166823,6 +166823,25 @@ var EntityStateProvider = class extends Service {
     }
     return value;
   }
+  /**
+   * Get battery percentage from a battery entity.
+   * Handles both numeric sensors (e.g. sensor.battery → "25.0" → 25)
+   * and binary sensors (e.g. binary_sensor.battery → off=100%, on=0%).
+   * In HA, binary_sensor with device_class=battery uses on=low battery.
+   */
+  getBatteryPercent(entityId) {
+    const state = this.getState(entityId);
+    if (!state) {
+      return null;
+    }
+    const numericValue = Number.parseFloat(state.state);
+    if (!Number.isNaN(numericValue)) {
+      return numericValue;
+    }
+    if (state.state === "off") return 100;
+    if (state.state === "on") return 0;
+    return null;
+  }
 };
 
 // src/utils/converters/temperature.ts
@@ -168010,7 +168029,7 @@ var batteryConfig = {
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) return Math.max(0, Math.min(100, battery));
     }
     return null;
@@ -168310,7 +168329,7 @@ var batteryConfig2 = {
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) return Math.max(0, Math.min(100, battery));
     }
     return null;
@@ -168876,7 +168895,7 @@ var ContactSensorWithBatteryType = ContactSensorDevice.with(
       const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
       if (batteryEntity) {
         const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getNumericState(batteryEntity);
+        const battery = stateProvider.getBatteryPercent(batteryEntity);
         if (battery != null) {
           return Math.max(0, Math.min(100, battery));
         }
@@ -168944,7 +168963,7 @@ var MotionSensorWithBatteryType = OccupancySensorDevice.with(
       const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
       if (batteryEntity) {
         const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getNumericState(batteryEntity);
+        const battery = stateProvider.getBatteryPercent(batteryEntity);
         if (battery != null) {
           return Math.max(0, Math.min(100, battery));
         }
@@ -169012,7 +169031,7 @@ var OccupancySensorWithBatteryType = OccupancySensorDevice.with(
       const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
       if (batteryEntity) {
         const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getNumericState(batteryEntity);
+        const battery = stateProvider.getBatteryPercent(batteryEntity);
         if (battery != null) {
           return Math.max(0, Math.min(100, battery));
         }
@@ -169050,7 +169069,7 @@ var OnOffSensorWithBatteryType = OnOffSensorDevice.with(
       const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
       if (batteryEntity) {
         const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getNumericState(batteryEntity);
+        const battery = stateProvider.getBatteryPercent(batteryEntity);
         if (battery != null) {
           return Math.max(0, Math.min(100, battery));
         }
@@ -169106,7 +169125,7 @@ var AlarmPowerSourceServer = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -170111,7 +170130,7 @@ var ClimatePowerSourceServer = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -170281,6 +170300,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   // Track when the last command was received to implement two-phase debounce
   lastLiftCommandTime = 0;
   lastTiltCommandTime = 0;
+  // Track lift direction to skip redundant tilt on downOrClose / upOrOpen (#246)
+  lastLiftMovementMs = 0;
+  lastLiftMovementDirection = null;
   // Store everything needed for debounced HA calls - entityId and actions service
   // must be captured before setTimeout because agent context expires after command handler
   pendingLiftAction = null;
@@ -170403,6 +170425,8 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       `handleMovement: type=${MovementType[type]}, direction=${MovementDirection[direction]}, target=${targetPercent100ths}, currentLift=${currentLift}, currentTilt=${currentTilt}, absolutePosition=${this.features.absolutePosition}`
     );
     if (type === MovementType.Lift) {
+      this.lastLiftMovementMs = Date.now();
+      this.lastLiftMovementDirection = direction;
       if (targetPercent100ths === 0) {
         this.handleLiftOpen();
       } else if (targetPercent100ths === 1e4) {
@@ -170415,6 +170439,12 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
         this.handleLiftClose();
       }
     } else if (type === MovementType.Tilt) {
+      if (targetPercent100ths == null && this.lastLiftMovementDirection === direction && Date.now() - this.lastLiftMovementMs < 50) {
+        logger175.info(
+          `Skipping tilt ${MovementDirection[direction]} \u2014 lift already moving in same direction`
+        );
+        return;
+      }
       if (targetPercent100ths === 0) {
         this.handleTiltOpen();
       } else if (targetPercent100ths === 1e4) {
@@ -170699,7 +170729,7 @@ var CoverPowerSourceServer = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -170873,7 +170903,7 @@ var FanPowerSourceServer = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -171471,7 +171501,7 @@ var LightPowerSourceServer = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -171508,7 +171538,7 @@ var LightPowerSourceServer2 = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -171558,7 +171588,7 @@ var LightPowerSourceServer3 = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -172279,7 +172309,7 @@ var LockPowerSourceServer = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -173970,7 +174000,7 @@ var batteryConfig3 = {
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -174468,7 +174498,7 @@ var batteryConfig4 = {
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -174550,7 +174580,7 @@ var batteryConfig5 = {
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -174695,7 +174725,7 @@ var SwitchWithBatteryEndpointType = OnOffPlugInUnitDevice.with(
       const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
       if (batteryEntity) {
         const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getNumericState(batteryEntity);
+        const battery = stateProvider.getBatteryPercent(batteryEntity);
         if (battery != null) {
           return Math.max(0, Math.min(100, battery));
         }
@@ -175697,7 +175727,7 @@ var VacuumPowerSourceServer = PowerSourceServer2({
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getNumericState(batteryEntity);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
       if (battery != null) {
         return Math.max(0, Math.min(100, battery));
       }
@@ -178162,6 +178192,16 @@ var BridgeRegistry = class _BridgeRegistry {
         return entity.entity_id;
       }
     }
+    for (const entity of sameDevice) {
+      if (!entity.entity_id.startsWith("binary_sensor.")) continue;
+      const state = this.registry.states[entity.entity_id];
+      if (!state) continue;
+      const attrs = state.attributes;
+      if (attrs.device_class === "battery") {
+        this._batteryEntityCache.set(deviceId, entity.entity_id);
+        return entity.entity_id;
+      }
+    }
     this._batteryEntityCache.set(deviceId, null);
     return void 0;
   }
@@ -178625,6 +178665,13 @@ var BridgeRegistry = class _BridgeRegistry {
             if (attrs.device_class === SensorDeviceClass.battery) continue;
           }
         }
+        if (entity.entity_id.startsWith("binary_sensor.")) {
+          const state = this._states[entity.entity_id];
+          if (state) {
+            const attrs = state.attributes;
+            if (attrs.device_class === "battery") continue;
+          }
+        }
         const batteryEntityId = this.findBatteryEntityForDevice(
           entity.device_id
         );