expo-beacon 0.7.11 → 0.7.13

package/android/src/main/AndroidManifest.xml

@@ -1,9 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- Bluetooth permissions (Android 12+ requires BLUETOOTH_SCAN and BLUETOOTH_CONNECT) -->
-    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
+    <!-- Bluetooth permissions.
+         BLUETOOTH and BLUETOOTH_ADMIN are legacy normal permissions required by AltBeacon's
+         PermissionsInspector on all API levels. On Android 12+ they are automatically granted
+         and act as no-ops, but removing them (via maxSdkVersion="30") causes AltBeacon to log
+         errors and believe BLE scanning is unavailable.
+         BLUETOOTH_SCAN and BLUETOOTH_CONNECT cover the runtime permission requirements on API 31+. -->
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 

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

@@ -61,6 +61,12 @@ class BeaconForegroundService : Service(), BeaconConsumer {
     private val notifIdCounter = AtomicInteger(0)
     private val notifIdMap = java.util.concurrent.ConcurrentHashMap<String, Int>()
 
+    // Debounce guard: prevent loadAndMonitorRegions() from running more than once per 500 ms.
+    // This protects against rapid double-invocations when JS calls stopMonitoring/startMonitoring
+    // in quick succession during activity lifecycle transitions (e.g. onHostPause → onHostResume),
+    // which would otherwise stop and restart all AltBeacon regions within milliseconds.
+    @Volatile private var lastLoadRegionsMs: Long = 0L
+
     // Distance logging
     private val distanceLogRegions = java.util.concurrent.CopyOnWriteArraySet<Region>()
 
@@ -189,6 +195,14 @@ class BeaconForegroundService : Service(), BeaconConsumer {
     }
 
     private fun loadAndMonitorRegions() {
+        val now = android.os.SystemClock.elapsedRealtime()
+        val elapsed = now - lastLoadRegionsMs
+        if (elapsed < LOAD_REGIONS_DEBOUNCE_MS) {
+            Log.d(TAG, "loadAndMonitorRegions: skipping duplicate call (${elapsed}ms after last load)")
+            return
+        }
+        lastLoadRegionsMs = now
+
         val prefs: SharedPreferences = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
         val json = prefs.getString(PREFS_KEY, "[]") ?: "[]"
         val beacons = try { JSONArray(json) } catch (_: Exception) { JSONArray() }
@@ -799,6 +813,8 @@ class BeaconForegroundService : Service(), BeaconConsumer {
         private const val MAX_STARTFOREGROUND_RETRIES = 3
         private const val RETRY_DELAY_MS = 10_000L
         private const val RETRY_SERVICE_REQUEST_CODE = 0x42454143 // "BEAC"
+        /** Minimum milliseconds between consecutive loadAndMonitorRegions() calls. */
+        private const val LOAD_REGIONS_DEBOUNCE_MS = 500L
         @Volatile private var activeService: BeaconForegroundService? = null
 
         fun start(context: Context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-beacon",
-  "version": "0.7.11",
+  "version": "0.7.13",
   "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.map

@@ -1 +1 @@
-{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAM9B,eAAO,MAAM,gBAAgB,mvBAkB5B,CAAC;AA0IF,QAAA,MAAM,aAAa,EAAE,YAkCpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAM9B,eAAO,MAAM,gBAAgB,mvBAkB5B,CAAC;AAoQF,QAAA,MAAM,aAAa,EAAE,YAkCpB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/plugin/build/withBeaconIOS.js

@@ -36,20 +36,26 @@ function normalizePBXValue(value) {
 function findPBXGroupKeyByName(xcodeProject, name) {
     var _a;
     const pbxGroups = (_a = xcodeProject.hash.project.objects['PBXGroup']) !== null && _a !== void 0 ? _a : {};
+    // Prefer a group whose `path` equals the name — that group IS the filesystem
+    // directory. A group matched only by `name` may be a virtual (path-less)
+    // container whose children resolve relative to its parent, not itself.
+    let nameMatch = null;
     for (const key of Object.keys(pbxGroups)) {
         if (key.endsWith('_comment'))
             continue;
         const group = pbxGroups[key];
-        if (normalizePBXValue(group.name) === name ||
-            normalizePBXValue(group.path) === name) {
+        if (normalizePBXValue(group.path) === name)
             return key;
+        if (normalizePBXValue(group.name) === name && nameMatch === null) {
+            nameMatch = key;
         }
     }
-    return null;
+    return nameMatch;
 }
-function findPBXFileReference(xcodeProject, filename) {
+function findPBXFileReferences(xcodeProject, filename) {
     var _a;
     const refs = (_a = xcodeProject.hash.project.objects['PBXFileReference']) !== null && _a !== void 0 ? _a : {};
+    const matches = [];
     for (const key of Object.keys(refs)) {
         if (key.endsWith('_comment'))
             continue;
@@ -60,13 +66,16 @@ function findPBXFileReference(xcodeProject, filename) {
         const refName = normalizePBXValue(ref.name);
         if (path.posix.basename(refPath) === filename ||
             path.posix.basename(refName) === filename) {
-            return { key, ref };
+            matches.push({ key, ref });
         }
     }
-    return null;
+    return matches;
 }
-function removeFileReferenceFromAllGroups(xcodeProject, fileRefKey) {
+function removeFileReferenceFromAllGroups(xcodeProject, fileRefKeys) {
     var _a;
+    if (fileRefKeys.length === 0)
+        return;
+    const fileRefKeySet = new Set(fileRefKeys);
     const pbxGroups = (_a = xcodeProject.hash.project.objects['PBXGroup']) !== null && _a !== void 0 ? _a : {};
     for (const key of Object.keys(pbxGroups)) {
         if (key.endsWith('_comment'))
@@ -74,32 +83,110 @@ function removeFileReferenceFromAllGroups(xcodeProject, fileRefKey) {
         const group = pbxGroups[key];
         if (!Array.isArray(group.children))
             continue;
-        group.children = group.children.filter((child) => child.value !== fileRefKey);
+        group.children = group.children.filter((child) => { var _a; return !fileRefKeySet.has((_a = child.value) !== null && _a !== void 0 ? _a : ''); });
     }
 }
-function ensureIOSPluginSourceFile(xcodeProject, projectName) {
+function findPBXBuildFileKeys(xcodeProject, fileRefKeys, filename) {
+    var _a;
+    const fileRefKeySet = new Set(fileRefKeys);
+    const buildFiles = (_a = xcodeProject.hash.project.objects['PBXBuildFile']) !== null && _a !== void 0 ? _a : {};
+    return Object.keys(buildFiles).filter((key) => {
+        if (key.endsWith('_comment'))
+            return false;
+        const buildFile = buildFiles[key];
+        if (typeof buildFile !== 'object' || buildFile === null)
+            return false;
+        return (fileRefKeySet.has(buildFile.fileRef) ||
+            normalizePBXValue(buildFile.fileRef_comment) === filename);
+    });
+}
+function removePBXBuildFiles(xcodeProject, buildFileKeys) {
     var _a;
+    if (buildFileKeys.length === 0)
+        return;
+    const buildFiles = (_a = xcodeProject.hash.project.objects['PBXBuildFile']) !== null && _a !== void 0 ? _a : {};
+    for (const key of buildFileKeys) {
+        delete buildFiles[key];
+        delete buildFiles[`${key}_comment`];
+    }
+}
+function removePBXSourcesBuildPhaseEntries(xcodeProject, buildFileKeys, filename) {
+    var _a;
+    if (buildFileKeys.length === 0)
+        return;
+    const buildFileKeySet = new Set(buildFileKeys);
+    const sourcePhases = (_a = xcodeProject.hash.project.objects['PBXSourcesBuildPhase']) !== null && _a !== void 0 ? _a : {};
+    for (const key of Object.keys(sourcePhases)) {
+        if (key.endsWith('_comment'))
+            continue;
+        const phase = sourcePhases[key];
+        if (!Array.isArray(phase.files))
+            continue;
+        phase.files = phase.files.filter((file) => {
+            var _a;
+            return !buildFileKeySet.has((_a = file.value) !== null && _a !== void 0 ? _a : '') &&
+                normalizePBXValue(file.comment) !== `${filename} in Sources`;
+        });
+    }
+}
+function removePBXFileReferences(xcodeProject, fileReferences) {
+    var _a;
+    if (fileReferences.length === 0)
+        return;
+    const refs = (_a = xcodeProject.hash.project.objects['PBXFileReference']) !== null && _a !== void 0 ? _a : {};
+    for (const { key } of fileReferences) {
+        delete refs[key];
+        delete refs[`${key}_comment`];
+    }
+}
+function ensureIOSPluginSourceFile(xcodeProject, projectName) {
+    var _a, _b, _c;
     const groupKey = (_a = findPBXGroupKeyByName(xcodeProject, projectName)) !== null && _a !== void 0 ? _a : undefined;
-    const existingFileReference = findPBXFileReference(xcodeProject, IOS_PLUGIN_FILENAME);
-    if (existingFileReference) {
+    // A virtual (name-only) PBXGroup has no `path`. Files added to it with
+    // `<group>` sourceTree resolve relative to the group's *parent*, not the
+    // group itself, so `BeaconGeoPlugin.swift` would land at `ios/` not
+    // `ios/<AppName>/`. Only treat the group as a physical directory group when
+    // its `path` actually equals the project name.
+    const pbxGroups = (_b = xcodeProject.hash.project.objects['PBXGroup']) !== null && _b !== void 0 ? _b : {};
+    const groupHasPhysicalPath = groupKey != null &&
+        normalizePBXValue((_c = pbxGroups[groupKey]) === null || _c === void 0 ? void 0 : _c.path) === projectName;
+    const existingFileReferences = findPBXFileReferences(xcodeProject, IOS_PLUGIN_FILENAME);
+    const existingBuildFileKeys = findPBXBuildFileKeys(xcodeProject, existingFileReferences.map(({ key }) => key), IOS_PLUGIN_FILENAME);
+    if (existingFileReferences.length === 1 &&
+        existingBuildFileKeys.length === 1) {
+        const [existingFileReference] = existingFileReferences;
         existingFileReference.ref.name = `"${IOS_PLUGIN_FILENAME}"`;
         existingFileReference.ref.sourceTree = '"<group>"';
         if (groupKey) {
-            removeFileReferenceFromAllGroups(xcodeProject, existingFileReference.key);
+            removeFileReferenceFromAllGroups(xcodeProject, [existingFileReference.key]);
             xcodeProject.addToPbxGroup({
                 fileRef: existingFileReference.key,
                 basename: IOS_PLUGIN_FILENAME,
             }, groupKey);
-            existingFileReference.ref.path = `"${IOS_PLUGIN_FILENAME}"`;
+            // If the group is virtual (no path), the file reference path must include
+            // the project name so Xcode resolves it to ios/<AppName>/BeaconGeoPlugin.swift.
+            existingFileReference.ref.path = groupHasPhysicalPath
+                ? `"${IOS_PLUGIN_FILENAME}"`
+                : `"${projectName}/${IOS_PLUGIN_FILENAME}"`;
             return;
         }
         existingFileReference.ref.path = `"${projectName}/${IOS_PLUGIN_FILENAME}"`;
         return;
     }
-    if (groupKey) {
+    if (existingFileReferences.length > 0 || existingBuildFileKeys.length > 0) {
+        removePBXSourcesBuildPhaseEntries(xcodeProject, existingBuildFileKeys, IOS_PLUGIN_FILENAME);
+        removePBXBuildFiles(xcodeProject, existingBuildFileKeys);
+        removeFileReferenceFromAllGroups(xcodeProject, existingFileReferences.map(({ key }) => key));
+        removePBXFileReferences(xcodeProject, existingFileReferences);
+    }
+    if (groupKey && groupHasPhysicalPath) {
+        // Physical group (path = projectName): add with just the filename; Xcode
+        // resolves it through the group's directory chain to ios/<AppName>/file.
         xcodeProject.addSourceFile(IOS_PLUGIN_FILENAME, null, groupKey);
         return;
     }
+    // Virtual group (name-only, no path) or no group found: use an explicit
+    // SOURCE_ROOT-relative path so Xcode always finds ios/<AppName>/file.
     xcodeProject.addSourceFile(`${projectName}/${IOS_PLUGIN_FILENAME}`);
 }
 function modifySwiftAppDelegate(contents) {