@rejourneyco/react-native 1.0.1 → 1.0.3

package/ios/Utils/RJWindowUtils.m

@@ -23,111 +23,111 @@
 
 @implementation RJWindowUtils
 
+static __weak UIWindow *_cachedKeyWindow = nil;
+static NSTimeInterval _lastCacheTime = 0;
+static const NSTimeInterval kKeyWindowCacheTTL = 0.5; // Cache for 500ms
+
 + (UIWindow *)keyWindow {
-    if (@available(iOS 13.0, *)) {
-        // IMPORTANT:
-        // "Key window" can temporarily become a system window such as:
-        // - UITextEffectsWindow
-        // - UIRemoteKeyboardWindow / UIInputWindowController-hosted windows
-        // Capturing those can trigger keyboard autolayout warnings/spikes even if the
-        // user never focused a text field. Prefer a normal-level app window.
-        //
-        // ALSO IMPORTANT:
-        // Some frameworks (including React Native/Expo modals/overlays) may present
-        // content in a separate UIWindow with a windowLevel > UIWindowLevelNormal.
-        // If we only consider "normal" level, we may capture the wrong window and
-        // miss TextInputs entirely (privacy masking failure).
-        //
-        // We therefore prefer the TOP-MOST visible non-system window, while still
-        // excluding keyboard/text-effects windows.
-
-        UIWindow *bestKeyApp = nil;
-        CGFloat bestKeyAppLevel = -CGFLOAT_MAX;
-        UIWindow *bestApp = nil;
-        CGFloat bestAppLevel = -CGFLOAT_MAX;
-        UIWindow *anyKey = nil;
-
-        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
-            if (![scene isKindOfClass:[UIWindowScene class]]) {
-                continue;
-            }
-            UIWindowScene *windowScene = (UIWindowScene *)scene;
-            if (windowScene.activationState != UISceneActivationStateForegroundActive) {
-                continue;
-            }
-
-            for (UIWindow *window in windowScene.windows) {
-                if (!window || window.isHidden || window.alpha <= 0.01) {
-                    continue;
-                }
-
-                NSString *cls = NSStringFromClass([window class]);
-                BOOL isSystemInputWindow =
-                    ([cls containsString:@"Keyboard"] ||
-                     [cls containsString:@"TextEffects"] ||
-                     [cls containsString:@"InputWindow"] ||
-                     [cls containsString:@"RemoteKeyboard"]);
-
-                BOOL hasRoot = (window.rootViewController != nil);
-                BOOL isAppCandidate = (!isSystemInputWindow && hasRoot);
-                CGFloat level = window.windowLevel;
-
-                if (window.isKeyWindow) {
-                    // Keep as a last-ditch fallback (even if it's a system window).
-                    if (!anyKey) {
-                        anyKey = window;
-                    }
-                    if (isAppCandidate && level > bestKeyAppLevel) {
-                        bestKeyAppLevel = level;
-                        bestKeyApp = window;
-                    }
-                }
-
-                if (isAppCandidate && level > bestAppLevel) {
-                    bestAppLevel = level;
-                    bestApp = window;
-                }
-            }
-        }
+  NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
+  if (_cachedKeyWindow && (now - _lastCacheTime < kKeyWindowCacheTTL)) {
+    return _cachedKeyWindow;
+  }
+
+  UIWindow *window = [self findKeyWindowInternal];
+  _cachedKeyWindow = window;
+  _lastCacheTime = now;
+  return window;
+}
+
++ (UIWindow *)findKeyWindowInternal {
+  if (@available(iOS 13.0, *)) {
+    UIWindow *bestKeyApp = nil;
+    CGFloat bestKeyAppLevel = -CGFLOAT_MAX;
+    UIWindow *bestApp = nil;
+    CGFloat bestAppLevel = -CGFLOAT_MAX;
+    UIWindow *anyKey = nil;
 
-        if (bestKeyApp) {
-            return bestKeyApp;
+    for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
+      if (![scene isKindOfClass:[UIWindowScene class]]) {
+        continue;
+      }
+      UIWindowScene *windowScene = (UIWindowScene *)scene;
+      if (windowScene.activationState !=
+          UISceneActivationStateForegroundActive) {
+        continue;
+      }
+
+      for (UIWindow *window in windowScene.windows) {
+        if (!window || window.isHidden || window.alpha <= 0.01) {
+          continue;
         }
-        if (bestApp) {
-            return bestApp;
+
+        NSString *cls = NSStringFromClass([window class]);
+        BOOL isSystemInputWindow = ([cls containsString:@"Keyboard"] ||
+                                    [cls containsString:@"TextEffects"] ||
+                                    [cls containsString:@"InputWindow"] ||
+                                    [cls containsString:@"RemoteKeyboard"]);
+
+        BOOL hasRoot = (window.rootViewController != nil);
+        BOOL isAppCandidate = (!isSystemInputWindow && hasRoot);
+        CGFloat level = window.windowLevel;
+
+        if (window.isKeyWindow) {
+          if (!anyKey) {
+            anyKey = window;
+          }
+          if (isAppCandidate && level > bestKeyAppLevel) {
+            bestKeyAppLevel = level;
+            bestKeyApp = window;
+          }
         }
-        if (anyKey) {
-            return anyKey;
+
+        if (isAppCandidate && level > bestAppLevel) {
+          bestAppLevel = level;
+          bestApp = window;
         }
-    } else {
+      }
+    }
+
+    if (bestKeyApp) {
+      return bestKeyApp;
+    }
+    if (bestApp) {
+      return bestApp;
+    }
+    if (anyKey) {
+      return anyKey;
+    }
+  } else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        return [UIApplication sharedApplication].keyWindow;
+    return [UIApplication sharedApplication].keyWindow;
 #pragma clang diagnostic pop
-    }
-    return nil;
+  }
+  return nil;
 }
 
 + (NSString *)accessibilityLabelForView:(UIView *)view {
-    UIView *current = view;
-    while (current) {
-        if (current.accessibilityLabel.length > 0) {
-            return current.accessibilityLabel;
-        }
-        current = current.superview;
+  UIView *current = view;
+  while (current) {
+    if (current.accessibilityLabel.length > 0) {
+      return current.accessibilityLabel;
     }
-    return nil;
+    current = current.superview;
+  }
+  return nil;
 }
 
 + (NSString *)generateSessionId {
-    NSTimeInterval timestamp = [[NSDate date] timeIntervalSince1970];
-    NSString *timestampStr = [NSString stringWithFormat:@"%.0f", timestamp * 1000];
-    NSString *randomHex = [NSString stringWithFormat:@"%08X", arc4random()];
-    return [NSString stringWithFormat:@"session_%@_%@", timestampStr, randomHex];
+  NSTimeInterval timestamp = [[NSDate date] timeIntervalSince1970];
+  NSString *timestampStr =
+      [NSString stringWithFormat:@"%.0f", timestamp * 1000];
+  NSString *randomHex = [NSString stringWithFormat:@"%08X", arc4random()];
+  return [NSString stringWithFormat:@"session_%@_%@", timestampStr, randomHex];
 }
 
 + (NSTimeInterval)currentTimestampMillis {
-    return [[NSDate date] timeIntervalSince1970] * 1000;
+  return [[NSDate date] timeIntervalSince1970] * 1000;
 }
 
 @end

package/lib/commonjs/components/Mask.js

@@ -30,7 +30,6 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
  * </Mask>
  * ```
  */
-// Lazy-loaded React Native modules
 let _RN = null;
 function getRN() {
   if (_RN) return _RN;
@@ -54,8 +53,6 @@ const Mask = ({
   ...props
 }) => {
   const RN = getRN();
-
-  // If RN isn't loaded yet (shouldn't happen in practice), render children directly
   if (!RN) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
   }
@@ -64,9 +61,7 @@ const Mask = ({
     StyleSheet
   } = RN;
   const styles = StyleSheet.create({
-    container: {
-      // Minimal container style - doesn't affect layout
-    }
+    container: {}
   });
   return /*#__PURE__*/_react.default.createElement(View, _extends({}, props, {
     style: [styles.container, style],

package/lib/commonjs/index.js

@@ -175,13 +175,10 @@ function getReactNative() {
     return null;
   }
 }
-
-// Lazy-loaded logger
 let _logger = null;
 function getLogger() {
   if (_logger) return _logger;
   if (_sdkDisabled) {
-    // Return a no-op logger if SDK is disabled
     return {
       debug: () => {},
       info: console.log.bind(console, '[Rejourney]'),
@@ -197,7 +194,12 @@ function getLogger() {
       logRecordingStart: () => {},
       logRecordingRemoteDisabled: () => {},
       logInvalidProjectKey: () => {},
-      logPackageMismatch: () => {}
+      logPackageMismatch: () => {},
+      logNetworkRequest: () => {},
+      logFrustration: () => {},
+      logError: () => {},
+      logUploadStats: () => {},
+      logLifecycleEvent: () => {}
     };
   }
   try {
@@ -222,7 +224,12 @@ function getLogger() {
       logRecordingStart: () => {},
       logRecordingRemoteDisabled: () => {},
       logInvalidProjectKey: () => {},
-      logPackageMismatch: () => {}
+      logPackageMismatch: () => {},
+      logNetworkRequest: () => {},
+      logFrustration: () => {},
+      logError: () => {},
+      logUploadStats: () => {},
+      logLifecycleEvent: () => {}
     };
   }
 }
@@ -260,7 +267,7 @@ const noopAutoTracking = {
   notifyStateChange: () => {},
   getSessionMetrics: () => ({}),
   resetMetrics: () => {},
-  collectDeviceInfo: () => ({}),
+  collectDeviceInfo: async () => ({}),
   ensurePersistentAnonymousId: async () => 'anonymous'
 };
 function getAutoTracking() {
@@ -279,6 +286,7 @@ function getAutoTracking() {
 let _isInitialized = false;
 let _isRecording = false;
 let _initializationFailed = false;
+let _metricsInterval = null;
 let _appStateSubscription = null;
 let _authErrorSubscription = null;
 let _currentAppState = 'active'; // Default to active, will be updated on init
@@ -301,7 +309,7 @@ async function loadPersistedUserIdentity() {
 
     // NATIVE STORAGE: Read directly from SharedPreferences/NSUserDefaults
     return await nativeModule.getUserIdentity();
-  } catch (e) {
+  } catch {
     return null;
   }
 }
@@ -321,9 +329,7 @@ let _runtimeReady = false;
 function isRuntimeReady() {
   if (_runtimeReady) return true;
   try {
-    // Try to access a core module to verify runtime is ready
     const RN = require('react-native');
-    // If we can access NativeModules without error, runtime is ready
     if (RN.NativeModules) {
       _runtimeReady = true;
       return true;
@@ -406,12 +412,9 @@ function getRejourneyNative() {
       }
     }
   } catch (error) {
-    // If any access fails, log and return null
     getLogger().warn('Rejourney: Failed to access native modules:', error);
     _rejourneyNative = null;
   }
-
-  // Ensure we never return undefined - convert to null
   if (_rejourneyNative === undefined) {
     _rejourneyNative = null;
   }
@@ -486,18 +489,12 @@ const Rejourney = {
       const apiUrl = _storedConfig.apiUrl || 'https://api.rejourney.co';
       const publicKey = _storedConfig.publicRouteKey || '';
       getLogger().debug(`Calling native startSession (apiUrl=${apiUrl})`);
-
-      // Use user identity if set, otherwise use anonymous device ID
       const deviceId = await getAutoTracking().ensurePersistentAnonymousId();
-
-      // Try to load persisted user identity if not already set in memory
       if (!_userIdentity) {
         _userIdentity = await loadPersistedUserIdentity();
       }
       const userId = _userIdentity || deviceId;
       getLogger().debug(`userId=${userId.substring(0, 8)}...`);
-
-      // Start native session
       const result = await nativeModule.startSession(userId, apiUrl, publicKey);
       getLogger().debug('Native startSession returned:', JSON.stringify(result));
       if (!result?.success) {
@@ -510,10 +507,27 @@ const Rejourney = {
       }
       _isRecording = true;
       getLogger().debug(`✅ Session started: ${result.sessionId}`);
-      // Use lifecycle log for session start - only shown in dev builds
       getLogger().logSessionStart(result.sessionId);
-
-      // Initialize auto tracking features
+      // Start polling for upload stats in dev mode
+      if (__DEV__) {
+        _metricsInterval = setInterval(async () => {
+          if (!_isRecording) {
+            if (_metricsInterval) clearInterval(_metricsInterval);
+            return;
+          }
+          try {
+            const native = getRejourneyNative();
+            if (native) {
+              const metrics = await native.getSDKMetrics();
+              if (metrics) {
+                getLogger().logUploadStats(metrics);
+              }
+            }
+          } catch (e) {
+            getLogger().debug('Failed to fetch metrics:', e);
+          }
+        }, 10000); // Poll more frequently in dev (10s) for better feedback
+      }
       getAutoTracking().initAutoTracking({
         rageTapThreshold: _storedConfig?.rageTapThreshold ?? 3,
         rageTapTimeWindow: _storedConfig?.rageTapTimeWindow ?? 500,
@@ -531,7 +545,7 @@ const Rejourney = {
             x,
             y
           });
-          // logger.debug(`Rage tap detected: ${count} taps at (${x}, ${y})`);
+          getLogger().logFrustration(`Rage tap (${count} taps)`);
         },
         // Error callback - log as error event
         onError: error => {
@@ -540,46 +554,31 @@ const Rejourney = {
             stack: error.stack,
             name: error.name
           });
-          // logger.debug(`Error captured: ${error.message}`);
+          getLogger().logError(error.message);
         },
-        // Screen change callback - log screen change
-        onScreen: (_screenName, _previousScreen) => {
-          // Native module already handles screen changes
-          // This is just for metrics tracking
-          // logger.debug(`Screen changed: ${previousScreen} -> ${screenName}`);
-        }
+        onScreen: (_screenName, _previousScreen) => {}
       });
-
-      // Collect and log device info
       if (_storedConfig?.collectDeviceInfo !== false) {
         try {
-          const deviceInfo = getAutoTracking().collectDeviceInfo();
+          const deviceInfo = await getAutoTracking().collectDeviceInfo();
           this.logEvent('device_info', deviceInfo);
         } catch (deviceError) {
           getLogger().warn('Failed to collect device info:', deviceError);
         }
       }
-
-      // Setup automatic network interception
       if (_storedConfig?.autoTrackNetwork !== false) {
         try {
           const ignoreUrls = [apiUrl, '/api/ingest/presign', '/api/ingest/batch/complete', '/api/ingest/session/end', ...(_storedConfig?.networkIgnoreUrls || [])];
           getNetworkInterceptor().initNetworkInterceptor(request => {
-            this.logNetworkRequest(request);
             getAutoTracking().trackAPIRequest(request.success || false, request.statusCode, request.duration || 0, request.responseBodySize || 0);
           }, {
             ignoreUrls,
             captureSizes: _storedConfig?.networkCaptureSizes !== false
           });
-
-          // logger.debug('Network interception enabled');
         } catch (networkError) {
           getLogger().warn('Failed to setup network interception:', networkError);
         }
       }
-
-      // logger.debug('Auto tracking enabled');
-
       return true;
     } catch (error) {
       getLogger().error('Failed to start recording:', error);
@@ -596,17 +595,17 @@ const Rejourney = {
       return;
     }
     try {
-      // Get session metrics before stopping
       const metrics = getAutoTracking().getSessionMetrics();
       this.logEvent('session_metrics', metrics);
-
-      // Cleanup
       getNetworkInterceptor().disableNetworkInterceptor();
       getAutoTracking().cleanupAutoTracking();
       getAutoTracking().resetMetrics();
       await safeNativeCall('stopSession', () => getRejourneyNative().stopSession(), undefined);
+      if (_metricsInterval) {
+        clearInterval(_metricsInterval);
+        _metricsInterval = null;
+      }
       _isRecording = false;
-      // Use lifecycle log for session end - only shown in dev builds
       getLogger().logSessionEnd('current');
     } catch (error) {
       getLogger().error('Failed to stop recording:', error);
@@ -622,7 +621,6 @@ const Rejourney = {
    */
   logEvent(name, properties) {
     safeNativeCallSync('logEvent', () => {
-      // Fire and forget - don't await
       getRejourneyNative().logEvent(name, properties || {}).catch(() => {});
     }, undefined);
   },
@@ -638,9 +636,6 @@ const Rejourney = {
   setUserIdentity(userId) {
     _userIdentity = userId;
     persistUserIdentity(userId).catch(() => {});
-    // logger.debug(`User identity set: ${userId}`);
-
-    // If recording is active, update the native module immediately
     if (_isRecording && getRejourneyNative()) {
       safeNativeCallSync('setUserIdentity', () => {
         getRejourneyNative().setUserIdentity(userId).catch(() => {});
@@ -654,9 +649,6 @@ const Rejourney = {
   clearUserIdentity() {
     _userIdentity = null;
     persistUserIdentity(null).catch(() => {});
-    // logger.debug('User identity cleared');
-
-    // If recording is active, update the native module immediately  
     if (_isRecording && getRejourneyNative()) {
       safeNativeCallSync('setUserIdentity', () => {
         getRejourneyNative().setUserIdentity('anonymous').catch(() => {});
@@ -670,10 +662,7 @@ const Rejourney = {
    * @param params - Optional screen parameters
    */
   tagScreen(screenName, _params) {
-    // Track screen for metrics and funnel tracking
     getAutoTracking().trackScreen(screenName);
-
-    // Notify state change (kept for API compatibility)
     getAutoTracking().notifyStateChange();
     safeNativeCallSync('tagScreen', () => {
       getRejourneyNative().screenChanged(screenName).catch(() => {});
@@ -759,7 +748,6 @@ const Rejourney = {
    * @returns Path to export file (not implemented)
    */
   async exportSession(_sessionId) {
-    // Return empty string - actual export should be done from dashboard server
     getLogger().warn('exportSession not implemented - export from dashboard server');
     return '';
   },
@@ -851,10 +839,6 @@ const Rejourney = {
     getAutoTracking().trackScroll();
     await safeNativeCall('onScroll', () => getRejourneyNative().onScroll(scrollOffset), undefined);
   },
-  // ========================================================================
-  // OAuth / External URL Tracking
-  // ========================================================================
-
   /**
    * Notify the SDK that an OAuth flow is starting
    * 
@@ -985,15 +969,9 @@ const Rejourney = {
         errorMessage: request.errorMessage,
         cached: request.cached
       };
-
-      // Fire and forget - don't await, this is low priority
       getRejourneyNative().logEvent('network_request', networkEvent).catch(() => {});
     }, undefined);
   },
-  // ========================================================================
-  // SDK Telemetry / Observability
-  // ========================================================================
-
   /**
    * Get SDK telemetry metrics for observability
    * 
@@ -1041,10 +1019,6 @@ const Rejourney = {
       getLogger().warn('debugTriggerANR is only available in development mode');
     }
   },
-  // ========================================================================
-  // Privacy / View Masking
-  // ========================================================================
-
   /**
    * Mask a view by its nativeID prop (will be occluded in recordings)
    * 
@@ -1080,10 +1054,6 @@ const Rejourney = {
   }
 };
 
-// =============================================================================
-// Automatic Lifecycle Management
-// =============================================================================
-
 /**
  * Handle app state changes for automatic session management
  * - Pauses recording when app goes to background
@@ -1095,10 +1065,10 @@ function handleAppStateChange(nextAppState) {
   try {
     if (_currentAppState.match(/active/) && nextAppState === 'background') {
       // App going to background - native module handles this automatically
-      getLogger().debug('App moving to background');
+      getLogger().logLifecycleEvent('App moving to background');
     } else if (_currentAppState.match(/inactive|background/) && nextAppState === 'active') {
       // App coming back to foreground
-      getLogger().debug('App returning to foreground');
+      getLogger().logLifecycleEvent('App returning to foreground');
     }
     _currentAppState = nextAppState;
   } catch (error) {
@@ -1114,20 +1084,13 @@ function setupLifecycleManagement() {
   if (_sdkDisabled) return;
   const RN = getReactNative();
   if (!RN) return;
-
-  // Remove any existing subscription
   if (_appStateSubscription) {
     _appStateSubscription.remove();
     _appStateSubscription = null;
   }
   try {
-    // Get current app state
     _currentAppState = RN.AppState.currentState || 'active';
-
-    // Subscribe to app state changes
     _appStateSubscription = RN.AppState.addEventListener('change', handleAppStateChange);
-
-    // Setup auth error listener from native module
     setupAuthErrorListener();
     getLogger().debug('Lifecycle management enabled');
   } catch (error) {
@@ -1150,9 +1113,6 @@ function setupAuthErrorListener() {
   try {
     const nativeModule = getRejourneyNative();
     if (nativeModule) {
-      // RN warns if a non-null module is passed without addListener/removeListeners.
-      // Our native module may not implement these no-op methods yet, so only pass
-      // the module when those hooks exist; otherwise use the global emitter.
       const maybeAny = nativeModule;
       const hasEventEmitterHooks = typeof maybeAny?.addListener === 'function' && typeof maybeAny?.removeListeners === 'function';
       const eventEmitter = hasEventEmitterHooks ? new RN.NativeEventEmitter(maybeAny) : new RN.NativeEventEmitter();
@@ -1163,11 +1123,7 @@ function setupAuthErrorListener() {
         } else if (error?.code === 404) {
           getLogger().logInvalidProjectKey();
         }
-
-        // Update SDK state - recording has been stopped by native
         _isRecording = false;
-
-        // Call user's error handler if provided
         if (_storedConfig?.onAuthError) {
           try {
             _storedConfig.onAuthError(error);
@@ -1178,7 +1134,6 @@ function setupAuthErrorListener() {
       });
     }
   } catch (error) {
-    // Event emitter not available on this platform - that's OK
     getLogger().debug('Auth error listener not available:', error);
   }
 }
@@ -1197,10 +1152,6 @@ function cleanupLifecycleManagement() {
   }
 }
 
-// =============================================================================
-// Simple Initialization API
-// =============================================================================
-
 /**
  * Initialize Rejourney SDK - STEP 1 of 3
  * 
@@ -1230,14 +1181,11 @@ function cleanupLifecycleManagement() {
  * ```
  */
 function initRejourney(publicRouteKey, options) {
-  // Validate public route key
   if (!publicRouteKey || typeof publicRouteKey !== 'string') {
     getLogger().warn('Rejourney: Invalid public route key provided. SDK will be disabled.');
     _initializationFailed = true;
     return;
   }
-
-  // Store config for later use
   _storedConfig = {
     ...options,
     publicRouteKey
@@ -1291,8 +1239,6 @@ function startRejourney() {
   }
   getLogger().logRecordingStart();
   getLogger().debug('Starting session...');
-
-  // Fire and forget - don't block the caller
   (async () => {
     try {
       const started = await Rejourney._startSession();
@@ -1323,12 +1269,7 @@ function stopRejourney() {
     getLogger().warn('Error stopping Rejourney:', error);
   }
 }
-var _default = exports.default = Rejourney; // Export types
-// Export auto tracking utilities for advanced usage
-// These are used internally but can be called manually if needed
-// Navigation
-// Re-export LogLevel enum from utils
-// Note: This is safe because the enum itself doesn't trigger react-native imports
+var _default = exports.default = Rejourney;
 /**
  * Configure SDK log verbosity.
  * 
@@ -1360,16 +1301,4 @@ var _default = exports.default = Rejourney; // Export types
 function setLogLevel(level) {
   getLogger().setLogLevel(level);
 }
-
-// Note: Components and hooks removed in new engine
-// Session replay now handled by dashboard web UI
-// export { RejourneyReplay } from './components/replay/RejourneyReplay';
-// export { GestureTracker } from './components/GestureTracker';
-// export { SessionList } from './components/SessionList';
-// export { useRejourney } from './hooks/useRejourney';
-// export { useReplay } from './hooks/useReplay';
-
-// Note: SDK managers removed in new engine - all functionality handled by native module
-
-// Export Mask component
 //# sourceMappingURL=index.js.map