expo-beacon 0.9.0 → 0.9.2

package/android/src/main/AndroidManifest.xml

@@ -68,6 +68,7 @@
         <service
             android:name="expo.modules.beacon.BeaconForegroundService"
             android:foregroundServiceType="connectedDevice"
+            android:stopWithTask="false"
             android:exported="false" />
 
         <!-- Restart monitoring after boot.
@@ -91,6 +92,8 @@
                 <!-- Self-scheduled CarPlay watchdog (11-min cadence; above
                      setExactAndAllowWhileIdle per-app quota). -->
                 <action android:name="expo.modules.beacon.ACTION_CARPLAY_WATCHDOG" />
+                <!-- Near-term keepalive armed when the app task is swiped away. -->
+                <action android:name="expo.modules.beacon.ACTION_TASK_REMOVED_KEEPALIVE" />
             </intent-filter>
         </receiver>
     </application>

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

@@ -1430,11 +1430,23 @@ class BeaconForegroundService : Service(), BeaconConsumer {
      * `stopSelf()` here; the system will redeliver `onStartCommand` on
      * its own if the process is later reclaimed.
      *
-     * Logging is the only side-effect so that stuck-state issues are
-     * traceable in logcat.
+    * We also arm a near-term keepalive alarm so devices that tear down the
+    * process on task removal recover before the slower periodic watchdogs run.
      */
     override fun onTaskRemoved(rootIntent: Intent?) {
         val keepAlive = isMonitoringActive(this) || isCarPlayEnabled(this)
+        if (keepAlive) {
+            try {
+                if (isCarPlayEnabled(this)) {
+                    startCarPlayObserverInternal()
+                    CarPlayWatchdogWorker.schedule(this)
+                    BootReceiver.scheduleCarPlayWatchdogAlarm(this)
+                }
+                BootReceiver.scheduleTaskRemovedKeepAlive(this)
+            } catch (t: Throwable) {
+                Log.w(TAG, "Failed to arm task-removed keepalive", t)
+            }
+        }
         Log.d(
             TAG,
             "onTaskRemoved received (monitoring=${isMonitoringActive(this)}, " +

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

@@ -17,9 +17,12 @@ private const val ACTION_RETRY_MONITORING = "expo.modules.beacon.ACTION_RETRY_MO
  * process has been killed.
  */
 internal const val ACTION_CARPLAY_WATCHDOG = "expo.modules.beacon.ACTION_CARPLAY_WATCHDOG"
+private const val ACTION_TASK_REMOVED_KEEPALIVE = "expo.modules.beacon.ACTION_TASK_REMOVED_KEEPALIVE"
 private const val RETRY_DELAY_MS = 10_000L
 private const val RETRY_REQUEST_CODE = 0x424F4F54 // "BOOT"
 private const val CARPLAY_WATCHDOG_REQUEST_CODE = 0x43504C57 // "CPLW"
+private const val TASK_REMOVED_KEEPALIVE_REQUEST_CODE = 0x54524B41 // "TRKA"
+private const val TASK_REMOVED_KEEPALIVE_DELAY_MS = 2_000L
 
 /**
  * Cadence for the AlarmManager-based CarPlay watchdog. Set to **11 minutes**
@@ -75,6 +78,21 @@ class BootReceiver : BroadcastReceiver() {
                 // Reschedule the next tick. setExactAndAllowWhileIdle is one-shot.
                 scheduleCarPlayWatchdogAlarm(context)
             }
+            ACTION_TASK_REMOVED_KEEPALIVE -> {
+                val monitoringActive = BeaconForegroundService.isMonitoringActive(context)
+                val carPlayEnabled = BeaconForegroundService.isCarPlayEnabled(context)
+                if (!monitoringActive && !carPlayEnabled) {
+                    Log.d(TAG, "BootReceiver: task-removed keepalive skipped (nothing active)")
+                    return
+                }
+                if (carPlayEnabled) {
+                    tryEnableCarPlay(context)
+                    scheduleCarPlayWatchdogAlarm(context)
+                } else {
+                    tryStartService(context)
+                }
+                Log.d(TAG, "BootReceiver: task-removed keepalive ensured service is running")
+            }
         }
     }
 
@@ -200,5 +218,35 @@ class BootReceiver : BroadcastReceiver() {
                 Log.w(TAG, "BootReceiver: failed to cancel CarPlay watchdog alarm", t)
             }
         }
+
+        /**
+         * Schedule a near-term service keepalive after the user swipes the app
+         * task away. Some devices tear down the process despite a foreground
+         * service; this closes that gap before the slower periodic watchdogs run.
+         */
+        @JvmStatic
+        fun scheduleTaskRemovedKeepAlive(context: Context) {
+            val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
+            val intent = Intent(context, BootReceiver::class.java).apply {
+                action = ACTION_TASK_REMOVED_KEEPALIVE
+                `package` = context.packageName
+            }
+            val pendingIntent = PendingIntent.getBroadcast(
+                context,
+                TASK_REMOVED_KEEPALIVE_REQUEST_CODE,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+            )
+            try {
+                alarmManager.setExactAndAllowWhileIdle(
+                    AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                    SystemClock.elapsedRealtime() + TASK_REMOVED_KEEPALIVE_DELAY_MS,
+                    pendingIntent,
+                )
+                Log.d(TAG, "BootReceiver: task-removed keepalive armed (${TASK_REMOVED_KEEPALIVE_DELAY_MS}ms)")
+            } catch (t: Throwable) {
+                Log.w(TAG, "BootReceiver: failed to arm task-removed keepalive", t)
+            }
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-beacon",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "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/withBeaconIOS.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from '@expo/config-plugins';
+import { ConfigPlugin } from "@expo/config-plugins";
 export type BeaconIOSPluginProps = {
     /**
      * Enable the CarPlay "Driving Task" entitlement integration.

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;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAIF,wBAAgB,iBAAiB,IAAI,MAAM,CAkC1C;AA+ED,QAAA,MAAM,aAAa,EAAE,YAAY,CAAC,oBAAoB,GAAG,IAAI,CA0E5D,CAAC;AA4CF,eAAe,aAAa,CAAC"}
+{"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;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAIF,wBAAgB,iBAAiB,IAAI,MAAM,CA4C1C;AAuFD,QAAA,MAAM,aAAa,EAAE,YAAY,CAAC,oBAAoB,GAAG,IAAI,CAuF5D,CAAC;AA6CF,eAAe,aAAa,CAAC"}

package/plugin/build/withBeaconIOS.js

@@ -11,52 +11,62 @@ import ExpoBeacon
 import TSLocationManager
 
 final class BeaconGeoPlugin: BeaconLifecycleDelegate {
-    func beaconDidEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
-        BackgroundGeolocation.sharedInstance().start()
-    }
-    func beaconDidExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
-        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()
-    }
-    func eddystoneDidExit(identifier: String, namespace: String, instance: String, distance: Double) {
-        BackgroundGeolocation.sharedInstance().stop()
-    }
-    func eddystoneDidTimeout(identifier: String, namespace: String, instance: String, distance: Double) {
-        BackgroundGeolocation.sharedInstance().stop()
-    }
-    // Start tracking when the device connects to CarPlay (wired or wireless),
-    // stop when it disconnects.
-    func carPlayDidConnect(transport: String) {
-        BackgroundGeolocation.sharedInstance().start()
-    }
-    func carPlayDidDisconnect() {
-        BackgroundGeolocation.sharedInstance().stop()
-    }
+  private func startTracking() {
+    BackgroundGeolocation.sharedInstance().start()
+    BackgroundGeolocation.sharedInstance().changePace(true)
+  }
+
+  private func stopTracking() {
+    BackgroundGeolocation.sharedInstance().changePace(false)
+    BackgroundGeolocation.sharedInstance().stop()
+  }
+
+  func beaconDidEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
+    startTracking()
+  }
+  func beaconDidExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
+    stopTracking()
+  }
+  func beaconDidTimeout(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
+    stopTracking()
+  }
+  func eddystoneDidEnter(identifier: String, namespace: String, instance: String, distance: Double) {
+    startTracking()
+  }
+  func eddystoneDidExit(identifier: String, namespace: String, instance: String, distance: Double) {
+    stopTracking()
+  }
+  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.
+  func carPlayDidConnect(transport: String) {
+    startTracking()
+  }
+  func carPlayDidDisconnect() {
+    stopTracking()
+  }
 }
 `;
 }
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 function modifyAppDelegateSwift(contents) {
-    const importLine = 'import ExpoBeacon';
+    const importLine = "import ExpoBeacon";
     // 1. Add import after the last existing import line.
     if (!contents.includes(importLine)) {
-        const lines = contents.split('\n');
-        const lastImportIdx = lines.reduce((last, line, i) => (line.trimStart().startsWith('import ') ? i : last), -1);
+        const lines = contents.split("\n");
+        const lastImportIdx = lines.reduce((last, line, i) => (line.trimStart().startsWith("import ") ? i : last), -1);
         if (lastImportIdx >= 0) {
             lines.splice(lastImportIdx + 1, 0, importLine);
         }
         else {
-            lines.splice(0, 0, importLine, '');
+            lines.splice(0, 0, importLine, "");
         }
-        contents = lines.join('\n');
+        contents = lines.join("\n");
     }
     // 2. Insert registration call before `return super.application(…didFinishLaunchingWithOptions…)`.
-    const registrationCall = 'BeaconLifecycleRegistry.register(BeaconGeoPlugin())';
+    const registrationCall = "BeaconLifecycleRegistry.register(BeaconGeoPlugin())";
     if (contents.includes(registrationCall)) {
         return contents; // already patched
     }
@@ -72,9 +82,12 @@ function modifyAppDelegateSwift(contents) {
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 `;
-    const lastBraceIdx = contents.lastIndexOf('}');
+    const lastBraceIdx = contents.lastIndexOf("}");
     if (lastBraceIdx >= 0) {
-        contents = contents.slice(0, lastBraceIdx) + methodOverride + contents.slice(lastBraceIdx);
+        contents =
+            contents.slice(0, lastBraceIdx) +
+                methodOverride +
+                contents.slice(lastBraceIdx);
     }
     return contents;
 }
@@ -96,7 +109,7 @@ function findAppDir(platformRoot) {
         catch {
             continue;
         }
-        const swiftPath = path.join(dirPath, 'AppDelegate.swift');
+        const swiftPath = path.join(dirPath, "AppDelegate.swift");
         if (fs.existsSync(swiftPath)) {
             return { appDir: entry, appDelegatePath: swiftPath };
         }
@@ -108,15 +121,15 @@ const withBeaconIOS = (config, props) => {
     const opts = props !== null && props !== void 0 ? props : {};
     // Step 1 – write BeaconGeoPlugin.swift into the iOS app directory.
     config = (0, config_plugins_1.withDangerousMod)(config, [
-        'ios',
+        "ios",
         (config) => {
             const platformRoot = config.modRequest.platformProjectRoot;
             const result = findAppDir(platformRoot);
             if (!result) {
-                console.warn('[expo-beacon] Could not locate iOS app directory — BeaconGeoPlugin.swift was not written.');
+                console.warn("[expo-beacon] Could not locate iOS app directory — BeaconGeoPlugin.swift was not written.");
                 return config;
             }
-            const outputPath = path.join(platformRoot, result.appDir, 'BeaconGeoPlugin.swift');
+            const outputPath = path.join(platformRoot, result.appDir, "BeaconGeoPlugin.swift");
             fs.writeFileSync(outputPath, getIOSPluginSwift());
             return config;
         },
@@ -128,10 +141,10 @@ const withBeaconIOS = (config, props) => {
         const filePath = `${projectName}/BeaconGeoPlugin.swift`;
         if (!xcodeProject.hasFile(filePath)) {
             // pbxGroupByName returns the group object; addSourceFile needs the UUID key.
-            const groups = xcodeProject.hash.project.objects['PBXGroup'];
+            const groups = xcodeProject.hash.project.objects["PBXGroup"];
             let groupKey;
             for (const key of Object.keys(groups)) {
-                if (key.endsWith('_comment'))
+                if (key.endsWith("_comment"))
                     continue;
                 const g = groups[key];
                 if (g.name === projectName || g.path === projectName) {
@@ -145,16 +158,16 @@ const withBeaconIOS = (config, props) => {
     });
     // Step 3 – patch AppDelegate.swift to register the plugin.
     config = (0, config_plugins_1.withDangerousMod)(config, [
-        'ios',
+        "ios",
         (config) => {
             const platformRoot = config.modRequest.platformProjectRoot;
             const result = findAppDir(platformRoot);
             if (!result) {
-                console.warn('[expo-beacon] AppDelegate.swift not found — ' +
-                    'please add BeaconLifecycleRegistry.register(BeaconGeoPlugin()) manually.');
+                console.warn("[expo-beacon] AppDelegate.swift not found — " +
+                    "please add BeaconLifecycleRegistry.register(BeaconGeoPlugin()) manually.");
                 return config;
             }
-            const original = fs.readFileSync(result.appDelegatePath, 'utf-8');
+            const original = fs.readFileSync(result.appDelegatePath, "utf-8");
             fs.writeFileSync(result.appDelegatePath, modifyAppDelegateSwift(original));
             return config;
         },
@@ -166,9 +179,9 @@ const withBeaconIOS = (config, props) => {
     return config;
 };
 // ─── CarPlay Driving Task wiring ──────────────────────────────────────────────
-const CARPLAY_ENTITLEMENT_KEY = 'com.apple.developer.carplay-driving-task';
-const CARPLAY_SCENE_DELEGATE_CLASS = 'ExpoBeacon.BeaconCarPlaySceneDelegate';
-const CARPLAY_SCENE_CONFIG_NAME = 'ExpoBeaconCarPlay';
+const CARPLAY_ENTITLEMENT_KEY = "com.apple.developer.carplay-driving-task";
+const CARPLAY_SCENE_DELEGATE_CLASS = "ExpoBeacon.BeaconCarPlaySceneDelegate";
+const CARPLAY_SCENE_CONFIG_NAME = "ExpoBeaconCarPlay";
 function withCarPlayDrivingTask(config) {
     // 4a — entitlement
     config = (0, config_plugins_1.withEntitlementsPlist)(config, (cfg) => {
@@ -191,7 +204,7 @@ function withCarPlayDrivingTask(config) {
             (entry === null || entry === void 0 ? void 0 : entry.UISceneConfigurationName) === CARPLAY_SCENE_CONFIG_NAME);
         if (!alreadyPresent) {
             role.push({
-                UISceneClassName: 'CPTemplateApplicationScene',
+                UISceneClassName: "CPTemplateApplicationScene",
                 UISceneConfigurationName: CARPLAY_SCENE_CONFIG_NAME,
                 UISceneDelegateClassName: CARPLAY_SCENE_DELEGATE_CLASS,
             });