@rejourneyco/react-native 1.0.13 → 1.0.14

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

@@ -60,6 +60,7 @@ import kotlin.concurrent.withLock
  */
 sealed class SessionState {
     object Idle : SessionState()
+    data class Starting(val sessionId: String, val startTimeMs: Long) : SessionState()
     data class Active(val sessionId: String, val startTimeMs: Long) : SessionState()
     data class Paused(val sessionId: String, val startTimeMs: Long) : SessionState()
     object Terminated : SessionState()
@@ -488,9 +489,16 @@ class RejourneyModuleImpl(
             // Check if already active
             stateLock.withLock {
                 val currentState = state
-                if (currentState is SessionState.Active) {
-                    promise.resolve(createResultMap(true, currentState.sessionId))
-                    return@post
+                when (currentState) {
+                    is SessionState.Active -> {
+                        promise.resolve(createResultMap(true, currentState.sessionId))
+                        return@post
+                    }
+                    is SessionState.Starting -> {
+                        promise.resolve(createResultMap(true, currentState.sessionId))
+                        return@post
+                    }
+                    else -> Unit
                 }
             }
 
@@ -522,10 +530,10 @@ class RejourneyModuleImpl(
                 DiagnosticLog.fault("[Rejourney] CRITICAL: No current activity available for capture!")
             }
 
-            // Pre-generate session ID to ensure consistency between JS and native
-            val sid = "session_${System.currentTimeMillis()}_${java.util.UUID.randomUUID().toString().replace("-", "").lowercase()}"
-            ReplayOrchestrator.shared?.replayId = sid
-            TelemetryPipeline.shared?.currentReplayId = sid
+            val pendingSessionId = "session_${System.currentTimeMillis()}_${java.util.UUID.randomUUID().toString().replace("-", "").lowercase()}"
+            stateLock.withLock {
+                state = SessionState.Starting(pendingSessionId, System.currentTimeMillis())
+            }
 
             // Begin replay
             ReplayOrchestrator.shared?.beginReplay(
@@ -539,6 +547,7 @@ class RejourneyModuleImpl(
 
             // Allow orchestrator time to spin up
             mainHandler.postDelayed({
+                val sid = ReplayOrchestrator.shared?.replayId ?: pendingSessionId
                 stateLock.withLock {
                     state = SessionState.Active(sid, System.currentTimeMillis())
                 }

package/ios/Engine/RejourneyImpl.swift

@@ -27,6 +27,7 @@ public final class RejourneyImpl: NSObject {
 
     private enum SessionState {
         case idle
+        case starting(sessionId: String, startTime: TimeInterval)
         case active(sessionId: String, startTime: TimeInterval)
         case paused(sessionId: String, startTime: TimeInterval)
         case terminated
@@ -353,12 +354,14 @@ public final class RejourneyImpl: NSObject {
             }
 
             self.stateLock.lock()
-            if case .active(let sid, _) = self.state {
+            switch self.state {
+            case .active(let sid, _), .starting(let sid, _):
                 self.stateLock.unlock()
                 resolve(["success": true, "sessionId": sid])
                 return
+            default:
+                self.stateLock.unlock()
             }
-            self.stateLock.unlock()
 
             if !userId.isEmpty && userId != "anonymous" && !userId.hasPrefix("anon_") {
                 self.currentUserIdentity = userId
@@ -376,11 +379,17 @@ public final class RejourneyImpl: NSObject {
             // Activate native network interception
             RejourneyURLProtocol.enable()
 
+            let pendingSessionId = "session_\(Int(Date().timeIntervalSince1970 * 1000))_\(UUID().uuidString.replacingOccurrences(of: "-", with: "").lowercased())"
+            let pendingStart = Date().timeIntervalSince1970
+            self.stateLock.lock()
+            self.state = .starting(sessionId: pendingSessionId, startTime: pendingStart)
+            self.stateLock.unlock()
+
             ReplayOrchestrator.shared.beginReplay(apiToken: publicKey, serverEndpoint: apiUrl, captureSettings: config)
 
             // Allow orchestrator time to spin up
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                let sid = ReplayOrchestrator.shared.replayId ?? UUID().uuidString
+                let sid = ReplayOrchestrator.shared.replayId ?? pendingSessionId
                 let start = Date().timeIntervalSince1970
 
                 self.stateLock.lock()

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rejourneyco/react-native",
-    "version": "1.0.13",
+    "version": "1.0.14",
     "description": "Rejourney Session Recording SDK for React Native",
     "main": "lib/commonjs/index.js",
     "module": "lib/module/index.js",