@rejourneyco/react-native 1.0.9 → 1.0.10

package/lib/commonjs/sdk/autoTracking.js

@@ -13,11 +13,13 @@ exports.getRemainingSessionDurationMs = getRemainingSessionDurationMs;
 exports.getSessionMetrics = getSessionMetrics;
 exports.hasExceededMaxSessionDuration = hasExceededMaxSessionDuration;
 exports.initAutoTracking = initAutoTracking;
+exports.isExpoRouterTrackingEnabled = isExpoRouterTrackingEnabled;
 exports.loadAnonymousId = loadAnonymousId;
 exports.markTapHandled = markTapHandled;
 exports.notifyStateChange = notifyStateChange;
 exports.resetMetrics = resetMetrics;
 exports.setAnonymousId = setAnonymousId;
+exports.setExpoRouterPollingInterval = setExpoRouterPollingInterval;
 exports.setMaxSessionDurationMinutes = setMaxSessionDurationMinutes;
 exports.trackAPIRequest = trackAPIRequest;
 exports.trackGesture = trackGesture;
@@ -147,6 +149,7 @@ function initAutoTracking(trackingConfig, callbacks = {}) {
     trackReactNativeErrors: true,
     trackConsoleLogs: true,
     collectDeviceInfo: true,
+    autoTrackExpoRouter: true,
     maxSessionDurationMs: trackingConfig.maxSessionDurationMs,
     ...trackingConfig
   };
@@ -596,10 +599,26 @@ function restoreConsoleHandlers() {
   // Note: console.error is restored in restoreErrorHandlers via originalConsoleError
 }
 let navigationPollingInterval = null;
+/** Interval ID from optional expo-router entry; cleared in cleanupNavigationTracking */
+let expoRouterPollingIntervalId = null;
 let lastDetectedScreen = '';
 let navigationSetupDone = false;
