expo-beacon 0.7.10 → 0.7.12

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.10",
+  "version": "0.7.12",
   "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;AA4DF,QAAA,MAAM,aAAa,EAAE,YAqCpB,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;AA8OF,QAAA,MAAM,aAAa,EAAE,YAkCpB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/plugin/build/withBeaconIOS.js

@@ -24,11 +24,15 @@ final class BeaconGeoPlugin: BeaconLifecycleDelegate {
     }
 }
 `;
+const IOS_PLUGIN_FILENAME = 'BeaconGeoPlugin.swift';
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 /**
  * Finds the UUID (key) of a PBXGroup by name, handling both quoted and unquoted
  * name values produced by node-xcode's parser.
  */
+function normalizePBXValue(value) {
+    return typeof value === 'string' ? value.replace(/^"|"$/g, '') : '';
+}
 function findPBXGroupKeyByName(xcodeProject, name) {
     var _a;
     const pbxGroups = (_a = xcodeProject.hash.project.objects['PBXGroup']) !== null && _a !== void 0 ? _a : {};
@@ -36,18 +40,133 @@ function findPBXGroupKeyByName(xcodeProject, name) {
         if (key.endsWith('_comment'))
             continue;
         const group = pbxGroups[key];
-        if (group.name === `"${name}"` || group.name === name)
+        if (normalizePBXValue(group.name) === name ||
+            normalizePBXValue(group.path) === name) {
             return key;
+        }
     }
     return null;
 }
-/** Returns true if a PBXFileReference for filename already exists (idempotency guard). */
-function isFileInXcodeProject(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;
+        const ref = refs[key];
+        if (typeof ref !== 'object' || ref === null)
+            continue;
+        const refPath = normalizePBXValue(ref.path);
+        const refName = normalizePBXValue(ref.name);
+        if (path.posix.basename(refPath) === filename ||
+            path.posix.basename(refName) === filename) {
+            matches.push({ key, ref });
+        }
+    }
+    return matches;
+}
+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'))
+            continue;
+        const group = pbxGroups[key];
+        if (!Array.isArray(group.children))
+            continue;
+        group.children = group.children.filter((child) => { var _a; return !fileRefKeySet.has((_a = child.value) !== null && _a !== void 0 ? _a : ''); });
+    }
+}
+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 : {};
-    return Object.values(refs).some((f) => typeof f === 'object' &&
-        f !== null &&
-        (f.path === `"${filename}"` || f.path === filename));
+    for (const { key } of fileReferences) {
+        delete refs[key];
+        delete refs[`${key}_comment`];
+    }
+}
+function ensureIOSPluginSourceFile(xcodeProject, projectName) {
+    var _a;
+    const groupKey = (_a = findPBXGroupKeyByName(xcodeProject, projectName)) !== null && _a !== void 0 ? _a : undefined;
+    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]);
+            xcodeProject.addToPbxGroup({
+                fileRef: existingFileReference.key,
+                basename: IOS_PLUGIN_FILENAME,
+            }, groupKey);
+            existingFileReference.ref.path = `"${IOS_PLUGIN_FILENAME}"`;
+            return;
+        }
+        existingFileReference.ref.path = `"${projectName}/${IOS_PLUGIN_FILENAME}"`;
+        return;
+    }
+    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) {
+        xcodeProject.addSourceFile(IOS_PLUGIN_FILENAME, null, groupKey);
+        return;
+    }
+    xcodeProject.addSourceFile(`${projectName}/${IOS_PLUGIN_FILENAME}`);
 }
 function modifySwiftAppDelegate(contents) {
     // Insert `import ExpoBeacon` after the last existing import line.
@@ -71,17 +190,13 @@ function modifySwiftAppDelegate(contents) {
 const withBeaconIOS = (config) => {
     // Step 1 – write BeaconGeoPlugin.swift and add it to the Xcode project.
     config = (0, config_plugins_1.withXcodeProject)(config, (config) => {
-        var _a;
         const xcodeProject = config.modResults;
         const { projectName, platformProjectRoot } = config.modRequest;
         if (!projectName || !platformProjectRoot)
             return config;
-        const swiftFilePath = path.join(platformProjectRoot, projectName, 'BeaconGeoPlugin.swift');
+        const swiftFilePath = path.join(platformProjectRoot, projectName, IOS_PLUGIN_FILENAME);
         fs.writeFileSync(swiftFilePath, exports.IOS_PLUGIN_SWIFT);
-        if (!isFileInXcodeProject(xcodeProject, 'BeaconGeoPlugin.swift')) {
-            const groupKey = (_a = findPBXGroupKeyByName(xcodeProject, projectName)) !== null && _a !== void 0 ? _a : undefined;
-            xcodeProject.addSourceFile('BeaconGeoPlugin.swift', null, groupKey !== null && groupKey !== void 0 ? groupKey : undefined);
-        }
+        ensureIOSPluginSourceFile(xcodeProject, projectName);
         return config;
     });
     // Step 2 – patch AppDelegate.swift to register the plugin before super.