@rejourneyco/react-native 1.0.0 → 1.0.2

package/ios/Capture/RJCaptureEngine.m

@@ -61,6 +61,7 @@ typedef struct {
 @property(nonatomic, assign) NSInteger generation;
 @property(nonatomic, strong, nullable) RJViewHierarchyScanResult *scanResult;
 @property(nonatomic, copy, nullable) NSString *layoutSignature;
+@property(nonatomic, assign) RJCaptureImportance importance;
 
 @end
 
@@ -168,6 +169,8 @@ typedef struct {
 @property(nonatomic, assign) CFRunLoopObserverRef runLoopObserver;
 @property(nonatomic, assign) BOOL runLoopCapturePending;
 
+@property(nonatomic, assign) BOOL isWarmingUp;
+
 @end
 
 #pragma mark - Implementation
@@ -300,6 +303,7 @@ typedef struct {
     _isShuttingDown = NO;
     _uiReadyForCapture = NO;
     _framesSinceHierarchy = 0;
+    _isWarmingUp = NO;
 
     [self applyDefaultConfiguration];
 
@@ -494,7 +498,38 @@ typedef struct {
 
 - (void)appDidBecomeActive:(NSNotification *)notification {
   self.isInBackground = NO;
-  RJLogDebug(@"CaptureEngine: App became active - warmup before capture");
+
+  // DEFENSIVE FIX: Warmup period
+  // When returning from background, the view hierarchy and layout may not be
+  // stable immediately. This can cause privacy masks to be drawn in the wrong
+  // position relative to the content (race condition). We impose a short
+  // "warmup" period where we skip capture to allow AutoLayout to settle.
+  self.isWarmingUp = YES;
+
+  // Clear stale caches to force fresh scan
+  if (self.lastCapturedPixelBuffer) {
+    CVPixelBufferRelease(self.lastCapturedPixelBuffer);
+    self.lastCapturedPixelBuffer = NULL;
+  }
+  self.lastMaskScanResult = nil;
+  self.lastSafeMaskScanResult = nil;
+
+  RJLogDebug(@"CaptureEngine: App became active - starting warmup (0.2s)");
+
+  __weak typeof(self) weakSelf = self;
+  dispatch_after(
+      dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)),
+      dispatch_get_main_queue(), ^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf)
+          return;
+
+        strongSelf.isWarmingUp = NO;
+        RJLogDebug(@"CaptureEngine: Warmup complete - resuming capture");
+
+        // Trigger an immediate capture check
+        [strongSelf captureVideoFrame];
+      });
 }
 
 #pragma mark - System Monitoring