-let navigationPollingErrors = 0;
-const MAX_POLLING_ERRORS = 10; // Stop polling after 10 consecutive errors
+
+/**
+ * Register the polling interval from the optional expo-router entry so we can clear it on cleanup.
+ * Used by src/expoRouterTracking.ts (only loaded when app imports '@rejourneyco/react-native/expo-router').
+ */
+function setExpoRouterPollingInterval(id) {
+  expoRouterPollingIntervalId = id;
+}
+
+/**
+ * Check if Expo Router auto-tracking is enabled in the current configuration.
+ * Used by src/expoRouterTracking.ts.
+ */
+function isExpoRouterTrackingEnabled() {
+  return config.autoTrackExpoRouter !== false;
+}
 
 /**
  * Track a navigation state change from React Navigation.
@@ -696,91 +715,94 @@ function useNavigationTracking() {
 }
 
 /**
- * Setup automatic Expo Router tracking
- * 
- * For Expo apps using expo-router - works automatically.
- * For bare React Native apps - use trackNavigationState instead.
+ * Setup automatic navigation tracking.
+ *
+ * Expo Router: not set up here to avoid pulling expo-router into the main bundle
+ * (Metro resolves require() at build time, which causes "Requiring unknown module"
+ * in apps that use Expo + react-navigation without expo-router). If you use
+ * expo-router, add: import '@rejourneyco/react-native/expo-router';
+ *
+ * For React Navigation (non–expo-router), use trackNavigationState() on your
+ * NavigationContainer's onStateChange.
  */
 function setupNavigationTracking() {
   if (navigationSetupDone) return;
   navigationSetupDone = true;
-  if (__DEV__) {
-    _utils.logger.debug('Setting up navigation tracking...');
+
+  // Auto-detect expo-router and set up screen tracking if available.
+  // This is safe: if expo-router isn't installed, the require fails silently.
+  // We defer slightly so the router has time to initialize after JS bundle load.
+  if (config.autoTrackExpoRouter !== false) {
+    tryAutoSetupExpoRouter();
   }
-  let attempts = 0;
-  const maxAttempts = 5;
-  const trySetup = () => {
-    attempts++;
-    if (__DEV__) {
-      _utils.logger.debug('Navigation setup attempt', attempts, 'of', maxAttempts);
-    }
-    const success = trySetupExpoRouter();
-    if (success) {
-      if (__DEV__) {
-        _utils.logger.debug('Expo Router setup: SUCCESS on attempt', attempts);
-      }
-    } else if (attempts < maxAttempts) {
-      const delay = 200 * attempts;
-      if (__DEV__) {
-        _utils.logger.debug('Expo Router not ready, retrying in', delay, 'ms');
+}
+
+/**
+ * Attempt to auto-detect and set up expo-router screen tracking.
+ * Uses a retry mechanism because the router may not be ready immediately
+ * after JS bundle load.
+ */
+function tryAutoSetupExpoRouter(attempt = 0, maxAttempts = 5) {
+  const delay = 200 * (attempt + 1); // 200, 400, 600, 800, 1000ms
+
+  setTimeout(() => {
+    try {
+      // Dynamic require wrapped in a variable to prevent Metro from statically resolving it
+      const EXPO_ROUTER = 'expo-router';
+      const expoRouter = require(EXPO_ROUTER);
+      if (!expoRouter?.router) {
+        // expo-router exists but router not ready yet — retry
+        if (attempt < maxAttempts - 1) {
+          tryAutoSetupExpoRouter(attempt + 1, maxAttempts);
+        }
+        return;
       }
-      setTimeout(trySetup, delay);
-    } else {
-      if (__DEV__) {
-        _utils.logger.debug('Expo Router setup: FAILED after', maxAttempts, 'attempts');
-        _utils.logger.debug('For manual navigation tracking, use trackNavigationState() on your NavigationContainer');
+
+      // Router is ready — set up the polling-based screen tracker
+      setupExpoRouterPolling(expoRouter.router);
+    } catch {
+      // expo-router not installed — this is fine, just means the app
+      // uses bare React Navigation or no navigation at all.
+      if (__DEV__ && attempt === 0) {
+        _utils.logger.debug('Expo Router not detected, skipping auto screen tracking. Use trackNavigationState() for React Navigation.');
       }
     }
-  };
-  setTimeout(trySetup, 200);
+  }, delay);
 }
 
 /**
-   * Set up Expo Router auto-tracking by polling the internal router store
-   * 
-   * Supports both expo-router v3 (store.rootState) and v6+ (store.state, store.navigationRef)
-   */
-function trySetupExpoRouter() {
+ * Poll expo-router state for screen changes.
+ * Inlined from expoRouterTracking.ts so no separate import is needed.
+ */
+function setupExpoRouterPolling(router) {
+  // Guard against double-setup (core auto-detection + legacy expoRouterTracking.ts import)
+  if (expoRouterPollingIntervalId != null) return;
+  const MAX_POLLING_ERRORS = 10;
+  let pollingErrors = 0;
   try {
-    const expoRouter = require('expo-router');
-    const router = expoRouter.router;
-    if (!router) {
-      if (__DEV__) {
-        _utils.logger.debug('Expo Router: router object not found');
-      }
-      return false;
-    }
-    if (__DEV__) {
-      _utils.logger.debug('Expo Router: Setting up navigation tracking');
-    }
     const {
       normalizeScreenName,
       getScreenNameFromPath
     } = require('./navigation');
-    navigationPollingInterval = setInterval(() => {
+    const intervalId = setInterval(() => {
       try {
         let state = null;
-        let stateSource = '';
         if (typeof router.getState === 'function') {
           state = router.getState();
-          stateSource = 'router.getState()';
         } else if (router.rootState) {
           state = router.rootState;
-          stateSource = 'router.rootState';
         }
         if (!state) {
           try {
-            const storeModule = require('expo-router/build/global-state/router-store');
+            const STORE_PATH = 'expo-router/build/global-state/router-store';
+            const storeModule = require(STORE_PATH);
             if (storeModule?.store) {
               state = storeModule.store.state;
-              if (state) stateSource = 'store.state';
               if (!state && storeModule.store.navigationRef?.current) {
                 state = storeModule.store.navigationRef.current.getRootState?.();
-                if (state) stateSource = 'navigationRef.getRootState()';
               }
               if (!state) {
                 state = storeModule.store.rootState || storeModule.store.initialState;
-                if (state) stateSource = 'store.rootState/initialState';
               }
             }
           } catch {
@@ -789,67 +811,53 @@ function trySetupExpoRouter() {
         }
         if (!state) {
           try {
-            const imperative = require('expo-router/build/imperative-api');
+            const IMPERATIVE_PATH = 'expo-router/build/imperative-api';
+            const imperative = require(IMPERATIVE_PATH);
             if (imperative?.router) {
               state = imperative.router.getState?.();
-              if (state) stateSource = 'imperative-api';
             }
           } catch {
             // Ignore
           }
         }
         if (state) {
-          navigationPollingErrors = 0;
-          navigationPollingErrors = 0;
+          pollingErrors = 0;
           const screenName = extractScreenNameFromRouterState(state, getScreenNameFromPath, normalizeScreenName);
           if (screenName && screenName !== lastDetectedScreen) {
-            if (__DEV__) {
-              _utils.logger.debug('Screen changed:', lastDetectedScreen, '->', screenName, `(source: ${stateSource})`);
-            }
             lastDetectedScreen = screenName;
             trackScreen(screenName);
           }
         } else {
-          navigationPollingErrors++;
-          if (__DEV__ && navigationPollingErrors === 1) {
-            _utils.logger.debug('Expo Router: Could not get navigation state');
-          }
-          if (navigationPollingErrors >= MAX_POLLING_ERRORS) {
-            cleanupNavigationTracking();
+          pollingErrors++;
+          if (pollingErrors >= MAX_POLLING_ERRORS) {
+            clearInterval(intervalId);
+            expoRouterPollingIntervalId = null;
           }
         }
-      } catch (e) {
-        navigationPollingErrors++;
-        if (__DEV__ && navigationPollingErrors === 1) {
-          _utils.logger.debug('Expo Router polling error:', e);
-        }
-        if (navigationPollingErrors >= MAX_POLLING_ERRORS) {
-          cleanupNavigationTracking();
+      } catch {
+        pollingErrors++;
+        if (pollingErrors >= MAX_POLLING_ERRORS) {
+          clearInterval(intervalId);
+          expoRouterPollingIntervalId = null;
         }
       }
     }, 500);
-    return true;
-  } catch (e) {
-    if (__DEV__) {
-      _utils.logger.debug('Expo Router not available:', e);
-    }
-    return false;
+    expoRouterPollingIntervalId = intervalId;
+  } catch {
+    // navigation module not available — ignore
   }
 }
 
 /**
- * Extract screen name from Expo Router navigation state
- * 
- * Handles complex nested structures like Drawer → Tabs → Stack
- * by recursively accumulating segments from each navigation level.
+ * Extract the active screen name from expo-router navigation state.
  */
-function extractScreenNameFromRouterState(state, getScreenNameFromPath, normalizeScreenName, accumulatedSegments = []) {
+function extractScreenNameFromRouterState(state, getScreenNameFromPathFn, normalizeScreenNameFn, accumulatedSegments = []) {
   if (!state?.routes) return null;
   const route = state.routes[state.index ?? state.routes.length - 1];
   if (!route) return null;
   const newSegments = [...accumulatedSegments, route.name];
   if (route.state) {
-    return extractScreenNameFromRouterState(route.state, getScreenNameFromPath, normalizeScreenName, newSegments);
+    return extractScreenNameFromRouterState(route.state, getScreenNameFromPathFn, normalizeScreenNameFn, newSegments);
   }
   const cleanSegments = newSegments.filter(s => !s.startsWith('(') && !s.endsWith(')'));
   if (cleanSegments.length === 0) {
@@ -862,7 +870,7 @@ function extractScreenNameFromRouterState(state, getScreenNameFromPath, normaliz
     }
   }
   const pathname = '/' + cleanSegments.join('/');
-  return getScreenNameFromPath(pathname, newSegments);
+  return getScreenNameFromPathFn(pathname, newSegments);
 }
 
 /**
@@ -873,9 +881,12 @@ function cleanupNavigationTracking() {
     clearInterval(navigationPollingInterval);
     navigationPollingInterval = null;
   }
+  if (expoRouterPollingIntervalId != null) {
+    clearInterval(expoRouterPollingIntervalId);
+    expoRouterPollingIntervalId = null;
+  }
   navigationSetupDone = false;
   lastDetectedScreen = '';
-  navigationPollingErrors = 0;
 }
 
 /**

package/lib/module/expoRouterTracking.js

@@ -0,0 +1,135 @@
+/**
+ * Optional Expo Router integration for @rejourneyco/react-native
+ *
+ * This file is only loaded when you import '@rejourneyco/react-native/expo-router'.
+ * It contains require('expo-router') and related subpaths. Metro bundles require()
+ * at build time, so keeping this in a separate entry ensures apps that use
+ * Expo with react-navigation (without expo-router) never pull in expo-router
+ * and avoid "Requiring unknown module" crashes.
+ *
+ * If you use expo-router, add this once (e.g. in your root _layout.tsx):
+ *   import '@rejourneyco/react-native/expo-router';
+ */
+
+import { trackScreen, setExpoRouterPollingInterval, isExpoRouterTrackingEnabled } from './sdk/autoTracking';
+import { normalizeScreenName, getScreenNameFromPath } from './sdk/navigation';
+const MAX_POLLING_ERRORS = 10;
+function extractScreenNameFromRouterState(state, getScreenNameFromPathFn, normalizeScreenNameFn, accumulatedSegments = []) {
+  if (!state?.routes) return null;
+  const route = state.routes[state.index ?? state.routes.length - 1];
+  if (!route) return null;
+  const newSegments = [...accumulatedSegments, route.name];
+  if (route.state) {
+    return extractScreenNameFromRouterState(route.state, getScreenNameFromPathFn, normalizeScreenNameFn, newSegments);
+  }
+  const cleanSegments = newSegments.filter(s => !s.startsWith('(') && !s.endsWith(')'));
+  if (cleanSegments.length === 0) {
+    for (let i = newSegments.length - 1; i >= 0; i--) {
+      const seg = newSegments[i];
+      if (seg && !seg.startsWith('(') && !seg.endsWith(')')) {
+        cleanSegments.push(seg);
+        break;
+      }
+    }
+  }
+  const pathname = '/' + cleanSegments.join('/');
+  return getScreenNameFromPathFn(pathname, newSegments);
+}
+function setupExpoRouterPolling() {
+  let lastDetectedScreen = '';
+  let pollingErrors = 0;
+  try {
+    const EXPO_ROUTER = 'expo-router';
+    const expoRouter = require(EXPO_ROUTER);
+    const router = expoRouter.router;
+    if (!router) {
+      if (typeof __DEV__ !== 'undefined' && __DEV__) {
+        console.debug('[Rejourney] Expo Router: router object not found');
+      }
+      return;
+    }
+    const intervalId = setInterval(() => {
+      try {
+        let state = null;
+        if (typeof router.getState === 'function') {
+          state = router.getState();
+        } else if (router.rootState) {
+          state = router.rootState;
+        }
+        if (!state) {
+          try {
+            const STORE_PATH = 'expo-router/build/global-state/router-store';
+            const storeModule = require(STORE_PATH);
+            if (storeModule?.store) {
+              state = storeModule.store.state;
+              if (!state && storeModule.store.navigationRef?.current) {
+                state = storeModule.store.navigationRef.current.getRootState?.();
+              }
+              if (!state) {
+                state = storeModule.store.rootState || storeModule.store.initialState;
+              }
+            }
+          } catch {
+            // Ignore
+          }
+        }
+        if (!state) {
+          try {
+            const IMPERATIVE_PATH = 'expo-router/build/imperative-api';
+            const imperative = require(IMPERATIVE_PATH);
+            if (imperative?.router) {
+              state = imperative.router.getState?.();
+            }
+          } catch {
+            // Ignore
+          }
+        }
+        if (state) {
+          pollingErrors = 0;
+          const screenName = extractScreenNameFromRouterState(state, getScreenNameFromPath, normalizeScreenName);
+          if (screenName && screenName !== lastDetectedScreen) {
+            lastDetectedScreen = screenName;
+            trackScreen(screenName);
+          }
+        } else {
+          pollingErrors++;
+          if (pollingErrors >= MAX_POLLING_ERRORS) {
+            clearInterval(intervalId);
+            setExpoRouterPollingInterval(null);
+          }
+        }
+      } catch {
+        pollingErrors++;
+        if (pollingErrors >= MAX_POLLING_ERRORS) {
+          clearInterval(intervalId);
+          setExpoRouterPollingInterval(null);
+        }
+      }
+    }, 500);
+    setExpoRouterPollingInterval(intervalId);
+  } catch (e) {
+    if (typeof __DEV__ !== 'undefined' && __DEV__) {
+      console.debug('[Rejourney] Expo Router not available:', e);
+    }
+  }
+}
+let attempts = 0;
+const maxAttempts = 5;
+function trySetup() {
+  attempts++;
+  try {
+    const EXPO_ROUTER = 'expo-router';
+    const expoRouter = require(EXPO_ROUTER);
+    if (expoRouter?.router && isExpoRouterTrackingEnabled()) {
+      setupExpoRouterPolling();
+      return;
+    }
+  } catch {
+    // Not ready or not installed
+  }
+  if (attempts < maxAttempts) {
+    setTimeout(trySetup, 200 * attempts);
+  }
+}
+setTimeout(trySetup, 200);
+//# sourceMappingURL=expoRouterTracking.js.map