@calimero-network/mero-react 6.0.0 → 6.0.2

package/dist/index.cjs

@@ -328,6 +328,7 @@ function MeroProvider({
   const [contextId, setContextIdState] = react.useState(() => getContextId());
   const [contextIdentity, setContextIdentityState] = react.useState(() => getContextIdentity());
   const meroRef = react.useRef(null);
+  const recoveringRef = react.useRef(false);
   const callbackRef = react.useRef(void 0);
   if (callbackRef.current === void 0 && isBrowser) {
     callbackRef.current = meroJs.parseAuthCallback(window.location.href);
@@ -351,12 +352,18 @@ function MeroProvider({
     async (instance) => {
       const accessToken = tokenStore.getTokens()?.access_token;
       if (!accessToken) return false;
-      try {
-        const { valid } = await instance.auth.validateToken(accessToken);
-        return valid;
-      } catch {
-        return false;
-      }
+      const validate = async (token) => {
+        try {
+          const { valid } = await instance.auth.validateToken(token);
+          return valid;
+        } catch {
+          return false;
+        }
+      };
+      if (await validate(accessToken)) return true;
+      const rotated = tokenStore.getTokens()?.access_token;
+      if (!rotated || rotated === accessToken) return false;
+      return validate(rotated);
     },
     [tokenStore]
   );
@@ -483,9 +490,23 @@ function MeroProvider({
     const onError = (err) => {
       if (!active) return;
       setIsOnline(false);
-      if (err.message.includes("401")) {
-        logout();
-      }
+      if (!err.message.includes("401")) return;
+      if (recoveringRef.current) return;
+      recoveringRef.current = true;
+      void (async () => {
+        try {
+          const instance = meroRef.current;
+          if (!instance) return;
+          if (await checkAuth(instance)) {
+            if (active) await instance.events.connect().catch(() => {
+            });
+            return;
+          }
+          if (active) logout();
+        } finally {
+          recoveringRef.current = false;
+        }
+      })();
     };
     sse.on("connect", onConnect);
     sse.on("error", onError);
@@ -497,7 +518,7 @@ function MeroProvider({
       sse.off("connect", onConnect);
       sse.off("error", onError);
     };
-  }, [isAuthenticated, mero]);
+  }, [isAuthenticated, mero, checkAuth, logout]);
   const contextValue = react.useMemo(
     () => ({
       mero,