@livedesk/client 0.1.215 → 0.1.217

package/src/runtime/hub-wake-listener.js

@@ -44,25 +44,38 @@ export async function createHubWakeListener(options = {}) {
   let socket = null;
   let retryTimer = null;
   let retryAttempt = 0;
+  let connectionGeneration = 0;
   let settle;
 
   const promise = new Promise(resolve => {
     settle = resolve;
   });
 
+  const closeSocket = current => {
+    if (!current) return;
+    try {
+      current.close();
+    } catch {
+      // Continue to the exact-socket termination fallback below.
+    }
+    try {
+      if (typeof current.terminate === 'function') current.terminate();
+    } catch {
+      // The listener is best-effort and polling remains the fallback.
+    }
+  };
+
   const close = () => {
     if (stopped) return;
     stopped = true;
+    connectionGeneration += 1;
     if (retryTimer) {
       clearTimeout(retryTimer);
       retryTimer = null;
     }
-    try {
-      socket?.close();
-    } catch {
-      // The listener is best-effort and polling remains the fallback.
-    }
+    const current = socket;
     socket = null;
+    closeSocket(current);
   };
 
   const scheduleReconnect = connect => {
@@ -78,12 +91,14 @@ export async function createHubWakeListener(options = {}) {
 
   const connect = async () => {
     if (stopped) return;
+    const generation = ++connectionGeneration;
     let accessToken = '';
     try {
       accessToken = String(await getAccessToken() || '').trim();
     } catch {
       accessToken = '';
     }
+    if (stopped || generation !== connectionGeneration) return;
     if (!accessToken) {
       scheduleReconnect(connect);
       return;
@@ -94,6 +109,10 @@ export async function createHubWakeListener(options = {}) {
       current = new WebSocketImpl(url, {
         headers: { Authorization: `Bearer ${accessToken}` }
       });
+      if (stopped || generation !== connectionGeneration) {
+        closeSocket(current);
+        return;
+      }
       socket = current;
     } catch {
       scheduleReconnect(connect);
@@ -101,6 +120,10 @@ export async function createHubWakeListener(options = {}) {
     }
 
     current.once('open', () => {
+      if (stopped || generation !== connectionGeneration || socket !== current) {
+        closeSocket(current);
+        return;
+      }
       retryAttempt = 0;
     });
     current.on('message', raw => {
@@ -112,17 +135,25 @@ export async function createHubWakeListener(options = {}) {
     });
     current.once('close', () => {
       if (socket === current) socket = null;
+      if (generation !== connectionGeneration) return;
       scheduleReconnect(connect);
     });
     current.once('error', () => {
-      try {
-        current.close();
-      } catch {
-        scheduleReconnect(connect);
-      }
+      closeSocket(current);
+      if (generation === connectionGeneration) scheduleReconnect(connect);
     });
   };
 
   void connect();
-  return { url, promise, close };
+  return {
+    url,
+    promise,
+    close,
+    inspect: () => ({
+      stopped,
+      connectionGeneration,
+      socketActive: socket !== null,
+      retryTimerActive: retryTimer !== null
+    })
+  };
 }