@rejourneyco/react-native 1.0.8 → 1.0.10

package/ios/Recording/SegmentDispatcher.swift

@@ -173,6 +173,8 @@ final class SegmentDispatcher {
         backgroundDurationMs: UInt64,
         metrics: [String: Any]?,
         currentQueueDepth: Int = 0,
+        endReason: String? = nil,
+        lifecycleVersion: Int? = nil,
         completion: @escaping (Bool) -> Void
     ) {
         guard let url = URL(string: "\(endpoint)/api/ingest/session/end") else {
@@ -190,6 +192,12 @@ final class SegmentDispatcher {
         if backgroundDurationMs > 0 { body["totalBackgroundTimeMs"] = backgroundDurationMs }
         if let m = metrics { body["metrics"] = m }
         body["sdkTelemetry"] = sdkTelemetrySnapshot(currentQueueDepth: currentQueueDepth)
+        if let endReason, !endReason.isEmpty {
+            body["endReason"] = endReason
+        }
+        if let lifecycleVersion, lifecycleVersion > 0 {
+            body["lifecycleVersion"] = lifecycleVersion
+        }
         
         do {
             req.httpBody = try JSONSerialization.data(withJSONObject: body)

package/ios/Recording/StabilityMonitor.swift

@@ -38,7 +38,7 @@ private func _rjSignalHandler(_ signum: Int32) {
     case SIGTRAP: name = "SIGTRAP"
     default:      name = "SIG\(signum)"
     }
-    
+
     let incident = IncidentRecord(
         sessionId: StabilityMonitor.shared.currentSessionId ?? "unknown",
         timestampMs: UInt64(Date().timeIntervalSince1970 * 1000),
@@ -52,60 +52,63 @@ private func _rjSignalHandler(_ signum: Int32) {
             "priority": String(format: "%.2f", Thread.current.threadPriority)
         ]
     )
-    
+
     ReplayOrchestrator.shared.incrementFaultTally()
     StabilityMonitor.shared.persistIncidentSync(incident)
-    
+
+    // Flush visual frames to disk for crash safety
+    VisualCapture.shared.flushToDisk()
+
     signal(signum, SIG_DFL)
     raise(signum)
 }
 
 @objc(StabilityMonitor)
 public final class StabilityMonitor: NSObject {
-    
+
     @objc public static let shared = StabilityMonitor()
     @objc public var isMonitoring = false
     @objc public var currentSessionId: String?
-    
+
     private let _incidentStore: URL
     private let _workerQueue = DispatchQueue(label: "co.rejourney.stability", qos: .utility)
-    
+
     private static var _chainedExceptionHandler: NSUncaughtExceptionHandler?
     private static var _chainedSignalHandlers: [Int32: sig_t] = [:]
     private static let _trackedSignals: [Int32] = [SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV, SIGTRAP]
-    
+
     private override init() {
         let cache = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
         _incidentStore = cache.appendingPathComponent("rj_incidents.json")
         super.init()
     }
-    
+
     @objc public func activate() {
         guard !isMonitoring else { return }
         isMonitoring = true
-        
+
         StabilityMonitor._chainedExceptionHandler = NSGetUncaughtExceptionHandler()
         NSSetUncaughtExceptionHandler { ex in
             StabilityMonitor.shared._captureException(ex)
             StabilityMonitor._chainedExceptionHandler?(ex)
         }
-        
+
         for sig in StabilityMonitor._trackedSignals {
             StabilityMonitor._chainedSignalHandlers[sig] = signal(sig, _rjSignalHandler)
         }
-        
+
         _workerQueue.async { [weak self] in
             self?._uploadStoredIncidents()
         }
     }
-    
+
     @objc public func deactivate() {
         guard isMonitoring else { return }
         isMonitoring = false
-        
+
         NSSetUncaughtExceptionHandler(nil)
         StabilityMonitor._chainedExceptionHandler = nil
-        
+
         for sig in StabilityMonitor._trackedSignals {
             if let prev = StabilityMonitor._chainedSignalHandlers[sig] {
                 signal(sig, prev)
@@ -115,13 +118,13 @@ public final class StabilityMonitor: NSObject {
         }
         StabilityMonitor._chainedSignalHandlers.removeAll()
     }
-    
+
     @objc public func transmitStoredReport() {
         _workerQueue.async { [weak self] in
             self?._uploadStoredIncidents()
         }
     }
-    
+
     private func _captureException(_ exception: NSException) {
         let incident = IncidentRecord(
             sessionId: currentSessionId ?? "unknown",
@@ -132,12 +135,16 @@ public final class StabilityMonitor: NSObject {
             frames: _formatFrames(exception.callStackSymbols),
             context: _captureContext()
         )
-        
+
         ReplayOrchestrator.shared.incrementFaultTally()
         _persistIncident(incident)
+
+        // Flush visual frames to disk for crash safety
+        VisualCapture.shared.flushToDisk()
+
         Thread.sleep(forTimeInterval: 0.15)
     }
-    
+
     func persistIncidentSync(_ incident: IncidentRecord) {
         do {
             let data = try JSONEncoder().encode(incident)
@@ -146,11 +153,11 @@ public final class StabilityMonitor: NSObject {
             DiagnosticLog.fault("[StabilityMonitor] Incident persist failed: \(error)")
         }
     }
-    
+
     private func _formatFrames(_ raw: [String]) -> [String] {
         raw.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
     }
-    
+
     private func _captureContext() -> [String: String] {
         [
             "threadName": Thread.current.name ?? "unnamed",
@@ -158,7 +165,7 @@ public final class StabilityMonitor: NSObject {
             "priority": String(format: "%.2f", Thread.current.threadPriority)
         ]
     }
-    
+
     private func _persistIncident(_ incident: IncidentRecord) {
         do {
             let data = try JSONEncoder().encode(incident)
@@ -167,39 +174,40 @@ public final class StabilityMonitor: NSObject {
             DiagnosticLog.fault("[StabilityMonitor] Incident persist failed: \(error)")
         }
     }
-    
+
     private func _uploadStoredIncidents() {
         guard FileManager.default.fileExists(atPath: _incidentStore.path),
               let data = try? Data(contentsOf: _incidentStore),
               let incident = try? JSONDecoder().decode(IncidentRecord.self, from: data) else { return }
-        
+
         _transmitIncident(incident) { [weak self] ok in
-            if ok { try? FileManager.default.removeItem(at: self!._incidentStore) }
+            guard ok, let self else { return }
+            try? FileManager.default.removeItem(at: self._incidentStore)
         }
     }
-    
+
     private func _transmitIncident(_ incident: IncidentRecord, completion: @escaping (Bool) -> Void) {
         let base = SegmentDispatcher.shared.endpoint
         guard let url = URL(string: "\(base)/api/ingest/fault") else {
             completion(false)
             return
         }
-        
+
         var req = URLRequest(url: url)
         req.httpMethod = "POST"
         req.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        
+
         if let key = SegmentDispatcher.shared.apiToken {
             req.setValue(key, forHTTPHeaderField: "x-rejourney-key")
         }
-        
+
         do {
             req.httpBody = try JSONEncoder().encode(incident)
         } catch {
             completion(false)
             return
         }
-        
+
         URLSession.shared.dataTask(with: req) { _, resp, _ in
             let code = (resp as? HTTPURLResponse)?.statusCode ?? 0
             completion(code >= 200 && code < 300)
@@ -210,13 +218,13 @@ public final class StabilityMonitor: NSObject {
 @objc(FaultTracker)
 public final class FaultTracker: NSObject {
     @objc public static let shared = FaultTracker()
-    
+
     private override init() { super.init() }
-    
+
     @objc public func activate() {
         StabilityMonitor.shared.activate()
     }
-    
+
     @objc public func deactivate() {
         StabilityMonitor.shared.deactivate()
     }

package/ios/Recording/TelemetryPipeline.swift

@@ -101,6 +101,25 @@ public final class TelemetryPipeline: NSObject {
         NotificationCenter.default.addObserver(self, selector: #selector(_appSuspending), name: UIApplication.willTerminateNotification, object: nil)
     }
     
+    /// Pause the heartbeat timer when the app goes to background.
+    /// This prevents the pipeline from uploading empty event batches
+    /// while backgrounded, which would inflate session duration.
+    @objc public func pause() {
+        _heartbeat?.invalidate()
+        _heartbeat = nil
+    }
+    
+    /// Resume the heartbeat timer when the app returns to foreground.
+    @objc public func resume() {
+        guard _heartbeat == nil else { return }
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            self._heartbeat = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { [weak self] _ in
+                self?.dispatchNow()
+            }
+        }
+    }
+    
     @objc public func shutdown() {
         _heartbeat?.invalidate()
         _heartbeat = nil
@@ -207,9 +226,13 @@ public final class TelemetryPipeline: NSObject {
         let isConstrained = ReplayOrchestrator.shared.networkIsConstrained
         let isExpensive = ReplayOrchestrator.shared.networkIsExpensive
         
+        // Prefer detailed hardware model (e.g. "iPhone16,1") when available,
+        // falling back to the generic UIDevice.model ("iPhone", "iPad", etc.).
+        let hardwareModel = (DeviceRegistrar.shared.gatherDeviceProfile()["hwModel"] as? String) ?? device.model
+        
         let meta: [String: Any] = [
             "platform": "ios",
-            "model": device.model,
+            "model": hardwareModel,
             "osVersion": device.systemVersion,
             "vendorId": device.identifierForVendor?.uuidString ?? "",
             "time": Date().timeIntervalSince1970,
@@ -276,9 +299,12 @@ public final class TelemetryPipeline: NSObject {
         let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "unknown"
         let appId = Bundle.main.bundleIdentifier ?? "unknown"
         
+        // Prefer detailed hardware model from DeviceRegistrar when available.
+        let hardwareModel = (DeviceRegistrar.shared.gatherDeviceProfile()["hwModel"] as? String) ?? device.model
+        
         let meta: [String: Any] = [
             "platform": "ios",
-            "model": device.model,
+            "model": hardwareModel,
             "osVersion": device.systemVersion,
             "vendorId": device.identifierForVendor?.uuidString ?? "",
             "time": Date().timeIntervalSince1970,
@@ -306,6 +332,15 @@ public final class TelemetryPipeline: NSObject {
         _enqueue(["type": "custom", "timestamp": _ts(), "name": name, "payload": payload])
     }
     
+    @objc public func recordConsoleLogEvent(level: String, message: String) {
+        _enqueue([
+            "type": "log",
+            "timestamp": _ts(),
+            "level": level,
+            "message": message
+        ])
+    }
+    
     @objc public func recordJSErrorEvent(name: String, message: String, stack: String?) {
         var event: [String: Any] = [
             "type": "error",
@@ -317,6 +352,10 @@ public final class TelemetryPipeline: NSObject {
             event["stack"] = stack
         }
         _enqueue(event)
+        // Prioritize JS error delivery to reduce loss on fatal terminations.
+        _serialWorker.async { [weak self] in
+            self?._shipPendingEvents()
+        }
     }
     
     @objc public func recordAnrEvent(durationMs: Int, stack: String?) {
@@ -330,6 +369,10 @@ public final class TelemetryPipeline: NSObject {
             event["stack"] = stack
         }
         _enqueue(event)
+        // Prioritize ANR delivery while the process is still alive.
+        _serialWorker.async { [weak self] in
+            self?._shipPendingEvents()
+        }
     }
     
     @objc public func recordUserAssociation(_ userId: String) {

package/ios/Recording/ViewHierarchyScanner.swift

@@ -136,6 +136,7 @@ import UIKit
     private func _typeName(_ v: UIView) -> String { String(describing: type(of: v)) }
     
     private func _isSensitive(_ v: UIView) -> Bool {
+        if v.accessibilityHint == "rejourney_occlude" { return true }
         if let tf = v as? UITextField, tf.isSecureTextEntry { return true }
         return false
     }

package/ios/Recording/VisualCapture.swift

@@ -162,6 +162,11 @@ public final class VisualCapture: NSObject {
         _redactionMask.remove(view)
     }
     
+    @objc public func invalidateMaskCache() {
+        _redactionMask.invalidateCache()
+    }
+
+    
     @objc public func configure(snapshotInterval: Double, jpegQuality: Double, captureScale: CGFloat = 1.25) {
         self.snapshotInterval = snapshotInterval
         self.quality = CGFloat(jpegQuality)
@@ -322,7 +327,7 @@ public final class VisualCapture: NSObject {
         
         guard !images.isEmpty else { return }
         
-        // All heavy work (tar, gzip, network) happens in background queue
+        // All heavy work (package, gzip, network) happens in background queue
         _encodeQueue.addOperation { [weak self] in
             self?._packageAndShip(images: images, sessionEpoch: sessionEpoch)
         }
@@ -374,10 +379,20 @@ public final class VisualCapture: NSObject {
     
     /// Load and upload any pending frames from disk for a session
     @objc public func uploadPendingFrames(sessionId: String) {
-        guard let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else { return }
+        uploadPendingFrames(sessionId: sessionId, completion: nil)
+    }
+    
+    public func uploadPendingFrames(sessionId: String, completion: ((Bool) -> Void)? = nil) {
+        guard let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else {
+            completion?(false)
+            return
+        }
         let framesPath = cacheDir.appendingPathComponent("rj_pending").appendingPathComponent(sessionId).appendingPathComponent("frames")
         
-        guard let frameFiles = try? FileManager.default.contentsOfDirectory(at: framesPath, includingPropertiesForKeys: nil) else { return }
+        guard let frameFiles = try? FileManager.default.contentsOfDirectory(at: framesPath, includingPropertiesForKeys: nil) else {
+            completion?(true)
+            return
+        }
         
         var frames: [(Data, UInt64)] = []
         for file in frameFiles.sorted(by: { $0.lastPathComponent < $1.lastPathComponent }) {
@@ -392,18 +407,24 @@ public final class VisualCapture: NSObject {
             frames.append((data, ts))
         }
         
-        guard !frames.isEmpty, let bundle = _packageFrameBundle(images: frames, sessionEpoch: frames.first?.1 ?? 0) else { return }
+        guard !frames.isEmpty, let bundle = _packageFrameBundle(images: frames, sessionEpoch: frames.first?.1 ?? 0) else {
+            completion?(frames.isEmpty)
+            return
+        }
         
         let endTs = frames.last?.1 ?? 0
-        let fname = "\(sessionId)-\(endTs).tar.gz"
         
-        TelemetryPipeline.shared.submitFrameBundle(
+        SegmentDispatcher.shared.transmitFrameBundle(
             payload: bundle,
-            filename: fname,
             startMs: frames.first?.1 ?? 0,
             endMs: endTs,
             frameCount: frames.count
-        )
+        ) { ok in
+            if ok {
+                try? FileManager.default.removeItem(at: framesPath)
+            }
+            completion?(ok)
+        }
     }
     
     /// Clear pending frames for a session after successful upload
@@ -445,34 +466,38 @@ public final class VisualCapture: NSObject {
         )
     }
     
+    /// Android-compatible binary format: [8-byte BE timestamp offset][4-byte BE size][jpeg] per frame. Backend auto-detects.
     private func _packageFrameBundle(images: [(Data, UInt64)], sessionEpoch: UInt64) -> Data? {
         var archive = Data()
-        
         for (jpeg, timestamp) in images {
-            let name = "\(sessionEpoch)_1_\(timestamp).jpeg"
-            archive.append(_tarHeader(name: name, size: jpeg.count))
+            let tsOffset = timestamp - sessionEpoch
+            archive.append(_uint64BigEndian(tsOffset))
+            archive.append(_uint32BigEndian(UInt32(jpeg.count)))
             archive.append(jpeg)
-            let padding = (512 - (jpeg.count % 512)) % 512
-            if padding > 0 { archive.append(Data(repeating: 0, count: padding)) }
         }
-        
-        archive.append(Data(repeating: 0, count: 1024))
         return archive.gzipCompress()
     }
     
-    private func _tarHeader(name: String, size: Int) -> Data {
-        var h = Data(count: 512)
-        if let nd = name.data(using: .utf8) { h.replaceSubrange(0..<min(100, nd.count), with: nd.prefix(100)) }
-        "0000644\0".data(using: .utf8).map { h.replaceSubrange(100..<108, with: $0) }
-        let z = "0000000\0".data(using: .utf8)!
-        h.replaceSubrange(108..<124, with: z + z)
-        String(format: "%011o\0", size).data(using: .utf8).map { h.replaceSubrange(124..<136, with: $0) }
-        String(format: "%011o\0", Int(Date().timeIntervalSince1970)).data(using: .utf8).map { h.replaceSubrange(136..<148, with: $0) }
-        h[156] = 0x30
-        "        ".data(using: .utf8).map { h.replaceSubrange(148..<156, with: $0) }
-        let sum = h.reduce(0) { $0 + Int($1) }
-        String(format: "%06o\0 ", sum).data(using: .utf8).map { h.replaceSubrange(148..<156, with: $0) }
-        return h
+    private func _uint64BigEndian(_ value: UInt64) -> Data {
+        Data([
+            UInt8((value >> 56) & 0xff),
+            UInt8((value >> 48) & 0xff),
+            UInt8((value >> 40) & 0xff),
+            UInt8((value >> 32) & 0xff),
+            UInt8((value >> 24) & 0xff),
+            UInt8((value >> 16) & 0xff),
+            UInt8((value >> 8) & 0xff),
+            UInt8(value & 0xff)
+        ])
+    }
+    
+    private func _uint32BigEndian(_ value: UInt32) -> Data {
+        Data([
+            UInt8((value >> 24) & 0xff),
+            UInt8((value >> 16) & 0xff),
+            UInt8((value >> 8) & 0xff),
+            UInt8(value & 0xff)
+        ])
     }
 }
 
@@ -512,7 +537,28 @@ private final class RedactionMask {
     // sensitive views (text inputs, cameras) don't appear/disappear at 3fps.
     private var _cachedAutoRects: [CGRect] = []
     private var _lastScanTime: CFAbsoluteTime = 0
-    private let _scanCacheDurationSec: CFAbsoluteTime = 1.0
+    private let _scanCacheDurationSec: CFAbsoluteTime = 0.5
+    
+    private var _observers: [Any] = []
+    
+    init() {
+        _observers.append(NotificationCenter.default.addObserver(forName: UIResponder.keyboardWillShowNotification, object: nil, queue: nil) { [weak self] _ in self?.invalidateCache() })
+        _observers.append(NotificationCenter.default.addObserver(forName: UIResponder.keyboardWillHideNotification, object: nil, queue: nil) { [weak self] _ in self?.invalidateCache() })
+        _observers.append(NotificationCenter.default.addObserver(forName: UITextField.textDidChangeNotification, object: nil, queue: nil) { [weak self] _ in self?.invalidateCache() })
+        _observers.append(NotificationCenter.default.addObserver(forName: UITextView.textDidChangeNotification, object: nil, queue: nil) { [weak self] _ in self?.invalidateCache() })
+    }
+    
+    deinit {
+        for observer in _observers {
+            NotificationCenter.default.removeObserver(observer)
+        }
+    }
+    
+    func invalidateCache() {
+        _lock.lock()
+        _lastScanTime = 0
+        _lock.unlock()
+    }
     
     // View class names that should always be masked (privacy sensitive)
     private let _sensitiveClassNames: Set<String> = [
@@ -668,6 +714,10 @@ private final class RedactionMask {
     }
     
     private func _shouldMask(_ view: UIView) -> Bool {
+        if view.accessibilityHint == "rejourney_occlude" {
+            return true
+        }
+        
         // 1. Mask ALL text input fields by default (privacy first)
         // This includes password fields, instructions, notes, etc.
         if view is UITextField {

package/ios/Rejourney.mm

@@ -70,11 +70,11 @@ RCT_EXPORT_MODULE()
 
 #pragma mark - Tap Event Emission (no-ops, dead tap detection is native-side)
 
-RCT_EXPORT_METHOD(addListener:(NSString *)eventName) {
+RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
   // No-op: dead tap detection is handled natively in TelemetryPipeline
 }
 
-RCT_EXPORT_METHOD(removeListeners:(double)count) {
+RCT_EXPORT_METHOD(removeListeners : (double)count) {
   // No-op: dead tap detection is handled natively in TelemetryPipeline
 }
 
@@ -195,6 +195,26 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
   [impl getUserIdentity:resolve reject:reject];
 }
 
+RCT_EXPORT_METHOD(setAnonymousId : (NSString *)anonymousId resolve : (
+    RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject) {
+  RejourneyImpl *impl = [self ensureImpl];
+  if (!impl) {
+    resolve(@{@"success" : @NO});
+    return;
+  }
+  [impl setAnonymousId:anonymousId resolve:resolve reject:reject];
+}
+
+RCT_EXPORT_METHOD(getAnonymousId : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject) {
+  RejourneyImpl *impl = [self ensureImpl];
+  if (!impl) {
+    resolve([NSNull null]);
+    return;
+  }
+  [impl getAnonymousId:resolve reject:reject];
+}
+
 #pragma mark - Events and Tracking
 
 RCT_EXPORT_METHOD(logEvent : (NSString *)eventType details : (NSDictionary *)
@@ -312,12 +332,11 @@ RCT_EXPORT_METHOD(setDebugMode : (BOOL)enabled resolve : (
   [impl setDebugMode:enabled resolve:resolve reject:reject];
 }
 
-RCT_EXPORT_METHOD(setRemoteConfig : (BOOL)rejourneyEnabled 
-                  recordingEnabled : (BOOL)recordingEnabled 
-                  sampleRate : (double)sampleRate 
-                  maxRecordingMinutes : (double)maxRecordingMinutes 
-                  resolve : (RCTPromiseResolveBlock)resolve 
-                  reject : (RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(setRemoteConfig : (BOOL)rejourneyEnabled recordingEnabled : (
+    BOOL)recordingEnabled sampleRate : (double)
+                      sampleRate maxRecordingMinutes : (double)
+                          maxRecordingMinutes resolve : (RCTPromiseResolveBlock)
+                              resolve reject : (RCTPromiseRejectBlock)reject) {
   RejourneyImpl *impl = [self ensureImpl];
   if (!impl) {
     resolve(@{@"success" : @NO});

package/ios/Utility/DataCompression.swift

@@ -26,8 +26,8 @@ extension Data {
             stream.avail_in = uint(self.count)
             stream.total_out = 0
             
-            // MAX_WBITS + 16 = gzip format
-            if deflateInit2_(&stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS + 16, 8, Z_DEFAULT_STRATEGY, ZLIB_VERSION, Int32(MemoryLayout<z_stream>.size)) != Z_OK {
+            // MAX_WBITS + 16 = gzip format; level 9 for best ratio (smaller S3 payloads)
+            if deflateInit2_(&stream, 9, Z_DEFLATED, MAX_WBITS + 16, 8, Z_DEFAULT_STRATEGY, ZLIB_VERSION, Int32(MemoryLayout<z_stream>.size)) != Z_OK {
                 return nil
             }
             

package/ios/Utility/ImageBlur.swift

@@ -18,7 +18,6 @@ import UIKit
 import Accelerate
 
 extension UIImage {
-    /// Apply Gaussian blur to the image
     func gaussianBlur(radius: CGFloat) -> UIImage? {
         guard let cgImage = cgImage else { return nil }