@rejourneyco/react-native 1.0.2 → 1.0.3

package/ios/Capture/RJViewHierarchyScanner.m

@@ -152,8 +152,10 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
 @property(nonatomic, strong) NSMutableArray<NSValue *> *mutableVideoFrames;
 @property(nonatomic, strong) NSMutableArray<NSValue *> *mutableMapViewFrames;
 @property(nonatomic, strong) NSMutableArray<NSValue *> *mutableMapViewPointers;
-@property(nonatomic, strong) NSMutableArray<NSValue *> *mutableScrollViewPointers;
-@property(nonatomic, strong) NSMutableArray<NSValue *> *mutableAnimatedViewPointers;
+@property(nonatomic, strong)
+    NSMutableArray<NSValue *> *mutableScrollViewPointers;
+@property(nonatomic, strong)
+    NSMutableArray<NSValue *> *mutableAnimatedViewPointers;
 
 @property(nonatomic, strong) NSMapTable<Class, NSString *> *classNameCache;
 
@@ -251,11 +253,14 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     // because map tiles load asynchronously and layout signature doesn't
     // capture them
     _mapViewClasses = [NSSet setWithArray:@[
-      @"MKMapView",  // Apple Maps
-      @"AIRMap",     // react-native-maps (iOS)
-      @"AIRMapView", // react-native-maps alternate
-      @"RNMMapView", // react-native-maps newer versions
-      @"GMSMapView", // Google Maps SDK
+      @"MKMapView",     // Apple Maps
+      @"AIRMap",        // react-native-maps (iOS)
+      @"AIRMapView",    // react-native-maps alternate
+      @"RNMMapView",    // react-native-maps newer versions
+      @"GMSMapView",    // Google Maps SDK
+      @"MGLMapView",    // Mapbox GL Native (< v10)
+      @"RCTMGLMapView", // React Native Mapbox wrapper
+      @"MapboxMapView", // Mapbox Maps SDK (v10+)
     ]];
 
     _layoutSignatureHash = 14695981039346656037ULL;
@@ -331,7 +336,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     BOOL needsPrivacyFallback =
         (self.config.detectTextInputs &&
          self.mutableTextInputFrames.count == 0) ||
