@blueid/access-react-native 1.16.0 → 1.18.0

package/frameworks/CBlueIDAccess.xcframework/Info.plist

@@ -10,7 +10,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
@@ -19,9 +19,7 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -29,7 +27,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
@@ -38,7 +36,9 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>

package/ios/BlueIDAccessSDK/BlueDevices.swift

@@ -2,10 +2,11 @@ import Foundation
 
 internal var maxDeviceAgeSeconds = 10.0
 
-private var blueDevices: [BlueDevice] = []
 private var bluePurgeDevicesTimer: Timer? = nil
 private var blueDeviceScannersCount = 0
 
+private let blueDevicesList = BlueDevicesList()
+
 internal func blueSetMaxDeviceAgeSeconds(_ newMaxDeviceAgeSeconds: Double) {
     maxDeviceAgeSeconds = max(newMaxDeviceAgeSeconds, 1)
 }
@@ -35,18 +36,11 @@ internal func waitForDeviceAvailability(_ deviceID: String, timeout: Int = 10, m
 }
 
 internal func blueGetDevice(_ deviceID: String) -> BlueDevice? {
-    for device in blueDevices {
-        if (device.info.deviceID == deviceID) {
-            return device
-        }
-    }
-    
-    return nil
+    return blueDevicesList.get(deviceID)
 }
 
 internal func blueAddDevice(_ device: BlueDevice) {
-    if blueGetDevice(device.info.deviceID) == nil {
-        blueDevices.append(device)
+    if blueDevicesList.add(device) {
         blueNotifyAddeddDevice(device)
     }
 }
@@ -54,32 +48,24 @@ internal func blueAddDevice(_ device: BlueDevice) {
 internal func bluePurgeOldDevices() {
     let now = Date()
     
-    var newDevices: [BlueDevice] = []
-    
-    for device in blueDevices {
+    blueDevicesList.remove() { device in
         let shouldPurge = now.timeIntervalSince(device.lastSeenAt) >= maxDeviceAgeSeconds && !isActiveDevice(device)
         if (shouldPurge) {
             blueNotifyRemovedDevice(device)
-        } else {
-            newDevices.append(device)
         }
+        
+        return shouldPurge
     }
-    
-    blueDevices = newDevices
 }
 
 internal func bluePurgeDevicesByType(_ deviceType: BlueDeviceType) {
-    var newDevices: [BlueDevice] = []
-    
-    for device in blueDevices {
-        if (device.info.deviceType == deviceType) {
+    blueDevicesList.remove() { device in
+        let shouldPurge = device.info.deviceType == deviceType
+        if (shouldPurge) {
             blueNotifyRemovedDevice(device)
-        } else {
-            newDevices.append(device)
         }
+        return shouldPurge
     }
-    
-    blueDevices = newDevices
 }
 
 internal func blueAddDeviceScanner() {

package/ios/BlueIDAccessSDK/BlueDevicesList.swift

@@ -0,0 +1,89 @@
+import Foundation
+
+/**
+ * @class BlueDevicesList
+ * A thread-safe list to manage BlueDevices.
+ * This class provides thread-safe operations for adding, retrieving, and removing BlueDevices.
+ * It internally uses a DispatchQueue with concurrent attributes to synchronize access to the list.
+ */
+internal class BlueDevicesList {
+    private let queue = DispatchQueue(label: "blueid.BlueDevicesList", attributes: .concurrent)
+    
+    private var devices: [BlueDevice] = []
+    
+    /**
+     * Adds a BlueDevice to the list.
+     *
+     * - Parameters:
+     *   - device: The BlueDevice to add.
+     *
+     * - Returns: `true` if the device was successfully added, `false` if a device with the same device ID already exists in the list.
+     */
+    func add(_ device: BlueDevice) -> Bool {
+        var added = false
+        
+        queue.sync(flags: .barrier) {
+            if (self.getById(device.info.deviceID) == nil) {
+                self.devices.append(device)
+                added = true
+            }
+        }
+        
+        return added
+    }
+    
+    /**
+     * Retrieves a BlueDevice from the list based on its device ID.
+     *
+     * - Parameters:
+     *   - deviceID: The ID of the BlueDevice to retrieve.
+     *
+     * - Returns: The BlueDevice with the specified device ID, or `nil` if no device with that ID exists in the list.
+     */
+    func get(_ deviceID: String) -> BlueDevice? {
+        var device: BlueDevice?
+        queue.sync() {
+            device = self.getById(deviceID)
+        }
+        
+        return device
+    }
+    
+    /**
+     * Removes BlueDevices from the list based on a filter closure.
+     *
+     * - Parameters:
+     *   - where: A closure that returns `true` for devices to be removed, `false` otherwise.
+     */
+    func remove(where shouldBeRemoved: @escaping (BlueDevice) -> Bool) {
+        queue.async(flags: .barrier) {
+            var newDevices: [BlueDevice] = []
+            
+            for device in self.devices {
+                if (!shouldBeRemoved(device)) {
+                    newDevices.append(device)
+                }
+            }
+            
+            self.devices.removeAll()
+            self.devices.append(contentsOf: newDevices)
+        }
+    }
+    
+    /**
+     * Returns the number of devices currently stored in the `BlueDevicesList`.
+     *
+     * - Returns: An integer representing the count of devices in the list.
+     */
+    func count() -> Int {
+        var count = 0
+        queue.sync() {
+            count = self.devices.count
+        }
+        return count
+    }
+    
+    private func getById(_ deviceID: String) -> BlueDevice? {
+        return self.devices.first { $0.info.deviceID == deviceID }
+    }
+}

package/ios/BlueIDAccessSDK/BlueSPTransponder.swift

@@ -61,10 +61,8 @@ internal final class BlueSPTransponder {
         
         do {
             _ = try blueClibErrorCheck(blueSPTransponder_Release())
-        } catch let error as BlueError {
-            fatalError(error.errorDescription!)
         } catch {
-            fatalError("Unknown error while releasing sp transponder")
+            blueLogError(error.localizedDescription)
         }
     }
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueid/access-react-native",
-  "version": "1.16.0",
+  "version": "1.18.0",
   "description": "React Native JS plugin for the BlueID Access SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",