expo-beacon 0.6.12 → 0.6.13

package/android/src/main/java/expo/modules/beacon/BeaconForegroundService.kt

@@ -288,9 +288,10 @@ class BeaconForegroundService : Service(), BeaconConsumer {
                 missCounters.remove(region.uniqueId)
             }
             if (wasEntered) {
-                cancelTimeout(region.uniqueId)
                 sendBeaconBroadcast(region, "exit", -1.0)
                 showEnterExitNotification(region, "exit")
+                // OS-level exit safety net — start the timeout clock.
+                scheduleTimeoutIfConfigured(region)
             }
         }
 
@@ -329,13 +330,15 @@ class BeaconForegroundService : Service(), BeaconConsumer {
                         enteredRegions.add(region.uniqueId)
                         sendBeaconBroadcast(region, "enter", beacon.distance, beacon.rssi)
                         showEnterExitNotification(region, "enter")
-                        scheduleTimeoutIfConfigured(region)
+                        // Beacon returned — cancel any running timeout timer.
+                        cancelTimeout(region.uniqueId)
                     }
                     HysteresisAction.EXIT -> {
-                        cancelTimeout(region.uniqueId)
                         enteredRegions.remove(region.uniqueId)
                         sendBeaconBroadcast(region, "exit", beacon.distance, beacon.rssi)
                         showEnterExitNotification(region, "exit")
+                        // Beacon left — start the timeout clock.
+                        scheduleTimeoutIfConfigured(region)
                     }
                     HysteresisAction.NONE -> {}
                 }
@@ -348,18 +351,14 @@ class BeaconForegroundService : Service(), BeaconConsumer {
                 missCounters[region.uniqueId] = count
 
                 if (enteredRegions.contains(region.uniqueId) && count >= EXIT_MISS_THRESHOLD) {
-                    // Do NOT cancel the timeout here. A miss-based exit is triggered by BLE
-                    // scan gaps (unreliable signal disappearance), not a confirmed physical
-                    // departure. Cancelling the timeout here would prevent it from ever firing
-                    // when the configured timeout (e.g. 25 s) exceeds the miss window (~21 s).
-                    // The timeout runnable fires unconditionally; distance-based exits still
-                    // call cancelTimeout() reliably when the beacon moves out of range.
                     enteredRegions.remove(region.uniqueId)
                     missCounters[region.uniqueId] = 0
                     enterCounters[region.uniqueId] = 0
                     exitCounters[region.uniqueId] = 0
                     sendBeaconBroadcast(region, "exit", -1.0)
                     showEnterExitNotification(region, "exit")
+                    // Beacon disappeared — start the timeout clock.
+                    scheduleTimeoutIfConfigured(region)
                 }
             }
         }
@@ -459,16 +458,10 @@ class BeaconForegroundService : Service(), BeaconConsumer {
 
     private fun scheduleTimeoutIfConfigured(region: Region) {
         val seconds = beaconTimeouts[region.uniqueId] ?: return
-        // If a timer is already running, don't reset it. Miss-based exits clear
-        // enteredRegions without cancelling the timer, so a subsequent re-entry
-        // must not restart the clock — doing so would defer the timeout indefinitely.
-        if (timeoutRunnables.containsKey(region.uniqueId)) return
+        // Cancel any existing timer so each exit resets the clock.
+        cancelTimeout(region.uniqueId)
         val runnable = Runnable {
             timeoutRunnables.remove(region.uniqueId)
-            // Fire unconditionally. A miss-based exit may have cleared enteredRegions before
-            // the timer elapsed (BLE gaps can cause false exits at ~21 s), but the beacon
-            // may still be physically present. Distance-based exits call cancelTimeout() so
-            // this runnable is never queued when the beacon has genuinely moved away.
             sendBeaconBroadcast(region, "timeout", -1.0)
         }
         timeoutRunnables[region.uniqueId] = runnable

package/ios/ExpoBeaconModule.swift

@@ -848,10 +848,10 @@ public class ExpoBeaconModule: Module {
                         "rssi": beaconRssi
                     ])
                     postBeaconNotification(identifier: identifier, eventType: "enter")
-                    scheduleEddystoneTimeout(identifier: identifier, namespace: ns, instance: inst)
+                    // Beacon returned — cancel any running timeout timer.
+                    cancelEddystoneTimeout(identifier: identifier)
                 case .exit:
                     smoothedDistances.removeValue(forKey: identifier)
-                    cancelEddystoneTimeout(identifier: identifier)
                     sendLoggedEvent("onEddystoneExit", [
                         "identifier": identifier,
                         "namespace": ns,
@@ -861,6 +861,8 @@ public class ExpoBeaconModule: Module {
                         "rssi": beaconRssi
                     ])
                     postBeaconNotification(identifier: identifier, eventType: "exit")
+                    // Beacon left — start the timeout clock.
+                    scheduleEddystoneTimeout(identifier: identifier, namespace: ns, instance: inst)
                 case .none:
                     break
                 }
@@ -1080,7 +1082,6 @@ public class ExpoBeaconModule: Module {
                 eddystoneExitCounters[identifier] = 0
                 eddystoneLatestSeen.removeValue(forKey: identifier)
                 smoothedDistances.removeValue(forKey: identifier)
-                // Do NOT cancel the timeout here — same reason as iBeacon miss-based exit.
 
                 let ns = paired["namespace"] as? String ?? ""
                 let inst = paired["instance"] as? String ?? ""
@@ -1093,17 +1094,17 @@ public class ExpoBeaconModule: Module {
                 ]
                 sendLoggedEvent("onEddystoneExit", params)
                 postBeaconNotification(identifier: identifier, eventType: "exit")
+                // Beacon disappeared — start the timeout clock.
+                scheduleEddystoneTimeout(identifier: identifier, namespace: ns, instance: inst)
             }
         }
     }
 
     // MARK: - Timeout timer helpers
 
-    private func scheduleBeaconTimeout(identifier: String, beacon: CLBeacon) {
-        // If a timer is already running, don't reset it. Miss-based exits clear
-        // enteredRegions without cancelling the timer, so a subsequent re-entry
-        // must not restart the clock — doing so would defer the timeout indefinitely.
-        guard beaconTimeoutTimers[identifier] == nil else { return }
+    private func scheduleBeaconTimeout(identifier: String, beacon: CLBeacon? = nil, region: CLBeaconRegion? = nil) {
+        // Cancel any existing timer so each exit resets the clock.
+        cancelBeaconTimeout(identifier: identifier)
 
         let paired = loadPairedBeaconsRaw().first { ($0["identifier"] as? String) == identifier }
         guard let seconds = paired?["timeoutSeconds"] as? Int, seconds > 0 else { return }
@@ -1111,11 +1112,7 @@ public class ExpoBeaconModule: Module {
         let work = DispatchWorkItem { [weak self] in
             guard let self = self else { return }
             self.beaconTimeoutTimers.removeValue(forKey: identifier)
-            // Fire unconditionally. A miss-based exit may have cleared enteredRegions before
-            // the timer elapsed (ranging gaps can cause false exits), but the beacon may still
-            // be physically present. Distance-based exits call cancelBeaconTimeout() so this
-            // work item is cancelled before it runs on genuine out-of-range departures.
-            self.sendLoggedEvent("onBeaconTimeout", self.makeBeaconEventParams(identifier: identifier, beacon: beacon))
+            self.sendLoggedEvent("onBeaconTimeout", self.makeBeaconEventParams(identifier: identifier, beacon: beacon, region: region))
         }
         beaconTimeoutTimers[identifier] = work
         DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(seconds), execute: work)
@@ -1126,8 +1123,8 @@ public class ExpoBeaconModule: Module {
     }
 
     private func scheduleEddystoneTimeout(identifier: String, namespace: String, instance: String) {
-        // If a timer is already running, don't reset it — same reason as iBeacon timeout.
-        guard eddystoneTimeoutTimers[identifier] == nil else { return }
+        // Cancel any existing timer so each exit resets the clock.
+        cancelEddystoneTimeout(identifier: identifier)
 
         let paired = loadPairedEddystonesRaw().first { ($0["identifier"] as? String) == identifier }
         guard let seconds = paired?["timeoutSeconds"] as? Int, seconds > 0 else { return }
@@ -1135,7 +1132,6 @@ public class ExpoBeaconModule: Module {
         let work = DispatchWorkItem { [weak self] in
             guard let self = self else { return }
             self.eddystoneTimeoutTimers.removeValue(forKey: identifier)
-            // Fire unconditionally — same reason as iBeacon timeout.
             self.sendLoggedEvent("onEddystoneTimeout", [
                 "identifier": identifier,
                 "namespace": namespace,
@@ -1362,12 +1358,14 @@ public class ExpoBeaconModule: Module {
                 case .enter:
                     sendLoggedEvent("onBeaconEnter", makeBeaconEventParams(identifier: identifier, beacon: beacon, event: "enter"))
                     postBeaconNotification(identifier: identifier, eventType: "enter")
-                    scheduleBeaconTimeout(identifier: identifier, beacon: beacon)
+                    // Beacon returned — cancel any running timeout timer.
+                    cancelBeaconTimeout(identifier: identifier)
                 case .exit:
                     smoothedDistances.removeValue(forKey: identifier)
-                    cancelBeaconTimeout(identifier: identifier)
                     sendLoggedEvent("onBeaconExit", makeBeaconEventParams(identifier: identifier, beacon: beacon, event: "exit"))
                     postBeaconNotification(identifier: identifier, eventType: "exit")
+                    // Beacon left — start the timeout clock.
+                    scheduleBeaconTimeout(identifier: identifier, beacon: beacon)
                 case .none:
                     break
                 }
@@ -1389,16 +1387,13 @@ public class ExpoBeaconModule: Module {
                     enterCounters[identifier] = 0
                     exitCounters[identifier] = 0
                     smoothedDistances.removeValue(forKey: identifier)
-                    // Do NOT cancel the timeout here. A miss-based exit is triggered by
-                    // ranging gaps (e.g. accuracy == -1), not a confirmed physical departure.
-                    // Cancelling here prevents the timeout from firing when it is longer than
-                    // the miss window. Distance-based exits call cancelBeaconTimeout() so the
-                    // timer is still cancelled on genuine out-of-range events.
 
                     // Look up region info for the exit event payload
                     let region = monitoredRegions.first { $0.identifier == identifier }
                     sendLoggedEvent("onBeaconExit", makeBeaconEventParams(identifier: identifier, region: region, event: "exit"))
                     postBeaconNotification(identifier: identifier, eventType: "exit")
+                    // Beacon disappeared — start the timeout clock.
+                    scheduleBeaconTimeout(identifier: identifier, region: region)
                 }
             }
             return
@@ -1441,9 +1436,10 @@ public class ExpoBeaconModule: Module {
         missCounters.removeValue(forKey: identifier)
         smoothedDistances.removeValue(forKey: identifier)
         if wasEntered {
-            cancelBeaconTimeout(identifier: identifier)
             sendLoggedEvent("onBeaconExit", makeBeaconEventParams(identifier: identifier, region: beaconRegion, event: "exit"))
             postBeaconNotification(identifier: identifier, eventType: "exit")
+            // OS-level exit safety net — start the timeout clock.
+            scheduleBeaconTimeout(identifier: identifier, region: beaconRegion)
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-beacon",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "description": "Expo module for scanning, pairing, and monitoring iBeacons on Android and iOS",
   "main": "build/index.js",
   "types": "build/index.d.ts",