-        (self.config.detectCameraViews && self.mutableCameraFrames.count == 0) ||
+        (self.config.detectCameraViews &&
+         self.mutableCameraFrames.count == 0) ||
         (self.config.detectWebViews && self.mutableWebViewFrames.count == 0) ||
         (self.config.detectVideoLayers && self.mutableVideoFrames.count == 0);
     if (needsPrivacyFallback && (hitViewLimit || self.didBailOutEarly)) {
@@ -358,9 +364,7 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     result.hasAnyAnimations = self.scanHasAnimations;
     CGFloat screenArea = window.bounds.size.width * window.bounds.size.height;
     result.animationAreaRatio =
-        (screenArea > 0)
-            ? MIN(self.scanAnimatedArea / screenArea, 1.0)
-            : 0.0;
+        (screenArea > 0) ? MIN(self.scanAnimatedArea / screenArea, 1.0) : 0.0;
     result.didBailOutEarly = self.didBailOutEarly;
 
     if (self.layoutSignatureHash != 14695981039346656037ULL) {
@@ -498,9 +502,9 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
            self.mutableTextInputFrames.count == 0) ||
           (self.config.detectCameraViews &&
            self.mutableCameraFrames.count == 0) ||
-          (self.config.detectWebViews && self.mutableWebViewFrames.count == 0) ||
-          (self.config.detectVideoLayers &&
-           self.mutableVideoFrames.count == 0);
+          (self.config.detectWebViews &&
+           self.mutableWebViewFrames.count == 0) ||
+          (self.config.detectVideoLayers && self.mutableVideoFrames.count == 0);
       if (needsPrivacyFallback && hitViewLimit) {
         [self scanSensitiveViewsOnlyInWindow:window];
       }
@@ -511,7 +515,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     BOOL needsPrivacyFallback =
         (self.config.detectTextInputs &&
          self.mutableTextInputFrames.count == 0) ||
-        (self.config.detectCameraViews && self.mutableCameraFrames.count == 0) ||
+        (self.config.detectCameraViews &&
+         self.mutableCameraFrames.count == 0) ||
         (self.config.detectWebViews && self.mutableWebViewFrames.count == 0) ||
         (self.config.detectVideoLayers && self.mutableVideoFrames.count == 0);
     if (needsPrivacyFallback && self.didBailOutEarly) {
@@ -542,9 +547,7 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     CGFloat screenArea =
         primaryWindow.bounds.size.width * primaryWindow.bounds.size.height;
     result.animationAreaRatio =
-        (screenArea > 0)
-            ? MIN(self.scanAnimatedArea / screenArea, 1.0)
-            : 0.0;
+        (screenArea > 0) ? MIN(self.scanAnimatedArea / screenArea, 1.0) : 0.0;
     result.didBailOutEarly = self.didBailOutEarly;
 
     if (self.layoutSignatureHash != 14695981039346656037ULL) {
@@ -679,8 +682,10 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
 
   @try {
     BOOL isWebView = self.config.detectWebViews && [self isWebView:view];
-    BOOL isCamera = self.config.detectCameraViews && [self isCameraPreview:view];
-    BOOL isVideo = self.config.detectVideoLayers && [self isVideoLayerView:view];
+    BOOL isCamera =
+        self.config.detectCameraViews && [self isCameraPreview:view];
+    BOOL isVideo =
+        self.config.detectVideoLayers && [self isVideoLayerView:view];
     BOOL isBlockedSurface = isWebView || isCamera || isVideo;
 
     [self checkSensitiveView:view inWindow:window];
@@ -762,10 +767,11 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
       UIEdgeInsets inset = ((UIScrollView *)view).contentInset;
       [self mixInt:(int32_t)lrintf(isfinite(inset.top) ? inset.top * 100 : 0)];
       [self mixInt:(int32_t)lrintf(isfinite(inset.bottom) ? inset.bottom * 100
-                                                         : 0)];
-      [self mixInt:(int32_t)lrintf(isfinite(inset.left) ? inset.left * 100 : 0)];
+                                                          : 0)];
+      [self
+          mixInt:(int32_t)lrintf(isfinite(inset.left) ? inset.left * 100 : 0)];
       [self mixInt:(int32_t)lrintf(isfinite(inset.right) ? inset.right * 100
-                                                      : 0)];
+                                                         : 0)];
     }
 
     // 5. Mix Text Content (avoid input content; use length only)
@@ -840,7 +846,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
   }
 }
 
-- (void)appendBlockedSurfaceInfoToSignature:(UIView *)view depth:(NSInteger)depth {
+- (void)appendBlockedSurfaceInfoToSignature:(UIView *)view
+                                      depth:(NSInteger)depth {
   if (!view) {
     return;
   }
@@ -998,18 +1005,18 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
       }
 
 #ifdef DEBUG
-       RJLogDebug(@"ViewHierarchyScanner: Found %@ at (%.0f,%.0f,%.0f,%.0f) - "
-                  @"view.window=%@ targetWindow=%@",
-                  isTextInput
-                      ? @"TextInput"
-                      : (isCamera
-                             ? @"Camera"
-                             : (isWebView ? @"WebView"
-                                          : (isVideo ? @"Video" : @"MaskedView"))),
-                  sanitizedFrame.origin.x, sanitizedFrame.origin.y,
-                  sanitizedFrame.size.width, sanitizedFrame.size.height,
-                  NSStringFromClass([view.window class]),
-                 NSStringFromClass([targetWindow class]));
+      RJLogDebug(
+          @"ViewHierarchyScanner: Found %@ at (%.0f,%.0f,%.0f,%.0f) - "
+          @"view.window=%@ targetWindow=%@",
+          isTextInput
+              ? @"TextInput"
+              : (isCamera ? @"Camera"
+                          : (isWebView ? @"WebView"
+                                       : (isVideo ? @"Video" : @"MaskedView"))),
+          sanitizedFrame.origin.x, sanitizedFrame.origin.y,
+          sanitizedFrame.size.width, sanitizedFrame.size.height,
+          NSStringFromClass([view.window class]),
+          NSStringFromClass([targetWindow class]));
 #endif
     }
   }
