@riddix/hamh 2.1.0-alpha.834 → 2.1.0-alpha.836

package/dist/backend/cli.js

@@ -132058,6 +132058,12 @@ var init_bridge_config_schema = __esm({
           description: "Anchor each device to its Home Assistant entity registry id instead of the entity id, so renaming an entity no longer re-adds it in your controller (Alexa, Google Home, Apple Home) and keeps groups and automations. Records are seeded from the start, so enabling this later is safe and never re-adds existing devices. Default off.",
           type: "boolean",
           default: false
+        },
+        wedgeWatchdog: {
+          title: "Wedge Watchdog (Apple 'Updating' workaround)",
+          description: "Rotate the one session that looks wedged, subscriptions still alive but no inbound request from the controller for about 45 minutes, earlier than the blind session rotation. Targets Apple Home tiles stuck on 'Updating' where the controller keeps acking but stops consuming data. A false positive only triggers a transparent reconnect, the same as normal rotation. Default off.",
+          type: "boolean",
+          default: false
         }
       }
     };
@@ -156805,7 +156811,23 @@ function seedExistingSessionStarts(startedAt, sessions, now = Date.now()) {
   }
 }
 
+// src/services/bridges/wedge-watchdog.ts
+var WEDGE_WARMUP_MS = 15 * 60 * 1e3;
+var WEDGE_IM_SILENCE_MS = 45 * 60 * 1e3;
+var WEDGE_MIN_ROTATE_INTERVAL_MS = 60 * 60 * 1e3;
+function decideWedgeRotation(input) {
+  const {
+    subscriptionCount,
+    sessionAgeMs,
+    lastImRequestMsAgo,
+    lastRotatedMsAgo
+  } = input;
+  const imSilenceMs = lastImRequestMsAgo == null ? sessionAgeMs : lastImRequestMsAgo;
+  return subscriptionCount > 0 && sessionAgeMs > WEDGE_WARMUP_MS && imSilenceMs > WEDGE_IM_SILENCE_MS && (lastRotatedMsAgo == null || lastRotatedMsAgo > WEDGE_MIN_ROTATE_INTERVAL_MS);
+}
+
 // src/services/bridges/bridge.ts
+var imWrapMarker = /* @__PURE__ */ Symbol("hamh.wedgeImWrap");
 var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
 var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS = 2500;
 var MDNS_ADDRESS_CHECK_INTERVAL_MS = 6e4;
