@rejourneyco/react-native 1.0.2 → 1.0.3

package/ios/Privacy/RJPrivacyMask.m

@@ -280,28 +280,19 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   }
 
   if (context) {
-    // PUSH context so high-level UIKit drawing (NSString drawAtPoint) works
     UIGraphicsPushContext(context);
 
-    // CRITICAL FIX: Flip coordinate system to match UIKit (Top-Left origin)
-    // CoreGraphics defaults to Bottom-Left origin, so without this flip,
-    // masking rects are drawn vertically mirrored (wrong place).
     CGContextTranslateCTM(context, 0, height);
     CGContextScaleCTM(context, 1.0, -1.0);
-
-    // Apply correct scale transform (Points -> Pixels)
     CGContextScaleCTM(context, safeScale, safeScale);
 
-    // If in background or privacy scan is unavailable, draw full overlay
     if (self.isInBackground || shouldMaskAll) {
-      // Create bounds in points (since we scaled the CTM)
       CGRect boundsPoints =
           CGRectMake(0, 0, width / safeScale, height / safeScale);
       [self drawBackgroundOverlayInContext:context
                                     bounds:boundsPoints
                                      scale:1.0];
     } else {
-      // Draw standard masks
       [self drawMasksWithScanResult:scanResult
                             context:context
                               bounds:CGRectMake(0, 0, width / safeScale,
@@ -332,9 +323,7 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
     self.lastFrameHadWebView = NO;
     self.lastFrameHadVideo = NO;
 
-    // Handle background state
     if (self.isInBackground) {
-      // Only draw background overlay if we have a method for it
       if ([self respondsToSelector:@selector
                 (drawBackgroundOverlayInContext:bounds:scale:)]) {
         [self drawBackgroundOverlayInContext:context bounds:bounds scale:scale];
@@ -342,7 +331,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
       return;
     }
 
-    // Early exit if nothing to mask - saves ~1-2ms per frame
     if (scanResult.textInputFrames.count == 0 &&
         scanResult.cameraFrames.count == 0 &&
         scanResult.webViewFrames.count == 0 &&
@@ -363,7 +351,7 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
       }
       [self drawBlurRectInContext:context
                             frame:frame
-                         maskType:0]; // 0 = TextInput
+                         maskType:0];
       self.lastFrameHadTextInput = YES;
     }
 
@@ -396,7 +384,7 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
         }
         [self drawBlurRectInContext:context
                               frame:frame
-                           maskType:2]; // 2 = WebView
+                           maskType:2];
         self.lastFrameHadWebView = YES;
       }
     }
@@ -415,7 +403,7 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
         }
         [self drawBlurRectInContext:context
                               frame:frame
-                           maskType:3]; // 3 = Video
+                           maskType:3];
         self.lastFrameHadVideo = YES;
       }
     }
@@ -427,17 +415,13 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
 - (void)drawBackgroundOverlayInContext:(CGContextRef)context
                                 bounds:(CGRect)bounds
                                  scale:(CGFloat)scale {
-  // Simple black overlay for backgrounding
   CGContextSetFillColorWithColor(context, [UIColor blackColor].CGColor);
   CGContextFillRect(context, bounds);
-
-  // Optional: Draw text or logo? Keeping it simple/fast.
 }
 
 - (void)drawBlurRectInContext:(CGContextRef)context
                         frame:(CGRect)frame
                      maskType:(NSInteger)maskType {
-  // Validate frame to prevent CoreGraphics NaN errors
   if (isnan(frame.origin.x) || isnan(frame.origin.y) ||
       isnan(frame.size.width) || isnan(frame.size.height) ||
       isinf(frame.origin.x) || isinf(frame.origin.y) ||
@@ -446,7 +430,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
     return;
   }
 
-  // Also skip zero or negative sized frames
   if (frame.size.width <= 0 || frame.size.height <= 0) {
     return;
   }
@@ -458,12 +441,11 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
                                  cornerRadius:self.blurCornerRadius];
 
   UIColor *blurColor;