@@ -1212,7 +1219,7 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
 
   @try {
     if ([view respondsToSelector:@selector(isLoading)]) {
-      BOOL (*loadingMsg)(id, SEL) = (BOOL (*)(id, SEL))objc_msgSend;
+      BOOL (*loadingMsg)(id, SEL) = (BOOL(*)(id, SEL))objc_msgSend;
       return loadingMsg(view, @selector(isLoading));
     }
     id loadingValue = [view valueForKey:@"loading"];
@@ -1314,8 +1321,9 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
 
   BOOL tracking = scrollView.isTracking || scrollView.isDragging ||
                   scrollView.isDecelerating;
-  BOOL offsetMoved = (fabs(offset.x - state.contentOffset.x) > kRJScrollEpsilon ||
-                      fabs(offset.y - state.contentOffset.y) > kRJScrollEpsilon);
+  BOOL offsetMoved =
+      (fabs(offset.x - state.contentOffset.x) > kRJScrollEpsilon ||
+       fabs(offset.y - state.contentOffset.y) > kRJScrollEpsilon);
   BOOL zoomMoved = fabs(zoomScale - state.zoomScale) > kRJZoomEpsilon;
   if (tracking || offsetMoved || zoomMoved) {
     self.scanScrollActive = YES;
@@ -1331,8 +1339,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
   }
 
   if ([self isRefreshActiveForScrollView:scrollView
-                                 offset:offset
-                                  inset:inset]) {
+                                  offset:offset
+                                   inset:inset]) {
     self.scanRefreshActive = YES;
   }
 
@@ -1351,16 +1359,16 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
   }
   CGFloat topLimit = -inset.top - kRJScrollEpsilon;
   CGFloat bottomLimit = scrollView.contentSize.height -
-                        scrollView.bounds.size.height +
-                        inset.bottom + kRJScrollEpsilon;
+                        scrollView.bounds.size.height + inset.bottom +
+                        kRJScrollEpsilon;
   if (offset.y < topLimit || offset.y > bottomLimit) {
     return YES;
   }
 
   CGFloat leftLimit = -inset.left - kRJScrollEpsilon;
   CGFloat rightLimit = scrollView.contentSize.width -
-                       scrollView.bounds.size.width +
-                       inset.right + kRJScrollEpsilon;
+                       scrollView.bounds.size.width + inset.right +
+                       kRJScrollEpsilon;
   return (offset.x < leftLimit || offset.x > rightLimit);
 }
 
@@ -1376,8 +1384,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     return YES;
   }
 
-  CGFloat triggerOffset = -scrollView.adjustedContentInset.top -
-                          kRJScrollEpsilon;
+  CGFloat triggerOffset =
+      -scrollView.adjustedContentInset.top - kRJScrollEpsilon;
   if (offset.y < triggerOffset) {
     return YES;
   }
@@ -1448,14 +1456,23 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     NSNumber *heading = [view valueForKeyPath:@"camera.heading"];
     NSNumber *pitch = [view valueForKeyPath:@"camera.pitch"];
 
+    // Mapbox uses zoomLevel instead of span
+    NSNumber *zoomLevel = nil;
+    @try {
+      zoomLevel = [view valueForKey:@"zoomLevel"];
+    } @catch (NSException *e) {
+    }
+
     double altitudeValue = altitude ? altitude.doubleValue : 0;
     double headingValue = heading ? heading.doubleValue : 0;
     double pitchValue = pitch ? pitch.doubleValue : 0;
