expo-beacon 0.10.6 → 0.10.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-beacon",
-  "version": "0.10.6",
+  "version": "0.10.8",
   "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,CA2KlE;AA8ND,QAAA,MAAM,iBAAiB,EAAE,YAAY,CAAC,wBAAwB,GAAG,IAAI,CA0BpE,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/plugin/build/withBeaconAndroid.js

@@ -7,39 +7,72 @@ const path = require("path");
 // ─── Generated Kotlin file ────────────────────────────────────────────────────
 function getAndroidPluginKotlin(packageName) {
     return `\
-package ${packageName}
+package ${packageName}
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Handler
+import android.os.Looper
+import android.os.SystemClock
+import com.transistorsoft.locationmanager.adapter.BackgroundGeolocation
+import com.transistorsoft.locationmanager.adapter.callback.TSCallback
+import com.transistorsoft.locationmanager.adapter.callback.TSSyncCallback
+import com.transistorsoft.locationmanager.data.LocationModel
+import expo.modules.beacon.BeaconEventPlugin
 
-import android.content.Context
-import com.transistorsoft.locationmanager.adapter.BackgroundGeolocation
-import com.transistorsoft.locationmanager.adapter.callback.TSCallback
-import com.transistorsoft.locationmanager.adapter.callback.TSSyncCallback
-import com.transistorsoft.locationmanager.data.LocationModel
-import expo.modules.beacon.BeaconEventPlugin
-
-class BeaconGeoPlugin(ctx: Context) : BeaconEventPlugin {
-    private val bgGeo = BackgroundGeolocation.getInstance(ctx, null)
-    private val noOp = object : TSCallback {
-        override fun onSuccess() {}
-        override fun onFailure(error: String) {}
+class BeaconGeoPlugin(ctx: Context) : BeaconEventPlugin {
+    private val appContext = ctx.applicationContext
+    private val bgGeo = BackgroundGeolocation.getInstance(ctx, null)
+    private val noOp = object : TSCallback {
+        override fun onSuccess() {}
+        override fun onFailure(error: String) {}
     }
     private val noOpSync = object : TSSyncCallback {
-        override fun onSuccess(records: MutableList<LocationModel>) {}
-        override fun onFailure(error: String) {}
-    }
-
-    private fun startTracking() {
-        bgGeo.start(noOp)
-        bgGeo.changePace(true, noOp)
-    }
-
-    private fun stopTracking() {
-        bgGeo.sync(noOpSync)
-        bgGeo.changePace(false, noOp)
-        bgGeo.stop(noOp)
-    }
-
-    override fun onBeaconEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) =
-        startTracking()
+        override fun onSuccess(records: MutableList<LocationModel>) {}
+        override fun onFailure(error: String) {}
+    }
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private var pendingCarPlayStop: Runnable? = null
+    private val carPlayStopDelayMs = 30_000L
+
+    private fun startTracking() {
+        cancelPendingCarPlayStop()
+        bgGeo.start(noOp)
+        bgGeo.changePace(true, noOp)
+    }
+
+    private fun stopTracking() {
+        cancelPendingCarPlayStop()
+        bgGeo.sync(noOpSync)
+        bgGeo.changePace(false, noOp)
+        bgGeo.stop(noOp)
+    }
+
+    private fun stopTrackingForCarPlay() {
+        bgGeo.sync(noOpSync)
+        bgGeo.changePace(false, noOp)
+        cancelPendingCarPlayStop()
+        val token = SystemClock.elapsedRealtimeNanos().toString()
+        val stop = Runnable {
+            pendingCarPlayStop = null
+            BeaconGeoCarPlayStop.performIfCurrent(appContext, token)
+        }
+        pendingCarPlayStop = stop
+        BeaconGeoCarPlayStop.schedule(appContext, token, carPlayStopDelayMs)
+        mainHandler.postDelayed(stop, carPlayStopDelayMs)
+    }
+
+    private fun cancelPendingCarPlayStop() {
+        pendingCarPlayStop?.let { mainHandler.removeCallbacks(it) }
+        pendingCarPlayStop = null
+        BeaconGeoCarPlayStop.cancel(appContext)
+    }
+
+    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) =
         stopTracking()
     override fun onBeaconTimeout(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) =
@@ -50,14 +83,98 @@ 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.
-    override fun onCarPlayConnected(transport: String) {
-        startTracking()
-    }
-    override fun onCarPlayDisconnected() {
-        stopTracking()
-    }
-}
+    // Start tracking when the device connects to Android Auto; stop after a
+    // grace period when it disconnects. The delayed stop is backed by
+    // AlarmManager so it can still fire if the process idles or is killed.
+    override fun onCarPlayConnected(transport: String) {
+        startTracking()
+    }
+    override fun onCarPlayDisconnected() {
+        stopTrackingForCarPlay()
+    }
+}
+
+private object BeaconGeoCarPlayStop {
+    private const val ACTION_STOP = "${packageName}.expo_beacon.CARPLAY_STOP_TRACKING"
+    private const val EXTRA_TOKEN = "token"
+    private const val PREFS = "expo_beacon_geo_plugin"
+    private const val KEY_PENDING_TOKEN = "pending_carplay_stop_token"
+    private const val REQUEST_CODE = 0xBEEA
+
+    fun schedule(context: Context, token: String, delayMs: Long) {
+        val appContext = context.applicationContext
+        appContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+            .edit()
+            .putString(KEY_PENDING_TOKEN, token)
+            .apply()
+        val alarmManager = appContext.getSystemService(AlarmManager::class.java) ?: return
+        val triggerAt = SystemClock.elapsedRealtime() + delayMs
+        try {
+            alarmManager.setAndAllowWhileIdle(
+                AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                triggerAt,
+                pendingIntent(appContext, token, PendingIntent.FLAG_UPDATE_CURRENT),
+            )
+        } catch (_: SecurityException) {
+            alarmManager.set(
+                AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                triggerAt,
+                pendingIntent(appContext, token, PendingIntent.FLAG_UPDATE_CURRENT),
+            )
+        }
+    }
+
+    fun cancel(context: Context) {
+        val appContext = context.applicationContext
+        appContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+            .edit()
+            .remove(KEY_PENDING_TOKEN)
+            .apply()
+        val alarmManager = appContext.getSystemService(AlarmManager::class.java) ?: return
+        alarmManager.cancel(pendingIntent(appContext, null, PendingIntent.FLAG_UPDATE_CURRENT))
+    }
+
+    fun performIfCurrent(context: Context, token: String?) {
+        if (token == null) return
+        val appContext = context.applicationContext
+        val prefs = appContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+        if (prefs.getString(KEY_PENDING_TOKEN, null) != token) return
+        prefs.edit().remove(KEY_PENDING_TOKEN).apply()
+        val bgGeo = BackgroundGeolocation.getInstance(appContext, null)
+        val noOp = object : TSCallback {
+            override fun onSuccess() {}
+            override fun onFailure(error: String) {}
+        }
+        val noOpSync = object : TSSyncCallback {
+            override fun onSuccess(records: MutableList<LocationModel>) {}
+            override fun onFailure(error: String) {}
+        }
+        bgGeo.sync(noOpSync)
+        bgGeo.changePace(false, noOp)
+        bgGeo.stop(noOp)
+    }
+
+    fun tokenFrom(intent: Intent): String? = intent.getStringExtra(EXTRA_TOKEN)
+
+    private fun pendingIntent(context: Context, token: String?, flags: Int): PendingIntent {
+        val intent = Intent(context, BeaconGeoStopReceiver::class.java).apply {
+            action = ACTION_STOP
+            token?.let { putExtra(EXTRA_TOKEN, it) }
+        }
+        return PendingIntent.getBroadcast(
+            context,
+            REQUEST_CODE,
+            intent,
+            flags or PendingIntent.FLAG_IMMUTABLE,
+        )
+    }
+}
+
+class BeaconGeoStopReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        BeaconGeoCarPlayStop.performIfCurrent(context, BeaconGeoCarPlayStop.tokenFrom(intent))
+    }
+}
 `;
 }
 // ─── Helpers ──────────────────────────────────────────────────────────────────
