@pooflabs/core 0.0.34 → 0.0.36

package/dist/index.js

@@ -4037,6 +4037,7 @@ const WS_CONFIG = {
 const WS_V2_PATH = '/ws/v2';
 let browserReconnectHooksAttached = false;
 let lastBrowserTriggeredReconnectAt = 0;
+let reconnectInProgress = null;
 // ============ Helper Functions ============
 function generateSubscriptionId() {
     return `sub_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
@@ -4095,10 +4096,11 @@ function scheduleTokenRefresh(connection, isServer) {
                 return;
             const timeUntilExpiry = expirationTime - Date.now();
             if (timeUntilExpiry <= TOKEN_REFRESH_BUFFER) {
-                console.info('[WS v2] Token expiring soon, proactively refreshing and reconnecting');
-                // Refresh the token directly rather than going through getFreshAuthToken(),
-                // which only refreshes when the token is within 60s of expiry. We want to
-                // refresh as soon as we enter the buffer window to avoid unnecessary reconnects.
+                console.info('[WS v2] Token expiring soon, proactively refreshing');
+                // Refresh the token and store it. Do NOT reconnect — the server only
+                // verifies JWT at $connect time, so the existing connection continues
+                // working. The fresh token is picked up by urlProvider the next time
+                // a reconnect naturally happens (network drop, keepalive timeout, etc.).
                 try {
                     const currentRefreshToken = await getRefreshToken(isServer);
                     if (!currentRefreshToken) {
@@ -4108,7 +4110,7 @@ function scheduleTokenRefresh(connection, isServer) {
                     const refreshData = await refreshSession(currentRefreshToken);
                     if (refreshData && refreshData.idToken && refreshData.accessToken) {
                         await updateIdTokenAndAccessToken(refreshData.idToken, refreshData.accessToken, isServer);
-                        reconnectWithNewAuthV2();
+                        console.info('[WS v2] Token refreshed successfully, stored for next connection');
                     }
                     else {
                         console.warn('[WS v2] Proactive token refresh returned incomplete data');
@@ -4216,8 +4218,6 @@ async function getOrCreateConnection(appId, isServer) {
         isConnected: false,
         appId,
         tokenRefreshTimer: null,
-        lastMessageAt: Date.now(),
-        keepaliveTimer: null,
         consecutiveAuthFailures: 0,
     };
     connections.set(appId, connection);
@@ -4238,8 +4238,6 @@ async function getOrCreateConnection(appId, isServer) {
         else {
             wsUrl.searchParams.append('appId', config.appId);
         }
-        // Add timestamp to prevent connection reuse issues
-        wsUrl.searchParams.append('_t', Date.now().toString());
         // Add auth token if available
         const authToken = await getFreshAuthToken(isServer);
         if (authToken) {
@@ -4271,7 +4269,6 @@ async function getOrCreateConnection(appId, isServer) {
     ws.addEventListener('open', () => {
         connection.isConnecting = false;
         connection.isConnected = true;
-        connection.lastMessageAt = Date.now();
         connection.consecutiveAuthFailures = 0;
         // Schedule periodic token freshness checks
         scheduleTokenRefresh(connection, isServer);
@@ -4280,25 +4277,9 @@ async function getOrCreateConnection(appId, isServer) {
             sub.lastData = undefined;
             sendSubscribe(connection, sub);
         }
-        // Start keepalive detection — if no messages for 90s, force reconnect
-        if (connection.keepaliveTimer) {
-            clearInterval(connection.keepaliveTimer);
-        }
-        connection.keepaliveTimer = setInterval(() => {
-            var _a;
-            if (Date.now() - connection.lastMessageAt > 90000) {
-                console.warn('[WS v2] No messages received for 90s, forcing reconnect');
-                if (connection.keepaliveTimer) {
-                    clearInterval(connection.keepaliveTimer);
-                    connection.keepaliveTimer = null;
-                }
-                (_a = connection.ws) === null || _a === void 0 ? void 0 : _a.reconnect();
-            }
-        }, 30000);
     });
     // Handle incoming messages
     ws.addEventListener('message', (event) => {
-        connection.lastMessageAt = Date.now();
         try {
             const message = JSON.parse(event.data);
             handleServerMessage(connection, message);
@@ -4322,10 +4303,6 @@ async function getOrCreateConnection(appId, isServer) {
             clearInterval(connection.tokenRefreshTimer);
             connection.tokenRefreshTimer = null;
         }
-        if (connection.keepaliveTimer) {
-            clearInterval(connection.keepaliveTimer);
-            connection.keepaliveTimer = null;
-        }
     });
     return connection;
 }
@@ -4579,17 +4556,19 @@ async function removeCallbackFromSubscription(connection, subscriptionId, callba
 async function closeAllSubscriptionsV2() {
     const closePromises = [];
     for (const [appId, connection] of connections) {
-        // Clear token refresh timer
         if (connection.tokenRefreshTimer) {
             clearInterval(connection.tokenRefreshTimer);
             connection.tokenRefreshTimer = null;
         }
         if (connection.ws) {
+            const ws = connection.ws;
+            connection.ws = null;
+            connection.isConnected = false;
             closePromises.push(new Promise((resolve) => {
-                connection.ws.addEventListener('close', () => {
+                ws.addEventListener('close', () => {
                     resolve();
                 });
-                connection.ws.close();
+                ws.close();
             }));
         }
         connections.delete(appId);
@@ -4636,7 +4615,18 @@ function getCachedDataV2(path, prompt) {
  * Note: Existing subscriptions will receive new initial data after reconnection.
  */
 async function reconnectWithNewAuthV2() {
-    // For each active connection
+    if (reconnectInProgress) {
+        return reconnectInProgress;
+    }
+    reconnectInProgress = doReconnectWithNewAuth();
+    try {
+        await reconnectInProgress;
+    }
+    finally {
+        reconnectInProgress = null;
+    }
+}
+async function doReconnectWithNewAuth() {
     for (const [appId, connection] of connections) {
         if (!connection.ws) {
             continue;
@@ -4645,7 +4635,6 @@ async function reconnectWithNewAuthV2() {
             pending.reject(new Error('Connection reconnecting due to auth change'));
         }
         connection.pendingSubscriptions.clear();
-        // Resolve any pending unsubscriptions - connection is closing anyway
         for (const [, pending] of connection.pendingUnsubscriptions) {
             pending.resolve();
         }
@@ -4655,8 +4644,6 @@ async function reconnectWithNewAuthV2() {
         // Close the WebSocket (this triggers reconnection in ReconnectingWebSocket)
         // We use reconnect() which will close and re-open with fresh URL (including new token)
         try {
-            // ReconnectingWebSocket.reconnect() closes current connection and opens a new one
-            // The urlProvider will be called again, getting a fresh auth token
             connection.ws.reconnect();
         }
         catch (error) {