+    double zoomValue = zoomLevel ? zoomLevel.doubleValue : 0;
 
-    return [NSString stringWithFormat:@"%.5f:%.5f:%.5f:%.5f:%.1f:%.1f:%.1f",
-                                      center.latitude, center.longitude,
-                                      span.latitudeDelta, span.longitudeDelta,
-                                      altitudeValue, headingValue, pitchValue];
+    return [NSString
+        stringWithFormat:@"%.5f:%.5f:%.5f:%.5f:%.1f:%.1f:%.1f:%.2f",
+                         center.latitude, center.longitude, span.latitudeDelta,
+                         span.longitudeDelta, altitudeValue, headingValue,
+                         pitchValue, zoomValue];
   } @catch (NSException *exception) {
     return @"";
   }

package/ios/Core/RJLifecycleManager.m

@@ -121,7 +121,6 @@
                  name:UIApplicationDidBecomeActiveNotification
                object:nil];
 
-  // Text change notifications
   [center addObserver:self
              selector:@selector(textDidChange:)
                  name:UITextFieldTextDidChangeNotification
@@ -220,8 +219,6 @@
   RJLogInfo(@"[RJ-LIFECYCLE] appDidEnterBackground (isRecording=%@)",
              self.isRecording ? @"YES" : @"NO");
 
-  // Always track background entry time, even if not recording
-  // This allows us to detect timeout when session was ended while in background
   self.inBackground = YES;
   self.backgroundEntryTime = [[NSDate date] timeIntervalSince1970];
 
@@ -257,13 +254,10 @@
     RJLogInfo(@"[RJ-LIFECYCLE] appDidBecomeActive - was NOT in background");
   }
   
-  // Reset background tracking state
   self.inBackground = NO;
   self.backgroundEntryTime = 0;
   
-  // Handle the case where we weren't recording (session already ended)
   if (!self.isRecording) {
-    // If we were in background long enough, signal that a new session should start
     if (wasInBackground && backgroundDurationSec >= self.backgroundTimeoutThreshold) {
       RJLogInfo(@"[RJ-LIFECYCLE] Was not recording, background >= %.0fs - signaling for new session start",
             self.backgroundTimeoutThreshold);
@@ -274,14 +268,10 @@
     return;
   }
 
-  // We ARE recording - handle background return
   if (wasInBackground) {
     NSTimeInterval bgDurationMs = backgroundDurationSec * 1000;
     
     if (backgroundDurationSec >= self.backgroundTimeoutThreshold) {
-      // TIMEOUT CASE: End old session, start new one
-      // Add this background duration to accumulated time BEFORE signaling timeout
-      // so the old session gets the correct total background time
       self.accumulatedBackgroundTimeMs += bgDurationMs;
       RJLogInfo(@"[RJ-LIFECYCLE] TIMEOUT: Added %.0fms, total background=%.0fms - signaling session restart",
             bgDurationMs, self.accumulatedBackgroundTimeMs);
@@ -289,17 +279,13 @@
       if ([self.delegate respondsToSelector:@selector(lifecycleManagerSessionDidTimeout:)]) {
         [self.delegate lifecycleManagerSessionDidTimeout:backgroundDurationSec];
       }
-      // Note: The delegate's handleSessionTimeout will read totalBackgroundTimeMs
-      // and then call resetBackgroundTime for the new session
     } else {
-      // SHORT BACKGROUND: Just accumulate and resume
       self.accumulatedBackgroundTimeMs += bgDurationMs;
       RJLogInfo(@"[RJ-LIFECYCLE] Short background: Added %.0fms, total=%.0fms - resuming session",
             bgDurationMs, self.accumulatedBackgroundTimeMs);
     }
   }
 
-  // Call didBecomeActive for normal resume handling (video capture, etc.)
   if ([self.delegate respondsToSelector:@selector(lifecycleManagerDidBecomeActive)]) {
     [self.delegate lifecycleManagerDidBecomeActive];
   }

package/ios/Core/Rejourney.mm

@@ -249,22 +249,33 @@ RCT_EXPORT_MODULE()
     didDecideSample = YES;
   }
 
