@arbidocs/client 0.3.20 → 0.3.22

package/dist/index.js

@@ -334,18 +334,23 @@ function createBearerAuthMiddleware(config) {
 
 // src/middleware/auto-relogin.ts
 function createAutoReloginMiddleware(config) {
+  const cloneCache = /* @__PURE__ */ new WeakMap();
   return {
+    async onRequest({ request }) {
+      try {
+        cloneCache.set(request, request.clone());
+      } catch {
+      }
+    },
     async onResponse({ response, request }) {
       if (response.status === 400) {
         const isSafeMethod = ["GET", "HEAD", "DELETE"].includes(request.method);
         if (isSafeMethod) {
-          console.info("[API] 400 error on protected endpoint - triggering instant re-login");
           const newToken = await config.reloginHandler();
           if (newToken) {
-            const newRequest = request.clone();
-            newRequest.headers.set("Authorization", `Bearer ${newToken}`);
-            console.info("[API] Retrying request after re-login");
-            return fetch(newRequest);
+            const retryRequest = cloneCache.get(request) ?? request.clone();
+            retryRequest.headers.set("Authorization", `Bearer ${newToken}`);
+            return fetch(retryRequest);
           }
         }
       }
@@ -355,13 +360,17 @@ function createAutoReloginMiddleware(config) {
         if (!isExcluded) {
           const newToken = await config.reloginHandler();
           if (newToken) {
+            const cached = cloneCache.get(request);
+            if (cached) {
+              cached.headers.set("Authorization", `Bearer ${newToken}`);
+              return fetch(cached);
+            }
             try {
-              const newRequest = request.clone();
-              newRequest.headers.set("Authorization", `Bearer ${newToken}`);
-              console.info("[API] Retrying request after re-login:", request.method, request.url);
-              return fetch(newRequest);
-            } catch (cloneError) {
-              console.warn("[API] Could not clone request for retry:", cloneError);
+              const retryRequest = request.clone();
+              retryRequest.headers.set("Authorization", `Bearer ${newToken}`);
+              return fetch(retryRequest);
+            } catch {
+              console.warn("[API] Could not retry request after re-login (body already consumed)");
               config.onRetryCloneFailed?.();
             }
           }
@@ -380,12 +389,10 @@ function createReloginHandler(deps) {
   let lastSuccessTime = 0;
   return function instantReLogin() {
     if (reloginPromise) {
-      console.info("[API] Re-login already in progress, waiting...");
       return reloginPromise;
     }
     const elapsed = Date.now() - lastSuccessTime;
     if (lastSuccessToken && elapsed < RELOGIN_COOLDOWN_MS) {
-      console.info(`[API] Re-login skipped (cooldown, ${elapsed}ms since last success)`);
       return Promise.resolve(lastSuccessToken);
     }
     reloginPromise = (async () => {
@@ -393,12 +400,12 @@ function createReloginHandler(deps) {
         await deps.crypto.ensureReady();
         const userEmail = deps.authState.getUserEmail();
         if (!userEmail) {
-          console.warn("[API] No user email found for instant re-login");
+          console.warn("[API] Re-login aborted: no user email");
           return null;
         }
         const session = await deps.sessionStorage.getSession();
         if (!session) {
-          console.warn("[API] No session found for instant re-login");
+          console.warn("[API] Re-login aborted: no session");
           return null;
         }
         const ed25519PublicKey = session.signingPrivateKey.slice(32, 64);
@@ -409,37 +416,21 @@ function createReloginHandler(deps) {
         const timestamp = Math.floor(Date.now() / 1e3);
         const message = `${userEmail}|${timestamp}`;
         const signature = deps.crypto.signMessage(message, session.signingPrivateKey);
-        console.info("[API] Attempting instant re-login");
         const ssoState = deps.authState.getSsoState();
-        console.info("[API] Re-login SSO mode:", ssoState.isSsoMode);
-        console.info("[API] Auth0 authenticated:", ssoState.isAuth0Authenticated);
-        console.info("[API] Persisted Auth0 token available:", !!ssoState.auth0AccessToken);
         const isSsoAccount = ssoState.isSsoMode || ssoState.isAuth0Authenticated || !!ssoState.auth0AccessToken;
         let ssoToken = null;
         if (deps.ssoTokenProvider) {
-          console.info("[API] SSO token provider available: true");
           try {
             ssoToken = await deps.ssoTokenProvider.getToken();
-            console.info(
-              "[API] Got SSO token from provider:",
-              ssoToken ? "yes (length: " + ssoToken.length + ")" : "no"
-            );
           } catch (error) {
             console.error("[API] Failed to get SSO token from provider:", error);
           }
-        } else {
-          console.info("[API] SSO token provider available: false");
         }
         if (!ssoToken && ssoState.auth0AccessToken) {
           ssoToken = ssoState.auth0AccessToken;
-          console.info(
-            "[API] Using persisted SSO token (length:",
-            ssoToken.length,
-            ") - may be expired"
-          );
         }
         if (!ssoToken && isSsoAccount) {
-          console.warn("[API] SSO account requires token but none available - aborting re-login");
+          console.warn("[API] Re-login aborted: SSO account but no token available");
           return null;
         }
         const loginResult = await deps.loginProvider.login({
@@ -449,7 +440,7 @@ function createReloginHandler(deps) {
           ssoToken: ssoToken ?? void 0
         });
         if (!loginResult) {
-          console.warn("[API] Instant re-login failed");
+          console.warn("[API] Re-login failed");
           return null;
         }
         await deps.sessionStorage.saveSession({
@@ -487,7 +478,6 @@ function createReloginHandler(deps) {
                   selectedWorkspaceId,
                   encryptedWorkspaceKey
                 );
-                console.info("[API] Workspace re-opened after re-login");
               }
             }
           } catch (error) {
@@ -499,7 +489,7 @@ function createReloginHandler(deps) {
         lastSuccessTime = Date.now();
         return activeToken;
       } catch (error) {
-        console.error("[API] Instant re-login error:", error);
+        console.error("[API] Re-login error:", error);
         lastSuccessToken = null;
         lastSuccessTime = 0;
         return null;