expo-beacon 0.9.0 → 0.9.1

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.1",
   "description": "Expo module for scanning, pairing, and monitoring iBeacons on Android and iOS",
   "main": "build/index.js",
   "types": "build/index.d.ts",