-  BOOL shouldRecord = self.recordingEnabledByConfig && self.sessionSampled;
-  self.remoteRecordingEnabled = shouldRecord;
+  // Decouple video recording from session active state.
+  // We want to record video ONLY if:
+  // 1. Config says recording is enabled (remote toggles)
+  // 2. Sample rate allows it
+  //
+  // NOTE: Even if shouldRecordVideo is NO, the session remains active
+  // (isRecording=YES) and events are still observed and uploaded ("Data-Only
+  // Mode").
+  BOOL shouldRecordVideo = self.recordingEnabledByConfig && self.sessionSampled;
+  self.remoteRecordingEnabled = shouldRecordVideo;
 
   if (self.captureEngine) {
-    self.captureEngine.uploadsEnabled = shouldRecord;
-    if (!shouldRecord && self.captureEngine.isRecording) {
+    self.captureEngine.uploadsEnabled = shouldRecordVideo;
+    if (!shouldRecordVideo && self.captureEngine.isRecording) {
+      // Stop video capture pipeline to save resources, but keep session alive
       [self.captureEngine stopSession];
     }
   }
 
   if (didDecideSample && self.recordingEnabledByConfig &&
       !self.sessionSampled) {
-    RJLogWarning(@"Session skipped by sample rate (%ld%%)", (long)clampedRate);
+    RJLogInfo(@"Session sampled out for video (%ld%%) - entering Data-Only "
+              @"Mode (Events enabled, Video disabled)",
+              (long)clampedRate);
   }
 
-  return shouldRecord;
+  return shouldRecordVideo;
 }
 
 - (void)ensureFullyInitialized {
@@ -676,10 +687,7 @@ RCT_EXPORT_METHOD(stopSession : (RCTPromiseResolveBlock)
 
       NSString *sessionId = self.currentSessionId ?: @"";
 
-      // CRITICAL: Compute background time at the moment we end the session.
-      // When a session ends while the app is in background (e.g. max duration),
-      // we must include the ongoing background duration, otherwise the backend
-      // will think the entire wall-clock session duration is playable.
+    
       NSTimeInterval totalBgTimeMs = 0;
       if (self.lifecycleManager) {
         totalBgTimeMs = self.lifecycleManager.totalBackgroundTimeMs;
@@ -1037,7 +1045,7 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
   if ([gestureType hasPrefix:@"scroll"]) {
     static NSTimeInterval lastScrollLogTime = 0;
     NSTimeInterval now = CACurrentMediaTime();
-    if (now - lastScrollLogTime < 0.5) { 
+    if (now - lastScrollLogTime < 0.5) {
       return;
     }
     lastScrollLogTime = now;
@@ -1125,7 +1133,7 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
       registerDeviceWithProjectKey:publicKey
                           bundleId:bundleId
                           platform:@"ios"
-                        sdkVersion:@"1.0.0"
+                        sdkVersion:RJSDKVersion
                             apiUrl:apiUrl
                         completion:^(BOOL success, NSString *credId,
                                      NSError *error) {
@@ -1329,12 +1337,10 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
       return;
     }
 
-    // Handle security errors (403 = forbidden/mismatch, 404 = not found)
     if ((error.code == 403 || error.code == 404) &&
         [error.domain isEqualToString:@"RJDeviceAuth"]) {
 
       if (!isRetry) {
-        // First failure - try re-registration
         RJLogDebug(@"Device auth invalid (%ld), attempting re-registration...",
                    (long)error.code);
         NSString *bundleId =
@@ -1345,7 +1351,7 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
             registerDeviceWithProjectKey:publicKey
                                 bundleId:bundleId
                                 platform:@"ios"
-                              sdkVersion:@"1.0.0"
+                              sdkVersion:RJSDKVersion
                                   apiUrl:apiUrl
                               completion:^(BOOL retrySuccess, NSString *credId,
                                            NSError *retryError) {
@@ -2112,7 +2118,7 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
     }
 
     if (self.captureEngine) {
-      
+
       RJLogInfo(@"[RJ-TERMINATE] Stopping capture engine synchronously");
       [self.captureEngine stopSessionSync];
       RJLogInfo(@"[RJ-TERMINATE] Capture engine stopped");
@@ -2146,9 +2152,9 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
 
     if (self.uploadManager && events.count > 0) {
       @try {
-        [self.uploadManager synchronousUploadWithEvents:events ?: @[]];
+        [self.uploadManager persistTerminationEvents:events ?: @[]];
       } @catch (NSException *e) {
-        RJLogWarning(@"Terminate upload failed: %@", e);
+        RJLogWarning(@"Terminate persistence failed: %@", e);
       }
     }
   } @catch (NSException *exception) {
@@ -2212,13 +2218,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
   [self handleSessionTimeout:backgroundDuration currentTime:currentTime];
 }
 
-
-/// 1. Capture final background time from lifecycle manager
-/// 2. Stop timers and capture engine for old session
-/// 3. Synchronously end the old session with correct background time
-/// 4. Create new session ID and reset all state
-/// 5. Start capture for new session
-/// 6. Trigger immediate upload to register new session
 - (void)handleSessionTimeout:(NSTimeInterval)backgroundDuration
                  currentTime:(NSTimeInterval)currentTime {
   RJLogInfo(
@@ -2232,8 +2231,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
     RJLogInfo(@"[RJ-SESSION-TIMEOUT] === ENDING OLD SESSION: %@ ===",
               oldSessionId);
 
-    // ========== STEP 1: Capture background time BEFORE any state changes
-    // ==========
     NSTimeInterval totalBackgroundMs = 0;
     if (self.lifecycleManager) {
       totalBackgroundMs = self.lifecycleManager.totalBackgroundTimeMs;
@@ -2242,7 +2239,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
           totalBackgroundMs);
     }
 
-    // ========== STEP 2: Stop all capture/timers for old session ==========
     [self stopBatchUploadTimer];
     [self stopDurationLimitTimer];
 
@@ -2255,14 +2251,10 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
       }
     }
 
-    // ========== STEP 3: End old session SYNCHRONOUSLY with correct background
-    // time ==========
     if (wasRecording && self.uploadManager && oldSessionId.length > 0 &&
         ![oldSessionId isEqualToString:@"none"]) {
-      // Set background time on upload manager
       self.uploadManager.totalBackgroundTimeMs = totalBackgroundMs;
 
-      // Get current events for final upload
       __block NSArray<NSDictionary *> *finalEvents = nil;
       [self performStateSync:^{
         finalEvents = [self.sessionEvents copy];
@@ -2272,7 +2264,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
                 @"bgTime=%.0fms",
                 (unsigned long)finalEvents.count, totalBackgroundMs);
 
-      // Synchronous upload and session end
       if (finalEvents.count > 0) {
         [self.uploadManager synchronousUploadWithEvents:finalEvents];
       } else {
@@ -2282,7 +2273,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
       RJLogInfo(@"[RJ-SESSION-TIMEOUT] Old session %@ ended", oldSessionId);
     }
 
-    // ========== STEP 4: Reset ALL state for new session ==========
     RJLogInfo(@"[RJ-SESSION-TIMEOUT] === STARTING NEW SESSION ===");
 
     __block NSString *newSessionId = nil;
@@ -2336,7 +2326,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
     self.eventBuffer = [[RJEventBuffer alloc] initWithSessionId:newSessionId
                                                 pendingRootPath:pendingPath];
 
-    // ========== STEP 5: Start capture for new session ==========
     [self resetSamplingDecision];
     self.remoteRecordingEnabled = self.recordingEnabledByConfig;
     if (self.captureEngine) {
@@ -2367,8 +2356,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
     [self startBatchUploadTimer];
     [self startDurationLimitTimer];
 
-    // ========== STEP 6: Log session_start and trigger immediate upload
-    // ==========
     NSMutableDictionary *sessionStartEvent = [NSMutableDictionary dictionary];
     sessionStartEvent[@"type"] = RJEventTypeSessionStart;
     sessionStartEvent[@"timestamp"] = @([RJWindowUtils currentTimestampMillis]);

package/ios/Network/RJDeviceAuthManager.m

@@ -857,10 +857,8 @@ static const NSInteger RJ_AUTH_MAX_CONSECUTIVE_FAILURES = 10;
     return;
   }
   
-  // Check cooldown after consecutive failures to prevent flooding
   NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
   if (self.consecutiveFailures > 0 && self.lastFailedRegistrationTime > 0) {
-    // Exponential backoff: 5s, 10s, 20s, 40s... up to 5 minutes
     NSTimeInterval cooldown = MIN(
       RJ_AUTH_COOLDOWN_BASE_SECONDS * pow(2, self.consecutiveFailures - 1),
       RJ_AUTH_COOLDOWN_MAX_SECONDS

package/ios/Network/RJUploadManager.h

@@ -180,6 +180,14 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)synchronousUploadWithEvents:(NSArray<NSDictionary *> *)events;
 
+/**
+ * Persists events to disk for termination, skipping network upload.
+ * Use this in appWillTerminate to avoid watchdog kills.
+ *
+ * @param events Array of event dictionaries.
+ */
+- (void)persistTerminationEvents:(NSArray<NSDictionary *> *)events;
+
 /**
  * Uploads a crash report to the dashboard.
  *

package/ios/Network/RJUploadManager.m

@@ -67,6 +67,7 @@ static NSString *RJRedactedURLForLogFromString(NSString *urlString) {
 
 @interface RJUploadManager ()
 
+@property(nonatomic, assign) BOOL keyboardVisible;
 @property(nonatomic, strong) dispatch_queue_t uploadQueue;
 
 @property(nonatomic, strong, nullable) NSTimer *batchUploadTimer;
@@ -1820,6 +1821,50 @@ static NSString *RJRedactedURLForLogFromString(NSString *urlString) {
   return YES;
 }
 
+- (void)persistTerminationEvents:(NSArray<NSDictionary *> *)events {
+  if (events.count == 0 && self.sessionId.length == 0)
+    return;
+
+  self.eventBatchNumber += 1;
+  NSInteger currentBatch = self.eventBatchNumber;
+
+  RJLogInfo(@"[RJ-UPLOAD] persistTerminationEvents starting: sessionId=%@, "
+            @"batch=%ld, "
+            @"eventCount=%lu",
+            self.sessionId ?: @"<nil>", (long)currentBatch,
+            (unsigned long)events.count);
+
+  NSDictionary *payload = [self buildEventPayloadWithEvents:events
+                                                batchNumber:currentBatch
+                                                    isFinal:YES];
+  if (!payload)
+    return;
+
+  NSError *jsonError = nil;
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:payload
+                                                     options:0
+                                                       error:&jsonError];
+  if (jsonError || !jsonData)
+    return;
+
+  NSError *gzipError = nil;
+  NSData *compressed = RJGzipData(jsonData, &gzipError);
+  if (gzipError || !compressed)
+    return;
+
+  [self persistPendingUploadWithContentType:@"events"
+                                batchNumber:currentBatch
+                                   keyframe:NO
+                                    gzipped:compressed
+                                 eventCount:events.count
+                                 frameCount:0];
+
+  [self markSessionActiveForRecovery];
+
+  RJLogInfo(@"[RJ-CHECKPOINT] Persisted termination events to disk, skipping "
+            @"sync upload");
+}
+
 - (BOOL)uploadEventsBatchSync:(NSArray<NSDictionary *> *)events
                       isFinal:(BOOL)isFinal {
   self.eventBatchNumber += 1;