@oxyhq/services 5.6.10 → 5.7.1

package/src/ui/context/OxyContext.tsx

@@ -138,6 +138,18 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
   // Add a new state to track token restoration
   const [tokenReady, setTokenReady] = React.useState(false);
 
+  // Add refs to prevent duplicate API calls
+  const initAuthRef = React.useRef(false);
+  const tokenRestoreRef = React.useRef(false);
+
+  // Development warning about React StrictMode
+  React.useEffect(() => {
+    if (__DEV__) {
+      console.log('🔍 OxyContext: React StrictMode may cause effects to run twice in development');
+      console.log('🔍 This is normal and helps detect side effects. Production builds will not have this behavior.');
+    }
+  }, []);
+
   // Storage keys (memoized to prevent infinite loops)
   const keys = useMemo(() => getSecureStorageKeys(storageKeyPrefix), [storageKeyPrefix]);
 
@@ -159,8 +171,12 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
   // Effect to initialize authentication state
   useEffect(() => {
     const initAuth = async () => {
-      if (!storage) return;
+      if (!storage || initAuthRef.current) return;
+
+      // Prevent multiple simultaneous initializations
+      if (isLoading) return;
 
+      initAuthRef.current = true;
       useAuthStore.setState({ isLoading: true });
       try {
         // Load stored sessions
@@ -254,15 +270,16 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       }
     };
 
-    if (storage) {
+    if (storage && !isLoading) {
       initAuth();
     }
-  }, [storage, oxyServices, keys, onAuthStateChange]);
+  }, [storage, oxyServices, keys.sessions, keys.activeSessionId]); // Removed onAuthStateChange from deps
 
-  // Effect to restore token on app load or session switch
+  // Effect to restore token on app load or session switch - with proper guards
   useEffect(() => {
     const restoreToken = async () => {
-      if (activeSessionId && oxyServices) {
+      if (activeSessionId && oxyServices && !tokenReady && !tokenRestoreRef.current) {
+        tokenRestoreRef.current = true;
         try {
           await oxyServices.getTokenBySession(activeSessionId);
           setTokenReady(true);
@@ -271,13 +288,16 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
           await logout();
           setTokenReady(false);
         }
-      } else {
+      } else if (!activeSessionId && !tokenReady) {
         setTokenReady(true); // No session, so token is not needed
       }
     };
-    restoreToken();
-    // Only run when activeSessionId or oxyServices changes
-  }, [activeSessionId, oxyServices]);
+
+    // Only run if we haven't already set tokenReady
+    if (!tokenReady) {
+      restoreToken();
+    }
+  }, [activeSessionId, oxyServices, tokenReady]); // Added tokenReady to prevent re-runs
 
   // Remove invalid session
   const removeInvalidSession = useCallback(async (sessionId: string): Promise<void> => {

package/src/ui/hooks/useSessionSocket.ts

@@ -13,9 +13,10 @@ interface UseSessionSocketProps {
 
 export function useSessionSocket({ userId, activeSessionId, refreshSessions, logout, baseURL, onRemoteSignOut }: UseSessionSocketProps) {
   const socketRef = useRef<any>(null);
+  const connectedRef = useRef(false);
 
   useEffect(() => {
-    if (!userId || !baseURL) return;
+    if (!userId || !baseURL || connectedRef.current) return;
 
     if (!socketRef.current) {
       socketRef.current = io(baseURL, {
@@ -26,6 +27,7 @@ export function useSessionSocket({ userId, activeSessionId, refreshSessions, log
 
     socket.on('connect', () => {
       console.log('Socket connected:', socket.id);
+      connectedRef.current = true;
     });
 
     socket.emit('join', { userId: `user:${userId}` });
@@ -43,6 +45,7 @@ export function useSessionSocket({ userId, activeSessionId, refreshSessions, log
     });
 
     return () => {
+      connectedRef.current = false;
       socket.emit('leave', { userId: `user:${userId}` });
       socket.off('session_update');
     };