spotny-sdk 1.0.8 → 1.0.9

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

@@ -64,14 +64,15 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   private var debounceInterval              = 5_000L  // ms
 
   // ── Per-beacon state ──────────────────────────────────────────────────────
-  private val activeCampaigns           = mutableMapOf<String, CampaignData>()
-  private val lastProximityEventSent    = mutableMapOf<String, Long>()
-  private val lastProximityDistance     = mutableMapOf<String, Double>()
-  private val lastImpressionEventSent   = mutableMapOf<String, Long>()
-  private val proximityEventInProgress  = mutableMapOf<String, Boolean>()
-  private val impressionEventInProgress = mutableMapOf<String, Boolean>()
-  private val campaignFetchInProgress   = mutableMapOf<String, Boolean>()
-  private val campaignFetched           = mutableMapOf<String, Boolean>()
+  private val activeCampaigns         = mutableMapOf<String, CampaignData>()
+  private val lastProximityEventSent  = mutableMapOf<String, Long>()
+  private val lastProximityDistance   = mutableMapOf<String, Double>()
+  private val lastImpressionEventSent = mutableMapOf<String, Long>()
+  // FIX #8: unified dict — key is "<beaconKey>:proximity" or "<beaconKey>:impression"
+  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
 
   // ── Module registration ───────────────────────────────────────────────────
 
@@ -295,21 +296,12 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
 
       if (distance <= 0 || distance > maxDetectionDistance) continue
 
-      val isFirst = !lastProximityEventSent.containsKey(key)
-      
-      if (isFirst) {
-        // First detection — send proximity immediately
+      // 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
-      } else if (distance >= 1.0) {
-        val lastDist = lastProximityDistance[key] ?: 0.0
-        if (abs(distance - lastDist) >= proximityDistanceThreshold) {
-          // Distance changed significantly — send proximity update
-          sendProximity("NEARBY", key, distance)
-          lastProximityDistance[key] = distance
-          lastProximityEventSent[key] = now
-        }
       }
       
       // Fetch campaign when distance <= 3m
@@ -349,9 +341,8 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
         putString("event",  "exit")
       }
       sendEvent("onBeaconRegionEvent", payload)
-      for (key in activeCampaigns.keys.toList()) {
-        cleanupBeacon(key)
-      }
+      // FIX #3: delegate to cleanupAllState which now uses lastProximityEventSent
+      cleanupAllState()
       try { beaconManager.stopRangingBeaconsInRegion(region) } catch (_: RemoteException) {}
     }
 
