@riddix/hamh 2.1.0-alpha.788 → 2.1.0-alpha.790

package/dist/backend/cli.js

@@ -148888,8 +148888,17 @@ function parseSessionMaxAgeHours(raw) {
   if (n > max) return max;
   return n;
 }
-function staleSessionShouldClose(session) {
-  return session.subscriptions.size === 0 && !session.isClosing && !session.isPeerActive;
+var STALE_SESSION_QUIET_WINDOW_MS = 5 * 60 * 1e3;
+function staleSessionQuietWindowMs(flags2) {
+  return flags2?.fastSessionRecovery ? 0 : STALE_SESSION_QUIET_WINDOW_MS;
+}
+function staleSessionShouldClose(session, quietWindowMs = STALE_SESSION_QUIET_WINDOW_MS, now = Date.now()) {
+  if (session.subscriptions.size > 0 || session.isClosing) return false;
+  if (session.isPeerActive) return false;
+  if (quietWindowMs > 0 && typeof session.timestamp === "number" && now - session.timestamp < quietWindowMs) {
+    return false;
+  }
+  return true;
 }
 function seedExistingSessionStarts(startedAt, sessions, now = Date.now()) {
   for (const session of sessions) {
@@ -149309,9 +149318,13 @@ ${e?.toString()}`);
         if (s.id !== sessionId || s.isClosing || s.subscriptions.size > 0) {
           continue;
         }
-        if (!staleSessionShouldClose(s)) {
+        const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
+        if (!staleSessionShouldClose(
+          s,
+          staleSessionQuietWindowMs(this.dataProvider.featureFlags)
+        )) {
           this.log.info(
-            `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs but peer still active)`
+            `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs, last traffic ${idleSec}s ago)`
           );
           this.staleSessionTimers.set(
             sessionId,
@@ -149323,7 +149336,7 @@ ${e?.toString()}`);
           break;
         }
         this.log.warn(
-          `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s)`
+          `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s, no traffic for ${idleSec}s)`
         );
         s.initiateClose().catch(() => {
           return s.initiateForceClose({
@@ -149346,12 +149359,19 @@ ${e?.toString()}`);
         if (s.isClosing || s.subscriptions.size > 0) {
           continue;
         }
-        if (!staleSessionShouldClose(s)) {
+        const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
+        if (!staleSessionShouldClose(
+          s,
+          staleSessionQuietWindowMs(this.dataProvider.featureFlags)
+        )) {
+          this.log.info(
+            `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs, last traffic ${idleSec}s ago)`
+          );
           kept++;
           continue;
         }
         this.log.warn(
-          `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s)`
+          `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s, no traffic for ${idleSec}s)`
         );
         closes.push(
           s.initiateClose().catch(() => {
@@ -165353,9 +165373,13 @@ ${e?.toString()}`);
         if (s.id !== sessionId || s.isClosing || s.subscriptions.size > 0) {
           continue;
         }
-        if (!staleSessionShouldClose(s)) {
+        const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
+        if (!staleSessionShouldClose(
+          s,
+          staleSessionQuietWindowMs(this.dataProvider.featureFlags)
+        )) {
           this.log.info(
-            `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs but peer still active)`
+            `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs, last traffic ${idleSec}s ago)`
           );
           this.staleSessionTimers.set(
             sessionId,
@@ -165367,7 +165391,7 @@ ${e?.toString()}`);
           break;
         }
         this.log.warn(
-          `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
+          `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s, no traffic for ${idleSec}s)`
         );
         s.initiateClose().catch(() => {
           return s.initiateForceClose({
@@ -165390,12 +165414,19 @@ ${e?.toString()}`);
         if (s.isClosing || s.subscriptions.size > 0) {
           continue;
         }
-        if (!staleSessionShouldClose(s)) {
+        const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
+        if (!staleSessionShouldClose(
+          s,
+          staleSessionQuietWindowMs(this.dataProvider.featureFlags)
+        )) {
+          this.log.info(
+            `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs, last traffic ${idleSec}s ago)`
+          );
           kept++;
           continue;
         }
         this.log.warn(
-          `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, no traffic for ${idleSec}s)`
         );
         closes.push(
           s.initiateClose().catch(() => {