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

package/dist/backend/cli.js

@@ -166866,7 +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 DEAD_SESSION_TIMEOUT_MS = 6e4;
 var Bridge = class {
   constructor(env, logger203, dataProvider, endpointManager) {
     this.dataProvider = dataProvider;
@@ -166890,6 +166890,7 @@ var Bridge = class {
   onStatusChange;
   autoForceSyncTimer = null;
   deadSessionTimer = null;
+  staleSessionTimers = /* @__PURE__ */ new Map();
   // 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();
@@ -167082,6 +167083,18 @@ ${e?.toString()}`);
             "Subscriptions recovered, canceled dead session cleanup"
           );
         }
+        if (session.subscriptions.size === 0 && !this.staleSessionTimers.has(session.id)) {
+          this.staleSessionTimers.set(
+            session.id,
+            setTimeout(() => {
+              this.staleSessionTimers.delete(session.id);
+              this.closeStaleSession(session.id);
+            }, DEAD_SESSION_TIMEOUT_MS)
+          );
+        } else if (session.subscriptions.size > 0 && this.staleSessionTimers.has(session.id)) {
+          clearTimeout(this.staleSessionTimers.get(session.id));
+          this.staleSessionTimers.delete(session.id);
+        }
       };
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
       this.sessionAddedHandler = (newSession) => {
@@ -167109,6 +167122,24 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  closeStaleSession(sessionId) {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      for (const s of [...sessionManager.sessions]) {
+        if (s.id === sessionId && !s.isClosing && s.subscriptions.size === 0) {
+          this.log.warn(
+            `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
+          );
+          s.initiateClose().catch(() => {
+            s.initiateForceClose().catch(() => {
+            });
+          });
+          break;
+        }
+      }
+    } catch {
+    }
+  }
   closeDeadSessions() {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -167116,9 +167147,11 @@ ${e?.toString()}`);
       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)`
+            `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
           );
-          s.initiateForceClose().catch(() => {
+          s.initiateClose().catch(() => {
+            s.initiateForceClose().catch(() => {
+            });
           });
         }
       }
@@ -167146,6 +167179,10 @@ ${e?.toString()}`);
       clearTimeout(this.deadSessionTimer);
       this.deadSessionTimer = null;
     }
+    for (const timer of this.staleSessionTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.staleSessionTimers.clear();
   }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {
@@ -179545,7 +179582,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 DEAD_SESSION_TIMEOUT_MS2 = 6e4;
 var ServerModeBridge = class {
   constructor(logger203, dataProvider, endpointManager, server) {
     this.dataProvider = dataProvider;
@@ -179563,6 +179600,7 @@ var ServerModeBridge = class {
   onStatusChange;
   autoForceSyncTimer = null;
   deadSessionTimer = null;
+  staleSessionTimers = /* @__PURE__ */ new Map();
   warmStartTimer = null;
   // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
   lastSyncedState;
@@ -179760,6 +179798,18 @@ ${e?.toString()}`);
             "Subscriptions recovered, canceled dead session cleanup"
           );
         }
+        if (session.subscriptions.size === 0 && !this.staleSessionTimers.has(session.id)) {
+          this.staleSessionTimers.set(
+            session.id,
+            setTimeout(() => {
+              this.staleSessionTimers.delete(session.id);
+              this.closeStaleSession(session.id);
+            }, DEAD_SESSION_TIMEOUT_MS2)
+          );
+        } else if (session.subscriptions.size > 0 && this.staleSessionTimers.has(session.id)) {
+          clearTimeout(this.staleSessionTimers.get(session.id));
+          this.staleSessionTimers.delete(session.id);
+        }
       };
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
       this.sessionAddedHandler = (newSession) => {
@@ -179787,6 +179837,24 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  closeStaleSession(sessionId) {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      for (const s of [...sessionManager.sessions]) {
+        if (s.id === sessionId && !s.isClosing && s.subscriptions.size === 0) {
+          this.log.warn(
+            `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
+          );
+          s.initiateClose().catch(() => {
+            s.initiateForceClose().catch(() => {
+            });
+          });
+          break;
+        }
+      }
+    } catch {
+    }
+  }
   closeDeadSessions() {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -179794,9 +179862,11 @@ ${e?.toString()}`);
       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)`
+            `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
           );
-          s.initiateForceClose().catch(() => {
+          s.initiateClose().catch(() => {
+            s.initiateForceClose().catch(() => {
+            });
           });
         }
       }
@@ -179824,6 +179894,10 @@ ${e?.toString()}`);
       clearTimeout(this.deadSessionTimer);
       this.deadSessionTimer = null;
     }
+    for (const timer of this.staleSessionTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.staleSessionTimers.clear();
   }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {