@riddix/hamh 2.1.0-alpha.556 → 2.1.0-alpha.558

package/dist/backend/cli.js

@@ -175886,19 +175886,22 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     }
     const previousMode = this.state.currentMode;
     const newMode = this.state.config.getCurrentMode(entity.state, this.agent);
-    applyPatchState(this.state, {
-      currentMode: newMode,
-      supportedModes: this.state.config.getSupportedModes(
-        entity.state,
-        this.agent
-      )
-    });
+    applyPatchState(
+      this.state,
+      {
+        currentMode: newMode,
+        supportedModes: this.state.config.getSupportedModes(
+          entity.state,
+          this.agent
+        )
+      },
+      { force: true }
+    );
     if (previousMode !== newMode) {
       if (newMode === 0 /* Idle */) {
         this.trySetCurrentArea(null);
         this.completedAreas.clear();
         this.lastCurrentArea = null;
-        this.activeAreas = [];
       } else if (newMode === 1 /* Cleaning */) {
         if (this.activeAreas.length > 0 && this.lastCurrentArea === null) {
           this.trySetCurrentArea(this.activeAreas[0]);
@@ -175923,7 +175926,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       if (!roomState || !roomState.state) return;
       if (this.activeAreas.length === 0) return;
       const serviceArea = this.agent.get(ServiceAreaBehavior);
-      const segmentId = roomState.attributes?.segment_id;
+      const sensorAttrs = roomState.attributes;
+      const segmentId = sensorAttrs.segment_id ?? sensorAttrs.room_id;
       const roomName = roomState.state;
       let matchedAreaId = null;
       if (segmentId != null) {
@@ -175939,7 +175943,12 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           matchedAreaId = area.areaId;
         }
       }
-      if (matchedAreaId === null) return;
+      if (matchedAreaId === null) {
+        logger189.debug(
+          `currentRoom sensor: no match for "${roomName}" (segmentId=${segmentId}), activeAreas=[${this.activeAreas.join(", ")}]`
+        );
+        return;
+      }
       if (matchedAreaId === this.lastCurrentArea) return;
       if (this.lastCurrentArea !== null) {
         this.completedAreas.add(this.lastCurrentArea);
@@ -176063,6 +176072,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }
       case 0 /* Idle */:
         this.trySetCurrentArea(null);
+        this.completedAreas.clear();
+        this.lastCurrentArea = null;
+        this.activeAreas = [];
         homeAssistant.callAction(
           this.state.config.returnToBase(void 0, this.agent)
         );
@@ -176684,7 +176696,8 @@ var vacuumRvcRunModeConfig = {
       VacuumState.segment_cleaning,
       VacuumState.zone_cleaning,
       VacuumState.spot_cleaning,
-      VacuumState.mop_cleaning
+      VacuumState.mop_cleaning,
+      VacuumState.paused
     ];
     const isCleaning = cleaningStates.includes(state);
     logger192.debug(
@@ -177863,12 +177876,16 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
       this.agent
     );
     const previousState = this.state.operationalState;
-    applyPatchState(this.state, {
-      operationalState: newState,
-      operationalError: {
-        errorStateId: newState === OperationalState4.Error ? ErrorState.Stuck : ErrorState.NoError
-      }
-    });
+    applyPatchState(
+      this.state,
+      {
+        operationalState: newState,
+        operationalError: {
+          errorStateId: newState === OperationalState4.Error ? ErrorState.Stuck : ErrorState.NoError
+        }
+      },
+      { force: true }
+    );
     if (activeStates.has(previousState) && !activeStates.has(newState)) {
       logger195.info(
         `Operation completed: ${OperationalState4[previousState]} -> ${OperationalState4[newState]}`
@@ -177974,7 +177991,7 @@ var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
       if (isCharging(entity)) {
         operationalState = RvcOperationalState3.OperationalState.Charging;
       } else {
-        operationalState = RvcOperationalState3.OperationalState.Paused;
+        operationalState = RvcOperationalState3.OperationalState.Stopped;
       }
     } else if (state === VacuumState.error || state === "unavailable") {
       operationalState = RvcOperationalState3.OperationalState.Error;
@@ -177985,8 +178002,8 @@ var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
         );
         operationalState = RvcOperationalState3.OperationalState.Running;
       } else {
-        logger196.info(`Unknown vacuum state "${state}", treating as Paused`);
-        operationalState = RvcOperationalState3.OperationalState.Paused;
+        logger196.info(`Unknown vacuum state "${state}", treating as Stopped`);
+        operationalState = RvcOperationalState3.OperationalState.Stopped;
       }
     }
     logger196.debug(
@@ -181088,6 +181105,8 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
   }
   lastState;
   pendingMappedChange = false;
+  /** Timestamp of the last non-empty state push to matter.js */
+  lastNonEmptyPush = Date.now();
   flushUpdate;
   constructor(type, entityId, customName, mappedEntityIds) {
     super(type, entityId, customName, mappedEntityIds);
@@ -181100,8 +181119,16 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
   async updateStates(states) {
     const state = states[this.entityId] ?? {};
     const mappedChanged = this.hasMappedEntityChanged(states);
-    if (!mappedChanged && state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
-      return;
+    const stateUnchanged = !mappedChanged && state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes);
+    if (stateUnchanged) {
+      const now = Date.now();
+      if (now - this.lastNonEmptyPush < 6e4) {
+        return;
+      }
+      this.lastNonEmptyPush = now;
+      this.pendingMappedChange = true;
+    } else {
+      this.lastNonEmptyPush = Date.now();
     }
     if (mappedChanged) {
       this.pendingMappedChange = true;