@riddix/hamh 2.1.0-alpha.551 → 2.1.0-alpha.553

package/dist/backend/cli.js

@@ -148699,6 +148699,7 @@ function entityMappingApi(mappingStorage) {
       mopIntensityEntity: body.mopIntensityEntity,
       customServiceAreas: body.customServiceAreas,
       customFanSpeedTags: body.customFanSpeedTags,
+      currentRoomEntity: body.currentRoomEntity,
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
       composedEntities: body.composedEntities
@@ -152885,11 +152886,12 @@ var EntityMappingStorage = class extends Service {
         (a) => a.name?.trim() && a.service?.trim()
       ) ?? void 0,
       customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0,
+      currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       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.valetudoIdentifier && !config10.coverSwapOpenClose && (!config10.composedEntities || config10.composedEntities.length === 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)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -175690,6 +175692,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);
@@ -175711,16 +175718,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]);
         }
       }
     }
@@ -175740,14 +175744,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;
         }
       }
@@ -175755,7 +175758,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;
         }
       }
@@ -175794,21 +175797,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
       }));
@@ -175844,7 +175846,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 {
@@ -175855,7 +175858,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)
         );
@@ -175871,7 +175876,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 {
         }