@scalebun/react-native 1.10.7 → 1.11.1

package/android/src/main/java/com/scalebun/replaysdk/tracking/InteractionTracker.kt

@@ -9,6 +9,7 @@ import android.view.Window
 import android.view.WindowManager
 import java.lang.ref.WeakReference
 import java.util.WeakHashMap
+import java.util.UUID
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.modules.core.DeviceEventManagerModule
@@ -34,13 +35,10 @@ class InteractionTracker(private val reactContext: ReactApplicationContext) {
     private var touchDownX = 0f
     private var touchDownY = 0f
     private var touchDownTs = 0L
-    private var lastEmitTs = 0L
-    private val THROTTLE_MS = 150L
-    // Same-coordinate duplicate window — see handleTouchUp. Wider than THROTTLE_MS on purpose:
-    // it only ever suppresses a bit-identical re-delivery, never a real second tap.
-    private val SAME_COORD_WINDOW_MS = 500L
-    private var lastEmitRawX = Float.NaN
-    private var lastEmitRawY = Float.NaN
+    private var touchDownOccurredAt = 0L
+    private var touchInteractionId = ""
+    private var lastEmittedInteractionId = ""
+    private val processInteractionNonce = UUID.randomUUID().toString().take(8)
     private val mainHandler = Handler(Looper.getMainLooper())
 
     fun attach(activity: Activity) {
@@ -63,6 +61,9 @@ class InteractionTracker(private val reactContext: ReactApplicationContext) {
                         touchDownX = rawX
                         touchDownY = rawY
                         touchDownTs = ts
+                        val id = "ixn-a-$processInteractionNonce-$ts"
+                        if (id != touchInteractionId) touchDownOccurredAt = System.currentTimeMillis()
+                        touchInteractionId = id
                     },
                     onUp = { rawX, rawY, ts ->
                         handleTouchUp(rawX, rawY, ts, resolveCaptureView(window))
@@ -86,6 +87,9 @@ class InteractionTracker(private val reactContext: ReactApplicationContext) {
                         touchDownX = rawX
                         touchDownY = rawY
                         touchDownTs = ts
+                        val id = "ixn-a-$processInteractionNonce-$ts"
+                        if (id != touchInteractionId) touchDownOccurredAt = System.currentTimeMillis()
+                        touchInteractionId = id
                     },
                     onUp = { rawX, rawY, ts ->
                         val main = attachedWindow ?: return@DialogTouchObserver
@@ -137,21 +141,11 @@ class InteractionTracker(private val reactContext: ReactApplicationContext) {
             ReplayLogger.debug("Native touch up dropped: no usable capture view")
             return
         }
-        val now = System.currentTimeMillis()
-        if (now - lastEmitTs < THROTTLE_MS) return
-        // Same-coordinate suppression: the same UP can be re-delivered through more than one
-        // hooked window callback at gaps just past THROTTLE_MS (measured in production:
-        // identical sub-pixel coords 158–240ms apart, recorded as 2–3 taps for one press).
-        // Bit-identical float coordinates within half a second cannot be a second physical
-        // tap — a real double-tap lands on at least slightly different pixels — so this
-        // drops only machine duplicates. Distinct-coordinate taps still pass at THROTTLE_MS.
-        if (rawX == lastEmitRawX && rawY == lastEmitRawY && now - lastEmitTs < SAME_COORD_WINDOW_MS) {
-            lastEmitTs = now // keep a chained burst suppressed
-            return
-        }
-        lastEmitTs = now
-        lastEmitRawX = rawX
-        lastEmitRawY = rawY
+        // Window/dialog hooks can re-deliver one physical touch. The ACTION_DOWN identity is stable
+        // across those deliveries, unlike coordinates: two legitimate rapid taps may land on the
+        // exact same pixel and must both survive.
+        if (touchInteractionId.isNotEmpty() && touchInteractionId == lastEmittedInteractionId) return
+        lastEmittedInteractionId = touchInteractionId
 
         val durationMs = ts - touchDownTs
         val dx = rawX - touchDownX
@@ -215,6 +209,8 @@ class InteractionTracker(private val reactContext: ReactApplicationContext) {
             screenshotW = viewW,
             screenshotH = viewH,
             durationMs = durationMs,
+            interactionId = touchInteractionId,
+            occurredAt = touchDownOccurredAt,
             onDialogWindow = onDialogWindow
         )
     }
@@ -226,11 +222,16 @@ class InteractionTracker(private val reactContext: ReactApplicationContext) {
         normalizedEndX: Float, normalizedEndY: Float,
         screenshotW: Float, screenshotH: Float,
         durationMs: Long,
+        interactionId: String,
+        occurredAt: Long,
         onDialogWindow: Boolean = false
     ) {
         try {
             val params = Arguments.createMap().apply {
                 putString("gestureType", gestureType)
+                putString("interactionId", interactionId)
+                putInt("interactionProtocol", 1)
+                putDouble("occurredAt", occurredAt.toDouble())
                 putDouble("rawX", rawX.toDouble())
                 putDouble("rawY", rawY.toDouble())
                 putDouble("normalizedX", normalizedX.toDouble())
@@ -275,9 +276,8 @@ class InteractionTracker(private val reactContext: ReactApplicationContext) {
 
     fun reset() {
         lastInteractionMs = 0
-        lastEmitTs = 0
-        lastEmitRawX = Float.NaN
-        lastEmitRawY = Float.NaN
+        touchInteractionId = ""
+        lastEmittedInteractionId = ""
         touchDownTs = 0
     }
 }

package/android/src/main/java/com/scalebun/rn/ota/SlotManager.kt

@@ -179,10 +179,18 @@ class SlotManager(private val filesDir: File) {
             if (reason != null) {
                 runCatching {
                     otaRoot.mkdirs()
+                    // Stamp WHICH bundle is being reverted away from, read before
+                    // current/ is deleted below. Without it JS had nothing to name:
+                    // slot meta carries no bundleId and the previous slot is gone by
+                    // the time JS looks, so every AUTO_ROLLBACK reported bundleId
+                    // "unknown" and the server dropped it as unresolvable — leaving
+                    // the crash guard's own rollback signal permanently at zero.
+                    val failingSha = readMeta(currentSlot)?.optString("sha256", "").orEmpty()
                     revertRecord.writeText(
                         JSONObject()
                             .put("reason", reason)
                             .put("at", System.currentTimeMillis())
+                            .apply { if (failingSha.isNotEmpty()) put("sha256", failingSha) }
                             .toString(),
                     )
                 }
@@ -237,7 +245,7 @@ class SlotManager(private val filesDir: File) {
             val metaFile = File(currentSlot, META_FILENAME)
             if (!metaFile.exists()) {
                 Log.w(TAG, "Boot marker present but no current/meta.json — auto-reverting")
-                revert()
+                revert(reason = "missing_meta")
                 return
             }
 
@@ -259,7 +267,7 @@ class SlotManager(private val filesDir: File) {
             }
             if (currentId != markerId) {
                 Log.w(TAG, "Boot marker sha256 mismatch — auto-reverting")
-                revert()
+                revert(reason = "hash_mismatch")
                 return
             }
 
@@ -290,7 +298,7 @@ class SlotManager(private val filesDir: File) {
             Log.i(TAG, "Boot guard: attempt $attempts/$MAX_BOOT_ATTEMPTS for this bundle")
         } catch (e: Exception) {
             Log.e(TAG, "checkBootGuard() failed — reverting to be safe", e)
-            revert()
+            revert(reason = "boot_guard_error")
         }
     }
 
@@ -312,6 +320,10 @@ class SlotManager(private val filesDir: File) {
                 state.put("bootGuardReverted", true)
                 state.put("bootGuardRevertReason", rec.optString("reason", "boot_crash_guard"))
                 state.put("bootGuardRevertedAt", rec.optLong("at", 0L))
+                // The bundle reverted AWAY from. JS joins it back to a bundle id
+                // through its install record so the rollback can be reported.
+                val sha = rec.optString("sha256", "")
+                if (sha.isNotEmpty()) state.put("bootGuardRevertedSha256", sha)
             }
             revertRecord.delete()
         }