@riddix/hamh 2.1.0-alpha.481 → 2.1.0-alpha.483

package/dist/backend/cli.js

@@ -168891,6 +168891,74 @@ var ContactSensorWithBatteryType = ContactSensorDevice.with(
   })
 );
 
+// src/matter/endpoints/legacy/binary-sensor/motion-sensor.ts
+init_home_assistant_entity_behavior();
+
+// src/matter/behaviors/pir-occupancy-sensing-server.ts
+init_home_assistant_entity_behavior();
+var PirOccupancySensingServerBase = OccupancySensingServer.with(
+  OccupancySensing3.Feature.PassiveInfrared
+);
+var PirOccupancySensingServer = class extends PirOccupancySensingServerBase {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update);
+  }
+  update(entity) {
+    if (!entity.state) {
+      return;
+    }
+    const { state } = entity;
+    applyPatchState(this.state, {
+      occupancy: { occupied: this.isOccupied(state) },
+      occupancySensorType: OccupancySensing3.OccupancySensorType.Pir,
+      occupancySensorTypeBitmap: {
+        pir: true,
+        physicalContact: false,
+        ultrasonic: false
+      }
+    });
+  }
+  isOccupied(state) {
+    return this.agent.get(HomeAssistantEntityBehavior).isAvailable && state.state !== "off";
+  }
+};
+
+// src/matter/endpoints/legacy/binary-sensor/motion-sensor.ts
+var MotionSensorType = OccupancySensorDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  PirOccupancySensingServer
+);
+var MotionSensorWithBatteryType = OccupancySensorDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  PirOccupancySensingServer,
+  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.getNumericState(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);
+    }
+  })
+);
+
 // src/matter/endpoints/legacy/binary-sensor/occupancy-sensor.ts
 init_home_assistant_entity_behavior();
 
@@ -169121,8 +169189,8 @@ var deviceClasses = {
   [BinarySensorDeviceClass.Update]: ContactSensorType,
   [BinarySensorDeviceClass.Vibration]: ContactSensorType,
   [BinarySensorDeviceClass.Window]: ContactSensorType,
-  [BinarySensorDeviceClass.Motion]: OccupancySensorType,
-  [BinarySensorDeviceClass.Moving]: OccupancySensorType,
+  [BinarySensorDeviceClass.Motion]: MotionSensorType,
+  [BinarySensorDeviceClass.Moving]: MotionSensorType,
   [BinarySensorDeviceClass.Occupancy]: OccupancySensorType,
   [BinarySensorDeviceClass.Presence]: OccupancySensorType,
   [BinarySensorDeviceClass.Smoke]: SmokeAlarmType,
@@ -169130,6 +169198,7 @@ var deviceClasses = {
 };
 var batteryTypes = /* @__PURE__ */ new Map([
   [ContactSensorType, ContactSensorWithBatteryType],
+  [MotionSensorType, MotionSensorWithBatteryType],
   [OccupancySensorType, OccupancySensorWithBatteryType],
   [OnOffSensorType, OnOffSensorWithBatteryType],
   [SmokeAlarmType, SmokeAlarmWithBatteryType],
@@ -170212,6 +170281,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;
@@ -170334,6 +170406,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) {
@@ -170346,6 +170420,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) {
@@ -177000,6 +177080,9 @@ var matterDeviceTypeFactories = {
   electrical_sensor: (ha) => ElectricalSensorType.set({
     homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
   }),
+  motion_sensor: (ha) => MotionSensorType.set({
+    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
+  }),
   mode_select: SelectDevice,
   water_valve: ValveDevice,
   pump: PumpEndpoint,