@@ -406,21 +397,24 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
   // ── State cleanup ─────────────────────────────────────────────────────────
 
   private fun cleanupBeacon(key: String) {
-    sendProximity("PROXIMITY_EXIT", key, 0.0)
+    // FIX #6: only send exit if NEARBY was previously emitted for this beacon
+    if (lastProximityEventSent.containsKey(key)) sendProximity("PROXIMITY_EXIT", key, 0.0)
     activeCampaigns.remove(key)
     lastProximityEventSent.remove(key)
     lastProximityDistance.remove(key)
     lastImpressionEventSent.remove(key)
-    proximityEventInProgress.remove(key)
-    impressionEventInProgress.remove(key)
+    // FIX #8: unified eventInProgress dict with suffixed keys
+    eventInProgress.remove("$key:proximity")
+    eventInProgress.remove("$key:impression")
     campaignFetchInProgress.remove(key)
     campaignFetched.remove(key)
-    Log.d(TAG, "Cleaned up state for beacon $key")
+    campaignFetchCooldown.remove(key)
+    Log.d(TAG, "Cleaned up $key")
   }
 
   private fun cleanupAllState() {
-    // Stagger exit events to avoid firing N simultaneous network requests
-    val keys = activeCampaigns.keys.toList()
+    // FIX #3: use lastProximityEventSent — covers beacons even without campaign data
+    val keys = lastProximityEventSent.keys.toList()
     keys.forEachIndexed { index, key ->
       android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
         cleanupBeacon(key)
@@ -543,14 +537,12 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     distance: Double,
     endpoint: String
   ) {
+    if (sdkToken == null) return  // FIX #4: no-op without JWT
     val isImpression = eventType == "IMPRESSION_HEARTBEAT"
-    if (isImpression && impressionEventInProgress[key] == true) return
-    if (!isImpression && proximityEventInProgress[key] == true) return
-
-    if (isImpression) impressionEventInProgress[key] = true
-    else              proximityEventInProgress[key]  = true
+    val progressKey  = "$key:${if (isImpression) "impression" else "proximity"}"  // FIX #8
+    if (eventInProgress[progressKey] == true) return
+    eventInProgress[progressKey] = true
 
-    // Build payload — all events send beacon_id, add campaign data when available
     val payload = mutableMapOf<String, Any?>(
       "event_type" to eventType,
       "beacon_id"  to key,
@@ -558,20 +550,18 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
     )
 
     if (isImpression) {
-      // Impressions require campaign to exist
       val campaign = activeCampaigns[key]
       if (campaign == null || campaign.campaignId == null || campaign.inQueue) {
-        impressionEventInProgress[key] = false
+        eventInProgress[progressKey] = false
         return
       }
       campaign.campaignId?.let { payload["campaign_id"] = it }
       campaign.sessionId?.let  { payload["session_id"]  = it }
     } else {
-      // Proximity events also include campaign_id if available
       activeCampaigns[key]?.campaignId?.let { payload["campaign_id"] = it }
     }
 
-    post(endpoint, payload) { status, body ->
+    post(endpoint, payload) { status, _ ->
       if (status in 200..299) {
         Log.d(TAG, "$eventType sent — distance ${"%.2f".format(distance)}m")
       } else if (status == 429) {
@@ -582,55 +572,43 @@ class SpotnySdkModule(private val reactContext: ReactApplicationContext) :
       } else {
         Log.w(TAG, "$eventType failed — status $status")
       }
-      if (isImpression) impressionEventInProgress[key] = false
-      else              proximityEventInProgress[key]  = false
+      eventInProgress[progressKey] = false
     }
   }
 
   private fun fetchCampaign(key: String, major: Int, minor: Int) {
+    if (sdkToken == null) return  // FIX #4: no-op without JWT
     if (campaignFetchInProgress[key] == true) return
     if (campaignFetched[key] == true) return
-    
+    // FIX #5: respect 30 s cooldown after a failed fetch
+    val cooldown = campaignFetchCooldown[key]
+    if (cooldown != null && System.currentTimeMillis() < cooldown) return
+
     campaignFetchInProgress[key] = true
-    
-    val payload = mapOf("beacon_id" to key)
-    
-    post("$apiBasePath/distribute", payload) { status, body ->
+
+    post("$apiBasePath/distribute", mapOf("beacon_id" to key)) { status, body ->
       campaignFetchInProgress[key] = false
-      
+
       if (status in 200..299) {
         try {
-          val json = parseJsonObject(body)
+          val json    = parseJsonObject(body)
           val dataObj = json?.get("data") as? Map<*, *>
-          
           if (dataObj != null) {
-            var campaignId: Int? = null
-            var sessionId: String? = null
-            var inQueue = false
-            
             val campaignObj = dataObj["campaign"] as? Map<*, *>
-            if (campaignObj != null) {
-              campaignId = (campaignObj["id"] as? Number)?.toInt()
-              sessionId = campaignObj["session_id"] as? String
-              inQueue = campaignObj["inQueue"] as? Boolean ?: false
-            }
-            
-            activeCampaigns[key] = CampaignData(
-              campaignId = campaignId,
-              sessionId = sessionId,
-              inQueue = inQueue,
-              major = major,
-              minor = minor
-            )
+            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)
             campaignFetched[key] = true
-            
-            Log.d(TAG, "Campaign fetched — campaignId=$campaignId, sessionId=$sessionId, inQueue=$inQueue")
+            Log.d(TAG, "Campaign fetched — campaignId=$campaignId inQueue=$inQueue")
           }
         } catch (e: Exception) {
           Log.w(TAG, "Error parsing campaign response: ${e.message}")
+          campaignFetchCooldown[key] = System.currentTimeMillis() + 30_000L  // FIX #5
         }
       } else {
         Log.w(TAG, "Campaign fetch failed — status $status")
+        campaignFetchCooldown[key] = System.currentTimeMillis() + 30_000L  // FIX #5
       }
     }
   }

package/ios/SpotnyBeaconScanner.swift

@@ -86,14 +86,15 @@ public class SpotnyBeaconScanner: NSObject {
   private var debounceInterval: TimeInterval         = 5.0
 
   // ── Per-beacon tracking state ──────────────────────────────────────────────
-  private var activeCampaigns:              [String: CampaignData] = [:]
-  private var lastProximityEventSent:       [String: Date]         = [:]
-  private var lastProximityDistance:        [String: Double]       = [:]
-  private var lastImpressionEventSent:      [String: Date]         = [:]
-  private var proximityEventInProgress:     [String: Bool]         = [:]
-  private var impressionEventInProgress:    [String: Bool]         = [:]
-  private var campaignFetchInProgress:       [String: Bool]         = [:]
-  private var campaignFetched:              [String: Bool]         = [:]
+  private var activeCampaigns:          [String: CampaignData] = [:]
+  private var lastProximityEventSent:   [String: Date]         = [:]
+  private var lastProximityDistance:    [String: Double]        = [:]
+  private var lastImpressionEventSent:  [String: Date]         = [:]
+  // Unified in-flight guard — keys are "<beaconKey>:proximity" or "<beaconKey>:impression"
+  private var eventInProgress:          [String: Bool]         = [:]
+  private var campaignFetchInProgress:  [String: Bool]         = [:]
+  private var campaignFetched:          [String: Bool]         = [:]
+  private var campaignFetchCooldown:    [String: Date]         = [:] // backoff after failed fetch
 
   // MARK: - Init
 
@@ -127,21 +128,25 @@ public class SpotnyBeaconScanner: NSObject {
   }
 
   private func resumeStoredSession() {
-    // Resume scanning only if a valid session was previously active
-    guard let ts = UserDefaults.standard.object(forKey: "SpotnySDK_sessionTimestamp") as? Double else { return }
-    let age = Date().timeIntervalSince1970 - ts
-    if age > sessionTTL {
-      print("⚠️ SpotnySDK: Stale session (\(Int(age / 3600))h old) — discarding")
-      clearStoredSession()
-      return
+    // Keychain flag survives reinstall — UserDefaults alone does not
+    guard keychainRead(key: "SpotnySDK_sessionActive") == "1" else { return }
+
+    let ts = UserDefaults.standard.double(forKey: "SpotnySDK_sessionTimestamp")
+    if ts > 0 {
+      let age = Date().timeIntervalSince1970 - ts
+      if age > sessionTTL {
+        print("⚠️ SpotnySDK: Stale session (\(Int(age / 3600))h) — discarding")
+        clearStoredSession()
+        return
+      }
     }
-    // Restore persisted JWT + credentials so all API calls work without initialize()
+
     sdkToken      = keychainRead(key: "SpotnySDK_jwt")
     sdkCredential = keychainRead(key: "SpotnySDK_sdkCredential")
     apiKey        = keychainRead(key: "SpotnySDK_apiKey")
     identifierId  = keychainRead(key: "SpotnySDK_identifierId")
-    if let expiryStr = keychainRead(key: "SpotnySDK_jwtExpiry"), let ts = Double(expiryStr) {
-      sdkTokenExpiry = Date(timeIntervalSince1970: ts)
+    if let expiryStr = keychainRead(key: "SpotnySDK_jwtExpiry"), let expTs = Double(expiryStr) {
+      sdkTokenExpiry = Date(timeIntervalSince1970: expTs)
     }
     print("🔄 SpotnySDK: Resuming session (device: \(getDeviceId()))")
     startPersistentScanning()
@@ -149,9 +154,9 @@ public class SpotnyBeaconScanner: NSObject {
   }
 
   private func clearStoredSession() {
-    // Only clears the scanning session — identity (Keychain) is intentionally kept
     UserDefaults.standard.removeObject(forKey: "SpotnySDK_sessionTimestamp")
     UserDefaults.standard.synchronize()
+    keychainDelete(key: "SpotnySDK_sessionActive")
   }
 
   // MARK: - ObjC-Exposed Methods (called from SpotnySdk.mm)
@@ -168,6 +173,7 @@ public class SpotnyBeaconScanner: NSObject {
 
     UserDefaults.standard.set(Date().timeIntervalSince1970, forKey: "SpotnySDK_sessionTimestamp")
     UserDefaults.standard.synchronize()
+    keychainWrite(key: "SpotnySDK_sessionActive", value: "1")
 
     let status = locationManager.authorizationStatus
     if status == .notDetermined {
@@ -188,11 +194,10 @@ public class SpotnyBeaconScanner: NSObject {
     beaconManager.stopMonitoringForAllRegions()
     beaconManager.stopRangingBeaconsInAllRegions()
     cleanupAllProximityState()
-
     clearStoredSession()
-
+    lastRangedSignature = ""
+    lastRangedEmit      = .distantPast
     scanning = false
-
     print("⏹️ SpotnySDK: Stopped scanning")
     resolve("Scanning stopped")
   }
@@ -582,20 +587,32 @@ public class SpotnyBeaconScanner: NSObject {
 
   // MARK: - Tracking
 
+  /// Keeps the app alive briefly in background after region events.
+  private func extendBackgroundTime(duration: TimeInterval) {
+    var bgTask: UIBackgroundTaskIdentifier = .invalid
+    bgTask = UIApplication.shared.beginBackgroundTask {
+      UIApplication.shared.endBackgroundTask(bgTask)
+    }
+    guard bgTask != .invalid else { return }
+    DispatchQueue.main.asyncAfter(deadline: .now() + duration) {
+      UIApplication.shared.endBackgroundTask(bgTask)
+    }
+  }
+
   private func sendTracking(
     eventType: String,
     key: String,
     distance: Double,
     endpoint: String
   ) {
-    let isImpression = eventType == "IMPRESSION_HEARTBEAT"
-    let inProg = isImpression ? impressionEventInProgress[key] : proximityEventInProgress[key]
-    guard inProg != true else { return }
+    // Skip if JWT not ready (initialize() not yet called or token not restored)
+    guard sdkToken != nil else { return }
 
-    if isImpression { impressionEventInProgress[key] = true }
-    else            { proximityEventInProgress[key]  = true }
+    let isImpression = eventType == "IMPRESSION_HEARTBEAT"
+    let progressKey  = "\(key):\(isImpression ? "impression" : "proximity")"
+    guard eventInProgress[progressKey] != true else { return }
+    eventInProgress[progressKey] = true
 
-    // Build payload — all events send beacon_id, add campaign data when available
     var payload: [String: Any] = [
       "event_type": eventType,
       "beacon_id":  key,
@@ -603,30 +620,25 @@ public class SpotnyBeaconScanner: NSObject {
     ]
 
     if isImpression {
-      // Impressions require campaign to exist
       guard let campaign = activeCampaigns[key],
             let _ = campaign.campaignId,
             !campaign.inQueue else {
-        impressionEventInProgress[key] = false
+        eventInProgress[progressKey] = false
         return
       }
       if let cid = campaign.campaignId { payload["campaign_id"] = cid }
       if let sid = campaign.sessionId  { payload["session_id"]  = sid }
     } else {
-      // Proximity events also include campaign_id if available
-      if let campaign = activeCampaigns[key],
-         let cid = campaign.campaignId {
-        payload["campaign_id"] = cid
-      }
+      if let cid = activeCampaigns[key]?.campaignId { payload["campaign_id"] = cid }
     }
 
     post(endpoint: endpoint, payload: payload) { [weak self] result in
       guard let self = self else { return }
       switch result {
-      case .success(let (status, data)):
+      case .success(let (status, _)):
         if 200...299 ~= status {
-          print("✅ SpotnySDK: \(eventType) sent — distance \(String(format: "%.2f", distance))m")
-          logToFile("✅ \(eventType) sent — beacon \(key) @ \(String(format: "%.2f", distance))m")
+          print("✅ SpotnySDK: \(eventType) — \(String(format: "%.2f", distance))m")
+          self.logToFile("\(eventType) beacon \(key) @ \(String(format: "%.2f", distance))m")
         } else if status == 429 {
           let penalty = Date().addingTimeInterval(10)
           if isImpression { self.lastImpressionEventSent[key] = penalty }
@@ -638,57 +650,51 @@ public class SpotnyBeaconScanner: NSObject {
       case .failure(let error):
         print("❌ SpotnySDK: \(eventType) error — \(error.localizedDescription)")
       }
-      if isImpression { self.impressionEventInProgress[key] = false }
-      else            { self.proximityEventInProgress[key]  = false }
+      self.eventInProgress[progressKey] = false
     }
   }
 
   private func fetchCampaign(key: String, major: Int, minor: Int) {
+    guard sdkToken != nil else { return }
     guard campaignFetchInProgress[key] != true else { return }
     guard campaignFetched[key] != true else { return }
-    
+    if let cooldown = campaignFetchCooldown[key], Date() < cooldown { return }
+
     campaignFetchInProgress[key] = true
-    
-    let payload: [String: Any] = ["beacon_id": key]
-    
-    post(endpoint: "\(apiBasePath)/distribute", payload: payload) { [weak self] result in
+
+    post(endpoint: "\(apiBasePath)/distribute", payload: ["beacon_id": key]) { [weak self] result in
       guard let self = self else { return }
       self.campaignFetchInProgress[key] = false
-      
+
       switch result {
       case .success(let (status, data)):
         if 200...299 ~= status {
           guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
-                let dObj = json["data"] as? [String: Any] else {
-            print("⚠️ SpotnySDK: Campaign fetch — invalid response format")
-            return
-          }
-          
+                let dObj = json["data"] as? [String: Any] else { return }
+
           var campaignId: Int?
-          var sessionId: String?
+          var sessionId:  String?
           var inQueue = false
-          
+
           if let campaignObj = dObj["campaign"] as? [String: Any] {
             campaignId = campaignObj["id"] as? Int
-            sessionId = campaignObj["session_id"] as? String
-            inQueue = campaignObj["inQueue"] as? Bool ?? false
+            sessionId  = campaignObj["session_id"] as? String
+            inQueue    = campaignObj["inQueue"] as? Bool ?? false
           }
-          
-          let campaign = CampaignData(
-            campaignId: campaignId,
-            sessionId: sessionId,
-            inQueue: inQueue,
-            major: major,
-            minor: minor
+
+          self.activeCampaigns[key] = CampaignData(
+            campaignId: campaignId, sessionId: sessionId,
+            inQueue: inQueue, major: major, minor: minor
           )
-          self.activeCampaigns[key] = campaign
           self.campaignFetched[key] = true
-          
-          print("✅ SpotnySDK: Campaign fetched — campaignId=\(campaignId ?? 0), sessionId=\(sessionId ?? "nil"), inQueue=\(inQueue)")
+          print("✅ SpotnySDK: Campaign — cid=\(campaignId ?? 0) queued=\(inQueue)")
         } else {
+          // 30s backoff on failure to avoid hammering the backend
+          self.campaignFetchCooldown[key] = Date().addingTimeInterval(30)
           print("❌ SpotnySDK: Campaign fetch failed — status \(status)")
         }
       case .failure(let error):
+        self.campaignFetchCooldown[key] = Date().addingTimeInterval(30)
         print("❌ SpotnySDK: Campaign fetch error — \(error.localizedDescription)")
       }
     }
@@ -707,21 +713,26 @@ public class SpotnyBeaconScanner: NSObject {
   // MARK: - State Cleanup
 
   private func cleanupBeacon(_ key: String, distance: Double = 0) {
-    sendProximity(eventType: "PROXIMITY_EXIT", key: key, distance: distance)
+    // FIX #6: only send exit if NEARBY was previously emitted for this beacon
+    if lastProximityEventSent[key] != nil {
+      sendProximity(eventType: "PROXIMITY_EXIT", key: key, distance: distance)
+    }
     activeCampaigns.removeValue(forKey: key)
     lastProximityEventSent.removeValue(forKey: key)
     lastProximityDistance.removeValue(forKey: key)
     lastImpressionEventSent.removeValue(forKey: key)
-    proximityEventInProgress.removeValue(forKey: key)
-    impressionEventInProgress.removeValue(forKey: key)
+    // FIX #8: unified eventInProgress dict with suffixed keys
+    eventInProgress.removeValue(forKey: "\(key):proximity")
+    eventInProgress.removeValue(forKey: "\(key):impression")
     campaignFetchInProgress.removeValue(forKey: key)
     campaignFetched.removeValue(forKey: key)
-    print("🧹 SpotnySDK: Cleaned up state for beacon \(key)")
+    campaignFetchCooldown.removeValue(forKey: key)
+    print("🧹 SpotnySDK: Cleaned up \(key)")
   }
 
   private func cleanupAllProximityState() {
-    // Stagger exit events to avoid firing N simultaneous network requests
-    let keys = Array(activeCampaigns.keys)
+    // FIX #3: use lastProximityEventSent — covers beacons even without campaign data
+    let keys = Array(lastProximityEventSent.keys)
     for (index, key) in keys.enumerated() {
       DispatchQueue.main.asyncAfter(deadline: .now() + Double(index) * 0.3) { [weak self] in
         self?.cleanupBeacon(key)
@@ -803,17 +814,9 @@ extension SpotnyBeaconScanner: KTKBeaconManagerDelegate {
 
       guard distance > 0 && distance <= maxDetectionDistance else { continue }
 
-      let isFirst = lastProximityEventSent[key] == nil
-
-      if isFirst {
-        // First detection — send proximity immediately
-        sendProximity(eventType: "NEARBY", key: key, distance: distance)
-        lastProximityDistance[key] = distance
-        lastProximityEventSent[key] = now
-      } else if distance >= 1.0,
-                let lastDist = lastProximityDistance[key],
-                abs(distance - lastDist) >= proximityDistanceThreshold {
-        // Distance changed significantly — send proximity update
+      // FIX #9: nil lastDist already implies first detection — no separate isFirst needed
+      let lastDist = lastProximityDistance[key]
+      if lastDist == nil || (distance >= 1.0 && abs(distance - (lastDist ?? 0)) >= proximityDistanceThreshold) {
         sendProximity(eventType: "NEARBY", key: key, distance: distance)
         lastProximityDistance[key] = distance
         lastProximityEventSent[key] = now
@@ -824,17 +827,13 @@ extension SpotnyBeaconScanner: KTKBeaconManagerDelegate {
         fetchCampaign(key: key, major: major, minor: minor)
       }
 
-      // Impression heartbeat when user is very close AND campaign exists
+      // FIX #10: use ?? .distantPast to eliminate duplicate first-time code path
       if let campaign = activeCampaigns[key],
-         let _ = campaign.campaignId,
+         campaign.campaignId != nil,
          !campaign.inQueue,
          distance <= impressionDistance {
-        if let last = lastImpressionEventSent[key] {
-          if now.timeIntervalSince(last) >= impressionEventInterval {
-            sendImpression(key: key, distance: distance)
-            lastImpressionEventSent[key] = now
-          }
-        } else {
+        let lastImp = lastImpressionEventSent[key] ?? .distantPast
+        if now.timeIntervalSince(lastImp) >= impressionEventInterval {
           sendImpression(key: key, distance: distance)
           lastImpressionEventSent[key] = now
         }
@@ -845,33 +844,16 @@ extension SpotnyBeaconScanner: KTKBeaconManagerDelegate {
   public func beaconManager(_ manager: KTKBeaconManager, didEnter region: KTKBeaconRegion) {
     print("🎯 SpotnySDK: Entered region \(region.identifier)")
     eventCallback?("onBeaconRegionEvent", ["region": region.identifier, "event": "enter"])
-
-    var bg: UIBackgroundTaskIdentifier = .invalid
-    bg = UIApplication.shared.beginBackgroundTask { UIApplication.shared.endBackgroundTask(bg); bg = .invalid }
-    defer {
-      DispatchQueue.main.asyncAfter(deadline: .now() + 3.0) {
-        if bg != .invalid { UIApplication.shared.endBackgroundTask(bg); bg = .invalid }
-      }
-    }
+    // FIX #1: use helper — avoids defer capturing bg by value
+    extendBackgroundTime(duration: 3.0)
   }
 
   public func beaconManager(_ manager: KTKBeaconManager, didExitRegion region: KTKBeaconRegion) {
     print("🚪 SpotnySDK: Exited region \(region.identifier)")
     eventCallback?("onBeaconRegionEvent", ["region": region.identifier, "event": "exit"])
-
-    var bg: UIBackgroundTaskIdentifier = .invalid
-    bg = UIApplication.shared.beginBackgroundTask { UIApplication.shared.endBackgroundTask(bg); bg = .invalid }
-    defer {
-      DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
-        if bg != .invalid { UIApplication.shared.endBackgroundTask(bg); bg = .invalid }
-      }
-    }
-
-    let parts = region.identifier.components(separatedBy: "_")
-    if parts.count == 3, let major = Int(parts[1]), let minor = Int(parts[2]) {
-      cleanupBeacon(beaconKey(major: major, minor: minor))
-    }
-
+    // FIX #1: use helper; FIX #3: cleanupAllProximityState covers all beacons regardless of region format
+    extendBackgroundTime(duration: 2.0)
+    cleanupAllProximityState()
     beaconManager.stopRangingBeacons(in: region)
   }
 

package/package.json

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