@riddix/hamh 2.1.0-alpha.552 → 2.1.0-alpha.554

package/dist/backend/cli.js

@@ -152869,6 +152869,8 @@ var EntityMappingStorage = class extends Service {
       entityId: request.entityId,
       matterDeviceType: request.matterDeviceType,
       customName: request.customName?.trim() || void 0,
+      customProductName: request.customProductName?.trim() || void 0,
+      customVendorName: request.customVendorName?.trim() || void 0,
       disabled: request.disabled,
       filterLifeEntity: request.filterLifeEntity?.trim() || void 0,
       cleaningModeEntity: request.cleaningModeEntity?.trim() || void 0,
@@ -152891,7 +152893,7 @@ var EntityMappingStorage = class extends Service {
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && (!config10.composedEntities || config10.composedEntities.length === 0)) {
+    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && (!config10.composedEntities || config10.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -167787,10 +167789,11 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
     const { basicInformation } = this.env.get(BridgeDataProvider);
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const device = entity.deviceRegistry;
+    const mapping = homeAssistant.state.mapping;
     applyPatchState(this.state, {
       vendorId: VendorId(basicInformation.vendorId),
-      vendorName: ellipse(32, device?.manufacturer) ?? hash(32, basicInformation.vendorName),
-      productName: ellipse(32, device?.model_id) ?? ellipse(32, device?.model) ?? hash(32, basicInformation.productName),
+      vendorName: ellipse(32, mapping?.customVendorName) ?? ellipse(32, device?.manufacturer) ?? hash(32, basicInformation.vendorName),
+      productName: ellipse(32, mapping?.customProductName) ?? ellipse(32, device?.model_id) ?? ellipse(32, device?.model) ?? hash(32, basicInformation.productName),
       productLabel: ellipse(64, device?.model) ?? hash(64, basicInformation.productLabel),
       hardwareVersion: basicInformation.hardwareVersion,
       softwareVersion: basicInformation.softwareVersion,
@@ -175692,6 +175695,11 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
   completedAreas = /* @__PURE__ */ new Set();
   /** Last known currentArea — used to detect room transitions */
   lastCurrentArea = null;
+  /** Snapshot of selectedAreas taken when cleaning starts.
+   *  The start handler clears serviceArea.state.selectedAreas after
+   *  dispatching the HA action to prevent re-dispatch, but progress
+   *  tracking needs the original list for the entire cleaning session. */
+  activeAreas = [];
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -175713,16 +175721,13 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     });
     if (previousMode !== newMode) {
       if (newMode === 0 /* Idle */) {
+        this.trySetCurrentArea(null);
         this.completedAreas.clear();
         this.lastCurrentArea = null;
-        this.trySetCurrentArea(null);
+        this.activeAreas = [];
       } else if (newMode === 1 /* Cleaning */) {
-        try {
-          const serviceArea = this.agent.get(ServiceAreaBehavior);
-          if (serviceArea.state.selectedAreas?.length > 0 && serviceArea.state.currentArea === null) {
-            this.trySetCurrentArea(serviceArea.state.selectedAreas[0]);
-          }
-        } catch {
+        if (this.activeAreas.length > 0 && this.lastCurrentArea === null) {
+          this.trySetCurrentArea(this.activeAreas[0]);
         }
       }
     }
@@ -175742,14 +175747,13 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       const stateProvider = this.agent.env.get(EntityStateProvider);
       const roomState = stateProvider.getState(currentRoomEntityId);
       if (!roomState || !roomState.state) return;
+      if (this.activeAreas.length === 0) return;
       const serviceArea = this.agent.get(ServiceAreaBehavior);
-      const selectedAreas = serviceArea.state.selectedAreas;
-      if (!selectedAreas || selectedAreas.length === 0) return;
       const segmentId = roomState.attributes?.segment_id;
       const roomName = roomState.state;
       let matchedAreaId = null;
       if (segmentId != null) {
-        if (selectedAreas.includes(segmentId)) {
+        if (this.activeAreas.includes(segmentId)) {
           matchedAreaId = segmentId;
         }
       }
@@ -175757,7 +175761,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         const area = serviceArea.state.supportedAreas.find(
           (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
         );
-        if (area && selectedAreas.includes(area.areaId)) {
+        if (area && this.activeAreas.includes(area.areaId)) {
           matchedAreaId = area.areaId;
         }
       }
@@ -175796,21 +175800,20 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
    * - null: mark all areas as Completed (cleaning done)
    * - areaId: mark that area as Operating, others as Pending
    *
-   * Rebuilds progress from selectedAreas (plain number array) instead of
-   * reading managed state progress entries, which avoids infinite recursion
-   * in matter.js property getters during transaction pre-commit.
+   * Uses the activeAreas snapshot (plain number array) instead of
+   * managed state entries, which avoids infinite recursion in
+   * matter.js property getters during transaction pre-commit.
    */
   updateProgress(serviceArea, areaId) {
+    if (this.activeAreas.length === 0) return;
     const state = serviceArea.state;
-    const selectedAreas = serviceArea.state.selectedAreas;
-    if (!selectedAreas || selectedAreas.length === 0) return;
     if (areaId === null) {
-      state.progress = selectedAreas.map((id) => ({
+      state.progress = this.activeAreas.map((id) => ({
         areaId: id,
         status: ServiceArea3.OperationalStatus.Completed
       }));
     } else {
-      state.progress = selectedAreas.map((id) => ({
+      state.progress = this.activeAreas.map((id) => ({
         areaId: id,
         status: id === areaId ? ServiceArea3.OperationalStatus.Operating : this.completedAreas.has(id) ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Pending
       }));
@@ -175846,7 +175849,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       try {
         const serviceArea = this.agent.get(ServiceAreaBehavior);
         if (serviceArea.state.selectedAreas?.length > 0) {
-          this.trySetCurrentArea(serviceArea.state.selectedAreas[0]);
+          this.activeAreas = [...serviceArea.state.selectedAreas];
+          this.trySetCurrentArea(this.activeAreas[0]);
           homeAssistant.callAction(this.state.config.start(void 0, this.agent));
           this.state.currentMode = newMode;
           return {
@@ -175857,7 +175861,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       } catch {
       }
       if (this.state.config.cleanRoom) {
-        this.trySetCurrentArea(this.findAreaIdForMode(newMode));
+        const areaId = this.findAreaIdForMode(newMode);
+        this.activeAreas = areaId !== null ? [areaId] : [];
+        this.trySetCurrentArea(areaId);
         homeAssistant.callAction(
           this.state.config.cleanRoom(newMode, this.agent)
         );
@@ -175873,7 +175879,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         try {
           const serviceArea = this.agent.get(ServiceAreaBehavior);
           if (serviceArea.state.selectedAreas?.length > 0) {
-            this.trySetCurrentArea(serviceArea.state.selectedAreas[0]);
+            this.activeAreas = [...serviceArea.state.selectedAreas];
+            this.trySetCurrentArea(this.activeAreas[0]);
           }
         } catch {
         }
@@ -178193,18 +178200,10 @@ var deviceCtrs = {
   event: EventDevice
 };
 var matterDeviceTypeFactories = {
-  on_off_light: (ha) => OnOffLightType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  dimmable_light: (ha) => DimmableLightType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  color_temperature_light: (ha) => ColorTemperatureLightType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  extended_color_light: (ha) => ExtendedColorLightType(true, true).set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
+  on_off_light: (ha) => OnOffLightType.set({ homeAssistantEntity: ha }),
+  dimmable_light: (ha) => DimmableLightType.set({ homeAssistantEntity: ha }),
+  color_temperature_light: (ha) => ColorTemperatureLightType.set({ homeAssistantEntity: ha }),
+  extended_color_light: (ha) => ExtendedColorLightType(true, true).set({ homeAssistantEntity: ha }),
   on_off_plugin_unit: (ha) => {
     const domain = ha.entity.entity_id.split(".")[0];
     if (domain === "alarm_control_panel") {
@@ -178212,9 +178211,7 @@ var matterDeviceTypeFactories = {
     }
     return SwitchDevice(ha);
   },
-  dimmable_plugin_unit: (ha) => DimmablePlugInUnitType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
+  dimmable_plugin_unit: (ha) => DimmablePlugInUnitType.set({ homeAssistantEntity: ha }),
   on_off_switch: SwitchDevice,
   door_lock: LockDevice,
   window_covering: CoverDevice,
@@ -178225,77 +178222,33 @@ var matterDeviceTypeFactories = {
   humidifier_dehumidifier: HumidifierDevice,
   speaker: MediaPlayerDevice,
   basic_video_player: VideoPlayerDevice,
-  humidity_sensor: (ha) => HumiditySensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  temperature_sensor: (ha) => TemperatureSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  pressure_sensor: (ha) => PressureSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  light_sensor: (ha) => IlluminanceSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  flow_sensor: (ha) => FlowSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  air_quality_sensor: (ha) => AirQualitySensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  battery_storage: (ha) => BatterySensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  tvoc_sensor: (ha) => TvocSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  carbon_monoxide_sensor: (ha) => CarbonMonoxideSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  nitrogen_dioxide_sensor: (ha) => NitrogenDioxideSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  ozone_sensor: (ha) => OzoneSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  formaldehyde_sensor: (ha) => FormaldehydeSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  radon_sensor: (ha) => RadonSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  pm1_sensor: (ha) => Pm1SensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  electrical_sensor: (ha) => ElectricalSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  contact_sensor: (ha) => ContactSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  motion_sensor: (ha) => MotionSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  occupancy_sensor: (ha) => OccupancySensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
+  humidity_sensor: (ha) => HumiditySensorType.set({ homeAssistantEntity: ha }),
+  temperature_sensor: (ha) => TemperatureSensorType.set({ homeAssistantEntity: ha }),
+  pressure_sensor: (ha) => PressureSensorType.set({ homeAssistantEntity: ha }),
+  light_sensor: (ha) => IlluminanceSensorType.set({ homeAssistantEntity: ha }),
+  flow_sensor: (ha) => FlowSensorType.set({ homeAssistantEntity: ha }),
+  air_quality_sensor: (ha) => AirQualitySensorType.set({ homeAssistantEntity: ha }),
+  battery_storage: (ha) => BatterySensorType.set({ homeAssistantEntity: ha }),
+  tvoc_sensor: (ha) => TvocSensorType.set({ homeAssistantEntity: ha }),
+  carbon_monoxide_sensor: (ha) => CarbonMonoxideSensorType.set({ homeAssistantEntity: ha }),
+  nitrogen_dioxide_sensor: (ha) => NitrogenDioxideSensorType.set({ homeAssistantEntity: ha }),
+  ozone_sensor: (ha) => OzoneSensorType.set({ homeAssistantEntity: ha }),
+  formaldehyde_sensor: (ha) => FormaldehydeSensorType.set({ homeAssistantEntity: ha }),
+  radon_sensor: (ha) => RadonSensorType.set({ homeAssistantEntity: ha }),
+  pm1_sensor: (ha) => Pm1SensorType.set({ homeAssistantEntity: ha }),
+  electrical_sensor: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
+  contact_sensor: (ha) => ContactSensorType.set({ homeAssistantEntity: ha }),
+  motion_sensor: (ha) => MotionSensorType.set({ homeAssistantEntity: ha }),
+  occupancy_sensor: (ha) => OccupancySensorType.set({ homeAssistantEntity: ha }),
   mode_select: SelectDevice,
   water_valve: ValveDevice,
   pump: PumpEndpoint,
-  rain_sensor: (ha) => RainSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
+  rain_sensor: (ha) => RainSensorType.set({ homeAssistantEntity: ha }),
   water_heater: WaterHeaterDevice,
   generic_switch: EventDevice,
-  smoke_co_alarm: (ha) => SmokeAlarmType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  water_freeze_detector: (ha) => WaterFreezeDetectorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  water_leak_detector: (ha) => WaterLeakDetectorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  })
+  smoke_co_alarm: (ha) => SmokeAlarmType.set({ homeAssistantEntity: ha }),
+  water_freeze_detector: (ha) => WaterFreezeDetectorType.set({ homeAssistantEntity: ha }),
+  water_leak_detector: (ha) => WaterLeakDetectorType.set({ homeAssistantEntity: ha })
 };
 
 // src/matter/endpoints/composed/user-composed-endpoint.ts