@capgo/capacitor-ibeacon 8.1.32 → 8.1.33

package/android/src/main/java/ee/forgr/plugin/capacitor_ibeacon/CapacitorIbeaconPlugin.java

@@ -44,7 +44,7 @@ import org.altbeacon.beacon.Settings;
 )
 public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
 
-    private final String pluginVersion = "8.1.32";
+    private final String pluginVersion = "8.1.33";
     private static final String FOREGROUND_CHANNEL_ID = "beacon_service_channel";
     private static final int FOREGROUND_NOTIFICATION_ID = 456;
     private BeaconManager beaconManager;
@@ -80,8 +80,7 @@ public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
         beaconManager.setForegroundBetweenScanPeriod(0L); // Continuous scanning in foreground
         beaconManager.setForegroundScanPeriod(1100L); // Standard scan period
 
-        // Bind to beacon service
-        beaconManager.bind(this);
+        // bind() is deferred to bindIfNeeded().
 
         // Set up monitoring and ranging notifiers
         beaconManager.addMonitorNotifier(
@@ -144,7 +143,7 @@ public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
 
     @Override
     public void onBeaconServiceConnect() {
-        beaconManagerBound = true;
+        // beaconManagerBound is already set synchronously wherever bind() is called.
     }
 
     @Override
@@ -179,6 +178,7 @@ public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
             if (enableBackgroundMode != null) {
                 setBackgroundModeEnabled(enableBackgroundMode);
             }
+            bindIfNeeded();
             Region region = createRegion(identifier, uuid, major, minor);
             monitoredRegions.put(identifier, region);
             beaconManager.startMonitoring(region);
@@ -227,6 +227,7 @@ public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
             if (enableBackgroundMode != null) {
                 setBackgroundModeEnabled(enableBackgroundMode);
             }
+            bindIfNeeded();
             Region region = createRegion(identifier, uuid, major, minor);
             rangedRegions.put(identifier, region);
             beaconManager.startRangingBeacons(region);
@@ -567,8 +568,17 @@ public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
     @PluginMethod
     public void enableBackgroundMode(PluginCall call) {
         Boolean enabled = call.getBoolean("enabled", true);
-        setBackgroundModeEnabled(enabled != null && enabled);
-        call.resolve();
+        boolean wantBackground = enabled != null && enabled;
+        try {
+            if (!ensureForegroundServiceMatches(wantBackground)) {
+                call.reject("Failed to enable foreground service scanning");
+                return;
+            }
+            setBackgroundModeEnabled(wantBackground);
+            call.resolve();
+        } catch (Exception e) {
+            call.reject("Failed to enable background mode", e);
+        }
     }
 
     @PluginMethod
@@ -579,6 +589,9 @@ public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
         try {
             beaconManager.setBackgroundScanPeriod(scanPeriod);
             beaconManager.setBackgroundBetweenScanPeriod(betweenScanPeriod);
+            if (beaconManagerBound) {
+                beaconManager.updateScanPeriods();
+            }
             call.resolve();
         } catch (Exception e) {
             call.reject("Failed to set background scan period", e);
@@ -703,6 +716,17 @@ public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
         }
     }
 
+    private void bindIfNeeded() {
+        ensureForegroundServiceMatches(backgroundModeEnabled);
+        if (beaconManagerBound || beaconManager == null) {
+            return;
+        }
+        // Set before bind() - AltBeacon is synchronously bound inside bind() itself, not only
+        // once onBeaconServiceConnect() fires.
+        beaconManagerBound = true;
+        beaconManager.bind(this);
+    }
+
     private void setBackgroundModeEnabled(boolean enabled) {
         backgroundModeEnabled = enabled;
         applyBackgroundMode(enabled);
@@ -712,16 +736,43 @@ public class CapacitorIbeaconPlugin extends Plugin implements BeaconConsumer {
         if (beaconManager == null) {
             return;
         }
+        beaconManager.setBackgroundMode(enabled && isInBackground);
+    }
 
-        boolean shouldEnableBackgroundMode = enabled && isInBackground;
+    // Covers both a fresh bind and a later call (e.g. a per-region enableBackgroundMode option)
+    // that raises the requirement while already bound.
+    private boolean ensureForegroundServiceMatches(boolean wantForegroundService) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || wantForegroundService == foregroundServiceEnabled) {
+            return true;
+        }
+        return reconfigureForegroundService(wantForegroundService);
+    }
 
