@riddix/hamh 2.1.0-alpha.573 → 2.1.0-alpha.575

package/dist/backend/cli.js

@@ -175948,21 +175948,21 @@ var ROOM_MODE_BASE = 100;
 function isRoomMode(mode) {
   return mode >= ROOM_MODE_BASE;
 }
+var cleaningSessions = /* @__PURE__ */ new WeakMap();
+function getSession(agent) {
+  let session = cleaningSessions.get(agent);
+  if (!session) {
+    session = {
+      completedAreas: /* @__PURE__ */ new Set(),
+      lastCurrentArea: null,
+      activeAreas: [],
+      loggedShortCircuits: /* @__PURE__ */ new Set()
+    };
+    cleaningSessions.set(agent, session);
+  }
+  return session;
+}
 var RvcRunModeServerBase = class extends RvcRunModeServer {
-  /** Areas that the vacuum has already finished cleaning in this session */
-  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 = [];
-  /** Diagnostic short-circuit reasons already logged this session.
-   *  updateCurrentRoomFromSensor() is called on every HA state event;
-   *  without this guard a failing path would flood the log. Cleared
-   *  when the vacuum returns to Idle. */
-  loggedShortCircuits = /* @__PURE__ */ new Set();
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -175973,6 +175973,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     if (!entity.state || !entity.state.attributes) {
       return;
     }
+    const s = getSession(this.agent);
     const previousMode = this.state.currentMode;
     const newMode = this.state.config.getCurrentMode(entity.state, this.agent);
     applyPatchState(
@@ -175989,12 +175990,12 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     if (previousMode !== newMode) {
       if (newMode === 0 /* Idle */) {
         this.trySetCurrentArea(null);
-        this.completedAreas.clear();
-        this.lastCurrentArea = null;
-        this.loggedShortCircuits.clear();
+        s.completedAreas.clear();
+        s.lastCurrentArea = null;
+        s.loggedShortCircuits.clear();
       } else if (newMode === 1 /* Cleaning */) {
-        if (this.activeAreas.length > 0 && this.lastCurrentArea === null) {
-          this.trySetCurrentArea(this.activeAreas[0]);
+        if (s.activeAreas.length > 0 && s.lastCurrentArea === null) {
+          this.trySetCurrentArea(s.activeAreas[0]);
         }
       }
     }
@@ -176008,8 +176009,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
    * surfacing the silent paths that would otherwise be invisible.
    */
   logShortCircuitOnce(reason, message) {
-    if (this.loggedShortCircuits.has(reason)) return;
-    this.loggedShortCircuits.add(reason);
+    const s = getSession(this.agent);
+    if (s.loggedShortCircuits.has(reason)) return;
+    s.loggedShortCircuits.add(reason);
     logger189.info(message);
   }
   /**
@@ -176018,6 +176020,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
    */
   updateCurrentRoomFromSensor() {
     try {
+      const s = getSession(this.agent);
       const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
       const currentRoomEntityId = homeAssistant.state.mapping?.currentRoomEntity;
       if (!currentRoomEntityId) {
@@ -176036,7 +176039,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         );
         return;
       }
-      if (this.activeAreas.length === 0) {
+      if (s.activeAreas.length === 0) {
         this.logShortCircuitOnce(
           "no-active-areas",
           `currentRoom sensor: activeAreas empty while cleaning \u2014 sensor=${currentRoomEntityId} state="${roomState.state}"`
@@ -176049,13 +176052,13 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       const roomName = roomState.state;
       let matchedAreaId = null;
       if (segmentId != null) {
-        if (this.activeAreas.includes(segmentId)) {
+        if (s.activeAreas.includes(segmentId)) {
           matchedAreaId = segmentId;
         }
       }
       if (matchedAreaId === null && segmentId != null) {
         for (const area of serviceArea.state.supportedAreas) {
-          if (this.activeAreas.includes(area.areaId) && area.areaId % 1e4 === segmentId) {
+          if (s.activeAreas.includes(area.areaId) && area.areaId % 1e4 === segmentId) {
             matchedAreaId = area.areaId;
             break;
           }
@@ -176065,23 +176068,23 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         const area = serviceArea.state.supportedAreas.find(
           (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
         );
-        if (area && this.activeAreas.includes(area.areaId)) {
+        if (area && s.activeAreas.includes(area.areaId)) {
           matchedAreaId = area.areaId;
         }
       }
       if (matchedAreaId === null) {
         logger189.info(
-          `currentRoom sensor: no match for "${roomName}" (segmentId=${segmentId}), activeAreas=[${this.activeAreas.join(", ")}], supportedAreas=[${serviceArea.state.supportedAreas.map((a) => `${a.areaId}:${a.areaInfo.locationInfo?.locationName}`).join(", ")}]`
+          `currentRoom sensor: no match for "${roomName}" (segmentId=${segmentId}), activeAreas=[${s.activeAreas.join(", ")}], supportedAreas=[${serviceArea.state.supportedAreas.map((a) => `${a.areaId}:${a.areaInfo.locationInfo?.locationName}`).join(", ")}]`
         );
         return;
       }
-      if (matchedAreaId === this.lastCurrentArea) return;
-      if (this.lastCurrentArea !== null) {
-        this.completedAreas.add(this.lastCurrentArea);
+      if (matchedAreaId === s.lastCurrentArea) return;
+      if (s.lastCurrentArea !== null) {
+        s.completedAreas.add(s.lastCurrentArea);
       }
-      this.lastCurrentArea = matchedAreaId;
+      s.lastCurrentArea = matchedAreaId;
       logger189.info(
-        `currentRoom sensor: transition to area ${matchedAreaId} ("${roomName}"), completed: [${[...this.completedAreas].join(", ")}]`
+        `currentRoom sensor: transition to area ${matchedAreaId} ("${roomName}"), completed: [${[...s.completedAreas].join(", ")}]`
       );
       this.trySetCurrentArea(matchedAreaId);
     } catch (e) {
@@ -176118,17 +176121,18 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
    * matter.js property getters during transaction pre-commit.
    */
   updateProgress(serviceArea, areaId) {
-    if (this.activeAreas.length === 0) return;
+    const s = getSession(this.agent);
+    if (s.activeAreas.length === 0) return;
     const state = serviceArea.state;
     if (areaId === null) {
-      state.progress = this.activeAreas.map((id) => ({
+      state.progress = s.activeAreas.map((id) => ({
         areaId: id,
         status: ServiceArea3.OperationalStatus.Completed
       }));
     } else {
-      state.progress = this.activeAreas.map((id) => ({
+      state.progress = s.activeAreas.map((id) => ({
         areaId: id,
-        status: id === areaId ? ServiceArea3.OperationalStatus.Operating : this.completedAreas.has(id) ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Pending
+        status: id === areaId ? ServiceArea3.OperationalStatus.Operating : s.completedAreas.has(id) ? ServiceArea3.OperationalStatus.Completed : ServiceArea3.OperationalStatus.Pending
       }));
     }
   }
@@ -176150,6 +176154,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     }
   }
   changeToMode(request) {
+    const s = getSession(this.agent);
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const { newMode } = request;
     if (newMode !== this.state.currentMode && !this.state.supportedModes.some((m) => m.mode === newMode)) {
@@ -176162,8 +176167,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       try {
         const serviceArea = this.agent.get(ServiceAreaBehavior);
         if (serviceArea.state.selectedAreas?.length > 0) {
-          this.activeAreas = [...serviceArea.state.selectedAreas];
-          this.trySetCurrentArea(this.activeAreas[0]);
+          s.activeAreas = [...serviceArea.state.selectedAreas];
+          this.trySetCurrentArea(s.activeAreas[0]);
           homeAssistant.callAction(this.state.config.start(void 0, this.agent));
           this.state.currentMode = newMode;
           return {
@@ -176175,7 +176180,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }
       if (this.state.config.cleanRoom) {
         const areaId = this.findAreaIdForMode(newMode);
-        this.activeAreas = areaId !== null ? [areaId] : [];
+        s.activeAreas = areaId !== null ? [areaId] : [];
         this.trySetCurrentArea(areaId);
         homeAssistant.callAction(
           this.state.config.cleanRoom(newMode, this.agent)
@@ -176192,8 +176197,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         try {
           const serviceArea = this.agent.get(ServiceAreaBehavior);
           if (serviceArea.state.selectedAreas?.length > 0) {
-            this.activeAreas = [...serviceArea.state.selectedAreas];
-            this.trySetCurrentArea(this.activeAreas[0]);
+            s.activeAreas = [...serviceArea.state.selectedAreas];
+            this.trySetCurrentArea(s.activeAreas[0]);
           }
         } catch {
         }
@@ -176202,9 +176207,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }
       case 0 /* Idle */:
         this.trySetCurrentArea(null);
-        this.completedAreas.clear();
-        this.lastCurrentArea = null;
-        this.activeAreas = [];
+        s.completedAreas.clear();
+        s.lastCurrentArea = null;
+        s.activeAreas = [];
         homeAssistant.callAction(
           this.state.config.returnToBase(void 0, this.agent)
         );
@@ -177986,21 +177991,6 @@ var advertisedOperationalStates = [
   OperationalState4.Docked
 ];
 var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
-  /**
-   * Alternating nonce that forces a structural difference in operationalError
-   * on every update call.  matter.js's Datasource uses isDeepEqual to detect
-   * attribute changes — writing the same value is silently ignored, so no
-   * subscription report is generated.  By toggling errorStateDetails between
-   * absent and "" (an optional, semantically meaningless field when
-   * errorStateId is NoError), we guarantee the struct is never deep-equal to
-   * its predecessor, which makes matter.js emit attrsChanged and produce a
-   * subscription report.
-   *
-   * This works around a matter.js 0.16.x bug where the subscription
-   * heartbeat timer (sendInterval) fails to fire for certain sessions,
-   * causing Apple Home (iOS via Apple TV proxy) to show "Updating...".
-   */
-  keepaliveNonce = false;
   async initialize() {
     this.state.operationalStateList = advertisedOperationalStates.map((id) => ({
       operationalStateId: id
@@ -178021,12 +178011,11 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
       this.agent
     );
     const previousState = this.state.operationalState;
-    this.keepaliveNonce = !this.keepaliveNonce;
     const errorStateId = newState === OperationalState4.Error ? ErrorState.Stuck : ErrorState.NoError;
-    const operationalError = { errorStateId };
-    if (this.keepaliveNonce) {
-      operationalError.errorStateDetails = "";
-    }
+    const operationalError = {
+      errorStateId,
+      errorStateDetails: String(Date.now())
+    };
     applyPatchState(
       this.state,
       {