@@ -156853,6 +156875,12 @@ var Bridge = class {
   sessionStartedAt = /* @__PURE__ */ new Map();
   rotationTimer = null;
   maxSessionAgeMs = 0;
+  // Wedge watchdog: last inbound Interaction Model request time per session and
+  // last time the watchdog rotated it, both keyed by the long-lived session
+  // object so they clear when the session goes away.
+  lastImRequestAt = /* @__PURE__ */ new WeakMap();
+  wedgeLastRotatedAt = /* @__PURE__ */ new WeakMap();
+  wedgeWatchdogTimer = null;
   // Watches the advertised interface addresses so a dynamic ISP IPv6 prefix
   // change forces a fresh operational announcement (#415).
   mdnsAddressTimer = null;
@@ -156912,6 +156940,8 @@ var Bridge = class {
         const nowMs = Date.now();
         const lastActiveMsAgo = typeof s.activeTimestamp === "number" && s.activeTimestamp > 0 ? nowMs - s.activeTimestamp : null;
         const lastAnyActivityMsAgo = typeof s.timestamp === "number" ? nowMs - s.timestamp : null;
+        const lastImAt = this.lastImRequestAt.get(s);
+        const lastImRequestMsAgo = lastImAt != null ? nowMs - lastImAt : null;
         const startedAt = this.sessionStartedAt.get(s.id);
         return {
           id: s.id,
@@ -156920,6 +156950,7 @@ var Bridge = class {
           subscriptionCount: subCount,
           lastActiveMsAgo,
           lastAnyActivityMsAgo,
+          lastImRequestMsAgo,
           isPeerActive: Boolean(s.isPeerActive),
           ageMsFromOpen: startedAt != null ? nowMs - startedAt : null
         };
@@ -157086,6 +157117,7 @@ var Bridge = class {
       this.wireSessionDiagnostics();
       this.wireFabricWarnings();
       this.startSessionRotation();
+      this.startWedgeWatchdog();
       this.startMdnsAddressWatch();
       logMemoryUsage(this.log, "bridge running");
       diagnosticEventBus.emit("bridge_started", `Bridge started`, {
@@ -157285,6 +157317,29 @@ ${e?.toString()}`);
       };
       sessionManager.sessions.added.on(this.sessionAddedHandler);
       sessionManager.sessions.deleted.on(this.sessionDeletedHandler);
+      this.wireImRequestTracking();
+    } catch {
+    }
+  }
+  // Stamp the time of every inbound Interaction Model request per session by
+  // wrapping InteractionServer.onNewExchange. The wedge watchdog reads these to
+  // tell a live-but-consuming controller from one that only keeps acking.
+  wireImRequestTracking() {
+    try {
+      const is = this.server.env.get(InteractionServer);
+      const marked = is;
+      if (marked[imWrapMarker]) {
+        return;
+      }
+      const original = is.onNewExchange.bind(is);
+      is.onNewExchange = (exchange, message) => {
+        const session = exchange.session;
+        if (session) {
+          this.lastImRequestAt.set(session, Date.now());
+        }
+        return original(exchange, message);
+      };
+      marked[imWrapMarker] = true;
     } catch {
     }
   }
@@ -157447,6 +157502,7 @@ ${e?.toString()}`);
     }
     this.staleSessionTimers.clear();
     this.stopSessionRotation();
+    this.stopWedgeWatchdog();
     this.stopMdnsAddressWatch();
     this.sessionStartedAt.clear();
   }
@@ -157512,6 +157568,72 @@ ${e?.toString()}`);
       this.rotationTimer = null;
     }
   }
+  // Opt-in wedge watchdog: reuse the rotation check cadence (5min) to look for
+  // the one session wedged on "Updating" and rotate just that one.
+  startWedgeWatchdog() {
+    this.stopWedgeWatchdog();
+    if (!this.dataProvider.featureFlags?.wedgeWatchdog) {
+      return;
+    }
+    this.wedgeWatchdogTimer = setInterval(
+      () => this.runWedgeWatchdogCheck(),
+      ROTATION_CHECK_INTERVAL_MS
+    );
+    this.log.info(
+      `Wedge watchdog: checking every ${ROTATION_CHECK_INTERVAL_MS / 6e4}min`
+    );
+  }
+  stopWedgeWatchdog() {
+    if (this.wedgeWatchdogTimer) {
+      clearInterval(this.wedgeWatchdogTimer);
+      this.wedgeWatchdogTimer = null;
+    }
+  }
+  // Rotate exactly the sessions the pure rule flags as wedged. Closing is the
+  // same graceful-then-force path age rotation uses, so a false positive just
+  // re-CASEs the controller.
+  runWedgeWatchdogCheck() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const now = Date.now();
+      const closes = [];
+      for (const s of [...sessionManager.sessions]) {
+        if (s.isClosing) continue;
+        const startedAt = this.sessionStartedAt.get(s.id);
+        const sessionAgeMs = startedAt != null ? now - startedAt : 0;
+        const lastImAt = this.lastImRequestAt.get(s);
+        const lastImRequestMsAgo = lastImAt != null ? now - lastImAt : null;
+        const lastRotatedAt = this.wedgeLastRotatedAt.get(s);
+        const lastRotatedMsAgo = lastRotatedAt != null ? now - lastRotatedAt : null;
+        if (!decideWedgeRotation({
+          subscriptionCount: s.subscriptions.size,
+          sessionAgeMs,
+          lastImRequestMsAgo,
+          lastRotatedMsAgo
+        })) {
+          continue;
+        }
+        const silenceMin = Math.round(
+          (lastImRequestMsAgo ?? sessionAgeMs) / 6e4
+        );
+        this.log.info(
+          `Wedge watchdog: rotating session ${s.id}, no inbound interaction for ${silenceMin}min`
+        );
+        this.wedgeLastRotatedAt.set(s, now);
+        closes.push(
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose({
+              cause: new Error("wedge watchdog, forcing")
+            });
+          })
+        );
+      }
+      if (closes.length > 0) {
+        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+      }
+    } catch {
+    }
+  }
   // Poll the interface addresses mDNS advertises and re-announce when they
   // change. matter.js caches the operational records at first announcement, so
   // a dynamic ISP IPv6 prefix change keeps advertising the dead global address
@@ -157643,6 +157765,7 @@ ${e?.toString()}`);
       if (this.status.code === BridgeStatus.Running) {
         this.startAutoForceSyncIfEnabled();
         this.startSessionRotation();
+        this.startWedgeWatchdog();
       }
     } catch (e) {
       const reason = "Failed to update bridge due to error:";
@@ -169579,20 +169702,22 @@ function resolveCleanAreaIds(selectedAreas, cleanAreaRooms) {
   }
   return haAreaIds;
 }
+var cleaningStates = [
+  VacuumState.cleaning,
+  VacuumState.segment_cleaning,
+  VacuumState.zone_cleaning,
+  VacuumState.spot_cleaning,
+  VacuumState.mop_cleaning,
+  VacuumState.paused
+];
+function vacuumIsCleaning(state) {
+  return state != null && cleaningStates.includes(state);
+}
 var vacuumRvcRunModeConfig = {
   getCurrentMode: (entity) => {
-    const state = entity.state;
-    const cleaningStates = [
-      VacuumState.cleaning,
-      VacuumState.segment_cleaning,
-      VacuumState.zone_cleaning,
-      VacuumState.spot_cleaning,
-      VacuumState.mop_cleaning,
-      VacuumState.paused
-    ];
-    const isCleaning = cleaningStates.includes(state);
+    const isCleaning = vacuumIsCleaning(entity.state);
     logger235.debug(
-      `Vacuum state: "${state}", isCleaning: ${isCleaning}, currentMode: ${isCleaning ? "Cleaning" : "Idle"}`
+      `Vacuum state: "${entity.state}", isCleaning: ${isCleaning}, currentMode: ${isCleaning ? "Cleaning" : "Idle"}`
     );
     return isCleaning ? 1 /* Cleaning */ : 0 /* Idle */;
   },
@@ -169926,11 +170051,12 @@ function createCleanAreaRvcRunModeServer(cleanAreaRooms) {
     currentMode: 0 /* Idle */
   });
 }