-  if (maskType == 1 || maskType == 3) { // Camera / Video
+  if (maskType == 1 || maskType == 3) {
     blurColor = [UIColor colorWithRed:0.12 green:0.12 blue:0.15 alpha:1.0];
-  } else if (maskType == 2) { // WebView - Use same style as Camera as requested
+  } else if (maskType == 2) {
     blurColor = [UIColor colorWithRed:0.12 green:0.12 blue:0.15 alpha:1.0];
   } else {
-    // TextInput and others
     blurColor = [UIColor blackColor];
   }
 
@@ -480,7 +462,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   if (maskType == 1) {
     [self drawCameraLabelInContext:context frame:frame];
   } else if (maskType == 2) {
-    // Reuse camera label style but with different text
     [self drawWebViewLabelInContext:context frame:frame];
   } else if (maskType == 3) {
     [self drawVideoLabelInContext:context frame:frame];
@@ -492,7 +473,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
 }
 
 - (void)drawCameraLabelInContext:(CGContextRef)context frame:(CGRect)frame {
-  // Skip if frame has invalid values
   if (isnan(frame.size.width) || isnan(frame.size.height) ||
       frame.size.width <= 0 || frame.size.height <= 0) {
     return;
@@ -501,7 +481,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   CGFloat centerX = CGRectGetMidX(frame);
   CGFloat centerY = CGRectGetMidY(frame);
 
-  // Validate centers aren't NaN
   if (isnan(centerX) || isnan(centerY)) {
     return;
   }
@@ -524,7 +503,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
 }
 
 - (void)drawWebViewLabelInContext:(CGContextRef)context frame:(CGRect)frame {
-  // Skip if frame has invalid values
   if (isnan(frame.size.width) || isnan(frame.size.height) ||
       frame.size.width <= 0 || frame.size.height <= 0) {
     return;
@@ -533,7 +511,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   CGFloat centerX = CGRectGetMidX(frame);
   CGFloat centerY = CGRectGetMidY(frame);
 
-  // Validate centers aren't NaN
   if (isnan(centerX) || isnan(centerY)) {
     return;
   }
@@ -586,7 +563,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
 }
 
 - (void)drawTextInputLabelInContext:(CGContextRef)context frame:(CGRect)frame {
-  // Skip if frame has invalid values
   if (isnan(frame.size.width) || isnan(frame.size.height) ||
       frame.size.width <= 0 || frame.size.height <= 0) {
     return;
@@ -595,7 +571,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   CGFloat centerX = CGRectGetMidX(frame);
   CGFloat centerY = CGRectGetMidY(frame);
 
-  // Validate centers aren't NaN
   if (isnan(centerX) || isnan(centerY)) {
     return;
   }
@@ -664,7 +639,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   if (isTextInput || isCamera || isWebView || isVideo || isManuallyMasked) {
     CGRect frameInWindow = [view convertRect:view.bounds toView:window];
 
-    // Sanitize NaN/Inf values from convertRect:toView:
     CGFloat x = (isnan(frameInWindow.origin.x) || isinf(frameInWindow.origin.x))
                     ? 0
                     : frameInWindow.origin.x;

package/ios/Rejourney.h

@@ -1,17 +1,3 @@
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-//  Copyright (c) 2026 Rejourney
-
 //
 //
 //  Rejourney.h

package/ios/Touch/RJTouchInterceptor.m

@@ -54,10 +54,10 @@ static void RJ_swizzled_sendEvent(id self, SEL _cmd, UIEvent *event) {
         static int swizzleSkipCount = 0;
         if (++swizzleSkipCount % 500 == 1) {
           RJLogInfo(@"[RJ-TOUCH-SWIZZLE] Touch not handled: interceptor=%@, "
-                @"isTrackingEnabled=%d (skipCount=%d)",
-                interceptor ? @"exists" : @"nil",
-                interceptor ? interceptor.isTrackingEnabled : -1,
-                swizzleSkipCount);
+                    @"isTrackingEnabled=%d (skipCount=%d)",
+                    interceptor ? @"exists" : @"nil",
+                    interceptor ? interceptor.isTrackingEnabled : -1,
+                    swizzleSkipCount);
         }
       }
     }
@@ -148,8 +148,8 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
 
 - (void)enableGlobalTracking {
   RJLogInfo(@"[RJ-TOUCH-SETUP] enableGlobalTracking called, current "
-        @"isTrackingEnabled=%d",
-        self.isTrackingEnabled);
+            @"isTrackingEnabled=%d",
+            self.isTrackingEnabled);
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     RJLogInfo(@"[RJ-TOUCH-SETUP] First-time setup - performing swizzle");
@@ -164,13 +164,14 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
       _swizzlingPerformed = YES;
       self.isTrackingEnabled = YES;
       RJLogInfo(@"[RJ-TOUCH-SETUP] Swizzle complete, isTrackingEnabled=%d",
-            self.isTrackingEnabled);
+                self.isTrackingEnabled);
     } else {
       RJLogError(@"Failed to enable touch tracking - sendEvent: not found");
     }
   });
