expo-beacon 0.7.22 → 0.7.24

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

@@ -10,8 +10,10 @@ interface BeaconEventPlugin {
     // iBeacon
     fun onBeaconEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double)
     fun onBeaconExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double)
+    fun onBeaconTimeout(identifier: String, uuid: String, major: Int, minor: Int, distance: Double)
 
     // Eddystone
     fun onEddystoneEnter(identifier: String, namespace: String, instance: String, distance: Double)
     fun onEddystoneExit(identifier: String, namespace: String, instance: String, distance: Double)
+    fun onEddystoneTimeout(identifier: String, namespace: String, instance: String, distance: Double)
 }

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

@@ -628,18 +628,18 @@ class BeaconForegroundService : Service(), BeaconConsumer {
         // Forward all produced events to remote API
         apiForwarder?.forwardEvent(params)
 
-        // Dispatch enter/exit to registered plugins (e.g. to start/stop BGLocation)
-        if (eventType == "enter" || eventType == "exit") {
+        // Dispatch enter/exit/timeout to registered plugins (e.g. to start/stop BGLocation)
+        if (eventType == "enter" || eventType == "exit" || eventType == "timeout") {
             val identifier = region.uniqueId
             val uuid = if (!isEddystone) id1Str else ""
             val major = if (!isEddystone) region.id2?.toInt() ?: 0 else 0
             val minor = if (!isEddystone) region.id3?.toInt() ?: 0 else 0
             val namespace = if (isEddystone) id1Str.removePrefix("0x") else ""
             val instance = if (isEddystone) region.id2?.toString()?.removePrefix("0x") ?: "" else ""
-            if (eventType == "enter") {
-                BeaconPluginRegistry.dispatchEnter(isEddystone, identifier, uuid, major, minor, namespace, instance, distance)
-            } else {
-                BeaconPluginRegistry.dispatchExit(isEddystone, identifier, uuid, major, minor, namespace, instance, distance)
+            when (eventType) {
+                "enter" -> BeaconPluginRegistry.dispatchEnter(isEddystone, identifier, uuid, major, minor, namespace, instance, distance)
+                "exit" -> BeaconPluginRegistry.dispatchExit(isEddystone, identifier, uuid, major, minor, namespace, instance, distance)
+                "timeout" -> BeaconPluginRegistry.dispatchTimeout(isEddystone, identifier, uuid, major, minor, namespace, instance, distance)
             }
         }
 

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

@@ -58,4 +58,23 @@ object BeaconPluginRegistry {
             }
         }
     }
+
+    internal fun dispatchTimeout(
+        isEddystone: Boolean,
+        identifier: String,
+        uuid: String,
+        major: Int,
+        minor: Int,
+        namespace: String,
+        instance: String,
+        distance: Double,
+    ) {
+        plugins.forEach { plugin ->
+            if (isEddystone) {
+                plugin.onEddystoneTimeout(identifier, namespace, instance, distance)
+            } else {
+                plugin.onBeaconTimeout(identifier, uuid, major, minor, distance)
+            }
+        }
+    }
 }

package/ios/BeaconLifecycleDelegate.swift

@@ -9,10 +9,12 @@ public protocol BeaconLifecycleDelegate: AnyObject {
     // MARK: iBeacon
     func beaconDidEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double)
     func beaconDidExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double)
+    func beaconDidTimeout(identifier: String, uuid: String, major: Int, minor: Int, distance: Double)
 
     // MARK: Eddystone
     func eddystoneDidEnter(identifier: String, namespace: String, instance: String, distance: Double)
     func eddystoneDidExit(identifier: String, namespace: String, instance: String, distance: Double)
+    func eddystoneDidTimeout(identifier: String, namespace: String, instance: String, distance: Double)
 }
 
 /// Thread-safe registry for [BeaconLifecycleDelegate] plugins.
