@rejourneyco/react-native 1.0.2 → 1.0.3

package/ios/Utils/RJWindowUtils.m

@@ -23,110 +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) {
-                    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/index.js

@@ -194,7 +194,12 @@ function getLogger() {
       logRecordingStart: () => {},
       logRecordingRemoteDisabled: () => {},
       logInvalidProjectKey: () => {},
-      logPackageMismatch: () => {}
+      logPackageMismatch: () => {},
+      logNetworkRequest: () => {},
+      logFrustration: () => {},
+      logError: () => {},
+      logUploadStats: () => {},
+      logLifecycleEvent: () => {}
     };
   }
   try {
@@ -219,7 +224,12 @@ function getLogger() {
       logRecordingStart: () => {},
       logRecordingRemoteDisabled: () => {},
       logInvalidProjectKey: () => {},
-      logPackageMismatch: () => {}
+      logPackageMismatch: () => {},
+      logNetworkRequest: () => {},
+      logFrustration: () => {},
+      logError: () => {},
+      logUploadStats: () => {},
+      logLifecycleEvent: () => {}
     };
   }
 }
@@ -276,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
@@ -478,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) {
@@ -502,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,
@@ -523,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 => {
@@ -532,17 +554,10 @@ 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 = await getAutoTracking().collectDeviceInfo();
@@ -551,13 +566,10 @@ const Rejourney = {
           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,
@@ -589,6 +601,10 @@ const Rejourney = {
       getAutoTracking().cleanupAutoTracking();
       getAutoTracking().resetMetrics();
       await safeNativeCall('stopSession', () => getRejourneyNative().stopSession(), undefined);
+      if (_metricsInterval) {
+        clearInterval(_metricsInterval);
+        _metricsInterval = null;
+      }
       _isRecording = false;
       getLogger().logSessionEnd('current');
     } catch (error) {
@@ -605,7 +621,6 @@ const Rejourney = {
    */
   logEvent(name, properties) {
     safeNativeCallSync('logEvent', () => {
-      // Fire and forget - don't await
       getRejourneyNative().logEvent(name, properties || {}).catch(() => {});
     }, undefined);
   },
@@ -733,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 '';
   },
@@ -955,8 +969,6 @@ 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);
   },
@@ -1053,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) {

package/lib/commonjs/sdk/autoTracking.js

@@ -479,9 +479,6 @@ function setupNavigationTracking() {
   if (__DEV__) {
     _utils.logger.debug('Setting up navigation tracking...');
   }
-
-  // Delay to ensure navigation is initialized - Expo Router needs more time
-  // We retry a few times with increasing delays
   let attempts = 0;
   const maxAttempts = 5;
   const trySetup = () => {

package/lib/commonjs/sdk/networkInterceptor.js

@@ -126,8 +126,6 @@ function queueRequest(request) {
 function flushPendingRequests() {
   flushTimer = null;
   if (!logCallback || pendingCount === 0) return;
-
-  // Process all pending requests
   while (pendingCount > 0) {
     const request = pendingRequests[pendingHead];
     pendingRequests[pendingHead] = null; // Allow GC
@@ -195,14 +193,9 @@ function interceptFetch() {
     if (!shouldSampleRequest(path)) {
       return originalFetch(input, init);
     }
-
-    // Capture start time (only synchronous work)
     const startTime = Date.now();
     const method = (init?.method || 'GET').toUpperCase();
-
-    // Call original fetch
     return originalFetch(input, init).then(response => {
-      // Success - queue the log asynchronously
       queueRequest({
         requestId: `f${startTime}`,
         method,
@@ -253,8 +246,6 @@ function interceptXHR() {
     if (!config.enabled || !logCallback || !data || shouldIgnoreUrl(data.u)) {
       return originalXHRSend.call(this, body);
     }
-
-    // Check sampling
     const {
       path
     } = parseUrlFast(data.u);
@@ -303,8 +294,6 @@ function initNetworkInterceptor(callback, options) {
  */
 function disableNetworkInterceptor() {
   config.enabled = false;
-
-  // Flush any pending requests
   if (flushTimer) {
     clearTimeout(flushTimer);
     flushTimer = null;

package/lib/commonjs/sdk/utils.js

@@ -243,7 +243,6 @@ let LogLevel = exports.LogLevel = /*#__PURE__*/function (LogLevel) {
  */
 class Logger {
   prefix = '[Rejourney]';
-  debugMode = false;
 
   /**
    * Minimum log level to display.
@@ -264,7 +263,6 @@ class Logger {
     this.minimumLogLevel = level;
   }
   setDebugMode(enabled) {
-    this.debugMode = enabled;
     this.minimumLogLevel = enabled ? LogLevel.DEBUG : typeof __DEV__ !== 'undefined' && __DEV__ ? LogLevel.ERROR : LogLevel.SILENT;
   }
 
@@ -285,14 +283,26 @@ class Logger {
   /** Log a warning message */
   warn(...args) {
     if (this.minimumLogLevel <= LogLevel.WARNING) {
-      console.warn(this.prefix, ...args);
+      if (this.minimumLogLevel <= LogLevel.DEBUG) {
+        // Explicit Debug Mode: Show YellowBox
+        console.warn(this.prefix, ...args);
+      } else {
+        // Default Dev Mode: Log to console only, avoid YellowBox
+        console.log(this.prefix, '[WARN]', ...args);
+      }
     }
   }
 
   /** Log an error message */
   error(...args) {
     if (this.minimumLogLevel <= LogLevel.ERROR) {
-      console.error(this.prefix, ...args);
+      if (this.minimumLogLevel <= LogLevel.DEBUG) {
+        // Explicit Debug Mode: Show RedBox
+        console.error(this.prefix, ...args);
+      } else {
+        // Default Dev Mode: Log to console only, avoid RedBox
+        console.log(this.prefix, '[ERROR]', ...args);
+      }
     }
   }
   notice(...args) {
@@ -306,9 +316,7 @@ class Logger {
    * Only shown in development builds - this is the minimal "SDK started" log.
    */
   logInitSuccess(version) {
-    if (this.debugMode) {
-      this.info(`✓ SDK initialized (v${version})`);
-    }
+    this.notice(`✓ SDK initialized (v${version})`);
   }
 
   /**
@@ -324,9 +332,7 @@ class Logger {
    * Only shown in development builds.
    */
   logSessionStart(sessionId) {
-    if (this.debugMode) {
-      this.info(`Session started: ${sessionId}`);
-    }
+    this.notice(`Session started: ${sessionId}`);
   }
 
   /**
@@ -334,12 +340,10 @@ class Logger {
    * Only shown in development builds.
    */
   logSessionEnd(sessionId) {
-    if (this.debugMode) {
-      this.info(`Session ended: ${sessionId}`);
-    }
+    this.notice(`Session ended: ${sessionId}`);
   }
   logObservabilityStart() {
-    this.notice('Starting Rejourney observability');
+    this.notice('💧 Starting Rejourney observability');
   }
   logRecordingStart() {
     this.notice('Starting recording');
@@ -353,6 +357,61 @@ class Logger {
   logPackageMismatch() {
     this.notice('Bundle ID / package name mismatch');
   }
+
+  /**
+   * Log network request details
+   */
+  logNetworkRequest(request) {
+    const statusIcon = request.error || request.statusCode && request.statusCode >= 400 ? '🔴' : '🟢';
+    const method = request.method || 'GET';
+    // Shorten URL to just path if possible
+    let url = request.url || '';
+    try {
+      if (url.startsWith('http')) {
+        const urlObj = new URL(url);
+        url = urlObj.pathname;
+      }
+    } catch {
+      // Keep full URL if parsing fails
+    }
+    const duration = request.duration ? `(${Math.round(request.duration)}ms)` : '';
+    const status = request.statusCode ? `${request.statusCode}` : 'ERR';
+    this.notice(`${statusIcon} [NET] ${status} ${method} ${url} ${duration} ${request.error ? `Error: ${request.error}` : ''}`);
+  }
+
+  /**
+   * Log frustration event (rage taps, etc)
+   */
+  logFrustration(kind) {
+    this.notice(`🤬 Frustration detected: ${kind}`);
+  }
+
+  /**
+   * Log error captured by SDK
+   */
+  logError(message) {
+    this.notice(`X Error captured: ${message}`);
+  }
+
+  /**
+   * Log lifecycle event (Background/Foreground)
+   * Visible in development builds.
+   */
+  logLifecycleEvent(event) {
+    this.notice(`🔄 Lifecycle: ${event}`);
+  }
+
+  /**
+   * Log upload statistics
+   */
+  logUploadStats(metrics) {
+    const success = metrics.uploadSuccessCount;
+    const failed = metrics.uploadFailureCount;
+    const bytes = formatBytes(metrics.totalBytesUploaded);
+
+    // Always show in dev mode for reassurance, even if 0
+    this.notice(`📡 Upload Stats: ${success} success, ${failed} failed (${bytes} uploaded)`);
+  }
 }
 const logger = exports.logger = new Logger();
 //# sourceMappingURL=utils.js.map