-  RJLogInfo(@"[RJ-TOUCH-SETUP] enableGlobalTracking finished, isTrackingEnabled=%d",
-        self.isTrackingEnabled);
+  RJLogInfo(
+      @"[RJ-TOUCH-SETUP] enableGlobalTracking finished, isTrackingEnabled=%d",
+      self.isTrackingEnabled);
 }
 
 #pragma mark - Touch Event Handling
@@ -181,7 +182,7 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
     static int skipCount = 0;
     if (++skipCount % 100 == 1) {
       RJLogInfo(@"[RJ-TOUCH] Skipping touch: event=%@, isTrackingEnabled=%d",
-            event ? @"exists" : @"nil", self.isTrackingEnabled);
+                event ? @"exists" : @"nil", self.isTrackingEnabled);
     }
     return;
   }
@@ -205,7 +206,7 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
       static int notRecordingCount = 0;
       if (++notRecordingCount % 100 == 1) {
         RJLogInfo(@"[RJ-TOUCH] Not recording, skipping touch (count=%d)",
-              notRecordingCount);
+                  notRecordingCount);
       }
       return;
     }
@@ -465,7 +466,11 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
   @try {
 
     NSMutableDictionary<NSNumber *, NSArray *> *touchPathsCopy =
-        [self.touchPaths mutableCopy];
+        [NSMutableDictionary dictionaryWithCapacity:self.touchPaths.count];
+    [self.touchPaths enumerateKeysAndObjectsUsingBlock:^(
+                         NSNumber *key, NSMutableArray *obj, BOOL *stop) {
+      touchPathsCopy[key] = [obj copy];
+    }];
     NSTimeInterval duration = MAX(0, timestamp - self.touchStartTime);
     NSInteger touchCount = self.touchPaths.count;
     CGPoint startPoint = self.touchStartPoint;
@@ -753,7 +758,8 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
             respondsToSelector:@selector
             (touchInterceptorDidRecognizeGesture:
                                          touches:duration:targetLabel:)]) {
-      RJLogInfo(@"[RJ-TOUCH] Calling delegate touchInterceptorDidRecognizeGesture");
+      RJLogInfo(
+          @"[RJ-TOUCH] Calling delegate touchInterceptorDidRecognizeGesture");
       [delegate
           touchInterceptorDidRecognizeGesture:gestureType ?: RJGestureTypeTap
                                       touches:touches ?: @[]
@@ -761,8 +767,8 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
                                   targetLabel:targetLabel];
     } else {
       RJLogInfo(@"[RJ-TOUCH] Delegate missing or doesn't respond to selector: "
-            @"delegate=%@",
-            delegate);
+                @"delegate=%@",
+                delegate);
     }
   } @catch (NSException *exception) {
     RJLogWarning(@"Gesture notification failed: %@", exception);

package/ios/Utils/RJEventBuffer.m

@@ -36,9 +36,10 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
   if (self) {
     _sessionId = [sessionId copy];
     if (pendingRootPath.length == 0) {
-      NSString *defaultPath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory,
-                                                                    NSUserDomainMask, YES)
-                               .firstObject stringByAppendingPathComponent:@"rj_pending"];
+      NSString *defaultPath =
+          [NSSearchPathForDirectoriesInDomains(NSCachesDirectory,
+                                               NSUserDomainMask, YES)
+                  .firstObject stringByAppendingPathComponent:@"rj_pending"];
       _pendingRootPath = [defaultPath copy];
     } else {
       _pendingRootPath = [pendingRootPath copy];
@@ -68,7 +69,6 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
   NSString *sessionDir =
       [self.pendingRootPath stringByAppendingPathComponent:self.sessionId];
 
-  
   NSFileManager *fm = [NSFileManager defaultManager];
   if (![fm fileExistsAtPath:sessionDir]) {
     NSError *error = nil;
@@ -87,12 +87,11 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
 
   if (![fm fileExistsAtPath:self.eventsFilePath]) {
     NSDictionary *attrs = @{
-      NSFileProtectionKey: NSFileProtectionCompleteUntilFirstUserAuthentication
+      NSFileProtectionKey : NSFileProtectionCompleteUntilFirstUserAuthentication
     };
     [fm createFileAtPath:self.eventsFilePath contents:nil attributes:attrs];
   }
 
-  
   NSError *error = nil;
   self.fileHandle =
       [NSFileHandle fileHandleForWritingAtPath:self.eventsFilePath];
@@ -102,14 +101,12 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
     return;
   }
 
-  
   if (@available(iOS 13.0, *)) {
     [self.fileHandle seekToEndReturningOffset:nil error:&error];
   } else {
     [self.fileHandle seekToEndOfFile];
   }
 
-  
   [self countExistingEvents];
 
   RJLogDebug(@"Event buffer ready: %@ (%ld existing events)",
@@ -117,40 +114,57 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
 }
 
 - (void)countExistingEvents {
-  NSError *error = nil;
-  NSString *content = [NSString stringWithContentsOfFile:self.eventsFilePath
-                                                encoding:NSUTF8StringEncoding
-                                                   error:&error];
-  if (error || !content) {
-    self.eventCount = 0;
-    return;
-  }
+  __block NSInteger count = 0;
+  __block NSTimeInterval lastTs = 0;
 
-  NSArray<NSString *> *lines = [content componentsSeparatedByString:@"\n"];
-  NSInteger count = 0;
-  NSTimeInterval lastTs = 0;
-
-  for (NSString *line in lines) {
-    if (line.length == 0)
-      continue;
-
-    NSData *data = [line dataUsingEncoding:NSUTF8StringEncoding];
-    NSDictionary *event = [NSJSONSerialization JSONObjectWithData:data
-                                                          options:0
-                                                            error:nil];
-    if (event) {
-      count++;
-      NSNumber *ts = event[@"timestamp"];
-      if (ts && [ts doubleValue] > lastTs) {
-        lastTs = [ts doubleValue];
-      }
+  [self enumerateEventsWithBlock:^(NSDictionary *event, BOOL *stop) {
+    count++;
+    NSNumber *ts = event[@"timestamp"];
+    if (ts && [ts doubleValue] > lastTs) {
+      lastTs = [ts doubleValue];
     }
-  }
+  }];
 
   self.eventCount = count;
   self.lastEventTimestamp = lastTs;
 }
 
+- (void)enumerateEventsWithBlock:(void (^)(NSDictionary *event,
+                                           BOOL *stop))block {
+  if (!block || !self.eventsFilePath)
+    return;
+
+  FILE *file = fopen([self.eventsFilePath UTF8String], "r");
+  if (!file)
+    return;
+
+  char *line = NULL;
+  size_t linecap = 0;
+  ssize_t linelen;
+  BOOL stop = NO;
+
+  while (!stop && (linelen = getline(&line, &linecap, file)) > 0) {
+    @autoreleasepool {
+      if (linelen <= 1)
+        continue;
+
+      NSData *data = [NSData dataWithBytesNoCopy:line
+                                          length:linelen
+                                    freeWhenDone:NO];
+      NSError *error = nil;
+      NSDictionary *event = [NSJSONSerialization JSONObjectWithData:data
+                                                            options:0
+                                                              error:&error];
+      if (event) {
+        block(event, &stop);
+      }
+    }
+  }
+  if (line)
+    free(line);
+  fclose(file);
+}
+
 - (void)closeFileHandle {
   if (self.fileHandle) {
     if (@available(iOS 13.0, *)) {
@@ -222,11 +236,9 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
       return NO;
     }
 
-    
     NSMutableData *lineData = [jsonData mutableCopy];
     [lineData appendData:[@"\n" dataUsingEncoding:NSUTF8StringEncoding]];
 
-    
     if (@available(iOS 13.4, *)) {
       NSError *writeError = nil;
       [self.fileHandle writeData:lineData error:&writeError];
@@ -243,14 +255,9 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
       }
     }
 
-    
-    if (@available(iOS 13.0, *)) {
-      [self.fileHandle synchronizeAndReturnError:nil];
-    } else {
-      [self.fileHandle synchronizeFile];
-    }
+    // Removed redundant synchronizeFile (fsync) calls to improve performance.
+    // The serial writeQueue ensures order, and the OS will manage buffering.
 
-    
     self.eventCount++;
     NSNumber *ts = event[@"timestamp"];
     if (ts) {
@@ -269,27 +276,9 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
   __block NSMutableArray<NSDictionary *> *events = [NSMutableArray new];
 
   [self performWriteSync:^{
-    NSError *error = nil;
-    NSString *content = [NSString stringWithContentsOfFile:self.eventsFilePath
-                                                  encoding:NSUTF8StringEncoding
-                                                     error:&error];
-    if (error || !content) {
-      return;
-    }
-
-    NSArray<NSString *> *lines = [content componentsSeparatedByString:@"\n"];
-    for (NSString *line in lines) {
-      if (line.length == 0)
-        continue;
-
-      NSData *data = [line dataUsingEncoding:NSUTF8StringEncoding];
-      NSDictionary *event = [NSJSONSerialization JSONObjectWithData:data
-                                                            options:0
-                                                              error:nil];
-      if (event) {
-        [events addObject:event];
-      }
-    }
+    [self enumerateEventsWithBlock:^(NSDictionary *event, BOOL *stop) {
+      [events addObject:event];
+    }];
   }];
 
   return events;
@@ -297,7 +286,7 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
 
 - (NSArray<NSDictionary *> *)readEventsAfterBatchNumber:
     (NSInteger)afterBatchNumber {
-  
+
   NSArray<NSDictionary *> *allEvents = [self readAllEvents];
 
   __block NSInteger uploadedCount = 0;
@@ -310,9 +299,8 @@ static void *kRJEventBufferQueueKey = &kRJEventBufferQueueKey;
     return @[];
   }
 
-  return [allEvents subarrayWithRange:NSMakeRange(
-                                           startIndex,
-                                           allEvents.count - startIndex)];
+  return [allEvents
+      subarrayWithRange:NSMakeRange(startIndex, allEvents.count - startIndex)];
 }
 
 - (void)markEventsUploadedUpToIndex:(NSInteger)eventIndex {