@@ -1087,14 +1122,31 @@ typedef struct {
 }
 
 - (void)captureVideoFrame {
+  [self captureVideoFrameWithImportance:RJCaptureImportanceLow reason:@"timer"];
+}
+
+- (void)captureVideoFrameWithImportance:(RJCaptureImportance)importance
+                                 reason:(NSString *)reason {
   if (!self.internalIsRecording || self.isShuttingDown)
     return;
+
+  if (self.isWarmingUp) {
+    return;
+  }
+
+  // Critical events (like navigation) should bypass UI ready checks if
+  // possible, but we still need a valid UI.
   if (!self.uiReadyForCapture) {
     if (self.framesSinceSessionStart % 60 == 0)
       RJLogDebug(@"Skipping capture: UI not ready");
     return;
   }
-  if (self.internalPerformanceLevel == RJPerformanceLevelPaused) {
+
+  // Critical events override paused state
+  BOOL isCritical = (importance == RJCaptureImportanceCritical ||
+                     importance == RJCaptureImportanceHigh);
+  if (self.internalPerformanceLevel == RJPerformanceLevelPaused &&
+      !isCritical) {
     static NSInteger pauseSkipCount = 0;
     if (++pauseSkipCount % 60 == 0)
       RJLogDebug(@"Skipping capture: Performance Paused");
@@ -1109,12 +1161,19 @@ typedef struct {
 
   RJCapturePendingCapture *pending = [[RJCapturePendingCapture alloc] init];
   pending.wantedAt = now;
+  pending.importance = importance;
+
   NSTimeInterval grace = self.captureHeuristics.captureGraceSeconds;
   if (self.captureHeuristics.animationBlocking ||
       self.captureHeuristics.scrollActive ||
       self.captureHeuristics.keyboardAnimating) {
     grace = MIN(grace, 0.3);
   }
+
+  if (isCritical) {
+    grace = MIN(grace, 0.1);
+  }
+
   pending.deadline = now + grace;
   pending.timestamp = [self currentTimestamp];
   pending.generation = ++self.pendingCaptureGeneration;
@@ -1207,7 +1266,8 @@ typedef struct {
   RJCaptureHeuristicsDecision *decision = [self.captureHeuristics
       decisionForSignature:pending.layoutSignature
                        now:now
-              hasLastFrame:(self.lastCapturedPixelBuffer != NULL)];
+              hasLastFrame:(self.lastCapturedPixelBuffer != NULL)
+                importance:pending.importance];
 
   if (decision.action == RJCaptureHeuristicsActionRenderNow && !fullScan) {
     RJ_TIME_START_NAMED(viewScan);
@@ -1241,7 +1301,8 @@ typedef struct {
     decision = [self.captureHeuristics
         decisionForSignature:pending.layoutSignature
                          now:now
-                hasLastFrame:(self.lastCapturedPixelBuffer != NULL)];
+                hasLastFrame:(self.lastCapturedPixelBuffer != NULL)
+                  importance:pending.importance];
   }
 
   if (decision.action == RJCaptureHeuristicsActionDefer && fullScan) {
@@ -1342,7 +1403,10 @@ typedef struct {
                    }
                    self.pendingDefensiveCaptureTime = 0;
                    self.lastIntentTime = CACurrentMediaTime();
-                   [self captureVideoFrame];
+                   // Defensive capture triggered by heuristics (e.g.
+                   // navigation) is High importance
+                   [self captureVideoFrameWithImportance:RJCaptureImportanceHigh
+                                                  reason:reason];
                  });
 }
 
@@ -1662,7 +1726,6 @@ typedef struct {
   }
 
   if (self.internalPerformanceLevel == RJPerformanceLevelMinimal) {
-    // Minimal mode trades quality for speed
     CGContextSetInterpolationQuality(context, kCGInterpolationNone);
     CGContextSetShouldAntialias(context, false);
     CGContextSetAllowsAntialiasing(context, false);
@@ -1672,17 +1735,13 @@ typedef struct {
     CGContextSetAllowsAntialiasing(context, true);
   }
 
-  // Set up context transform (flip for UIKit coordinates)
   CGContextScaleCTM(context, contextScale, -contextScale);
   CGContextTranslateCTM(context, 0, -sizePoints.height);
 
-  // Optimization #9: Fast Memset Clear (White = 0xFF)
-  // Much faster than CGContextFillRect
   memset(baseAddress, 0xFF, bytesPerRow * height);
 
   UIGraphicsPushContext(context);
 
-  // ===== RENDERING: ALWAYS USE drawViewHierarchyInRect =====
   RJ_TIME_START_NAMED(render);
   BOOL didDraw = NO;
   @try {
@@ -1703,10 +1762,6 @@ typedef struct {
     return NULL;
   }
 
-  // Recalculate effective scale so consumers (PrivacyMask) know the real
-  // mapping Used by caller to pass to applyToPixelBuffer Note: we don't need to
-  // return it, caller has it.
-
   return pixelBuffer;
 }
 
@@ -1746,9 +1801,6 @@ typedef struct {
 }
 
 - (NSTimeInterval)currentTimestamp {
-  // Always use wall clock time for session timestamps
-  // CACurrentMediaTime optimization removed - it causes drift after
-  // background periods The ~1ms overhead is acceptable for 1fps capture
   return [[NSDate date] timeIntervalSince1970] * 1000.0;
 }
 
@@ -1760,8 +1812,6 @@ typedef struct {
                              endTime:(NSTimeInterval)endTime
                           frameCount:(NSInteger)frameCount {
 
-  // Ensure we are on our own encoding queue to protect hierarchySnapshots
-  // and maintain thread safety (callback comes from VideoEncoder queue)
   dispatch_async(self.encodingQueue, ^{
     RJLogDebug(@"CaptureEngine: videoEncoderDidFinishSegment: %@ (%ld frames, "
                @"%.1fs), sessionId=%@",
@@ -1803,9 +1853,6 @@ typedef struct {
 
     [self uploadCurrentHierarchySnapshots];
 
-    // NUCLEAR FIX: Do NOT call startSegmentWithSize here!
-    // The encoder's appendFrame method will auto-start a segment with the
-    // correct PIXEL dimensions when the next frame is captured.
     if (self.internalIsRecording && !self.isShuttingDown) {
       RJLogDebug(
           @"CaptureEngine: Segment finished, auto-start new on next frame");
@@ -1843,10 +1890,8 @@ typedef struct {
 
   RJLogInfo(@"CaptureEngine: Pausing video capture (sync=%d)", synchronous);
 
-  // Reset capture-in-progress flag immediately to prevent stuck state
   self.captureInProgress = NO;
 
-  // Invalidate timer synchronously if in sync mode
   if (synchronous) {
     [self teardownDisplayLink];
   } else {
@@ -1856,7 +1901,7 @@ typedef struct {
   }
 
   if (self.internalVideoEncoder) {
-    self.internalIsRecording = NO; // prevent any new frames from being enqueued
+    self.internalIsRecording = NO;
 
     if (synchronous) {
       void (^finishSync)(void) = ^{
@@ -1895,19 +1940,15 @@ typedef struct {
     return;
   }
 
-  // Set recording back to YES to allow captureVideoFrame to proceed
   self.internalIsRecording = YES;
 
   RJLogInfo(@"CaptureEngine: Resuming video capture");
 
-  // Reset capture state to ensure clean resumption
-  // These flags may have been left in an inconsistent state when going to
-  // background
   self.captureInProgress = NO;
-  self.lastIntentTime = 0; // Allow immediate capture on resume
+  self.lastIntentTime = 0;
 
   self.internalPerformanceLevel =
-      RJPerformanceLevelNormal; // Reset perf level on resume
+      RJPerformanceLevelNormal;
 
   self.pendingCapture = nil;
   self.pendingCaptureGeneration = 0;
@@ -1926,7 +1967,6 @@ typedef struct {
     if (window && self.internalVideoEncoder) {
       RJLogInfo(@"CaptureEngine: Resuming capture...");
 
-      // Use the optimized Display Link
       [self setupDisplayLink];
 
     } else {
@@ -1943,14 +1983,12 @@ typedef struct {
   if (!self.internalIsRecording)
     return;
 
-  // Force update if screen changed
   if (![screenName isEqualToString:self.currentScreenName]) {
     NSTimeInterval now = CACurrentMediaTime();
     self.currentScreenName = screenName;
     RJLogDebug(@"Navigation to screen: %@ (forcing layout refresh)",
                screenName);
 
-    // Force layout change detection on next frame
     [self.captureHeuristics invalidateSignature];
     [self.captureHeuristics recordNavigationEventAtTime:now];
     self.lastSerializedSignature = nil;

package/ios/Capture/RJCaptureHeuristics.h

@@ -10,6 +10,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+#import "../Core/RJTypes.h"
 #import "RJViewHierarchyScanner.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -59,7 +60,7 @@ typedef NS_ENUM(NSInteger, RJCaptureHeuristicsReason) {
 - (void)recordMapInteractionAtTime:(NSTimeInterval)time;
 - (void)recordNavigationEventAtTime:(NSTimeInterval)time;
 - (void)recordRenderedSignature:(nullable NSString *)signature
-                          atTime:(NSTimeInterval)time;
+                         atTime:(NSTimeInterval)time;
 
 - (void)updateWithScanResult:(RJViewHierarchyScanResult *)scanResult
                       window:(UIWindow *)window
@@ -68,10 +69,11 @@ typedef NS_ENUM(NSInteger, RJCaptureHeuristicsReason) {
 - (void)updateWithStabilityProbeForWindow:(UIWindow *)window
                                       now:(NSTimeInterval)now;
 
-- (RJCaptureHeuristicsDecision *)decisionForSignature:
-                                    (nullable NSString *)signature
-                                                 now:(NSTimeInterval)now
-                                         hasLastFrame:(BOOL)hasLastFrame;
+- (RJCaptureHeuristicsDecision *)
+    decisionForSignature:(nullable NSString *)signature
+                     now:(NSTimeInterval)now
+            hasLastFrame:(BOOL)hasLastFrame
+              importance:(RJCaptureImportance)importance;
 
 + (NSString *)stringForReason:(RJCaptureHeuristicsReason)reason;