@volr/react 0.1.20 → 0.1.21

package/dist/index.js

@@ -9306,6 +9306,21 @@ var APIClient = class {
   }
 };
 
+// src/config/backend.ts
+var DEFAULT_API_BASE_URL = "https://api.volr.io";
+function resolveApiBaseUrl(config) {
+  const anyConfig = config;
+  const devOverride = anyConfig.__devApiBaseUrl;
+  if (devOverride && typeof devOverride === "string") {
+    return devOverride.replace(/\/+$/, "");
+  }
+  const override = anyConfig.apiBaseUrl;
+  if (override && typeof override === "string") {
+    return override.replace(/\/+$/, "");
+  }
+  return DEFAULT_API_BASE_URL;
+}
+
 // src/headless/auth-sync.ts
 var SessionSync = class {
   constructor() {
@@ -9319,11 +9334,12 @@ var SessionSync = class {
     }
     if (typeof window !== "undefined") {
       window.addEventListener("storage", (e) => {
-        if (e.key === STORAGE_KEYS.accessToken || e.key === STORAGE_KEYS.user) {
+        if (e.key === STORAGE_KEYS.accessToken || e.key === STORAGE_KEYS.refreshToken || e.key === STORAGE_KEYS.user) {
           this.notifyListeners({
             type: "REFRESH",
             payload: {
-              accessToken: safeStorage.getItem(STORAGE_KEYS.accessToken) || ""
+              accessToken: safeStorage.getItem(STORAGE_KEYS.accessToken) || "",
+              refreshToken: safeStorage.getItem(STORAGE_KEYS.refreshToken)
             }
           });
         }
@@ -9377,19 +9393,63 @@ var SessionSync = class {
   }
 };
 
-// src/config/backend.ts
-var DEFAULT_API_BASE_URL = "https://api.volr.io";
-function resolveApiBaseUrl(config) {
-  const anyConfig = config;
-  const devOverride = anyConfig.__devApiBaseUrl;
-  if (devOverride && typeof devOverride === "string") {
-    return devOverride.replace(/\/+$/, "");
-  }
-  const override = anyConfig.apiBaseUrl;
-  if (override && typeof override === "string") {
-    return override.replace(/\/+$/, "");
-  }
-  return DEFAULT_API_BASE_URL;
+// src/react/hooks/useSessionSync.ts
+function useSessionSync({
+  client,
+  config,
+  setAccessTokenState,
+  setRefreshTokenState,
+  setUser,
+  setProviderState
+}) {
+  const syncRef = useRef(null);
+  useEffect(() => {
+    syncRef.current = new SessionSync();
+    const unsubscribe = syncRef.current.subscribe((event) => {
+      if (event.type === "LOGIN") {
+        client.setAccessToken(event.payload.accessToken);
+        setAccessTokenState(event.payload.accessToken);
+        client.setRefreshToken(event.payload.refreshToken);
+        setRefreshTokenState(event.payload.refreshToken);
+        setUser(event.payload.user);
+        safeStorage.setItem(
+          STORAGE_KEYS.user,
+          JSON.stringify(event.payload.user)
+        );
+        client.setApiKey(config.projectApiKey);
+      } else if (event.type === "LOGOUT") {
+        client.setAccessToken(null);
+        client.setRefreshToken(null);
+        setAccessTokenState(null);
+        setRefreshTokenState(null);
+        setUser(null);
+        setProviderState(null);
+        safeStorage.removeItem(STORAGE_KEYS.user);
+        safeStorage.removeItem(STORAGE_KEYS.provider);
+      } else if (event.type === "REFRESH") {
+        client.setAccessToken(event.payload.accessToken);
+        setAccessTokenState(event.payload.accessToken);
+        if (event.payload.refreshToken) {
+          client.setRefreshToken(event.payload.refreshToken);
+          setRefreshTokenState(event.payload.refreshToken);
+        }
+      } else if (event.type === "PROVIDER_SET") {
+        setUser(
+          (prev) => prev ? {
+            ...prev,
+            keyStorageType: event.payload.keyStorageType,
+            address: event.payload.address
+          } : null
+        );
+        safeStorage.setItem(STORAGE_KEYS.provider, event.payload.keyStorageType);
+      }
+    });
+    return () => {
+      unsubscribe();
+      syncRef.current?.destroy();
+    };
+  }, [client, config.projectApiKey, setAccessTokenState, setRefreshTokenState, setUser, setProviderState]);
+  return syncRef;
 }
 
 // src/config/webauthn.ts
@@ -9652,6 +9712,120 @@ async function restorePasskey(params) {
     provider
   };
 }
+
+// src/react/hooks/useAutoRecover.ts
+function useAutoRecover({
+  client,
+  config,
+  setAccessTokenState,
+  setRefreshTokenState,
+  setUser,
+  setProviderState,
+  setProvider,
+  setIsLoading
+}) {
+  const REQUIRE_USER_GESTURE_TO_RESTORE = true;
+  const hasRecoveredRef = useRef(false);
+  const restorationAttemptedRef = useRef(false);
+  useEffect(() => {
+    if (config.autoRecoverOnLogin !== false && !hasRecoveredRef.current) {
+      hasRecoveredRef.current = true;
+      const recover = async () => {
+        try {
+          setIsLoading(true);
+          if (!client.getRefreshToken()) {
+            console.log("[Provider] No refresh token found, skipping auto-recover");
+            setIsLoading(false);
+            return;
+          }
+          const refreshedUser = await client.refreshSession();
+          console.log("[Provider] Session refreshed, user:", refreshedUser);
+          setAccessTokenState(client.getAccessToken());
+          setRefreshTokenState(client.getRefreshToken());
+          if (refreshedUser) {
+            setUser(refreshedUser);
+            if (!REQUIRE_USER_GESTURE_TO_RESTORE) ; else if (refreshedUser.keyStorageType === "passkey") {
+              console.log("[Provider] TTL=0 mode: Provider restoration deferred");
+              if (!refreshedUser.blobUrl || !refreshedUser.prfInput) {
+                console.warn("[Provider] Passkey user missing blobUrl or prfInput");
+              }
+            }
+          } else {
+            const userStr = safeStorage.getItem(STORAGE_KEYS.user);
+            if (userStr) {
+              try {
+                setUser(JSON.parse(userStr));
+              } catch {
+                safeStorage.removeItem(STORAGE_KEYS.user);
+              }
+            }
+          }
+        } catch {
+          client.setAccessToken(null);
+          client.setRefreshToken(null);
+          setAccessTokenState(null);
+          setRefreshTokenState(null);
+          setUser(null);
+          setProviderState(null);
+          safeStorage.removeItem(STORAGE_KEYS.user);
+          safeStorage.removeItem(STORAGE_KEYS.provider);
+        } finally {
+          setIsLoading(false);
+        }
+      };
+      recover();
+    } else {
+      setIsLoading(false);
+    }
+  }, [client, config.autoRecoverOnLogin, setAccessTokenState, setRefreshTokenState, setUser, setProviderState, setProvider, setIsLoading]);
+}
+function useWalletEvents({
+  user,
+  logout,
+  setUser,
+  setProviderState
+}) {
+  useEffect(() => {
+    if (!user) return;
+    if (typeof window === "undefined" || !window.ethereum) {
+      return;
+    }
+    const ethereum = window.ethereum;
+    const handleAccountsChanged = (accounts) => {
+      console.log("[Provider] accountsChanged event:", accounts);
+      if (accounts.length === 0) {
+        console.warn("[Provider] Wallet disconnected, logging out...");
+        setTimeout(() => logout(), 3e3);
+      } else if (user.evmAddress && accounts[0].toLowerCase() !== user.evmAddress.toLowerCase()) {
+        console.warn("[Provider] Account changed, logging out in 3 seconds...");
+        setTimeout(() => logout(), 3e3);
+      }
+    };
+    const handleChainChanged = (chainIdHex) => {
+      const newChainId = parseInt(chainIdHex, 16);
+      console.log("[Provider] chainChanged event:", newChainId);
+      setUser(
+        (prev) => prev ? { ...prev, lastWalletChainId: newChainId } : null
+      );
+      window.location.reload();
+    };
+    const handleDisconnect = () => {
+      console.log("[Provider] disconnect event");
+      setProviderState(null);
+      safeStorage.removeItem(STORAGE_KEYS.provider);
+    };
+    ethereum.on("accountsChanged", handleAccountsChanged);
+    ethereum.on("chainChanged", handleChainChanged);
+    ethereum.on("disconnect", handleDisconnect);
+    return () => {
+      ethereum.removeListener("accountsChanged", handleAccountsChanged);
+      ethereum.removeListener("chainChanged", handleChainChanged);
+      ethereum.removeListener("disconnect", handleDisconnect);
+    };
+  }, [user, logout, setUser, setProviderState]);
+}
+
+// src/utils/json.ts
 function serializeBigIntDeep(obj) {
   if (obj === null || obj === void 0) {
     return obj;
@@ -9673,8 +9847,62 @@ function serializeBigIntDeep(obj) {
   }
   return obj;
 }
+
+// src/react/hooks/useVolrActions.ts
+function useVolrActions({
+  client,
+  setError
+}) {
+  const precheck = useCallback(
+    async (input) => {
+      try {
+        setError(null);
+        await client.ensureAccessToken();
+        const response = await client.post(
+          "/wallet/precheck",
+          input
+        );
+        return response.quote;
+      } catch (err) {
+        const error = err instanceof Error ? err : new Error("Precheck failed");
+        const diag = err?.response?.data?.error?.developerDiagnostics;
+        if (diag) {
+          console.error("[volr][precheck] developerDiagnostics:", diag);
+        }
+        setError(error);
+        throw error;
+      }
+    },
+    [client, setError]
+  );
+  const relay = useCallback(
+    async (input, opts) => {
+      try {
+        setError(null);
+        await client.ensureAccessToken();
+        const idempotencyKey = opts?.idempotencyKey ?? (typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`);
+        const serializedInput = serializeBigIntDeep(input);
+        const response = await client.post(
+          "/wallet/relay",
+          serializedInput,
+          idempotencyKey
+        );
+        return response;
+      } catch (err) {
+        const error = err instanceof Error ? err : new Error("Relay failed");
+        const diag = err?.response?.data?.error?.developerDiagnostics;
+        if (diag) {
+          console.error("[volr][relay] developerDiagnostics:", diag);
+        }
+        setError(error);
+        throw error;
+      }
+    },
+    [client, setError]
+  );
+  return { precheck, relay };
+}
 function VolrProvider({ config, children }) {
-  const REQUIRE_USER_GESTURE_TO_RESTORE = true;
   const providerCountRef = useRef(0);
   useEffect(() => {
     providerCountRef.current++;
@@ -9723,45 +9951,14 @@ function VolrProvider({ config, children }) {
   const [refreshToken, setRefreshTokenState] = useState(() => {
     return client.getRefreshToken();
   });
-  const syncRef = useRef(null);
-  useEffect(() => {
-    syncRef.current = new SessionSync();
-    const unsubscribe = syncRef.current.subscribe((event) => {
-      if (event.type === "LOGIN") {
-        client.setAccessToken(event.payload.accessToken);
-        setAccessTokenState(event.payload.accessToken);
-        setUser(event.payload.user);
-        safeStorage.setItem(
-          STORAGE_KEYS.user,
-          JSON.stringify(event.payload.user)
-        );
-        client.setApiKey(config.projectApiKey);
-      } else if (event.type === "LOGOUT") {
-        client.setAccessToken(null);
-        client.setRefreshToken(null);
-        setAccessTokenState(null);
-        setRefreshTokenState(null);
-        setUser(null);
-        setProviderState(null);
-        safeStorage.removeItem(STORAGE_KEYS.user);
-        safeStorage.removeItem(STORAGE_KEYS.provider);
-      } else if (event.type === "REFRESH") {
-        client.setAccessToken(event.payload.accessToken);
-        setAccessTokenState(event.payload.accessToken);
-      } else if (event.type === "PROVIDER_SET") {
-        setUser((prev) => ({
-          ...prev,
-          keyStorageType: event.payload.keyStorageType,
-          address: event.payload.address
-        }));
-        safeStorage.setItem(STORAGE_KEYS.provider, event.payload.keyStorageType);
-      }
-    });
-    return () => {
-      unsubscribe();
-      syncRef.current?.destroy();
-    };
-  }, [client, config.projectApiKey]);
+  const syncRef = useSessionSync({
+    client,
+    config,
+    setAccessTokenState,
+    setRefreshTokenState,
+    setUser,
+    setProviderState
+  });
   const setProvider = useCallback(
     async (newProvider) => {
       try {
@@ -9793,108 +9990,22 @@ function VolrProvider({ config, children }) {
         throw error2;
       }
     },
-    [client, user]
-  );
-  const hasRecoveredRef = useRef(false);
-  const restorationAttemptedRef = useRef(false);
-  useEffect(() => {
-    if (config.autoRecoverOnLogin !== false && !hasRecoveredRef.current) {
-      hasRecoveredRef.current = true;
-      const recover = async () => {
-        try {
-          setIsLoading(true);
-          if (!client.getRefreshToken()) {
-            console.log("[Provider] No refresh token found, skipping auto-recover");
-            setIsLoading(false);
-            return;
-          }
-          const refreshedUser = await client.refreshSession();
-          console.log("[Provider] Session refreshed, user:", refreshedUser);
-          setAccessTokenState(client.getAccessToken());
-          setRefreshTokenState(client.getRefreshToken());
-          if (refreshedUser) {
-            setUser(refreshedUser);
-            if (!REQUIRE_USER_GESTURE_TO_RESTORE) ; else if (refreshedUser.keyStorageType === "passkey") {
-              console.log("[Provider] TTL=0 mode: Provider restoration deferred");
-              if (!refreshedUser.blobUrl || !refreshedUser.prfInput) {
-                console.warn("[Provider] Passkey user missing blobUrl or prfInput");
-              }
-            }
-          } else {
-            const userStr = safeStorage.getItem(STORAGE_KEYS.user);
-            if (userStr) {
-              try {
-                setUser(JSON.parse(userStr));
-              } catch {
-                safeStorage.removeItem(STORAGE_KEYS.user);
-              }
-            }
-          }
-        } catch {
-          client.setAccessToken(null);
-          client.setRefreshToken(null);
-          setAccessTokenState(null);
-          setRefreshTokenState(null);
-          setUser(null);
-          setProviderState(null);
-          safeStorage.removeItem(STORAGE_KEYS.user);
-          safeStorage.removeItem(STORAGE_KEYS.provider);
-        } finally {
-          setIsLoading(false);
-        }
-      };
-      recover();
-    } else {
-      setIsLoading(false);
-    }
-  }, [client, config.autoRecoverOnLogin]);
-  const precheck = useCallback(
-    async (input) => {
-      try {
-        setError(null);
-        await client.ensureAccessToken();
-        const response = await client.post(
-          "/wallet/precheck",
-          input
-        );
-        return response.quote;
-      } catch (err) {
-        const error2 = err instanceof Error ? err : new Error("Precheck failed");
-        const diag = err?.response?.data?.error?.developerDiagnostics;
-        if (diag) {
-          console.error("[volr][precheck] developerDiagnostics:", diag);
-        }
-        setError(error2);
-        throw error2;
-      }
-    },
-    [client]
-  );
-  const relay = useCallback(
-    async (input, opts) => {
-      try {
-        setError(null);
-        await client.ensureAccessToken();
-        const idempotencyKey = opts?.idempotencyKey ?? (typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`);
-        const serializedInput = serializeBigIntDeep(input);
-        const response = await client.post(
-          "/wallet/relay",
-          serializedInput,
-          idempotencyKey
-        );
-        return response;
-      } catch (err) {
-        const error2 = err instanceof Error ? err : new Error("Relay failed");
-        const diag = err?.response?.data?.error?.developerDiagnostics;
-        if (diag) {
-          console.error("[volr][relay] developerDiagnostics:", diag);
-        }
-        setError(error2);
-        throw error2;
-      }
-    },
-    [client]
+    [client, user, syncRef]
   );
+  useAutoRecover({
+    client,
+    config,
+    setAccessTokenState,
+    setRefreshTokenState,
+    setUser,
+    setProviderState,
+    setProvider,
+    setIsLoading
+  });
+  const { precheck, relay } = useVolrActions({
+    client,
+    setError
+  });
   const logout = useCallback(async () => {
     try {
       setError(null);
@@ -9914,45 +10025,13 @@ function VolrProvider({ config, children }) {
       setError(error2);
       throw error2;
     }
-  }, [client]);
-  useEffect(() => {
-    if (!user) return;
-    if (typeof window === "undefined" || !window.ethereum) {
-      return;
-    }
-    const ethereum = window.ethereum;
-    const handleAccountsChanged = (accounts) => {
-      console.log("[Provider] accountsChanged event:", accounts);
-      if (accounts.length === 0) {
-        console.warn("[Provider] Wallet disconnected, logging out...");
-        setTimeout(() => logout(), 3e3);
-      } else if (user.evmAddress && accounts[0].toLowerCase() !== user.evmAddress.toLowerCase()) {
-        console.warn("[Provider] Account changed, logging out in 3 seconds...");
-        setTimeout(() => logout(), 3e3);
-      }
-    };
-    const handleChainChanged = (chainIdHex) => {
-      const newChainId = parseInt(chainIdHex, 16);
-      console.log("[Provider] chainChanged event:", newChainId);
-      setUser(
-        (prev) => prev ? { ...prev, lastWalletChainId: newChainId } : null
-      );
-      window.location.reload();
-    };
-    const handleDisconnect = () => {
-      console.log("[Provider] disconnect event");
-      setProviderState(null);
-      safeStorage.removeItem(STORAGE_KEYS.provider);
-    };
-    ethereum.on("accountsChanged", handleAccountsChanged);
-    ethereum.on("chainChanged", handleChainChanged);
-    ethereum.on("disconnect", handleDisconnect);
-    return () => {
-      ethereum.removeListener("accountsChanged", handleAccountsChanged);
-      ethereum.removeListener("chainChanged", handleChainChanged);
-      ethereum.removeListener("disconnect", handleDisconnect);
-    };
-  }, [user, logout, setUser]);
+  }, [client, syncRef]);
+  useWalletEvents({
+    user,
+    logout,
+    setUser,
+    setProviderState
+  });
   const publicValue = useMemo(
     () => ({
       config,
@@ -18538,6 +18617,10 @@ function useVolrLogin() {
       setAccessToken(accessToken);
       if (refreshToken) {
         setRefreshToken(refreshToken);
+      } else {
+        console.warn(
+          "[useVolrLogin] Access token received but refresh token is missing. Check if backend is updated to return refresh token in body."
+        );
       }
       if (userFromServer) {
         setUser(toVolrUser(userFromServer));