@riddix/hamh 2.1.0-alpha.516 → 2.1.0-alpha.518

package/dist/backend/cli.js

@@ -166866,6 +166866,7 @@ function ensureCommissioningConfig(server) {
 
 // src/services/bridges/bridge.ts
 var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
+var DEAD_SESSION_TIMEOUT_MS = 3 * 60 * 1e3;
 var Bridge = class {
   constructor(env, logger203, dataProvider, endpointManager) {
     this.dataProvider = dataProvider;
@@ -166888,6 +166889,7 @@ var Bridge = class {
   // (e.g. Stopped → Starting → Running).
   onStatusChange;
   autoForceSyncTimer = null;
+  deadSessionTimer = null;
   // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
   // Key: entity_id, Value: JSON.stringify of entity.state
   lastSyncedStates = /* @__PURE__ */ new Map();
@@ -167064,6 +167066,21 @@ ${e?.toString()}`);
           this.log.warn(
             `All subscriptions lost \u2014 ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
           );
+          if (!this.deadSessionTimer) {
+            this.deadSessionTimer = setTimeout(() => {
+              this.deadSessionTimer = null;
+              this.closeDeadSessions();
+            }, DEAD_SESSION_TIMEOUT_MS);
+            this.log.info(
+              `Scheduled dead session cleanup in ${DEAD_SESSION_TIMEOUT_MS / 1e3}s`
+            );
+          }
+        } else if (totalSubs > 0 && this.deadSessionTimer) {
+          clearTimeout(this.deadSessionTimer);
+          this.deadSessionTimer = null;
+          this.log.info(
+            "Subscriptions recovered, canceled dead session cleanup"
+          );
         }
       };
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
@@ -167092,6 +167109,22 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  closeDeadSessions() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const sessions = [...sessionManager.sessions];
+      for (const s of sessions) {
+        if (!s.isClosing && s.subscriptions.size === 0) {
+          this.log.warn(
+            `Force-closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
+          );
+          s.initiateForceClose().catch(() => {
+          });
+        }
+      }
+    } catch {
+    }
+  }
   unwireSessionDiagnostics() {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -167109,6 +167142,10 @@ ${e?.toString()}`);
     this.sessionDiagHandler = void 0;
     this.sessionAddedHandler = void 0;
     this.sessionDeletedHandler = void 0;
+    if (this.deadSessionTimer) {
+      clearTimeout(this.deadSessionTimer);
+      this.deadSessionTimer = null;
+    }
   }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {
@@ -167276,6 +167313,7 @@ function getMappedEntityIds(mapping) {
   if (!mapping) return [];
   const ids = [];
   if (mapping.batteryEntity) ids.push(mapping.batteryEntity);
+  if (mapping.temperatureEntity) ids.push(mapping.temperatureEntity);
   if (mapping.humidityEntity) ids.push(mapping.humidityEntity);
   if (mapping.pressureEntity) ids.push(mapping.pressureEntity);
   if (mapping.cleaningModeEntity) ids.push(mapping.cleaningModeEntity);
@@ -178732,6 +178770,9 @@ var BridgeEndpointManager = class extends Service {
         continue;
       }
       if (this.registry.isAutoComposedDevicesEnabled() && this.registry.isComposedSubEntityUsed(entityId)) {
+        this.log.debug(
+          `Skipping ${entityId} \u2014 already part of a composed device`
+        );
         continue;
       }
       if (entityId.length > MAX_ENTITY_ID_LENGTH) {
@@ -179504,6 +179545,7 @@ function hashAreaId(areaId) {
 // src/services/bridges/server-mode-bridge.ts
 init_dist();
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
+var DEAD_SESSION_TIMEOUT_MS2 = 3 * 60 * 1e3;
 var ServerModeBridge = class {
   constructor(logger203, dataProvider, endpointManager, server) {
     this.dataProvider = dataProvider;
@@ -179520,6 +179562,7 @@ var ServerModeBridge = class {
   // broadcast updates via WebSocket so the frontend sees every transition.
   onStatusChange;
   autoForceSyncTimer = null;
+  deadSessionTimer = null;
   warmStartTimer = null;
   // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
   lastSyncedState;
@@ -179701,6 +179744,21 @@ ${e?.toString()}`);
           this.log.warn(
             `All subscriptions lost \u2014 ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
           );
+          if (!this.deadSessionTimer) {
+            this.deadSessionTimer = setTimeout(() => {
+              this.deadSessionTimer = null;
+              this.closeDeadSessions();
+            }, DEAD_SESSION_TIMEOUT_MS2);
+            this.log.info(
+              `Scheduled dead session cleanup in ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s`
+            );
+          }
+        } else if (totalSubs > 0 && this.deadSessionTimer) {
+          clearTimeout(this.deadSessionTimer);
+          this.deadSessionTimer = null;
+          this.log.info(
+            "Subscriptions recovered, canceled dead session cleanup"
+          );
         }
       };
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
@@ -179729,6 +179787,22 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  closeDeadSessions() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const sessions = [...sessionManager.sessions];
+      for (const s of sessions) {
+        if (!s.isClosing && s.subscriptions.size === 0) {
+          this.log.warn(
+            `Force-closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
+          );
+          s.initiateForceClose().catch(() => {
+          });
+        }
+      }
+    } catch {
+    }
+  }
   unwireSessionDiagnostics() {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -179746,6 +179820,10 @@ ${e?.toString()}`);
     this.sessionDiagHandler = void 0;
     this.sessionAddedHandler = void 0;
     this.sessionDeletedHandler = void 0;
+    if (this.deadSessionTimer) {
+      clearTimeout(this.deadSessionTimer);
+      this.deadSessionTimer = null;
+    }
   }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {