expo-beacon 0.5.2 → 0.5.4

package/ios/ExpoBeaconModule.swift

@@ -242,20 +242,21 @@ public class ExpoBeaconModule: Module {
         // MARK: - Eddystone Pair
 
         Function("pairEddystone") { (identifier: String, namespace: String, instance: String) -> Void in
-            let hexPattern = /^[0-9a-fA-F]+$/
-            guard namespace.count == 20, namespace.wholeMatch(of: hexPattern) != nil else {
+            guard namespace.count == 20, namespace.range(of: "^[0-9a-fA-F]+$", options: .regularExpression) != nil else {
                 throw Exception(name: "INVALID_NAMESPACE", description: "Namespace must be 20 hex characters, got: \(namespace)")
             }
-            guard instance.count == 12, instance.wholeMatch(of: hexPattern) != nil else {
+            guard instance.count == 12, instance.range(of: "^[0-9a-fA-F]+$", options: .regularExpression) != nil else {
                 throw Exception(name: "INVALID_INSTANCE", description: "Instance must be 12 hex characters, got: \(instance)")
             }
 
             var eddystones = self.loadPairedEddystonesRaw()
             eddystones.removeAll { ($0["identifier"] as? String) == identifier }
+            // Normalize hex to lowercase — parseEddystoneFrame produces lowercase,
+            // so stored values must match for monitoring comparisons.
             eddystones.append([
                 "identifier": identifier,
-                "namespace": namespace,
-                "instance": instance
+                "namespace": namespace.lowercased(),
+                "instance": instance.lowercased()
             ])
             self.defaults.set(eddystones, forKey: PAIRED_EDDYSTONES_KEY)
             self.cachedPairedEddystones = nil
@@ -663,27 +664,14 @@ public class ExpoBeaconModule: Module {
             guard let identifier = paired["identifier"] as? String,
                   let pns = paired["namespace"] as? String,
                   let pinst = paired["instance"] as? String,
-                  pns == ns && pinst == inst else { continue }
+                  pns.lowercased() == ns && pinst.lowercased() == inst else { continue }
 
             eddystoneLatestSeen[identifier] = Date()
             eddystoneMissCounters[identifier] = 0
 
-            // Throttle distance events
-            let now = Date()
-            if let lastEmit = eddystoneLastDistanceEmit[identifier],
-               now.timeIntervalSince(lastEmit) < DISTANCE_EVENT_THROTTLE_INTERVAL {
-                break
-            }
-            eddystoneLastDistanceEmit[identifier] = now
-
-            sendEvent("onEddystoneDistance", [
-                "identifier": identifier,
-                "namespace": ns,
-                "instance": inst,
-                "distance": distance
-            ])
-
-            // Distance-driven enter/exit with hysteresis
+            // Distance-driven enter/exit with hysteresis — evaluated on every
+            // BLE callback (not throttled) so the hysteresis counters advance
+            // reliably regardless of advertisement rate.
             let maxDist = self.defaults.object(forKey: MAX_DISTANCE_KEY) as? Double
             let exitDist = self.defaults.object(forKey: EXIT_DISTANCE_KEY) as? Double
             let action = evaluateDistanceHysteresis(
@@ -717,6 +705,22 @@ public class ExpoBeaconModule: Module {
             case .none:
                 break
             }
+
+            // Throttle distance events — enter/exit above is evaluated on every
+            // callback, but distance events are rate-limited to avoid flooding JS.
+            let now = Date()
+            if let lastEmit = eddystoneLastDistanceEmit[identifier],
+               now.timeIntervalSince(lastEmit) < DISTANCE_EVENT_THROTTLE_INTERVAL {
+                break
+            }
+            eddystoneLastDistanceEmit[identifier] = now
+
+            sendEvent("onEddystoneDistance", [
+                "identifier": identifier,
+                "namespace": ns,
+                "instance": inst,
+                "distance": distance
+            ])
             break
         }
     }
@@ -1214,9 +1218,12 @@ private class BluetoothDelegate: NSObject, CBCentralManagerDelegate {
         case .poweredOn:
             module?.ensureBleScanRunning()
         case .unauthorized:
+            print("[ExpoBeacon] Bluetooth authorization denied — Eddystone scanning/monitoring unavailable. " +
+                  "Ensure NSBluetoothAlwaysUsageDescription is set in Info.plist.")
             module?.eddystoneScanPromise?.reject("BLUETOOTH_UNAUTHORIZED", "Bluetooth permission denied")
             module?.eddystoneScanPromise = nil
         case .poweredOff:
+            print("[ExpoBeacon] Bluetooth is powered off — Eddystone scanning/monitoring unavailable.")
             module?.eddystoneScanPromise?.reject("BLUETOOTH_OFF", "Bluetooth is powered off")
             module?.eddystoneScanPromise = nil
         default:

package/package.json

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