spotny-sdk 1.0.26 → 1.0.27

package/android/src/main/java/com/spotnysdk/SpotnySdkModule.kt

@@ -22,8 +22,6 @@ private const val TAG            = "SpotnySDK"
 // ── Campaign data ─────────────────────────────────────────────────────────────
 private data class CampaignData(
   val campaignId: Int?,
-
-  val sessionId: String?,
   val inQueue: Boolean,
   val major: Int,
   val minor: Int
@@ -72,7 +70,16 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   private val eventInProgress         = mutableMapOf<String, Boolean>()
   private val campaignFetchInProgress = mutableMapOf<String, Boolean>()
   private val campaignFetched         = mutableMapOf<String, Boolean>()
-  private val campaignFetchCooldown   = mutableMapOf<String, Long>()   // FIX #5: epoch-ms backoff
+  private val campaignFetchCooldown   = mutableMapOf<String, Long>()   // epoch-ms backoff
+  // 410 from /track means backend session expired — stop heartbeats until next NEARBY
+  private val impressionDisabled      = mutableMapOf<String, Boolean>()
+  // Last time each beacon was seen in ranging — used to detect slow drift exits
+  private val beaconLastSeen          = mutableMapOf<String, Long>()
+
+  // ── JS event deduplication ────────────────────────────────────────────────
+  private var lastRangedSignature = ""
+  private var lastRangedEmit      = 0L
+  private var lastSessionHeartbeat = 0L
 
   // ── Module registration ───────────────────────────────────────────────────
 
@@ -150,7 +157,7 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
       ?.let { maxDetectionDistance = it; Log.d(TAG, "maxDetectionDistance = $it m") }
     config?.getString("apiKey")?.let { apiKey = it; Log.d(TAG, "apiKey = $it") }
     config?.getDouble("distanceCorrectionFactor")
-      .takeIf { config?.hasKey("distanceCorrectionFactor") == true && it > 0 }
+      .takeIf { config?.hasKey("distanceCorrectionFactor") == true && (it ?: 0.0) > 0 }
       ?.let { distanceCorrectionFactor = it; Log.d(TAG, "distanceCorrectionFactor = $it") }
     val token = config?.getString("token")?.takeIf { it.isNotBlank() }
     if (token == null) {
@@ -171,13 +178,13 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
 
     // Send token + apiKey + identifierId to backend — response returns a JWT used for all subsequent calls
     // sdkToken is null here so no Authorization header is injected on this call
-    val verifyPayload = mapOf("token" to token, "api_key" to key, "user_id" to uid)
+    val verifyPayload = mapOf("api_token" to token, "api_key" to key, "identifier_id" to uid, "device_id" to getDeviceId())
     post("$apiBasePath/verify", verifyPayload) { status, body ->
       when {
         status in 200..299 -> {
           val verifyJson = try { parseJsonObject(body) } catch (_: Exception) { null }
           val verifyData = verifyJson?.get("data") as? Map<*, *>
-          val jwt = (verifyData?.get("jwt") as? String)?.takeIf { it.isNotBlank() }
+          val jwt = (verifyData?.get("token") as? String)?.takeIf { it.isNotBlank() }
           if (jwt == null) {
             promise.reject("VERIFY_FAILED", "SDK verification response missing JWT")
             return@post
@@ -262,32 +269,66 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   private val rangeNotifier = RangeNotifier { beacons, region ->
     val now = System.currentTimeMillis()
 
-    // JS event payload
-    val jsBeacons = WritableNativeArray()
+    // Session heartbeat every 60 s to prevent TTL expiry on a live session
+    if (now - lastSessionHeartbeat >= 60_000L) {
+      val prefs = reactContext.getSharedPreferences("SpotnySDK", Context.MODE_PRIVATE).edit()
+      prefs.putLong("sessionTimestamp", now); prefs.apply()
+      lastSessionHeartbeat = now
+    }
+
+    // Build JS event payload for all ranged beacons (with debounce)
+    val beaconList = mutableListOf<Map<String, Any>>()
     for (beacon in beacons) {
       val raw = beacon.distance
       val adjusted = raw * distanceCorrectionFactor
       if (adjusted <= 0 || adjusted > maxDetectionDistance) continue
+      beaconList.add(mapOf(
+        "uuid"      to (beacon.id1?.toString() ?: BEACON_UUID),
+        "major"     to (beacon.id2?.toInt() ?: 0),
+        "minor"     to (beacon.id3?.toInt() ?: 0),
+        "distance"  to adjusted,
+        "rssi"      to beacon.rssi,
+        "proximity" to proximityLabel(adjusted)
+      ))
+    }
 
-      val b = WritableNativeMap().apply {
-        putString("uuid",      beacon.id1?.toString() ?: BEACON_UUID)
-        putInt("major",        beacon.id2?.toInt() ?: 0)
-        putInt("minor",        beacon.id3?.toInt() ?: 0)
-        putDouble("distance",  adjusted)
-        putInt("rssi",         beacon.rssi)
-        putString("proximity", proximityLabel(adjusted))
+    if (beaconList.isNotEmpty()) {
+      val signature = beaconList
+        .map { "${it["major"]}_${it["minor"]}_${it["proximity"]}" }
+        .sorted().joinToString(",")
+      val stale = now - lastRangedEmit >= debounceInterval
+      if (signature != lastRangedSignature || stale) {
+        val jsBeacons = WritableNativeArray()
+        for (b in beaconList) {
+          val bMap = WritableNativeMap().apply {
+            putString("uuid",      b["uuid"] as String)
+            putInt("major",        b["major"] as Int)
+            putInt("minor",        b["minor"] as Int)
+            putDouble("distance",  b["distance"] as Double)
+            putInt("rssi",         b["rssi"] as Int)
+            putString("proximity", b["proximity"] as String)
+          }
+          jsBeacons.pushMap(bMap)
+        }
+        val payload = WritableNativeMap().apply {
+          putArray("beacons", jsBeacons)
+          putString("region", region.uniqueId)
+        }
+        sendEvent("onBeaconsRanged", payload)
+        lastRangedSignature = signature
+        lastRangedEmit = now
       }
-      jsBeacons.pushMap(b)
-    }
-    if (jsBeacons.size() > 0) {
+    } else if (lastRangedSignature != "") {
+      // All beacons left range — emit empty to let JS clear its state
       val payload = WritableNativeMap().apply {
-        putArray("beacons", jsBeacons)
-        putString("region",  region.uniqueId)
+        putArray("beacons", WritableNativeArray())
+        putString("region", region.uniqueId)
       }
       sendEvent("onBeaconsRanged", payload)
+      lastRangedSignature = ""
     }
 
-    // Per-beacon logic
+    // Per-beacon campaign & proximity logic
     for (beacon in beacons) {
       val major    = beacon.id2?.toInt() ?: continue
       val minor    = beacon.id3?.toInt() ?: continue
@@ -296,29 +337,41 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
 
       if (distance <= 0 || distance > maxDetectionDistance) continue
 
-      // FIX #9: null lastDist already implies first detection
       val lastDist = lastProximityDistance[key]
       if (lastDist == null || (distance >= 1.0 && abs(distance - lastDist) >= proximityDistanceThreshold)) {
         sendProximity("NEARBY", key, distance)
         lastProximityDistance[key] = distance
         lastProximityEventSent[key] = now
       }
-      
+
+      beaconLastSeen[key] = now
+
       // Fetch campaign when distance <= 3m
       if (distance <= 3.0 && campaignFetched[key] != true) {
         fetchCampaign(key, major, minor)
       }
-      
+
       // Impression heartbeat when user is very close AND campaign exists
       val campaign = activeCampaigns[key]
-      if (campaign?.campaignId != null && campaign.inQueue == false && distance <= impressionDistance) {
-        val lastImp = lastImpressionEventSent[key]
-        if (lastImp == null || now - lastImp >= impressionEventInterval) {
+      if (campaign?.campaignId != null && !campaign.inQueue &&
+          impressionDisabled[key] != true && distance <= impressionDistance) {
+        val lastImp = lastImpressionEventSent[key] ?: 0L
+        if (now - lastImp >= impressionEventInterval) {
           sendImpression(key, distance)
           lastImpressionEventSent[key] = now
         }
       }
     }
+
+    // Slow-drift exit detection — beacon disappeared without a region exit event
+    val beaconExitTimeout = 5_000L
+    for (key in lastProximityEventSent.keys.toList()) {
+      val lastSeen = beaconLastSeen[key]
+      if (lastSeen == null) { beaconLastSeen[key] = now; continue }
+      if (now - lastSeen >= beaconExitTimeout) {
+        cleanupBeacon(key)
+      }
+    }
   }
 
   // ── Monitor notifier ──────────────────────────────────────────────────────
@@ -397,24 +450,30 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   // ── State cleanup ─────────────────────────────────────────────────────────
 
   private fun cleanupBeacon(key: String) {
-    // FIX #6: only send exit if NEARBY was previously emitted for this beacon
-    if (lastProximityEventSent.containsKey(key)) sendProximity("PROXIMITY_EXIT", key, 0.0)
+    // Only send exit if NEARBY was previously emitted for this beacon
+    val exitDistance = lastProximityDistance[key] ?: 0.01
+    if (lastProximityEventSent.containsKey(key)) sendProximity("PROXIMITY_EXIT", key, exitDistance)
     activeCampaigns.remove(key)
     lastProximityEventSent.remove(key)
     lastProximityDistance.remove(key)
     lastImpressionEventSent.remove(key)
-    // FIX #8: unified eventInProgress dict with suffixed keys
     eventInProgress.remove("$key:proximity")
     eventInProgress.remove("$key:impression")
     campaignFetchInProgress.remove(key)
     campaignFetched.remove(key)
     campaignFetchCooldown.remove(key)
+    impressionDisabled.remove(key)
+    beaconLastSeen.remove(key)
     Log.d(TAG, "Cleaned up $key")
   }
 
   private fun cleanupAllState() {
-    // FIX #3: use lastProximityEventSent — covers beacons even without campaign data
     val keys = lastProximityEventSent.keys.toList()
+    if (keys.isEmpty()) {
+      // Killed-app wake: in-memory state lost — tell backend to close open sessions
+      sendResetEventStates()
+      return
+    }
     keys.forEachIndexed { index, key ->
       android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
         cleanupBeacon(key)
@@ -422,6 +481,13 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     }
   }
 
+  private fun sendResetEventStates() {
+    if (sdkToken == null) return
+    post("$apiBasePath/reset-event-states", emptyMap()) { status, _ ->
+      Log.d(TAG, "reset-event-states → $status")
+    }
+  }
+
   // ── Backend API ───────────────────────────────────────────────────────────
 
   private fun isTokenExpired(): Boolean {
@@ -452,14 +518,14 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
         readTimeout    = 10_000
         doOutput = true
       }
-      conn.outputStream.use { it.write(buildJsonString(mapOf("token" to credential, "api_key" to key, "user_id" to (identifierId ?: ""))).toByteArray()) }
+      conn.outputStream.use { it.write(buildJsonString(mapOf("api_token" to credential, "api_key" to key, "identifier_id" to (identifierId ?: ""), "device_id" to getDeviceId())).toByteArray()) }
       val status   = conn.responseCode
       val response = try { conn.inputStream.bufferedReader().readText() }
                      catch (_: Exception) { conn.errorStream?.bufferedReader()?.readText() ?: "" }
       conn.disconnect()
       if (status in 200..299) {
         val data = (parseJsonObject(response)?.get("data") as? Map<*, *>)
-        val jwt  = (data?.get("jwt") as? String)?.takeIf { it.isNotBlank() }
+        val jwt  = (data?.get("token") as? String)?.takeIf { it.isNotBlank() }
         if (jwt != null) {
           sdkToken = jwt
           val expiresAt = (data?.get("expires_at") as? Number)?.toLong()
@@ -556,7 +622,6 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
         return
       }
       campaign.campaignId?.let { payload["campaign_id"] = it }
-      campaign.sessionId?.let  { payload["session_id"]  = it }
     } else {
       activeCampaigns[key]?.campaignId?.let { payload["campaign_id"] = it }
     }
@@ -564,6 +629,10 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     post(endpoint, payload) { status, _ ->
       if (status in 200..299) {
         Log.d(TAG, "$eventType sent — distance ${"%.2f".format(distance)}m")
+        logToFile("$eventType beacon $key @ ${"%.2f".format(distance)}m")
+      } else if (status == 410 && isImpression) {
+        impressionDisabled[key] = true
+        Log.w(TAG, "IMPRESSION_HEARTBEAT session expired (410) — stopping heartbeats for $key")
       } else if (status == 429) {
         val penalty = System.currentTimeMillis() + 10_000L
         if (isImpression) lastImpressionEventSent[key] = penalty
@@ -596,9 +665,8 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
           if (dataObj != null) {
             val campaignObj = dataObj["campaign"] as? Map<*, *>
             val campaignId  = (campaignObj?.get("id") as? Number)?.toInt()
-            val sessionId   = campaignObj?.get("session_id") as? String
             val inQueue     = campaignObj?.get("inQueue") as? Boolean ?: false
-            activeCampaigns[key] = CampaignData(campaignId, sessionId, inQueue, major, minor)
+            activeCampaigns[key] = CampaignData(campaignId, inQueue, major, minor)
             campaignFetched[key] = true
             Log.d(TAG, "Campaign fetched — campaignId=$campaignId inQueue=$inQueue")
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spotny-sdk",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "description": "Beacon Scanner",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",