expo-beacon 0.6.6 → 0.6.8

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

@@ -76,29 +76,31 @@ class BeaconForegroundService : Service(), BeaconConsumer {
         // Increase AltBeacon's region exit period so didExitRegion doesn't fire
         // prematurely during brief BLE scan gaps.
         BeaconManager.setRegionExitPeriod(REGION_EXIT_PERIOD_MS)
-        // Let AltBeacon's internal BeaconService run as a foreground service so
-        // Samsung/OEM battery enforcement doesn't kill BLE scanning after ~4 min.
-        // Reset first to clear any stale state from a previous session.
-        try { beaconManager.disableForegroundServiceScanning() } catch (_: Exception) {}
-        try {
-            beaconManager.enableForegroundServiceScanning(
-                buildForegroundNotification(), FOREGROUND_NOTIF_ID
-            )
-        } catch (e: IllegalStateException) {
-            // Already bound by another consumer (e.g. a scan in progress) — non-fatal.
-            Log.w(TAG, "enableForegroundServiceScanning skipped (already bound)", e)
-        }
+        // NOTE: We intentionally do NOT call enableForegroundServiceScanning().
+        // Our BeaconForegroundService is already a foreground service (startForeground
+        // in onStartCommand). AltBeacon's internal BeaconService runs in the same
+        // process and inherits the elevated priority. Calling enable/disable on the
+        // shared singleton causes crashes when the ExpoBeaconModule has an active
+        // scan bound to the same BeaconManager.
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            startForeground(
-                FOREGROUND_NOTIF_ID,
-                buildForegroundNotification(),
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE
-            )
-        } else {
-            startForeground(FOREGROUND_NOTIF_ID, buildForegroundNotification())
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                startForeground(
+                    FOREGROUND_NOTIF_ID,
+                    buildForegroundNotification(),
+                    ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE
+                )
+            } else {
+                startForeground(FOREGROUND_NOTIF_ID, buildForegroundNotification())
+            }
+        } catch (e: Exception) {
+            // SecurityException on Android 14+ if BT permissions missing,
+            // or other platform-specific issues. Stop gracefully instead of crashing.
+            Log.e(TAG, "startForeground failed — stopping service", e)
+            stopSelf()
+            return START_NOT_STICKY
         }
         if (serviceConnected) {
             // Already bound from a prior onStartCommand — reload regions directly
@@ -157,8 +159,11 @@ class BeaconForegroundService : Service(), BeaconConsumer {
             try { beaconManager.stopRangingBeaconsInRegion(it) } catch (_: RemoteException) {}
         }
         distanceLogRegions.clear()
+        monitoredRegions.forEach {
+            try { beaconManager.stopMonitoringBeaconsInRegion(it) } catch (_: RemoteException) {}
+        }
+        monitoredRegions.clear()
         monitoredRegionIds.clear()
-        enteredRegions.clear()
         lastSeenAtMs.clear()
         timeoutHandler.removeCallbacksAndMessages(null)
         timeoutRunnables.clear()
@@ -167,10 +172,12 @@ class BeaconForegroundService : Service(), BeaconConsumer {
             exitCounters.clear()
             missCounters.clear()
         }
-        monitoredRegions.forEach {
-            try { beaconManager.stopMonitoringBeaconsInRegion(it) } catch (_: RemoteException) {}
-        }
-        monitoredRegions.clear()
+        // NOTE: enteredRegions is intentionally NOT cleared here.
+        // Clearing it on every reload (e.g. START_STICKY restart or repeated
+        // startMonitoring calls) would reset the "already entered" state and
+        // cause the hysteresis to fire another ENTER event for beacons that
+        // are still nearby. Stale entries are pruned below after new regions
+        // are determined.
 
         // iBeacon regions
         for (i in 0 until beacons.length()) {
@@ -230,8 +237,12 @@ class BeaconForegroundService : Service(), BeaconConsumer {
 
         // If no regions to monitor, stop the service to avoid idling
         if (monitoredRegions.isEmpty()) {
+            enteredRegions.clear()
             Log.d(TAG, "No paired beacons — stopping idle foreground service")
             stopSelf()
+        } else {
+            // Prune enteredRegions for regions that are no longer monitored
+            enteredRegions.retainAll(monitoredRegionIds)
         }
     }
 
@@ -581,6 +592,7 @@ class BeaconForegroundService : Service(), BeaconConsumer {
         fun start(context: Context) {
             context.getSharedPreferences(PREF_IS_MONITORING, Context.MODE_PRIVATE)
                 .edit().putBoolean("active", true).apply()
+            ensureNotificationChannel(context)
             val intent = Intent(context, BeaconForegroundService::class.java)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 context.startForegroundService(intent)
@@ -691,7 +703,6 @@ class BeaconForegroundService : Service(), BeaconConsumer {
         monitoredRegions.forEach {
             try { beaconManager.stopMonitoringBeaconsInRegion(it) } catch (_: RemoteException) {}
         }
-        try { beaconManager.disableForegroundServiceScanning() } catch (_: Exception) {}
         beaconManager.unbind(this)
         super.onDestroy()
     }

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

@@ -327,24 +327,25 @@ class ExpoBeaconModule : Module(), BeaconConsumer {
                 promise.reject("PERMISSION_DENIED", "Location permissions required for background monitoring. Call requestPermissionsAsync() first.", null)
                 return@AsyncFunction
             }
-
-            // Enable AltBeacon foreground service scanning so the internal BeaconService
-            // runs as a foreground service, preventing Samsung/OEM BLE throttling.
-            // Reset first to clear stale state from a previous session / hot-reload.
-            if (!isBoundForScan) {
-                try {
-                    BeaconForegroundService.ensureNotificationChannel(ctx)
-                    try { beaconManager.disableForegroundServiceScanning() } catch (_: Exception) {}
-                    beaconManager.enableForegroundServiceScanning(
-                        BeaconForegroundService.buildForegroundNotification(ctx), FOREGROUND_NOTIF_ID
-                    )
-                } catch (_: IllegalStateException) {
-                    // Already bound — service onCreate() will enable it instead.
+            // Android 12+ requires BLUETOOTH_SCAN for BLE operations;
+            // Android 14+ additionally requires it for connectedDevice foreground services.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                val hasBtScan = ContextCompat.checkSelfPermission(ctx, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED
+                val hasBtConnect = ContextCompat.checkSelfPermission(ctx, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED
+                if (!hasBtScan || !hasBtConnect) {
+                    promise.reject("PERMISSION_DENIED", "Bluetooth permissions required for beacon monitoring. Call requestPermissionsAsync() first.", null)
+                    return@AsyncFunction
                 }
             }
 
             registerEventReceiver()
-            BeaconForegroundService.start(ctx)
+            try {
+                BeaconForegroundService.start(ctx)
+            } catch (e: Exception) {
+                unregisterEventReceiver()
+                promise.reject("SERVICE_START_FAILED", "Failed to start monitoring service: ${e.message}", e)
+                return@AsyncFunction
+            }
             promise.resolve(null)
         }
 
@@ -360,7 +361,6 @@ class ExpoBeaconModule : Module(), BeaconConsumer {
                 return@AsyncFunction
             }
             BeaconForegroundService.stop(ctx)
-            try { beaconManager.disableForegroundServiceScanning() } catch (_: Exception) {}
             unregisterEventReceiver()
             promise.resolve(null)
         }

package/package.json

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