@@ -87,6 +204,7 @@ function modifyMainApplication(contents) {
 const AA_META_DATA_NAME = "com.google.android.gms.car.application";
 const AA_META_DATA_RESOURCE = "@xml/automotive_app_desc";
 const AA_RES_FILE = "automotive_app_desc.xml";
+const BEACON_GEO_STOP_RECEIVER = "BeaconGeoStopReceiver";
 function getAutomotiveAppDescXml(usesName) {
     return `<?xml version="1.0" encoding="utf-8"?>
 <!--
@@ -150,6 +268,30 @@ function withAndroidAutoDescriptor(usesName) {
  * the `backgroundGeolocation` plugin prop (default: enabled).
  */
 const withBeaconGeoPlugin = (config) => {
+    config = (0, config_plugins_1.withAndroidManifest)(config, (config) => {
+        var _a, _b;
+        const pkgName = (_a = config.android) === null || _a === void 0 ? void 0 : _a.package;
+        if (!pkgName)
+            return config;
+        const app = config_plugins_1.AndroidConfig.Manifest.getMainApplicationOrThrow(config.modResults);
+        const receiverName = `${pkgName}.${BEACON_GEO_STOP_RECEIVER}`;
+        const receivers = ((_b = app.receiver) !== null && _b !== void 0 ? _b : (app.receiver = []));
+        const exists = receivers.some((receiver) => {
+            var _a, _b;
+            return ((_a = receiver === null || receiver === void 0 ? void 0 : receiver.$) === null || _a === void 0 ? void 0 : _a["android:name"]) === receiverName ||
+                ((_b = receiver === null || receiver === void 0 ? void 0 : receiver.$) === null || _b === void 0 ? void 0 : _b["android:name"]) === `.${BEACON_GEO_STOP_RECEIVER}`;
+        });
+        if (!exists) {
+            receivers.push({
+                $: {
+                    "android:name": receiverName,
+                    "android:enabled": "true",
+                    "android:exported": "false",
+                },
+            });
+        }
+        return config;
+    });
     // Step 1 – write BeaconGeoPlugin.kt into the app source tree.
     config = (0, config_plugins_1.withDangerousMod)(config, [
         "android",

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()
   }
 }
 `;