@riddix/hamh 2.1.0-alpha.526 → 2.1.0-alpha.527

package/dist/backend/cli.js

@@ -173623,8 +173623,38 @@ var PumpType = PumpDevice.with(
   PumpOnOffServer,
   PumpConfigurationAndControlServer2
 );
+var PumpWithBatteryType = PumpDevice.with(
+  IdentifyServer2,
+  BasicInformationServer2,
+  HomeAssistantEntityBehavior,
+  PumpOnOffServer,
+  PumpConfigurationAndControlServer2,
+  PowerSourceServer2({
+    getBatteryPercent: (entity, agent) => {
+      const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+      const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
+      if (batteryEntity) {
+        const stateProvider = agent.env.get(EntityStateProvider);
+        const battery = stateProvider.getBatteryPercent(batteryEntity);
+        if (battery != null) {
+          return Math.max(0, Math.min(100, battery));
+        }
+      }
+      const attrs = entity.attributes;
+      const level = attrs.battery_level ?? attrs.battery;
+      if (level == null || Number.isNaN(Number(level))) {
+        return null;
+      }
+      return Number(level);
+    }
+  })
+);
 function PumpEndpoint(homeAssistantEntity) {
-  return PumpType.set({ homeAssistantEntity });
+  const attrs = homeAssistantEntity.entity.state.attributes;
+  const hasBatteryAttr = attrs.battery_level != null || attrs.battery != null;
+  const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
+  const device = hasBatteryAttr || hasBatteryEntity ? PumpWithBatteryType : PumpType;
+  return device.set({ homeAssistantEntity });
 }
 
 // src/matter/endpoints/legacy/remote/index.ts
@@ -177644,8 +177674,37 @@ var ValveEndpointType = WaterValveDevice.with(
   HomeAssistantEntityBehavior,
   ValveServer
 );
+var ValveWithBatteryEndpointType = WaterValveDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  ValveServer,
+  PowerSourceServer2({
+    getBatteryPercent: (entity, agent) => {
+      const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+      const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
+      if (batteryEntity) {
+        const stateProvider = agent.env.get(EntityStateProvider);
+        const battery = stateProvider.getBatteryPercent(batteryEntity);
+        if (battery != null) {
+          return Math.max(0, Math.min(100, battery));
+        }
+      }
+      const attrs = entity.attributes;
+      const level = attrs.battery_level ?? attrs.battery;
+      if (level == null || Number.isNaN(Number(level))) {
+        return null;
+      }
+      return Number(level);
+    }
+  })
+);
 function ValveDevice(homeAssistantEntity) {
-  return ValveEndpointType.set({ homeAssistantEntity });
+  const attrs = homeAssistantEntity.entity.state.attributes;
+  const hasBatteryAttr = attrs.battery_level != null || attrs.battery != null;
+  const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
+  const device = hasBatteryAttr || hasBatteryEntity ? ValveWithBatteryEndpointType : ValveEndpointType;
+  return device.set({ homeAssistantEntity });
 }
 
 // src/matter/endpoints/legacy/water-heater/index.ts