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

package/dist/backend/cli.js

@@ -146701,12 +146701,6 @@ var init_bridge_config_schema = __esm({
           type: "boolean",
           default: false
         },
-        alexaPreserveBrightnessOnTurnOn: {
-          title: "Alexa: Preserve Brightness on Turn-On (Deprecated)",
-          description: "This workaround is now always active and this setting has no effect. The bridge automatically ignores brightness commands that set lights to 100% immediately after a turn-on command.",
-          type: "boolean",
-          default: true
-        },
         serverMode: {
           title: "Server Mode (for Robot Vacuums)",
           description: "Expose the device as a standalone Matter device instead of a bridged device. This is required for Apple Home to properly support Siri voice commands for Robot Vacuums. IMPORTANT: Only ONE device should be in this bridge when server mode is enabled.",
@@ -146747,12 +146741,6 @@ var init_bridge_config_schema = __esm({
           title: "Vacuum: Include OnOff Cluster (Alexa)",
           description: "Add an OnOff cluster to robot vacuum endpoints. Alexa REQUIRES this (PowerController) to show robotic vacuums in the app. Without it, Alexa commissions the device but never displays it. In Server Mode this is enabled automatically \u2014 only check this for bridge mode. WARNING: OnOff is NOT part of the Matter RVC device type specification. Enabling this may break Apple Home (shows 'Updating') and Google Home.",
           type: "boolean"
-        },
-        vacuumMinimalClusters: {
-          title: "Vacuum: Minimal Clusters (Alexa troubleshooting)",
-          description: "Strip the vacuum endpoint to only the clusters required by the Matter RVC spec. Removes PowerSource (battery) and the default ServiceArea placeholder. Enable this if Alexa commissions the vacuum but the device never appears in the app. Trade-off: battery percentage will not be reported to Matter controllers.",
-          type: "boolean",
-          default: false
         }
       },
       additionalProperties: false
@@ -168903,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();
 
@@ -169133,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,
@@ -169142,6 +169198,7 @@ var deviceClasses = {
 };
 var batteryTypes = /* @__PURE__ */ new Map([
   [ContactSensorType, ContactSensorWithBatteryType],
+  [MotionSensorType, MotionSensorWithBatteryType],
   [OccupancySensorType, OccupancySensorWithBatteryType],
   [OnOffSensorType, OnOffSensorWithBatteryType],
   [SmokeAlarmType, SmokeAlarmWithBatteryType],
@@ -176609,7 +176666,7 @@ var VacuumEndpointType = RoboticVacuumCleanerDevice.with(
   HomeAssistantEntityBehavior,
   VacuumRvcOperationalStateServer
 );
-function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters = false, cleaningModeOptions) {
+function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOptions) {
   if (homeAssistantEntity.entity.state === void 0) {
     return void 0;
   }
@@ -176630,9 +176687,7 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters
     logger196.info(`${entityId}: Adding OnOff cluster (vacuumOnOff flag enabled)`);
     device = device.with(VacuumOnOffServer);
   }
-  if (!minimalClusters) {
-    device = device.with(VacuumPowerSourceServer);
-  }
+  device = device.with(VacuumPowerSourceServer);
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes7);
   logger196.info(
@@ -176648,11 +176703,9 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters
     device = device.with(
       createVacuumServiceAreaServer(attributes7, roomEntities)
     );
-  } else if (!minimalClusters) {
+  } else {
     logger196.info(`${entityId}: Adding ServiceArea (default single-area)`);
     device = device.with(createDefaultServiceAreaServer());
-  } else {
-    logger196.info(`${entityId}: Skipping ServiceArea (minimal clusters mode)`);
   }
   const fanSpeedList = resolveFanSpeedList(
     attributes7,
@@ -176882,7 +176935,6 @@ function createLegacyEndpointType(entity, mapping, areaName, options) {
       type = VacuumDevice(
         { entity, customName, mapping },
         options?.vacuumOnOff,
-        options?.vacuumMinimalClusters,
         options?.cleaningModeOptions
       );
     } else {
@@ -177017,6 +177069,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,
@@ -177305,7 +177360,6 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     const areaName = registry2.getAreaName(entityId);
     const type = createLegacyEndpointType(payload, effectiveMapping, areaName, {
       vacuumOnOff: registry2.isVacuumOnOffEnabled(),
-      vacuumMinimalClusters: registry2.isVacuumMinimalClustersEnabled(),
       cleaningModeOptions
     });
     if (!type) {
@@ -178255,9 +178309,6 @@ var BridgeRegistry = class _BridgeRegistry {
   isServerModeVacuumOnOffEnabled() {
     return this.dataProvider.featureFlags?.vacuumOnOff === true;
   }
-  isVacuumMinimalClustersEnabled() {
-    return this.dataProvider.featureFlags?.vacuumMinimalClusters === true;
-  }
   /**
    * Auto-detect vacuum-related select entities on the same HA device.
    * HA integrations (Dreame, Roborock, Ecovacs, Valetudo, etc.) expose vacuum
@@ -178973,7 +179024,7 @@ var ServerModeVacuumEndpointType = RoboticVacuumCleanerDevice.with(
   HomeAssistantEntityBehavior,
   VacuumRvcOperationalStateServer
 );
-function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters = false, cleaningModeOptions) {
+function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOptions) {
   if (homeAssistantEntity.entity.state === void 0) {
     return void 0;
   }
@@ -178984,9 +179035,7 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, minim
   if (includeOnOff) {
     device = device.with(VacuumOnOffServer);
   }
-  if (!minimalClusters) {
-    device = device.with(VacuumPowerSourceServer);
-  }
+  device = device.with(VacuumPowerSourceServer);
   const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes7);
@@ -178996,7 +179045,7 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, minim
     device = device.with(
       createVacuumServiceAreaServer(attributes7, roomEntities)
     );
-  } else if (!minimalClusters) {
+  } else {
     device = device.with(createDefaultServiceAreaServer());
   }
   const fanSpeedList = resolveFanSpeedList(
@@ -179161,7 +179210,6 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
         mapping: effectiveMapping
       },
       registry2.isServerModeVacuumOnOffEnabled(),
-      registry2.isVacuumMinimalClustersEnabled(),
       cleaningModeOptions
     );
     if (!endpointType) {