@flamingo-stack/openframe-frontend-core 0.0.690 → 0.0.691-2504.7650.1

package/dist/utils/index.js

@@ -3766,6 +3766,10 @@ function setEmbedAuthAdapter(adapter2) {
   }
   storeRegisteredAuthAdapter(adapter2);
 }
+function subscribeEmbedCredentialChange(listener) {
+  return getRegisteredAuthAdapter()?.subscribe?.(listener) ?? (() => {
+  });
+}
 function embedAuthedFetch(url, init = {}) {
   assertSameOrigin(url);
   let baseHeaders;
@@ -3873,6 +3877,9 @@ var SUBSCRIBE_CONFIRM_TIMEOUT_MS = 15e3;
 var SERVER_RETRY_GRACE_MS = 9e4;
 var FAILED_RECONNECT_DELAY_MS = 3e4;
 var HIDDEN_GRACE_MS = 45e3;
+var AUTH_RETRY_INITIAL_MS = 3e4;
+var AUTH_RETRY_MAX_MS = 3e5;
+var PRESENCE_RETRY_MIN_INTERVAL_MS = 3e4;
 function createSseSubscription(options) {
   const {
     url,
@@ -3888,6 +3895,10 @@ function createSseSubscription(options) {
   let closed = false;
   let suspended = false;
   let attempt = 0;
+  let authAttempt = 0;
+  let stalled = false;
+  let awaitingAuth = false;
+  let lastConnectAt = 0;
   let generation = 0;
   let abortController = null;
   let retryTimerId = null;
@@ -3964,7 +3975,6 @@ function createSseSubscription(options) {
     confirmTimerId = clearLifecycleTimer(confirmTimerId);
     serverGraceTimerId = clearLifecycleTimer(serverGraceTimerId);
     failedDelayTimerId = clearLifecycleTimer(failedDelayTimerId);
-    hiddenGraceTimerId = clearLifecycleTimer(hiddenGraceTimerId);
   };
   const armSilenceTimer = () => {
     if (silenceTimerId) clearTimeout(silenceTimerId);
@@ -3972,16 +3982,23 @@ function createSseSubscription(options) {
       abortController?.abort();
     }, silenceTimeoutMs);
   };
-  const scheduleReconnect = () => {
+  const scheduleReconnect = (delayMs) => {
     if (closed || suspended || retryTimerId) return;
-    setStatus("reconnecting");
-    const backoff = Math.min(maxBackoffMs, initialBackoffMs * 2 ** attempt);
+    if (failedDelayTimerId) {
+      setStatus("reconnecting");
+      return;
+    }
+    let backoff = delayMs;
+    if (backoff === void 0) {
+      backoff = Math.min(maxBackoffMs, initialBackoffMs * 2 ** attempt);
+      attempt += 1;
+    }
     const jitter = backoff * 0.25 * Math.random();
-    attempt += 1;
     retryTimerId = setTimeout(() => {
       retryTimerId = null;
       void connect();
     }, backoff + jitter);
+    setStatus("reconnecting");
   };
   const parseFrame = (rawFrame) => {
     let eventName = "message";
@@ -4013,6 +4030,9 @@ function createSseSubscription(options) {
   async function connect() {
     if (closed || suspended) return;
     const gen = ++generation;
+    stalled = false;
+    awaitingAuth = false;
+    lastConnectAt = Date.now();
     setStatus("connecting");
     abortController = new AbortController();
     let response;
@@ -4040,9 +4060,19 @@ function createSseSubscription(options) {
         return;
       }
       const blockLayer = response.headers.get("x-block-layer");
+      const blockNote = blockLayer ? ` (x-block-layer: ${blockLayer})` : "";
+      if (response.status === 401 && pauseWhenHidden) {
+        const delayMs = Math.min(AUTH_RETRY_MAX_MS, AUTH_RETRY_INITIAL_MS * 2 ** authAttempt);
+        authAttempt += 1;
+        console.warn(`[sse-subscription] 401 for ${url}${blockNote} \u2014 retrying in ~${Math.round(delayMs / 1e3)}s`);
+        awaitingAuth = true;
+        scheduleReconnect(delayMs);
+        return;
+      }
       console.warn(
-        `[sse-subscription] terminal ${response.status} for ${url}${blockLayer ? ` (x-block-layer: ${blockLayer})` : ""} \u2014 not retrying`
+        `[sse-subscription] terminal ${response.status} for ${url}${blockNote} \u2014 ${pauseWhenHidden ? "retrying on presence" : "not retrying"}`
       );
+      stalled = pauseWhenHidden;
       setStatus("terminal");
       return;
     }
@@ -4051,6 +4081,7 @@ function createSseSubscription(options) {
       return;
     }
     attempt = 0;
+    authAttempt = 0;
     setStatus("open");
     armSilenceTimer();
     confirmTimerId = clearLifecycleTimer(confirmTimerId);
@@ -4112,6 +4143,10 @@ function createSseSubscription(options) {
     abortController?.abort();
     setStatus("suspended");
   };
+  const retryIfStalled = () => {
+    if (!stalled || Date.now() - lastConnectAt < PRESENCE_RETRY_MIN_INTERVAL_MS) return;
+    doReconnect();
+  };
   const onVisibilityChange = () => {
     if (document.visibilityState === "hidden") {
       if (!hiddenGraceTimerId) {
@@ -4126,15 +4161,21 @@ function createSseSubscription(options) {
     if (suspended) {
       suspended = false;
       void connect();
+      return;
     }
+    retryIfStalled();
   };
   const onOnline = () => {
     if (!suspended) doReconnect();
   };
+  const unsubscribeCredentials = pauseWhenHidden && fetchImpl === embedAuthedFetch ? subscribeEmbedCredentialChange(() => {
+    if (awaitingAuth) doReconnect();
+  }) : null;
   const listenersActive = pauseWhenHidden && typeof document !== "undefined" && typeof window !== "undefined";
   if (listenersActive) {
     document.addEventListener("visibilitychange", onVisibilityChange);
     window.addEventListener("online", onOnline);
+    window.addEventListener("focus", retryIfStalled);
   }
   void connect();
   return {
@@ -4143,11 +4184,14 @@ function createSseSubscription(options) {
       closed = true;
       generation += 1;
       clearTimers();
+      hiddenGraceTimerId = clearLifecycleTimer(hiddenGraceTimerId);
       abortController?.abort();
       if (listenersActive) {
         document.removeEventListener("visibilitychange", onVisibilityChange);
         window.removeEventListener("online", onOnline);
+        window.removeEventListener("focus", retryIfStalled);
       }
+      unsubscribeCredentials?.();
       setConnected(false);
       onStatusChange?.("closed");
     },