-        if (shouldEnableBackgroundMode) {
-            enableForegroundServiceIfNeeded();
-            beaconManager.setBackgroundMode(true);
+    // enableForegroundServiceScanning()/disableForegroundServiceScanning() may only be called
+    // while unbound. Re-registers any regions that were actively monitored/ranged before the cycle.
+    private boolean reconfigureForegroundService(boolean wantForegroundService) {
+        boolean wasBound = beaconManagerBound;
+        if (wasBound) {
+            beaconManager.unbind(this);
+            beaconManagerBound = false;
+        }
+        boolean success = true;
+        if (wantForegroundService) {
+            success = enableForegroundServiceIfNeeded();
         } else {
             disableForegroundServiceIfNeeded();
-            beaconManager.setBackgroundMode(false);
         }
+        if (wasBound) {
+            beaconManagerBound = true;
+            beaconManager.bind(this);
+            for (Region region : monitoredRegions.values()) {
+                beaconManager.startMonitoring(region);
+            }
+            for (Region region : rangedRegions.values()) {
+                beaconManager.startRangingBeacons(region);
+            }
+        }
+        return success;
     }
 
     private boolean enableForegroundServiceIfNeeded() {

package/ios/Sources/CapacitorIbeaconPlugin/CapacitorIbeacon.swift

@@ -8,18 +8,44 @@ public class CapacitorIbeacon: NSObject, CLLocationManagerDelegate, CBPeripheral
     private weak var plugin: CapacitorIbeaconPlugin?
     private var monitoredRegions: [String: CLBeaconRegion] = [:]
     private var rangedRegions: [String: CLBeaconRegion] = [:]
+    private var peripheralManagerReadyCallbacks: [(CBPeripheralManager) -> Void] = []
+    private let peripheralManagerStateTimeout: TimeInterval = 3.0
 
     override public init() {
         super.init()
         locationManager = CLLocationManager()
         locationManager.delegate = self
-        peripheralManager = CBPeripheralManager(delegate: self, queue: nil)
+        // peripheralManager intentionally not constructed here - see withReadyPeripheralManager().
     }
 
     public func setPlugin(_ plugin: CapacitorIbeaconPlugin) {
         self.plugin = plugin
     }
 
+    // Merely instantiating CBPeripheralManager triggers the Bluetooth permission prompt, so
+    // construction is deferred to here rather than init(). Its state also starts .unknown and
+    // only settles asynchronously via peripheralManagerDidUpdateState() below, so `body` waits
+    // for that instead of seeing a stale .unknown - with a timeout in case it never settles.
+    private func withReadyPeripheralManager(_ body: @escaping (CBPeripheralManager) -> Void) {
+        if peripheralManager == nil {
+            peripheralManager = CBPeripheralManager(delegate: self, queue: nil)
+        }
+
+        if peripheralManager.state != .unknown {
+            body(peripheralManager)
+            return
+        }
+
+        peripheralManagerReadyCallbacks.append(body)
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + peripheralManagerStateTimeout) { [weak self] in
+            guard let self = self, !self.peripheralManagerReadyCallbacks.isEmpty else { return }
+            let callbacks = self.peripheralManagerReadyCallbacks
+            self.peripheralManagerReadyCallbacks.removeAll()
+            callbacks.forEach { $0(self.peripheralManager) }
+        }
+    }
+
     public func startMonitoringForRegion(identifier: String, uuid: String, major: Int?, minor: Int?, completion: @escaping (Result<Void, Error>) -> Void) {
         guard let beaconUUID = UUID(uuidString: uuid) else {
             completion(.failure(NSError(domain: "CapacitorIbeacon", code: -1, userInfo: [NSLocalizedDescriptionKey: "Invalid UUID"])))
@@ -90,17 +116,27 @@ public class CapacitorIbeacon: NSObject, CLLocationManagerDelegate, CBPeripheral
 
         let beaconRegion = CLBeaconRegion(uuid: beaconUUID, major: CLBeaconMajorValue(major), minor: CLBeaconMinorValue(minor), identifier: identifier)
 
-        if let power = measuredPower {
-            peripheralManager.startAdvertising(beaconRegion.peripheralData(withMeasuredPower: NSNumber(value: power)) as? [String: Any])
-        } else {
-            peripheralManager.startAdvertising(beaconRegion.peripheralData(withMeasuredPower: nil) as? [String: Any])
-        }
+        withReadyPeripheralManager { manager in
+            guard manager.state == .poweredOn else {
+                let error = NSError(domain: "CapacitorIbeacon", code: -2, userInfo: [NSLocalizedDescriptionKey: "Bluetooth is not powered on"])
+                completion(.failure(error))
+                return
+            }
 
-        completion(.success(()))
+            if let power = measuredPower {
+                manager.startAdvertising(beaconRegion.peripheralData(withMeasuredPower: NSNumber(value: power)) as? [String: Any])
+            } else {
+                manager.startAdvertising(beaconRegion.peripheralData(withMeasuredPower: nil) as? [String: Any])
+            }
+
+            completion(.success(()))
+        }
     }
 
     public func stopAdvertising() {
-        peripheralManager.stopAdvertising()
+        // Not ensurePeripheralManager(): stopping something that was never started shouldn't
+        // newly construct (and trigger a permission prompt for) a manager that doesn't exist yet.
+        peripheralManager?.stopAdvertising()
     }
 
     public func requestWhenInUseAuthorization() {
@@ -129,8 +165,10 @@ public class CapacitorIbeacon: NSObject, CLLocationManagerDelegate, CBPeripheral
         }
     }
 
-    public func isBluetoothEnabled() -> Bool {
-        return peripheralManager.state == .poweredOn
+    public func isBluetoothEnabled(completion: @escaping (Bool) -> Void) {
+        withReadyPeripheralManager { manager in
+            completion(manager.state == .poweredOn)
+        }
     }
 
     public func isRangingAvailable() -> Bool {
@@ -229,6 +267,11 @@ public class CapacitorIbeacon: NSObject, CLLocationManagerDelegate, CBPeripheral
     // MARK: - CBPeripheralManagerDelegate
 
     public func peripheralManagerDidUpdateState(_ peripheral: CBPeripheralManager) {
-        // Handle Bluetooth state changes if needed
+        guard !peripheralManagerReadyCallbacks.isEmpty else {
+            return
+        }
+        let callbacks = peripheralManagerReadyCallbacks
+        peripheralManagerReadyCallbacks.removeAll()
+        callbacks.forEach { $0(peripheral) }
     }
 }

package/ios/Sources/CapacitorIbeaconPlugin/CapacitorIbeaconPlugin.swift

@@ -4,7 +4,7 @@ import CoreLocation
 
 @objc(CapacitorIbeaconPlugin)
 public class CapacitorIbeaconPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.1.32"
+    private let pluginVersion: String = "8.1.33"
     public let identifier = "CapacitorIbeaconPlugin"
     public let jsName = "CapacitorIbeacon"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -144,8 +144,9 @@ public class CapacitorIbeaconPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     @objc func isBluetoothEnabled(_ call: CAPPluginCall) {
-        let enabled = implementation.isBluetoothEnabled()
-        call.resolve(["enabled": enabled])
+        implementation.isBluetoothEnabled { enabled in
+            call.resolve(["enabled": enabled])
+        }
     }
 
     @objc func isRangingAvailable(_ call: CAPPluginCall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-ibeacon",
-  "version": "8.1.32",
+  "version": "8.1.33",
   "description": "iBeacon plugin for Capacitor - proximity detection and beacon region monitoring",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",