@rejourneyco/react-native 1.0.1 → 1.0.2

package/android/src/main/java/com/rejourney/RejourneyModuleImpl.kt

@@ -57,7 +57,6 @@ import java.io.File
 import java.util.*
 import java.util.concurrent.CopyOnWriteArrayList
 
-// Enum for session end reasons
 enum class EndReason {
     SESSION_TIMEOUT,
     MANUAL_STOP,
@@ -107,7 +106,6 @@ class RejourneyModuleImpl(
         }
     }
 
-    // Core components
     private var captureEngine: CaptureEngine? = null
     private var uploadManager: UploadManager? = null
     private var touchInterceptor: TouchInterceptor? = null
@@ -116,7 +114,6 @@ class RejourneyModuleImpl(
     private var keyboardTracker: KeyboardTracker? = null
     private var textInputTracker: TextInputTracker? = null
 
-    // Session state
     private var currentSessionId: String? = null
     private var userId: String? = null
     @Volatile private var isRecording: Boolean = false
@@ -134,59 +131,43 @@ class RejourneyModuleImpl(
     private var maxRecordingMinutes: Int = 10
     @Volatile private var sessionEndSent: Boolean = false
     
-    // Keyboard state
     private var keyPressCount: Int = 0
     private var isKeyboardVisible: Boolean = false
     private var lastKeyboardHeight: Int = 0
     
-    // Session state saved on background - used to restore on foreground if within timeout
     private var savedApiUrl: String = ""
     private var savedPublicKey: String = ""
     private var savedDeviceHash: String = ""
 
-    // Events buffer
     private val sessionEvents = CopyOnWriteArrayList<Map<String, Any?>>()
 
-    // Throttle immediate upload kicks (ms)
     @Volatile private var lastImmediateUploadKickMs: Long = 0
     
-    // Write-first event buffer for crash-safe persistence
     private var eventBuffer: EventBuffer? = null
 
-    // Coroutine scope for async operations
     private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
     
-    // Dedicated scope for background flush - survives independently of main scope
-    // This prevents cancellation when app goes to background
     private val backgroundScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-    // Timer jobs
     private var batchUploadJob: Job? = null
     private var durationLimitJob: Job? = null
     
-    // Main thread handler for posting delayed tasks
     private val mainHandler = android.os.Handler(android.os.Looper.getMainLooper())
 
-    // Debounced background detection (prevents transient pauses from ending sessions)
     private var scheduledBackgroundRunnable: Runnable? = null
     private var backgroundScheduled: Boolean = false
 
-    // Safety flag
     @Volatile private var isShuttingDown = false
 
-    // Auth resilience - retry mechanism
     private var authRetryCount = 0
     private var authPermanentlyFailed = false
     private var authRetryJob: Job? = null
 
     init {
         // DO NOT initialize anything here that could throw exceptions
-        // React Native needs the module constructor to complete cleanly
-        // All initialization will happen lazily on first method call
         Logger.debug("RejourneyModuleImpl constructor completed")
     }
     
-    // Lazy initialization flag
     @Volatile
     private var isInitialized = false
     private val initLock = Any()
@@ -237,21 +218,19 @@ class RejourneyModuleImpl(
                     Logger.error("Failed to schedule recovery upload (non-critical)", e)
                 }
                 
-                // Check if app was killed in previous session (Android 11+)
+                // Che  ck if app was killed in previous session (Android 11+)
                 try {
                     checkPreviousAppKill()
                 } catch (e: Exception) {
                     Logger.error("Failed to check previous app kill (non-critical)", e)
                 }
                 
-                // Check for unclosed sessions from previous launch
                 try {
                     checkForUnclosedSessions()
                 } catch (e: Exception) {
                     Logger.error("Failed to check for unclosed sessions (non-critical)", e)
                 }
                 
-                // Log OEM information for debugging
                 val oem = OEMDetector.getOEM()
                 Logger.debug("Device OEM: $oem")
                 Logger.debug("OEM Recommendations: ${OEMDetector.getRecommendations()}")
@@ -291,7 +270,6 @@ class RejourneyModuleImpl(
                     Logger.error("Failed to set up task removed listener (non-critical)", e)
                 }
                 
-                // Use lifecycle log - only shown in debug builds
                 Logger.logInitSuccess(Constants.SDK_VERSION)
                 
                 isInitialized = true
@@ -313,8 +291,6 @@ class RejourneyModuleImpl(
         
         Logger.debug("[Rejourney] addEventWithPersistence: type=$eventType, sessionId=$sessionId, inMemoryCount=${sessionEvents.size + 1}")
         
-        // CRITICAL: Write to disk immediately for crash safety
-        // This ensures events are never lost even if app is force-killed
         val bufferSuccess = eventBuffer?.appendEvent(event) ?: false
         if (!bufferSuccess) {
             Logger.warning("[Rejourney] addEventWithPersistence: Failed to append event to buffer: type=$eventType")
@@ -322,7 +298,6 @@ class RejourneyModuleImpl(
             Logger.debug("[Rejourney] addEventWithPersistence: Event appended to buffer: type=$eventType")
         }
 
-        // Also add to in-memory buffer for batched upload
         sessionEvents.add(event)
         Logger.debug("[Rejourney] addEventWithPersistence: Event added to in-memory list: type=$eventType, totalInMemory=${sessionEvents.size}")
     }
@@ -332,14 +307,12 @@ class RejourneyModuleImpl(
      * This is more reliable than Activity lifecycle callbacks.
      */
     private fun registerProcessLifecycleObserver() {
-        // Must run on main thread
         Handler(Looper.getMainLooper()).post {
             try {
                 ProcessLifecycleOwner.get().lifecycle.addObserver(this)
                 Logger.debug("ProcessLifecycleOwner observer registered")
             } catch (e: Exception) {
                 Logger.error("Failed to register ProcessLifecycleOwner observer (non-critical)", e)
-                // This is non-critical - we can still use Activity lifecycle callbacks as fallback
             }
         }
     }
@@ -472,7 +445,40 @@ class RejourneyModuleImpl(
         }
     }
 
-    // ==================== React Native Methods ====================
+    fun getDeviceInfo(promise: Promise) {
+        try {
+            val map = Arguments.createMap()
+            map.putString("model", android.os.Build.MODEL)
+            map.putString("brand", android.os.Build.MANUFACTURER)
+            map.putString("systemName", "Android")
+            map.putString("systemVersion", android.os.Build.VERSION.RELEASE)
+            map.putString("bundleId", reactContext.packageName)
+            
+            try {
+                val pInfo = reactContext.packageManager.getPackageInfo(reactContext.packageName, 0)
+                map.putString("appVersion", pInfo.versionName)
+                if (android.os.Build.VERSION.SDK_INT >= 28) {
+                    map.putString("buildNumber", pInfo.longVersionCode.toString())
+                } else {
+                    @Suppress("DEPRECATION")
+                    map.putString("buildNumber", pInfo.versionCode.toString())
+                }
+            } catch (e: Exception) {
+                map.putString("appVersion", "unknown")
+            }
+            
+            map.putBoolean("isTablet", isTablet())
+            promise.resolve(map)
+        } catch (e: Exception) {
+            promise.reject("DEVICE_INFO_ERROR", e)
+        }
+    }
+
+    private fun isTablet(): Boolean {
+        val configuration = reactContext.resources.configuration
+        return (configuration.screenLayout and android.content.res.Configuration.SCREENLAYOUT_SIZE_MASK) >= 
+                android.content.res.Configuration.SCREENLAYOUT_SIZE_LARGE
+    }
 
     fun startSession(userId: String, apiUrl: String, publicKey: String, promise: Promise) {
         ensureInitialized() // Lazy init on first call

package/android/src/newarch/java/com/rejourney/RejourneyModule.kt

@@ -132,6 +132,13 @@ class RejourneyModule(reactContext: ReactApplicationContext) :
            instance.getSDKMetrics(promise)
     }
 
+    @ReactMethod
+    @DoNotStrip
+    override fun getDeviceInfo(promise: Promise) {
+           val instance = getImplOrReject(promise) ?: return
+           instance.getDeviceInfo(promise)
+    }
+
     @ReactMethod
     @DoNotStrip
     override fun debugCrash() {

package/android/src/oldarch/java/com/rejourney/RejourneyModule.kt

@@ -128,6 +128,15 @@ class RejourneyModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    fun getDeviceInfo(promise: Promise) {
+        try {
+            impl.getDeviceInfo(promise)
+        } catch (e: Exception) {
+            promise.resolve(Arguments.createMap())
+        }
+    }
+
     @ReactMethod
     fun debugCrash() {
         try {

package/ios/Capture/RJCaptureEngine.m

@@ -1155,9 +1155,6 @@ typedef struct {
   NSTimeInterval now = CACurrentMediaTime();
 
   if (self.pendingCapture) {
-    // If we have a pending capture, force it to resolve now.
-    // If the new request is High importance, we effectively "upgrade" the
-    // current cycle by ensuring it runs immediately.
     self.pendingCapture.deadline = now;
     [self attemptPendingCapture:self.pendingCapture fullScan:NO];
   }
@@ -1173,8 +1170,6 @@ typedef struct {
     grace = MIN(grace, 0.3);
   }
 
-  // High importance requests should have a shorter grace, forcing faster
-  // resolution
   if (isCritical) {
     grace = MIN(grace, 0.1);
   }
@@ -1731,7 +1726,6 @@ typedef struct {
   }
 
   if (self.internalPerformanceLevel == RJPerformanceLevelMinimal) {
-    // Minimal mode trades quality for speed
     CGContextSetInterpolationQuality(context, kCGInterpolationNone);
     CGContextSetShouldAntialias(context, false);
     CGContextSetAllowsAntialiasing(context, false);
@@ -1741,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 {
@@ -1772,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;
 }
 
@@ -1815,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;
 }
 
@@ -1829,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=%@",
@@ -1872,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");
@@ -1912,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 {
@@ -1925,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) = ^{
@@ -1964,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;
@@ -1995,7 +1967,6 @@ typedef struct {
     if (window && self.internalVideoEncoder) {
       RJLogInfo(@"CaptureEngine: Resuming capture...");
 
-      // Use the optimized Display Link
       [self setupDisplayLink];
 
     } else {
@@ -2012,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/RJVideoEncoder.m

@@ -520,16 +520,7 @@
 }
 
 - (void)cleanup {
-  // Only cancel the current in-progress segment, don't delete the entire temp
-  // directory. Completed segments may still be uploading and must not be
-  // deleted here. The RJSegmentUploader handles file cleanup after successful
-  // upload.
   [self cancelSegment];
-
-  // NOTE: Do NOT delete rj_segments directory here!
-  // Other segments may be in the middle of uploading.
-  // Old orphaned segments are cleaned up by
-  // RJSegmentUploader.cleanupOrphanedSegments()
 }
 
 #pragma mark - Private Methods
@@ -561,14 +552,9 @@
   size_t width = (size_t)self.currentFrameSize.width;
   size_t height = (size_t)self.currentFrameSize.height;
 
-  // CRITICAL FIX: Validate incoming image dimensions match expected size
-  // During keyboard/rotation transitions, image size may temporarily differ
-  // from currentFrameSize, causing CGBitmapContextCreate bytesPerRow mismatch
   size_t imageWidth = CGImageGetWidth(cgImage);
   size_t imageHeight = CGImageGetHeight(cgImage);
 
-  // Allow small variance (1-2 pixels) due to rounding, but reject major
-  // mismatches
   if (labs((long)imageWidth - (long)width) > 2 ||
       labs((long)imageHeight - (long)height) > 2) {
     RJLogDebug(@"Video encoder: Skipping frame - size mismatch (got %zux%zu, "
@@ -639,9 +625,6 @@
     colorSpace = CGColorSpaceCreateDeviceRGB();
   }
 
-  // CRITICAL: Validate bytesPerRow is sufficient for the target width
-  // Error "CGBitmapContextCreate: invalid data bytes/row" occurs when
-  // bytesPerRow < width * 4 (4 bytes per pixel for BGRA)
   size_t requiredBytesPerRow = width * 4;
   if (bytesPerRow < requiredBytesPerRow) {
     CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
@@ -663,7 +646,6 @@
     return NULL;
   }
 
-  // Use fastest interpolation for pixel buffer drawing
   CGContextSetInterpolationQuality(context, kCGInterpolationNone);
   CGContextDrawImage(context, CGRectMake(0, 0, width, height), cgImage);
   CGContextRelease(context);
@@ -681,14 +663,10 @@
 }
 
 - (void)prewarmPixelBufferPool {
-  // Pre-warm the VideoToolbox H.264 encoder by creating a minimal AVAssetWriter
-  // and encoding a single dummy frame. This eliminates the ~1.5s spike on first
-  // real frame encode by front-loading the hardware encoder initialization.
   dispatch_async(self.encodingQueue, ^{
     @autoreleasepool {
       NSTimeInterval startTime = CACurrentMediaTime();
 
-      // Use a small size for fast prewarm (H.264 requires even dimensions)
       CGSize warmupSize = CGSizeMake(100, 100);
 
       // Create temp file for dummy segment
@@ -808,15 +786,12 @@ static dispatch_once_t sPrewarmOnceToken;
       return;
     sEncoderPrewarmed = YES;
 
-    // Run prewarm on a low-priority background queue
     dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
       @autoreleasepool {
         NSTimeInterval startTime = CACurrentMediaTime();
 
-        // Use a small size for fast prewarm (H.264 requires even dimensions)
         CGSize warmupSize = CGSizeMake(100, 100);
 
-        // Create temp file for dummy segment
         NSURL *tempDir = [NSURL fileURLWithPath:NSTemporaryDirectory()];
         NSURL *warmupURL =
             [tempDir URLByAppendingPathComponent:@"rj_encoder_prewarm.mp4"];
@@ -873,7 +848,6 @@ static dispatch_once_t sPrewarmOnceToken;
 
         [warmupWriter startSessionAtSourceTime:kCMTimeZero];
 
-        // Create and encode a single dummy frame to trigger H.264 encoder init
         CVPixelBufferRef dummyBuffer = NULL;
         NSDictionary *pixelBufferOpts = @{
           (id)kCVPixelBufferCGImageCompatibilityKey : @YES,