@pear-protocol/symmio-client 0.3.2 → 0.3.5

package/dist/react/index.mjs

@@ -2,7 +2,7 @@
 import { createContext, useContext, useMemo, useCallback, useRef, useEffect } from 'react';
 import { createSymmSDK, isAuthExpiredError, isNetworkError, isInsufficientMarginError, isRateLimitedError, isTimeoutError } from '@pear-protocol/symm-core';
 import { create } from 'zustand';
-import { useQueryClient, useQuery, useMutation } from '@tanstack/react-query';
+import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query';
 import { jsx } from 'react/jsx-runtime';
 import { SiweMessage } from 'siwe';
 import { isAddress, encodeFunctionData } from 'viem';
@@ -675,6 +675,9 @@ function useSymmWs(params = {}) {
   }, [symmCoreClient, accountAddress, chainId, queryClient, setConnected]);
   return { isConnected };
 }
+function trimTrailingSlashes(value) {
+  return value.replace(/\/+$/, "");
+}
 function SymmProvider({
   chainId = 42161,
   address,
@@ -686,13 +689,21 @@ function SymmProvider({
   symmioConfig,
   children
 }) {
+  const normalizedApiUrl = useMemo(
+    () => trimTrailingSlashes(symmCoreConfig.apiUrl),
+    [symmCoreConfig.apiUrl]
+  );
+  const normalizedWsUrl = useMemo(
+    () => symmCoreConfig.wsUrl ? trimTrailingSlashes(symmCoreConfig.wsUrl) : void 0,
+    [symmCoreConfig.wsUrl]
+  );
   const symmCoreClient = useMemo(() => {
     return createSymmSDK({
-      apiUrl: symmCoreConfig.apiUrl,
-      wsUrl: symmCoreConfig.wsUrl,
+      apiUrl: normalizedApiUrl,
+      wsUrl: normalizedWsUrl,
       defaultChainId: chainId
     });
-  }, [chainId, symmCoreConfig.apiUrl, symmCoreConfig.wsUrl]);
+  }, [chainId, normalizedApiUrl, normalizedWsUrl]);
   const value = useMemo(
     () => ({
       symmCoreClient,
@@ -893,27 +904,116 @@ async function fetchAccessTokenEntry(walletClient, signerAddress, accountAddress
   writeStoredToken(accountAddress, chainId, cachedToken);
   return cachedToken;
 }
+function authStoreKey(accountAddress, chainId, signerAddress) {
+  return `${accountAddress}:${chainId}:${signerAddress ?? ""}`;
+}
+function getEntryFromSnapshot(state, accountAddress, chainId, signerAddress) {
+  const signerScoped = state.entries[authStoreKey(accountAddress, chainId, signerAddress)];
+  if (signerScoped) {
+    return signerScoped;
+  }
+  return state.entries[authStoreKey(accountAddress, chainId)] ?? null;
+}
+function getStatusFromSnapshot(state, accountAddress, chainId, signerAddress) {
+  const signerScoped = state.status[authStoreKey(accountAddress, chainId, signerAddress)];
+  if (signerScoped) {
+    return signerScoped;
+  }
+  return state.status[authStoreKey(accountAddress, chainId)] ?? {
+    error: null,
+    isLoading: false
+  };
+}
+var useSymmAuthStore = create((set) => ({
+  entries: {},
+  status: {},
+  setEntry: (accountAddress, chainId, signerAddress, entry) => set((state) => ({
+    entries: {
+      ...state.entries,
+      [authStoreKey(accountAddress, chainId, signerAddress)]: entry
+    },
+    status: {
+      ...state.status,
+      [authStoreKey(accountAddress, chainId, signerAddress)]: {
+        error: null,
+        isLoading: false
+      }
+    }
+  })),
+  clearEntry: (accountAddress, chainId, signerAddress) => set((state) => {
+    const nextEntries = { ...state.entries };
+    const nextStatus = { ...state.status };
+    delete nextEntries[authStoreKey(accountAddress, chainId, signerAddress)];
+    delete nextStatus[authStoreKey(accountAddress, chainId, signerAddress)];
+    return {
+      entries: nextEntries,
+      status: nextStatus
+    };
+  }),
+  setStatus: (accountAddress, chainId, signerAddress, status) => set((state) => ({
+    status: {
+      ...state.status,
+      [authStoreKey(accountAddress, chainId, signerAddress)]: {
+        error: null,
+        isLoading: false,
+        ...state.status[authStoreKey(accountAddress, chainId, signerAddress)],
+        ...status
+      }
+    }
+  })),
+  reset: () => set({
+    entries: {},
+    status: {}
+  })
+}));
+function getAuthStoreEntry(accountAddress, chainId, signerAddress) {
+  return getEntryFromSnapshot(
+    useSymmAuthStore.getState(),
+    accountAddress,
+    chainId,
+    signerAddress
+  );
+}
+function selectAuthStoreEntry(state, accountAddress, chainId, signerAddress) {
+  if (!accountAddress || chainId == null) {
+    return null;
+  }
+  return getEntryFromSnapshot(state, accountAddress, chainId, signerAddress);
+}
+function selectAuthStoreStatus(state, accountAddress, chainId, signerAddress) {
+  if (!accountAddress || chainId == null) {
+    return {
+      error: null,
+      isLoading: false
+    };
+  }
+  return getStatusFromSnapshot(state, accountAddress, chainId, signerAddress);
+}
+function setAuthStoreEntry(accountAddress, chainId, signerAddress, entry) {
+  useSymmAuthStore.getState().setEntry(accountAddress, chainId, signerAddress, entry);
+}
+function setAuthStoreStatus(accountAddress, chainId, signerAddress, status) {
+  useSymmAuthStore.getState().setStatus(accountAddress, chainId, signerAddress, status);
+}
+function clearAuthStoreEntry(accountAddress, chainId, signerAddress) {
+  useSymmAuthStore.getState().clearEntry(accountAddress, chainId, signerAddress);
+}
 
 // src/react/auth-cache.ts
-function getAuthQueryData(queryClient, accountAddress, chainId, signerAddress) {
-  return queryClient.getQueryData(
-    symmKeys.auth(accountAddress, chainId, signerAddress)
-  ) ?? null;
+function getAuthQueryData(accountAddress, chainId, signerAddress) {
+  return getAuthStoreEntry(accountAddress, chainId, signerAddress);
 }
-function setAuthQueryData(queryClient, accountAddress, chainId, signerAddress, entry) {
-  queryClient.setQueryData(symmKeys.auth(accountAddress, chainId, signerAddress), entry);
+function setAuthQueryData(accountAddress, chainId, signerAddress, entry) {
+  setAuthStoreEntry(accountAddress, chainId, signerAddress, entry);
 }
-function clearAuthQueryData(queryClient, accountAddress, chainId, signerAddress) {
-  queryClient.removeQueries({
-    queryKey: symmKeys.auth(accountAddress, chainId, signerAddress),
-    exact: true
-  });
+function clearAuthQueryData(accountAddress, chainId, signerAddress) {
+  clearAuthStoreEntry(accountAddress, chainId, signerAddress);
 }
 function clearPersistedAuthState(accountAddress, chainId) {
   clearCachedToken(accountAddress, chainId);
 }
-function getAuthTokenFromRuntimeCache(queryClient, accountAddress, chainId, signerAddress) {
-  const inQuery = getAuthQueryData(queryClient, accountAddress, chainId, signerAddress) ?? getAuthQueryData(queryClient, accountAddress, chainId);
+function getAuthTokenFromRuntimeCache(accountAddress, chainId, signerAddress) {
+  const inQuery = getAuthQueryData(accountAddress, chainId, signerAddress) ?? getAuthQueryData(accountAddress, chainId);
   if (inQuery && inQuery.expiresAt > Date.now()) {
     return inQuery.token;
   }
@@ -921,11 +1021,10 @@ function getAuthTokenFromRuntimeCache(queryClient, accountAddress, chainId, sign
   if (!persisted) {
     return null;
   }
-  setAuthQueryData(queryClient, accountAddress, chainId, signerAddress, persisted);
+  setAuthQueryData(accountAddress, chainId, signerAddress, persisted);
   return persisted.token;
 }
 async function resolveAuthTokenEntry({
-  queryClient,
   walletClient,
   signerAddress,
   accountAddress,
@@ -937,13 +1036,13 @@ async function resolveAuthTokenEntry({
     return null;
   }
   if (!force) {
-    const inQuery = getAuthQueryData(queryClient, accountAddress, chainId, signerAddress);
+    const inQuery = getAuthQueryData(accountAddress, chainId, signerAddress);
     if (inQuery && inQuery.expiresAt > Date.now()) {
       return inQuery;
     }
     const persisted = getCachedTokenEntry(accountAddress, chainId);
     if (persisted) {
-      setAuthQueryData(queryClient, accountAddress, chainId, signerAddress, persisted);
+      setAuthQueryData(accountAddress, chainId, signerAddress, persisted);
       return persisted;
     }
   }
@@ -954,25 +1053,33 @@ async function resolveAuthTokenEntry({
     chainId,
     siweDomain
   );
-  setAuthQueryData(queryClient, accountAddress, chainId, signerAddress, fresh);
+  setAuthQueryData(accountAddress, chainId, signerAddress, fresh);
   return fresh;
 }
-function clearAuthState(queryClient, accountAddress, chainId, signerAddress) {
+function clearAuthState(accountAddress, chainId, signerAddress) {
   clearPersistedAuthState(accountAddress, chainId);
-  clearAuthQueryData(queryClient, accountAddress, chainId, signerAddress);
+  clearAuthQueryData(accountAddress, chainId, signerAddress);
 }
 
 // src/react/hooks/use-symm-auth.ts
 function useSymmAuth(params) {
   const context = useSymmContext();
-  const queryClient = useQueryClient();
   const address = params?.address ?? context.address;
   const chainId = params?.chainId ?? context.chainId ?? 42161;
   const walletClient = params?.walletClient ?? context.walletClient;
   const siweDomain = params?.siweDomain;
   const activeAccountAddress = params?.activeAccountAddress;
-  const canBootstrap = !!walletClient && !!address && !!activeAccountAddress;
-  const refreshAuth = useCallback(
+  const authEntry = useSymmAuthStore(
+    (state) => selectAuthStoreEntry(state, activeAccountAddress, chainId, address)
+  );
+  useSymmAuthStore(
+    (state) => selectAuthStoreStatus(state, activeAccountAddress, chainId, address).isLoading
+  );
+  const error = useSymmAuthStore(
+    (state) => selectAuthStoreStatus(state, activeAccountAddress, chainId, address).error
+  );
+  const persistedEntry = !authEntry && activeAccountAddress ? getCachedTokenEntry(activeAccountAddress, chainId) : null;
+  const signIn = useCallback(
     async (accountAddress, options) => {
       const resolvedAccountAddress = accountAddress ?? activeAccountAddress;
       if (!resolvedAccountAddress) {
@@ -980,8 +1087,11 @@ function useSymmAuth(params) {
       }
       if (!walletClient || !address) return null;
       try {
-        const tokenEntry = await resolveAuthTokenEntry({
-          queryClient,
+        setAuthStoreStatus(resolvedAccountAddress, chainId, address, {
+          error: null,
+          isLoading: true
+        });
+        const tokenEntry2 = await resolveAuthTokenEntry({
           walletClient,
           signerAddress: address,
           accountAddress: resolvedAccountAddress,
@@ -989,10 +1099,16 @@ function useSymmAuth(params) {
           siweDomain,
           force: options?.force
         });
-        const token2 = tokenEntry?.token ?? null;
-        return token2;
-      } catch (error) {
-        clearPersistedAuthState(resolvedAccountAddress, chainId);
+        setAuthStoreStatus(resolvedAccountAddress, chainId, address, {
+          error: null,
+          isLoading: false
+        });
+        return tokenEntry2?.token ?? null;
+      } catch (error2) {
+        clearAuthState(resolvedAccountAddress, chainId, address);
+        setAuthStoreStatus(resolvedAccountAddress, chainId, address, {
+          error: error2 instanceof Error ? error2 : new Error("failed to sign in")
+        });
         return null;
       }
     },
@@ -1001,46 +1117,22 @@ function useSymmAuth(params) {
       address,
       activeAccountAddress,
       chainId,
-      siweDomain,
-      queryClient
+      siweDomain
     ]
   );
-  const authQuery = useQuery({
-    queryKey: symmKeys.auth(activeAccountAddress, chainId, address),
-    queryFn: async () => {
-      const tokenEntry = await resolveAuthTokenEntry({
-        queryClient,
-        walletClient,
-        signerAddress: address,
-        accountAddress: activeAccountAddress,
-        chainId,
-        siweDomain
-      });
-      if (!tokenEntry) {
-        return null;
-      }
-      return tokenEntry;
-    },
-    enabled: canBootstrap,
-    retry: false,
-    refetchOnWindowFocus: false,
-    refetchOnReconnect: false
-  });
   const clearAuth = useCallback(() => {
     if (activeAccountAddress) {
-      clearAuthState(queryClient, activeAccountAddress, chainId, address);
+      clearAuthState(activeAccountAddress, chainId, address);
     }
-  }, [activeAccountAddress, address, chainId, queryClient]);
-  const token = authQuery.data?.token ?? null;
+  }, [activeAccountAddress, address, chainId]);
+  const tokenEntry = authEntry ?? persistedEntry;
+  const token = tokenEntry?.token ?? null;
   return {
     accessToken: token,
-    authToken: token,
     isAuthenticated: !!token,
-    isLoading: authQuery.isLoading,
-    isFetching: authQuery.isFetching,
-    error: authQuery.error,
-    refresh: refreshAuth,
-    refreshAuth,
+    error,
+    signIn,
+    refreshAuth: signIn,
     clear: clearAuth
   };
 }
@@ -1844,7 +1936,6 @@ async function ensureInstantTradeReady(deps, queryClient, request) {
     throw new Error("at least one delegation selector is required");
   }
   const accessToken = getAuthTokenFromRuntimeCache(
-    queryClient,
     accountAddress,
     chainId,
     signerAddress
@@ -2254,7 +2345,6 @@ function splitTradeHookArgs(paramsOrOptions, options) {
 }
 function useResolveTradeAuthToken(params = {}) {
   const context = useSymmContext();
-  const queryClient = useQueryClient();
   const address = params.address ?? context.address;
   const chainId = params.chainId ?? context.chainId;
   return useCallback(
@@ -2268,7 +2358,6 @@ function useResolveTradeAuthToken(params = {}) {
         return null;
       }
       const inMemoryToken = getAuthTokenFromRuntimeCache(
-        queryClient,
         resolvedAccountAddress,
         resolvedChainId,
         address
@@ -2278,7 +2367,7 @@ function useResolveTradeAuthToken(params = {}) {
       }
       return null;
     },
-    [address, chainId, queryClient]
+    [address, chainId]
   );
 }
 
@@ -26240,7 +26329,6 @@ function useSymmPendingInstantOpens(params) {
     chainId: ctxChainId,
     address
   } = useSymmContext();
-  const queryClient = useQueryClient();
   const { accountAddress, authToken: providedAuthToken } = params;
   const chainId = params.chainId ?? ctxChainId;
   const internalEnabled = !!symmCoreClient && !!accountAddress;
@@ -26249,7 +26337,6 @@ function useSymmPendingInstantOpens(params) {
     queryKey: symmKeys.pendingInstantOpens(accountAddress, chainId),
     queryFn: async () => {
       const authToken = providedAuthToken ?? getAuthTokenFromRuntimeCache(
-        queryClient,
         accountAddress,
         chainId,
         address