@basictech/react 0.8.0-beta.2 → 0.8.0-beta.4

package/src/sync/syncProtocol.js

@@ -38,6 +38,7 @@ export const syncProtocol = function () {
       var requestId = 0;
       var acceptCallbacks = {};
       var refreshTimer = null;
+      var pendingTokenUpdate = null;
 
       // Connect the WebSocket to given url:
       log("Connecting to", url)
@@ -81,6 +82,13 @@ export const syncProtocol = function () {
         }
       }
 
+      function sendTokenUpdate(token) {
+        if (ws.readyState !== WebSocket.OPEN) return false;
+        pendingTokenUpdate = token;
+        ws.send(JSON.stringify({ type: "tokenUpdate", authToken: token }));
+        return true;
+      }
+
       // Resolve the getToken function from the module-level registry.
       // It's stored there (not in options) because dexie-syncable serializes
       // options into IndexedDB, and functions can't survive structured clone.
@@ -103,10 +111,8 @@ export const syncProtocol = function () {
         refreshTimer = setTimeout(async function () {
           try {
             var newToken = await resolveGetToken()({ forceRefresh: true });
-            if (ws.readyState === WebSocket.OPEN) {
+            if (sendTokenUpdate(newToken)) {
               log("Sending tokenUpdate on existing WebSocket");
-              ws.send(JSON.stringify({ type: "tokenUpdate", authToken: newToken }));
-              scheduleTokenRefresh(newToken);
             }
           } catch (err) {
             log("Proactive token refresh failed (non-fatal):", err);
@@ -137,9 +143,34 @@ export const syncProtocol = function () {
         }
       };
 
+      // When the page becomes visible again (e.g. PWA/mobile browser resuming
+      // from background), the scheduled setTimeout for token refresh may have
+      // been frozen by the browser. Force-refresh the token and re-send it to
+      // the server so the WebSocket connection stays authenticated.
+      function handleVisibilityResume() {
+        if (document.visibilityState === 'visible' && ws.readyState === WebSocket.OPEN) {
+          log("Page became visible - refreshing token for WebSocket");
+          resolveGetToken()({ forceRefresh: true }).then(function(newToken) {
+            sendTokenUpdate(newToken);
+          }).catch(function(err) {
+            log("Token refresh on visibility resume failed:", err);
+          });
+        }
+      }
+      if (typeof document !== 'undefined') {
+        document.addEventListener('visibilitychange', handleVisibilityResume);
+      }
+
+      function cleanupVisibilityListener() {
+        if (typeof document !== 'undefined') {
+          document.removeEventListener('visibilitychange', handleVisibilityResume);
+        }
+      }
+
       // If network down or other error, tell the framework to reconnect again in some time:
       ws.onerror = function (event) {
         clearRefreshTimer();
+        cleanupVisibilityListener();
         ws.close();
         log("ws.onerror", event);
         onError(event?.message, RECONNECT_DELAY);
@@ -148,6 +179,7 @@ export const syncProtocol = function () {
       // If socket is closed (network disconnected), inform framework and make it reconnect
       ws.onclose = function (event) {
         clearRefreshTimer();
+        cleanupVisibilityListener();
         onError("Socket closed: " + event.reason, RECONNECT_DELAY);
       };
 
@@ -211,11 +243,25 @@ export const syncProtocol = function () {
                 },
                 disconnect: function () {
                   clearRefreshTimer();
+                  cleanupVisibilityListener();
                   ws.close();
                 },
               });
               isFirstRound = false;
             }
+          } else if (requestFromServer.type == "tokenUpdateAck") {
+            if (requestFromServer.ok) {
+              scheduleTokenRefresh(requestFromServer.authToken || pendingTokenUpdate);
+              pendingTokenUpdate = null;
+            } else {
+              log("tokenUpdate rejected by server:", requestFromServer.code || requestFromServer.message);
+              pendingTokenUpdate = null;
+              ws.close(4001, requestFromServer.code || "token_update_failed");
+              onError(
+                requestFromServer.message || "Authentication refresh failed",
+                RECONNECT_DELAY,
+              );
+            }
           } else if (requestFromServer.type == "ack") {
             var requestId = requestFromServer.requestId;
             var acceptCallback = acceptCallbacks[requestId.toString()];

package/src/utils/network.ts

@@ -110,7 +110,7 @@ export function cleanOAuthParamsFromUrl(): void {
         const url = new URL(window.location.href)
         url.searchParams.delete('code')
         url.searchParams.delete('state')
-        window.history.pushState({}, document.title, url.pathname + url.search)
+        window.history.replaceState({}, document.title, url.pathname + url.search)
         log('Cleaned OAuth parameters from URL')
     }
 }