@@ -46,6 +48,12 @@ public final class BeaconLifecycleRegistry {
     internal func dispatchEddystoneExit(identifier: String, namespace: String, instance: String, distance: Double) {
         snapshot().forEach { $0.eddystoneDidExit(identifier: identifier, namespace: namespace, instance: instance, distance: distance) }
     }
+    internal func dispatchBeaconTimeout(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
+        snapshot().forEach { $0.beaconDidTimeout(identifier: identifier, uuid: uuid, major: major, minor: minor, distance: distance) }
+    }
+    internal func dispatchEddystoneTimeout(identifier: String, namespace: String, instance: String, distance: Double) {
+        snapshot().forEach { $0.eddystoneDidTimeout(identifier: identifier, namespace: namespace, instance: instance, distance: distance) }
+    }
 
     private func snapshot() -> [any BeaconLifecycleDelegate] {
         lock.lock(); defer { lock.unlock() }

package/ios/ExpoBeaconModule.swift

@@ -1066,6 +1066,14 @@ public class ExpoBeaconModule: Module {
                 minor: params["minor"] as? Int ?? 0,
                 distance: distance
             )
+        case "onBeaconTimeout":
+            r.dispatchBeaconTimeout(
+                identifier: identifier,
+                uuid: params["uuid"] as? String ?? "",
+                major: params["major"] as? Int ?? 0,
+                minor: params["minor"] as? Int ?? 0,
+                distance: distance
+            )
         case "onEddystoneEnter":
             r.dispatchEddystoneEnter(
                 identifier: identifier,
@@ -1080,6 +1088,13 @@ public class ExpoBeaconModule: Module {
                 instance: params["instance"] as? String ?? "",
                 distance: distance
             )
+        case "onEddystoneTimeout":
+            r.dispatchEddystoneTimeout(
+                identifier: identifier,
+                namespace: params["namespace"] as? String ?? "",
+                instance: params["instance"] as? String ?? "",
+                distance: distance
+            )
         default:
             break
         }

package/package.json

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

package/plugin/build/withBeaconAndroid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withBeaconAndroid.d.ts","sourceRoot":"","sources":["../src/withBeaconAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoB,MAAM,sBAAsB,CAAC;AAMtE,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CA0BlE;AAqCD,QAAA,MAAM,iBAAiB,EAAE,YA0DxB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"withBeaconAndroid.d.ts","sourceRoot":"","sources":["../src/withBeaconAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoB,MAAM,sBAAsB,CAAC;AAMtE,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CA8BlE;AAqCD,QAAA,MAAM,iBAAiB,EAAE,YA0DxB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/plugin/build/withBeaconAndroid.js

@@ -25,10 +25,14 @@ class BeaconGeoPlugin(ctx: Context) : BeaconEventPlugin {
         bgGeo.start(noOp)
     override fun onBeaconExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) =
         bgGeo.stop(noOp)
+    override fun onBeaconTimeout(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) =
+        bgGeo.stop(noOp)
     override fun onEddystoneEnter(identifier: String, namespace: String, instance: String, distance: Double) =
         bgGeo.start(noOp)
     override fun onEddystoneExit(identifier: String, namespace: String, instance: String, distance: Double) =
         bgGeo.stop(noOp)
+    override fun onEddystoneTimeout(identifier: String, namespace: String, instance: String, distance: Double) =
+        bgGeo.stop(noOp)
 }
 `;
 }

package/plugin/build/withBeaconIOS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsC,MAAM,sBAAsB,CAAC;AAMxF,wBAAgB,iBAAiB,IAAI,MAAM,CAoB1C;AA+ED,QAAA,MAAM,aAAa,EAAE,YAmEpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsC,MAAM,sBAAsB,CAAC;AAMxF,wBAAgB,iBAAiB,IAAI,MAAM,CA0B1C;AA+ED,QAAA,MAAM,aAAa,EAAE,YAmEpB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/plugin/build/withBeaconIOS.js

@@ -12,16 +12,22 @@ import TSLocationManager
 
 final class BeaconGeoPlugin: BeaconLifecycleDelegate {
     func beaconDidEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
-        BackgroundGeolocation.sharedInstance().start({ _ in }, failure: { _ in })
+        BackgroundGeolocation.sharedInstance().start()
     }
     func beaconDidExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
-        BackgroundGeolocation.sharedInstance().stop({ _ in }, failure: { _ in })
+        BackgroundGeolocation.sharedInstance().stop()
+    }
+    func beaconDidTimeout(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
+        BackgroundGeolocation.sharedInstance().stop()
     }
     func eddystoneDidEnter(identifier: String, namespace: String, instance: String, distance: Double) {
-        BackgroundGeolocation.sharedInstance().start({ _ in }, failure: { _ in })
+        BackgroundGeolocation.sharedInstance().start()
     }
     func eddystoneDidExit(identifier: String, namespace: String, instance: String, distance: Double) {
-        BackgroundGeolocation.sharedInstance().stop({ _ in }, failure: { _ in })
+        BackgroundGeolocation.sharedInstance().stop()
+    }
+    func eddystoneDidTimeout(identifier: String, namespace: String, instance: String, distance: Double) {
+        BackgroundGeolocation.sharedInstance().stop()
     }
 }
 `;