expo-beacon 0.10.6 → 0.10.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-beacon",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "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,EAEL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAM9B;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC;AAExE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE;QACZ;2EACmE;QACnE,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;qCAC6B;QAC7B,QAAQ,CAAC,EAAE,mBAAmB,CAAC;KAChC,CAAC;CACH,CAAC;AAIF,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAsDlE;AAoMD,QAAA,MAAM,iBAAiB,EAAE,YAAY,CAAC,wBAAwB,GAAG,IAAI,CA0BpE,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"withBeaconAndroid.d.ts","sourceRoot":"","sources":["../src/withBeaconAndroid.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,YAAY,EAGZ,MAAM,sBAAsB,CAAC;AAM9B;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,OAAO,GAAG,cAAc,CAAC;AAExE,MAAM,MAAM,wBAAwB,GAAG;IACtC;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE;QACb;2EACmE;QACnE,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;qCAC6B;QAC7B,QAAQ,CAAC,EAAE,mBAAmB,CAAC;KAC/B,CAAC;CACF,CAAC;AAIF,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAmFlE;AAoMD,QAAA,MAAM,iBAAiB,EAAE,YAAY,CAAC,wBAAwB,GAAG,IAAI,CA0BpE,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/plugin/build/withBeaconAndroid.js

@@ -10,6 +10,8 @@ function getAndroidPluginKotlin(packageName) {
 package ${packageName}
 
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import com.transistorsoft.locationmanager.adapter.BackgroundGeolocation
 import com.transistorsoft.locationmanager.adapter.callback.TSCallback
 import com.transistorsoft.locationmanager.adapter.callback.TSSyncCallback
@@ -27,6 +29,12 @@ class BeaconGeoPlugin(ctx: Context) : BeaconEventPlugin {
         override fun onFailure(error: String) {}
     }
 
+    // CarPlay disconnect uses a grace period: flush immediately, but defer the
+    // actual stop() so a quick reconnect (brief dropout) keeps tracking alive.
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private var pendingCarPlayStop: Runnable? = null
+    private val carPlayStopDelayMs = 30_000L
+
     private fun startTracking() {
         bgGeo.start(noOp)
         bgGeo.changePace(true, noOp)
@@ -38,6 +46,25 @@ class BeaconGeoPlugin(ctx: Context) : BeaconEventPlugin {
         bgGeo.stop(noOp)
     }
 
+    // Flush queued locations right away, then stop tracking after a grace
+    // period. Cancelled by cancelPendingCarPlayStop() if CarPlay reconnects.
+    private fun stopTrackingForCarPlay() {
+        bgGeo.sync(noOpSync)
+        bgGeo.changePace(false, noOp)
+        cancelPendingCarPlayStop()
+        val stop = Runnable {
+            pendingCarPlayStop = null
+            bgGeo.stop(noOp)
+        }
+        pendingCarPlayStop = stop
+        mainHandler.postDelayed(stop, carPlayStopDelayMs)
+    }
+
+    private fun cancelPendingCarPlayStop() {
+        pendingCarPlayStop?.let { mainHandler.removeCallbacks(it) }
+        pendingCarPlayStop = null
+    }
+
     override fun onBeaconEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) =
         startTracking()
     override fun onBeaconExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) =
@@ -50,12 +77,14 @@ class BeaconGeoPlugin(ctx: Context) : BeaconEventPlugin {
         stopTracking()
     override fun onEddystoneTimeout(identifier: String, namespace: String, instance: String, distance: Double) =
         stopTracking()
-    // Start tracking when the device connects to Android Auto, stop when it disconnects.
+    // Start tracking when the device connects to Android Auto; stop (after a
+    // grace period) when it disconnects.
     override fun onCarPlayConnected(transport: String) {
+        cancelPendingCarPlayStop()
         startTracking()
     }
     override fun onCarPlayDisconnected() {
-        stopTracking()
+        stopTrackingForCarPlay()
     }
 }
 `;

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

@@ -1 +1 @@
-{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAKb,MAAM,sBAAsB,CAAC;AAM9B,MAAM,MAAM,oBAAoB,GAAG;IACjC;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAIF,wBAAgB,iBAAiB,IAAI,MAAM,CA6C1C;AA2KD,QAAA,MAAM,aAAa,EAAE,YAAY,CAAC,oBAAoB,GAAG,IAAI,CAgC5D,CAAC;AA6CF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EAKZ,MAAM,sBAAsB,CAAC;AAM9B,MAAM,MAAM,oBAAoB,GAAG;IAClC;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,wBAAgB,iBAAiB,IAAI,MAAM,CAsE1C;AA2KD,QAAA,MAAM,aAAa,EAAE,YAAY,CAAC,oBAAoB,GAAG,IAAI,CAgC5D,CAAC;AA6CF,eAAe,aAAa,CAAC"}

package/plugin/build/withBeaconIOS.js

@@ -11,6 +11,11 @@ import ExpoBeacon
 import TSLocationManager
 
 final class BeaconGeoPlugin: BeaconLifecycleDelegate {
+  // CarPlay disconnect uses a grace period: flush immediately, but defer the
+  // actual stop() so a quick reconnect (brief dropout) keeps tracking alive.
+  private var pendingCarPlayStop: DispatchWorkItem?
+  private let carPlayStopDelay: TimeInterval = 30
+
   private func startTracking() {
     BackgroundGeolocation.sharedInstance().start()
     BackgroundGeolocation.sharedInstance().changePace(true)
@@ -22,6 +27,25 @@ final class BeaconGeoPlugin: BeaconLifecycleDelegate {
     BackgroundGeolocation.sharedInstance().stop()
   }
 
+  // Flush queued locations right away, then stop tracking after a grace
+  // period. Cancelled by cancelPendingCarPlayStop() if CarPlay reconnects.
+  private func stopTrackingForCarPlay() {
+    BackgroundGeolocation.sharedInstance().sync({ _ in }, failure: { _ in })
+    BackgroundGeolocation.sharedInstance().changePace(false)
+    cancelPendingCarPlayStop()
+    let work = DispatchWorkItem { [weak self] in
+      self?.pendingCarPlayStop = nil
+      BackgroundGeolocation.sharedInstance().stop()
+    }
+    pendingCarPlayStop = work
+    DispatchQueue.main.asyncAfter(deadline: .now() + carPlayStopDelay, execute: work)
+  }
+
+  private func cancelPendingCarPlayStop() {
+    pendingCarPlayStop?.cancel()
+    pendingCarPlayStop = nil
+  }
+
   func beaconDidEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
     startTracking()
   }
@@ -40,13 +64,14 @@ final class BeaconGeoPlugin: BeaconLifecycleDelegate {
   func eddystoneDidTimeout(identifier: String, namespace: String, instance: String, distance: Double) {
     stopTracking()
   }
-  // Start tracking when the device connects to CarPlay (wired or wireless),
-  // stop when it disconnects.
+  // Start tracking when the device connects to CarPlay (wired or wireless);
+  // stop (after a grace period) when it disconnects.
   func carPlayDidConnect(transport: String) {
+    cancelPendingCarPlayStop()
     startTracking()
   }
   func carPlayDidDisconnect() {
-    stopTracking()
+    stopTrackingForCarPlay()
   }
 }
 `;