-var VacuumRvcRunModeServer = RvcRunModeServer2(vacuumRvcRunModeConfig);
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-on-off-server.ts
 var VacuumOnOffServer = OnOffServer2({
-  isOn: (_, agent) => agent.get(VacuumRvcRunModeServer).state.currentMode === 1 /* Cleaning */,
+  // Derive from the entity directly. Reading the sibling rvcRunMode behavior
+  // crashed with a class mismatch and would lag one tick behind anyway (#428).
+  isOn: (entity) => vacuumIsCleaning(entity.state),
   turnOn: () => ({ action: "vacuum.start" }),
   turnOff: () => ({ action: "vacuum.return_to_base" })
 }).with();
@@ -170743,7 +170869,7 @@ function isDockedCharging(entity, batteryPercent) {
 }
 function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttributes(entity.attributes), chargingState = null) {
   const state = entity.state;
-  const cleaningStates = [
+  const cleaningStates2 = [
     VacuumState.cleaning,
     VacuumState.segment_cleaning,
     VacuumState.zone_cleaning,
@@ -170756,7 +170882,7 @@ function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttribute
     operationalState = charging ? RvcOperationalState4.OperationalState.Charging : RvcOperationalState4.OperationalState.Docked;
   } else if (state === VacuumState.returning) {
     operationalState = RvcOperationalState4.OperationalState.SeekingCharger;
-  } else if (cleaningStates.includes(state)) {
+  } else if (cleaningStates2.includes(state)) {
     operationalState = RvcOperationalState4.OperationalState.Running;
   } else if (state === VacuumState.paused) {
     operationalState = RvcOperationalState4.OperationalState.Paused;
@@ -174375,6 +174501,7 @@ init_dist();
 init_esm7();
 import * as os10 from "node:os";
 init_diagnostic_event_bus();
+var imWrapMarker2 = /* @__PURE__ */ Symbol("hamh.wedgeImWrap");
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
 var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS2 = 2500;
 var MDNS_ADDRESS_CHECK_INTERVAL_MS2 = 6e4;
@@ -174407,6 +174534,12 @@ var ServerModeBridge = class {
   sessionStartedAt = /* @__PURE__ */ new Map();
   rotationTimer = null;
   maxSessionAgeMs = 0;
+  // Wedge watchdog: last inbound Interaction Model request time per session and
+  // last time the watchdog rotated it, both keyed by the long-lived session
+  // object so they clear when the session goes away.
+  lastImRequestAt = /* @__PURE__ */ new WeakMap();
+  wedgeLastRotatedAt = /* @__PURE__ */ new WeakMap();
+  wedgeWatchdogTimer = null;
   // Watches the advertised interface addresses so a dynamic ISP IPv6 prefix
   // change forces a fresh operational announcement (#415).
   mdnsAddressTimer = null;
@@ -174483,6 +174616,8 @@ var ServerModeBridge = class {
         const nowMs = Date.now();
         const lastActiveMsAgo = typeof s.activeTimestamp === "number" && s.activeTimestamp > 0 ? nowMs - s.activeTimestamp : null;
         const lastAnyActivityMsAgo = typeof s.timestamp === "number" ? nowMs - s.timestamp : null;
+        const lastImAt = this.lastImRequestAt.get(s);
+        const lastImRequestMsAgo = lastImAt != null ? nowMs - lastImAt : null;
         const startedAt = this.sessionStartedAt.get(s.id);
         return {
           id: s.id,
@@ -174491,6 +174626,7 @@ var ServerModeBridge = class {
           subscriptionCount: subCount,
           lastActiveMsAgo,
           lastAnyActivityMsAgo,
+          lastImRequestMsAgo,
           isPeerActive: Boolean(s.isPeerActive),
           ageMsFromOpen: startedAt != null ? nowMs - startedAt : null
         };
@@ -174554,6 +174690,7 @@ var ServerModeBridge = class {
       this.wireSessionDiagnostics();
       this.wireFabricWarnings();
       this.startSessionRotation();
+      this.startWedgeWatchdog();
       this.startMdnsAddressWatch();
       this.scheduleWarmStart();
       logMemoryUsage(this.log, "server mode bridge running");
@@ -174571,6 +174708,7 @@ ${e?.toString()}`);
   }
   async stop(code = BridgeStatus.Stopped, reason = "Manually stopped") {
     this.stopSessionRotation();
+    this.stopWedgeWatchdog();
     this.stopMdnsAddressWatch();
     this.unwireSessionDiagnostics();
     this.unwireFabricWarnings();
@@ -174603,6 +174741,7 @@ ${e?.toString()}`);
       if (this.status.code === BridgeStatus.Running) {
         this.startAutoForceSyncIfEnabled();
         this.startSessionRotation();
+        this.startWedgeWatchdog();
       }
     } catch (e) {
       const reason = "Failed to update server mode bridge due to error:";
@@ -174787,6 +174926,29 @@ ${e?.toString()}`);
       sessionManager.sessions.added.on(this.sessionAddedHandler);
       sessionManager.sessions.deleted.on(this.sessionDeletedHandler);
       seedExistingSessionStarts(this.sessionStartedAt, sessionManager.sessions);
+      this.wireImRequestTracking();
+    } catch {
+    }
+  }
+  // Stamp the time of every inbound Interaction Model request per session by
+  // wrapping InteractionServer.onNewExchange. The wedge watchdog reads these to
+  // tell a live-but-consuming controller from one that only keeps acking.
+  wireImRequestTracking() {
+    try {
+      const is = this.server.env.get(InteractionServer);
+      const marked = is;
+      if (marked[imWrapMarker2]) {
+        return;
+      }
+      const original = is.onNewExchange.bind(is);
+      is.onNewExchange = (exchange, message) => {
+        const session = exchange.session;
+        if (session) {
+          this.lastImRequestAt.set(session, Date.now());
+        }
+        return original(exchange, message);
+      };
+      marked[imWrapMarker2] = true;
     } catch {
     }
   }
@@ -175004,6 +175166,72 @@ ${e?.toString()}`);
       this.rotationTimer = null;
     }
   }
+  // Opt-in wedge watchdog: reuse the rotation check cadence (5min) to look for
+  // the one session wedged on "Updating" and rotate just that one.
+  startWedgeWatchdog() {
+    this.stopWedgeWatchdog();
+    if (!this.dataProvider.featureFlags?.wedgeWatchdog) {
+      return;
+    }
+    this.wedgeWatchdogTimer = setInterval(
+      () => this.runWedgeWatchdogCheck(),
+      ROTATION_CHECK_INTERVAL_MS
+    );
+    this.log.info(
+      `Wedge watchdog: checking every ${ROTATION_CHECK_INTERVAL_MS / 6e4}min`
+    );
+  }
+  stopWedgeWatchdog() {
+    if (this.wedgeWatchdogTimer) {
+      clearInterval(this.wedgeWatchdogTimer);
+      this.wedgeWatchdogTimer = null;
+    }
+  }
+  // Rotate exactly the sessions the pure rule flags as wedged. Closing is the
+  // same graceful-then-force path age rotation uses, so a false positive just
+  // re-CASEs the controller.
+  runWedgeWatchdogCheck() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const now = Date.now();
+      const closes = [];
+      for (const s of [...sessionManager.sessions]) {
+        if (s.isClosing) continue;
+        const startedAt = this.sessionStartedAt.get(s.id);
+        const sessionAgeMs = startedAt != null ? now - startedAt : 0;
+        const lastImAt = this.lastImRequestAt.get(s);
+        const lastImRequestMsAgo = lastImAt != null ? now - lastImAt : null;
+        const lastRotatedAt = this.wedgeLastRotatedAt.get(s);
+        const lastRotatedMsAgo = lastRotatedAt != null ? now - lastRotatedAt : null;
+        if (!decideWedgeRotation({
+          subscriptionCount: s.subscriptions.size,
+          sessionAgeMs,
+          lastImRequestMsAgo,
+          lastRotatedMsAgo
+        })) {
+          continue;
+        }
+        const silenceMin = Math.round(
+          (lastImRequestMsAgo ?? sessionAgeMs) / 6e4
+        );
+        this.log.info(
+          `Wedge watchdog: rotating session ${s.id}, no inbound interaction for ${silenceMin}min`
+        );
+        this.wedgeLastRotatedAt.set(s, now);
+        closes.push(
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose({
+              cause: new Error("wedge watchdog, forcing")
+            });
+          })
+        );
+      }
+      if (closes.length > 0) {
+        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+      }
+    } catch {
+    }
+  }
   // Poll the interface addresses mDNS advertises and re-announce when they
   // change. matter.js caches the operational records at first announcement, so
   // a dynamic ISP IPv6 prefix change keeps advertising the dead global address