@rejourneyco/react-native 1.0.2 → 1.0.3

package/android/src/main/java/com/rejourney/network/UploadManager.kt

@@ -41,13 +41,9 @@ class UploadManager(
     private val context: Context,
     var apiUrl: String
 ) {
-    // Configuration
     var publicKey: String = ""
     var deviceHash: String = ""
     
-    // NUCLEAR FIX: Two session ID fields to prevent recovery from corrupting the current session
-    // - sessionId: Used by uploadGzippedContent/uploadContent for recovery operations (can be temporarily changed)
-    // - activeSessionId: The REAL current session ID, never modified by recovery - use this for current session operations
     var sessionId: String? = null
     private var activeSessionId: String? = null
     
@@ -55,37 +51,29 @@ class UploadManager(
     var sessionStartTime: Long = 0
     var projectId: String? = null
     
-    // Background time tracking for billing exclusion
     var totalBackgroundTimeMs: Long = 0
     
-    // Billing blocked flag - set when 402 is received
     var billingBlocked: Boolean = false
     
     private var batchNumber = AtomicInteger(0)
 
-    // Video segment uploader
     private var segmentUploader: SegmentUploader? = null
 
-    // Circuit breaker state
     private var consecutiveFailures = AtomicInteger(0)
     private var circuitOpen = false
     private var circuitOpenTime: Long = 0
     private val circuitBreakerThreshold = 5
     private val circuitResetTimeMs = 60_000L
 
-    // Retry configuration
     private val maxRetries = 3
     private val initialRetryDelayMs = 1000L
 
-    // Use shared client (SSL pinning removed)
     private val client = HttpClientProvider.shared
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-    // Serialize uploads + endSession so stopSession can't race an in-flight timer upload.
     private val uploadMutex = Mutex()
 
-    // Crash-safe persistence (disk-backed pending uploads)
     private val pendingRootDir: File by lazy {
         File(context.filesDir, "rejourney/pending_uploads").apply { mkdirs() }
     }
@@ -96,8 +84,7 @@ class UploadManager(
     fun resetForNewSession() {
         batchNumber.set(0)
         totalBackgroundTimeMs = 0
-        billingBlocked = false  // Reset billing blocked state for new session
-        // CRITICAL FIX: Clear cached SegmentUploader to prevent stale session data
+        billingBlocked = false
         segmentUploader = null
     }
     
@@ -108,7 +95,7 @@ class UploadManager(
      */
     fun setActiveSessionId(newSessionId: String) {
         activeSessionId = newSessionId
-        sessionId = newSessionId  // Keep in sync initially
+        sessionId = newSessionId
         Logger.debug("[UploadManager] sessionId SET to: $newSessionId (activeSessionId=$activeSessionId)")
     }
     
@@ -184,7 +171,7 @@ class UploadManager(
     @Deprecated("Use UploadWorker.scheduleRecoveryUpload() instead - this blocks all uploads")
     suspend fun recoverPendingSessions(): Boolean {
         Logger.warning("[UploadManager] recoverPendingSessions is DEPRECATED - use WorkManager recovery instead")
-        return true  // No-op, return success
+        return true
     }
 
     /**
@@ -198,13 +185,9 @@ class UploadManager(
         events: List<Map<String, Any?>>,
         isFinal: Boolean = false
     ): Boolean {
-        // CRITICAL FIX: Use activeSessionId for current session operations.
-        // sessionId can be temporarily modified by recoverPendingSessions(), causing events
-        // to be uploaded to the WRONG session. activeSessionId is protected from recovery.
         val effectiveSessionId = activeSessionId ?: sessionId
         Logger.debug("[UploadManager] uploadBatch: START (eventCount=${events.size}, isFinal=$isFinal, effectiveSessionId=$effectiveSessionId)")
         
-        // Skip uploads if billing is blocked
         if (billingBlocked) {
             Logger.warning("[UploadManager] uploadBatch: Upload skipped - billing blocked")
             return false
@@ -223,20 +206,16 @@ class UploadManager(
         
         Logger.debug("[UploadManager] uploadBatch: batchNumber=$currentBatch, canUploadNow=$canUploadNow, effectiveSessionId=$effectiveSessionId")
 
-        // If we're online, first flush any previously persisted pending payloads
-        // for the *current* session (offline queue drain).
         if (canUploadNow) {
             effectiveSessionId?.takeIf { it.isNotBlank() }?.let { sid ->
                 val ok = flushPendingForSession(sid)
                 if (!ok) {
-                    // Don't block new data persistence; just mark as failure.
                     success = false
                 }
             }
         }
 
         try {
-            // Upload events if present OR if this is the final batch (to send duration/endTime)
             if (events.isNotEmpty() || isFinal) {
                 Logger.debug("[UploadManager] uploadBatch: Building payload (eventCount=${events.size}, isFinal=$isFinal)")
                 val payload = buildEventsPayload(events, currentBatch, isFinal)
@@ -288,17 +267,14 @@ class UploadManager(
                 onUploadFailure()
             }
         } catch (e: CancellationException) {
-            // Normal cancellation (e.g., app going to background) - not an error
-            // The data is persisted on disk and WorkManager will handle the upload
             Logger.debug("[UploadManager] uploadBatch: Batch upload cancelled - WorkManager will handle upload")
-            throw e // Re-throw to propagate cancellation properly
+            throw e
         } catch (e: Exception) {
             Logger.error("[UploadManager] uploadBatch: ❌ Exception during batch upload: ${e.message}", e)
             onUploadFailure()
             success = false
         }
 
-        // Semantics: return true when data is either uploaded (online) or safely persisted (offline).
         val result = if (canUploadNow) {
             success
         } else {
@@ -319,18 +295,11 @@ class UploadManager(
         endTime: Long,
         frameCount: Int
     ): Boolean {
-        // CRITICAL FIX: Extract session ID from segment filename instead of using this.sessionId
-        // The segment filename format is: seg_<sessionId>_<timestamp>.mp4
-        // This ensures we upload to the correct session even when this.sessionId is stale
-        // (e.g., from a previous session that wasn't properly cleaned up)
         val sid = extractSessionIdFromFilename(segmentFile.name) ?: sessionId ?: return false
         
-        // DEBUG: Log to trace stale session ID issue
         Logger.debug("[UploadManager] uploadVideoSegment START (file=${segmentFile.name}, frames=$frameCount)")
         Logger.debug("[UploadManager] sessionId from filename=$sid, this.sessionId=$sessionId")
         
-        // CRITICAL FIX: Ensure valid token before segment upload
-        // Same pattern as UploadWorker fix - token may have expired since uploader was created
         val authManager = DeviceAuthManager.getInstance(context)
         val tokenValid = authManager.ensureValidToken()
         if (!tokenValid) {
@@ -338,7 +307,6 @@ class UploadManager(
         }
         
         val uploader = getOrCreateSegmentUploader()
-        // Always update token before each upload (may have been refreshed)
         uploader.uploadToken = authManager.getCurrentUploadToken()
         
         val result = uploader.uploadVideoSegment(
@@ -365,15 +333,12 @@ class UploadManager(
      * Returns: session_1768582930679_9510E45F
      */
     private fun extractSessionIdFromFilename(filename: String): String? {
-        // Remove prefix and extension
-        // Format: seg_session_<timestamp>_<hash>_<segmentTimestamp>.mp4
         if (!filename.startsWith("seg_") || !filename.endsWith(".mp4")) {
             return null
         }
         
         val withoutPrefix = filename.removePrefix("seg_").removeSuffix(".mp4")
         
-        // The session ID is everything except the last underscore-separated component (segment timestamp)
         val lastUnderscore = withoutPrefix.lastIndexOf('_')
         if (lastUnderscore <= 0) {
             return null
@@ -398,8 +363,6 @@ class UploadManager(
         Logger.debug("[UploadManager] uploadHierarchy: size=${hierarchyData.size} bytes, timestamp=$timestamp, sessionId=$sessionId")
         Logger.debug("[UploadManager] uploadHierarchy: this.sessionId=$sessionId, activeSessionId=$activeSessionId")
         
-        // CRITICAL FIX: Ensure valid token before hierarchy upload
-        // Same pattern as uploadVideoSegment - token may have expired since uploader was created
         val authManager = DeviceAuthManager.getInstance(context)
         Logger.debug("[UploadManager] uploadHierarchy: Ensuring valid auth token...")
         val tokenValid = authManager.ensureValidToken()
@@ -410,7 +373,6 @@ class UploadManager(
         }
         
         val uploader = getOrCreateSegmentUploader()
-        // Always update token before each upload (may have been refreshed)
         uploader.uploadToken = authManager.getCurrentUploadToken()
         Logger.debug("[UploadManager] uploadHierarchy: SegmentUploader ready, apiKey=${uploader.apiKey?.take(8)}..., projectId=${uploader.projectId}")
         
@@ -454,7 +416,6 @@ class UploadManager(
         isKeyframe: Boolean
     ): Boolean {
         val gzipped = gzipData(content) ?: return false
-        // CRITICAL FIX: Use activeSessionId for current session operations
         val sidForPersist = (activeSessionId ?: sessionId ?: "").ifBlank { "unknown" }
         persistPendingUpload(
             sessionId = sidForPersist,
@@ -514,7 +475,6 @@ class UploadManager(
                     file.delete()
                     metaFile.delete()
                 } catch (_: Exception) {
-                    // ignore
                 }
             } else {
                 allOk = false
@@ -535,15 +495,12 @@ class UploadManager(
         frameCount: Int,
         isKeyframe: Boolean = false
     ): Boolean {
-        // Step 1: Gzip the content
         val gzipped = gzipData(content)
         if (gzipped == null) {
             Logger.error("Failed to gzip $contentType data")
             return false
         }
 
-        // Crash-safe persistence: write pending gzipped payload before any network
-        // CRITICAL FIX: Use activeSessionId for current session operations
         val sidForPersist = (activeSessionId ?: sessionId ?: "").ifBlank { "unknown" }
         val pendingFile = persistPendingUpload(
             sessionId = sidForPersist,
@@ -557,50 +514,41 @@ class UploadManager(
 
         Logger.debug("$contentType batch $batchNumber: ${content.size} bytes -> ${gzipped.size} gzipped")
 
-        // Step 2: Request presigned URL
         val presignResult = presignForContentType(contentType, batchNumber, gzipped.size, isKeyframe)
         if (presignResult == null) {
             Logger.error("Failed to get presigned URL for $contentType")
             return false
         }
 
-        // Check if server says to skip this upload (recording disabled for frames)
         val skipUpload = presignResult.optBoolean("skipUpload", false)
         if (skipUpload) {
             Logger.debug("$contentType upload skipped - recording disabled for project")
-            // Clean up pending file since we don't need to upload
             try {
                 pendingFile?.delete()
                 pendingFile?.let { File(it.parentFile, it.name + ".meta.json").delete() }
             } catch (_: Exception) {}
-            return true // Return success - skip is intentional, not an error
+            return true
         }
 
         val presignedUrl = presignResult.optString("presignedUrl")
         val batchId = presignResult.optString("batchId")
         
-        // NUCLEAR FIX: Do NOT update this.sessionId from server response!
-        // This was corrupting the current session ID when uploading old/recovered sessions.
-        // The sessionId should only be set by RejourneyModuleImpl.startSession()
 
         if (presignedUrl.isEmpty() || batchId.isEmpty()) {
             Logger.error("Invalid presign response: $presignResult")
             return false
         }
 
-        // Step 3: Upload to S3
         val uploadSuccess = uploadToS3(presignedUrl, gzipped)
         if (!uploadSuccess) {
             Logger.error("Failed to upload $contentType to S3")
             return false
         }
 
-        // Step 4: Complete batch
         val completeSuccess = completeBatch(batchId, gzipped.size, eventCount, frameCount)
         if (!completeSuccess) {
             Logger.warning("Failed to complete batch $batchId (data uploaded to S3)")
         } else {
-            // Only delete pending file when complete succeeds (safe to retry otherwise)
             try {
                 pendingFile?.delete()
                 pendingFile?.let { File(it.parentFile, it.name + ".meta.json").delete() }
@@ -623,7 +571,6 @@ class UploadManager(
     }
 
     private fun parsePendingFilename(name: String): PendingName? {
-        // Format: <contentType>_<batchNumber>_<k|n>.gz
         if (!name.endsWith(".gz")) return null
         val base = name.removeSuffix(".gz")
         val parts = base.split("_")
@@ -681,14 +628,11 @@ class UploadManager(
 
         val presignedUrl = presignResult.optString("presignedUrl")
         val batchId = presignResult.optString("batchId")
-        // NUCLEAR FIX: Do NOT update this.sessionId from server response!
-        // This was corrupting the current session ID when uploading old/recovered sessions.
         if (presignedUrl.isEmpty() || batchId.isEmpty()) return false
 
         val uploadSuccess = uploadToS3(presignedUrl, gzipped)
         if (!uploadSuccess) return false
 
-        // Treat completion as required for deleting pending content
         return completeBatch(batchId, gzipped.size, eventCount, frameCount)
     }
 
@@ -703,7 +647,6 @@ class UploadManager(
     ): JSONObject? {
         Logger.debug("[UploadManager] presignForContentType START (type=$contentType, batch=$batchNumber, size=$sizeBytes, sessionId=${sessionId?.take(20)}...)")
         
-        // CRITICAL FIX: Use activeSessionId for current session operations
         val effectiveSessionId = activeSessionId ?: sessionId ?: ""
         val body = JSONObject().apply {
             put("batchNumber", batchNumber)
@@ -732,7 +675,6 @@ class UploadManager(
                         Logger.debug("[UploadManager] Presign SUCCESS - got batchId: ${result.optString("batchId", "null")}")
                         result
                     } else if (it.code == 402) {
-                        // Payment required - billing blocked, stop uploads
                         Logger.warning("[UploadManager] Presign BLOCKED (402) - billing issue, stopping uploads")
                         billingBlocked = true
                         null
@@ -748,7 +690,6 @@ class UploadManager(
                 }
             }
         } catch (e: CancellationException) {
-            // Expected during shutdown - don't log as error
             Logger.debug("[UploadManager] Presign request cancelled (shutdown)")
             null
         } catch (e: Exception) {
@@ -845,7 +786,6 @@ class UploadManager(
     ): Boolean {
         Logger.debug("[UploadManager] ===== END SESSION START =====")
         
-        // Use explicit sessionId if provided, otherwise fall back to current sessionId
         val effectiveSessionId = sessionIdOverride ?: sessionId
         Logger.debug("[UploadManager] endSession: sessionId=$effectiveSessionId, totalBackgroundTimeMs=$totalBackgroundTimeMs")
         
@@ -856,7 +796,6 @@ class UploadManager(
 
         Logger.debug("[UploadManager] endSession: Sending session end for: $effectiveSessionId")
 
-        // Use provided endedAt if available (for crash recovery), otherwise current time
         val endedAt = endedAtOverride ?: System.currentTimeMillis()
         Logger.debug("[UploadManager] endSession: endedAt=$endedAt (override=${endedAtOverride != null})")
         
@@ -936,7 +875,6 @@ class UploadManager(
             return false
         }
 
-        // Temporarily use crash session ID for presign
         val originalSessionId = sessionId
         sessionId = crashSessionId
 
@@ -965,7 +903,6 @@ class UploadManager(
             Logger.debug("Crash report uploaded")
             return true
         } finally {
-            // Restore original session ID
             sessionId = originalSessionId
         }
     }
@@ -997,7 +934,6 @@ class UploadManager(
             return false
         }
 
-        // Temporarily use ANR session ID for presign
         val originalSessionId = sessionId
         sessionId = anrSessionId
 
@@ -1026,7 +962,6 @@ class UploadManager(
             Logger.debug("ANR report uploaded")
             return true
         } finally {
-            // Restore original session ID
             sessionId = originalSessionId
         }
     }
@@ -1086,8 +1021,6 @@ class UploadManager(
         
         val currentTime = System.currentTimeMillis()
         
-        // CRITICAL FIX: Use activeSessionId for current session operations
-        // sessionId can be temporarily modified by recoverPendingSessions()
         val effectiveSessionId = activeSessionId ?: sessionId ?: ""
         
         val payload = JSONObject().apply {
@@ -1119,7 +1052,6 @@ class UploadManager(
         val payloadBytes = payload.toString().toByteArray(Charsets.UTF_8)
         Logger.debug("[UploadManager] buildEventsPayload: Payload built - size=${payloadBytes.size} bytes, sessionId=${sessionId ?: "null"}, userId=${userId.ifEmpty { "anonymous" }}, eventCount=${events.size}")
         
-        // Log event types in payload
         if (events.isNotEmpty()) {
             val eventTypes = events.mapNotNull { it["type"]?.toString() }.groupingBy { it }.eachCount()
             Logger.debug("[UploadManager] buildEventsPayload: Event types in payload: ${eventTypes.entries.joinToString(", ") { "${it.key}=${it.value}" }}")
@@ -1149,7 +1081,7 @@ class UploadManager(
                 }
             }
             is Number, is String, is Boolean -> value
-            else -> value.toString() // Fallback for unknown types
+            else -> value.toString()
         }
     }
 
@@ -1164,12 +1096,6 @@ class UploadManager(
             put("deviceHash", deviceHash)
             put("name", Build.DEVICE)
             
-            // Screen info
-            // IMPORTANT: Use density-independent pixels (dp) to match touch coordinate format.
-            // Touch coordinates from TouchInterceptor are normalized to dp (divided by density).
-            // Using dp ensures consistent coordinate system across:
-            //   - iOS (uses points natively)
-            //   - Android (raw pixels divided by density = dp)
             val displayMetrics = context.resources.displayMetrics
             val density = if (displayMetrics.density > 0f) displayMetrics.density else 1f
             var widthPx = displayMetrics.widthPixels
@@ -1184,16 +1110,13 @@ class UploadManager(
             put("screenHeight", (heightPx / density).toInt())
             put("screenScale", density)
             
-            // App info
             try {
                 val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
                 put("appVersion", packageInfo.versionName)
                 put("appId", context.packageName)
             } catch (e: Exception) {
-                // Ignore
             }
             
-            // Network info
             val networkQuality = NetworkMonitor.getInstance(context).captureNetworkQuality()
             val networkMap = networkQuality.toMap()
             put("networkType", networkMap["networkType"] ?: "none")
@@ -1210,7 +1133,6 @@ class UploadManager(
         val deviceAuthManager = DeviceAuthManager.getInstance(context)
         val token = deviceAuthManager.getCurrentUploadToken()
 
-        // Log token status for debugging
         Logger.debug("[UploadManager] buildAuthenticatedRequest: path=$path, token=${if (token != null) "present" else "NULL"}")
 
         if (token == null) {
@@ -1228,7 +1150,6 @@ class UploadManager(
             .url("$apiUrl$path")
             .post(body.toRequestBody("application/json".toMediaType()))
             .apply {
-                // Match iOS header names exactly
                 if (publicKey.isNotEmpty()) {
                     addHeader("X-Rejourney-Key", publicKey)
                 }
@@ -1259,10 +1180,8 @@ class UploadManager(
     }
 
     private fun canUpload(): Boolean {
-        // Check circuit breaker
         if (circuitOpen) {
             if (System.currentTimeMillis() - circuitOpenTime > circuitResetTimeMs) {
-                // Reset circuit breaker
                 circuitOpen = false
                 consecutiveFailures.set(0)
                 Logger.debug("Circuit breaker reset")
@@ -1271,7 +1190,6 @@ class UploadManager(
             }
         }
 
-        // Check network
         val networkMonitor = NetworkMonitor.getInstance(context)
         return networkMonitor.isConnected
     }
@@ -1293,9 +1211,6 @@ class UploadManager(
         }
     }
 
-    // =============================================================================
-    // Replay Promotion
-    // =============================================================================
 
     /**
      * Whether this session has been promoted for replay upload.
@@ -1317,7 +1232,6 @@ class UploadManager(
             return Pair(false, "network_unavailable")
         }
 
-        // CRITICAL FIX: Use activeSessionId for current session operations
         val effectiveSessionId = activeSessionId ?: sessionId ?: ""
         
         val body = JSONObject().apply {
@@ -1357,7 +1271,7 @@ class UploadManager(
             }
         } catch (e: Exception) {
             Logger.warning("Replay promotion evaluation error: ${e.message}")
-            Pair(false, "exception") // Don't upload frames on evaluation failure (fail-safe)
+            Pair(false, "exception")
         }
     }
 }