@umituz/react-native-firebase 1.13.9 → 1.13.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-firebase",
-  "version": "1.13.9",
+  "version": "1.13.11",
   "description": "Unified Firebase package for React Native apps - Auth and Firestore services using Firebase JS SDK (no native modules).",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/auth/presentation/hooks/useFirebaseAuth.ts

@@ -1,14 +1,22 @@
 /**
  * useFirebaseAuth Hook
  * React hook for Firebase Auth state management
- * 
+ *
  * Directly uses Firebase Auth's built-in state management via onAuthStateChanged
+ * Includes retry mechanism to wait for Firebase initialization
  */
 
-import { useEffect, useState } from "react";
+import { useEffect, useState, useRef, useCallback } from "react";
 import { onAuthStateChanged, type User } from "firebase/auth";
 import { getFirebaseAuth, isFirebaseAuthInitialized } from "../../infrastructure/config/FirebaseAuthClient";
 
+declare const __DEV__: boolean;
+
+/** Retry interval in milliseconds */
+const RETRY_INTERVAL_MS = 100;
+/** Maximum retry attempts (100ms * 50 = 5 seconds max wait) */
+const MAX_RETRY_ATTEMPTS = 50;
+
 export interface UseFirebaseAuthResult {
   /** Current authenticated user from Firebase Auth */
   user: User | null;
@@ -20,10 +28,10 @@ export interface UseFirebaseAuthResult {
 
 /**
  * Hook for Firebase Auth state management
- * 
+ *
  * Directly uses Firebase Auth's built-in state management.
- * No additional state management layer needed.
- * 
+ * Includes retry mechanism to wait for Firebase initialization.
+ *
  * @example
  * ```typescript
  * const { user, loading } = useFirebaseAuth();
@@ -34,46 +42,98 @@ export function useFirebaseAuth(): UseFirebaseAuthResult {
   const [loading, setLoading] = useState(true);
   const [initialized, setInitialized] = useState(false);
 
-  useEffect(() => {
-    // Check if Firebase Auth is initialized
-    const isInitialized = isFirebaseAuthInitialized();
-    setInitialized(isInitialized);
-
-    if (!isInitialized) {
-      setLoading(false);
-      setUser(null);
-      return;
-    }
+  const retryCountRef = useRef(0);
+  const unsubscribeRef = useRef<(() => void) | null>(null);
+  const retryIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
 
+  const subscribeToAuth = useCallback(() => {
     try {
       const auth = getFirebaseAuth();
-      
+
       if (!auth) {
-        setUser(null);
-        setLoading(false);
-        return;
+        return false;
       }
-      
+
       // Subscribe to auth state changes
-      const unsubscribe = onAuthStateChanged(auth, (currentUser: User | null) => {
+      unsubscribeRef.current = onAuthStateChanged(auth, (currentUser: User | null) => {
+        if (__DEV__) {
+          console.log('[useFirebaseAuth] Auth state changed:', currentUser?.uid || 'null');
+        }
         setUser(currentUser);
         setLoading(false);
+        setInitialized(true);
       });
 
-      // Set initial state
-      setUser(auth.currentUser);
-      setLoading(false);
+      return true;
+    } catch {
+      return false;
+    }
+  }, []);
 
+  useEffect(() => {
+    // Try to subscribe immediately if Firebase is ready
+    if (isFirebaseAuthInitialized()) {
+      if (__DEV__) {
+        console.log('[useFirebaseAuth] Firebase already initialized, subscribing...');
+      }
+      setInitialized(true);
+      subscribeToAuth();
       return () => {
-        unsubscribe();
+        if (unsubscribeRef.current) {
+          unsubscribeRef.current();
+        }
       };
-    } catch (error) {
-      // Firebase Auth not initialized or error
-      setUser(null);
-      setLoading(false);
-      return () => {};
     }
-  }, []);
+
+    // Firebase not ready, start polling
+    if (__DEV__) {
+      console.log('[useFirebaseAuth] Firebase not initialized, starting retry...');
+    }
+
+    retryIntervalRef.current = setInterval(() => {
+      retryCountRef.current += 1;
+
+      if (isFirebaseAuthInitialized()) {
+        // Firebase is now initialized, subscribe and stop polling
+        if (__DEV__) {
+          console.log('[useFirebaseAuth] Firebase initialized after', retryCountRef.current, 'retries');
+        }
+
+        if (retryIntervalRef.current) {
+          clearInterval(retryIntervalRef.current);
+          retryIntervalRef.current = null;
+        }
+
+        setInitialized(true);
+        subscribeToAuth();
+        return;
+      }
+
+      if (retryCountRef.current >= MAX_RETRY_ATTEMPTS) {
+        // Max retries reached, stop polling
+        if (__DEV__) {
+          console.log('[useFirebaseAuth] Max retries reached, Firebase not initialized');
+        }
+
+        if (retryIntervalRef.current) {
+          clearInterval(retryIntervalRef.current);
+          retryIntervalRef.current = null;
+        }
+
+        setLoading(false);
+        setUser(null);
+      }
+    }, RETRY_INTERVAL_MS);
+
+    return () => {
+      if (retryIntervalRef.current) {
+        clearInterval(retryIntervalRef.current);
+      }
+      if (unsubscribeRef.current) {
+        unsubscribeRef.current();
+      }
+    };
+  }, [subscribeToAuth]);
 
   return {
     user,