@riddix/hamh 2.1.0-alpha.559 → 2.1.0-alpha.561

package/dist/backend/cli.js

@@ -175935,6 +175935,14 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
           matchedAreaId = segmentId;
         }
       }
+      if (matchedAreaId === null && segmentId != null) {
+        for (const area of serviceArea.state.supportedAreas) {
+          if (this.activeAreas.includes(area.areaId) && area.areaId % 1e4 === segmentId) {
+            matchedAreaId = area.areaId;
+            break;
+          }
+        }
+      }
       if (matchedAreaId === null && roomName) {
         const area = serviceArea.state.supportedAreas.find(
           (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
@@ -175944,8 +175952,8 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         }
       }
       if (matchedAreaId === null) {
-        logger189.debug(
-          `currentRoom sensor: no match for "${roomName}" (segmentId=${segmentId}), activeAreas=[${this.activeAreas.join(", ")}]`
+        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(", ")}]`
         );
         return;
       }
@@ -175954,11 +175962,15 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         this.completedAreas.add(this.lastCurrentArea);
       }
       this.lastCurrentArea = matchedAreaId;
-      logger189.debug(
-        `currentRoom sensor: area ${matchedAreaId} ("${roomName}"), completed: [${[...this.completedAreas].join(", ")}]`
+      logger189.info(
+        `currentRoom sensor: transition to area ${matchedAreaId} ("${roomName}"), completed: [${[...this.completedAreas].join(", ")}]`
       );
       this.trySetCurrentArea(matchedAreaId);
-    } catch {
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      if (!msg.includes("No provider for") && !msg.includes("not supported")) {
+        logger189.warn(`currentRoom sensor update failed: ${msg}`);
+      }
     }
   }
   /**
@@ -177856,6 +177868,21 @@ 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
@@ -177876,13 +177903,17 @@ 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 = "";
+    }
     applyPatchState(
       this.state,
       {
         operationalState: newState,
-        operationalError: {
-          errorStateId: newState === OperationalState4.Error ? ErrorState.Stuck : ErrorState.NoError
-        }
+        operationalError
       },
       { force: true }
     );