@blueid/access-capacitor 0.106.0 → 0.108.0

package/ios/CBlueIDAccess.xcframework/Info.plist

@@ -10,15 +10,16 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -26,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>
@@ -35,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>
@@ -43,18 +46,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/Plugin/BlueIDAccessSDK/BlueAccess.swift

@@ -139,7 +139,6 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
         case deployBlacklistEntries
         case getSystemStatus
         case pushSystemStatus
-        case checkLatestFirmware
     }
     
     internal override func runAsync(arg0: Any? = nil, arg1: Any? = nil, arg2: Any? = nil) async throws -> Any? {
@@ -267,20 +266,6 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
                 
                 try await self.pushDeviceSystemStatus(status: status, with: tokenAuthentication)
                 
-                return .result(status)
-            },
-            
-            BlueTask(
-                id: BlueSynchronizeAccessTaskId.checkLatestFirmware,
-                label: blueI18n.syncDeviceCheckLatestFwlabel,
-                failable: true
-            ) {_, runner in
-                let tokenAuthentication: BlueTokenAuthentication = try runner.getResult(BlueSynchronizeAccessTaskId.getAuthenticationToken)
-                var status: BlueSystemStatus = try runner.getResult(BlueSynchronizeAccessTaskId.pushSystemStatus)
-                let latestFW = try await self.sdkService.apiService.getLatestFirmware(deviceID: deviceID, with: tokenAuthentication).getData()
-                
-                self.updateFirmwareFlags(&status, latestFW)
-                
                 return .result(status)
             }
         ]
@@ -298,11 +283,6 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
 #endif
         
         if runner.isSuccessful() {
-            let status: BlueSystemStatus? = try runner.getResult(BlueSynchronizeAccessTaskId.checkLatestFirmware)
-            if let status = status {
-                return status
-            }
-            
             return try runner.getResult(BlueSynchronizeAccessTaskId.pushSystemStatus)
         }
         
@@ -349,11 +329,7 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
     
     private func getSystemStatus(_ deviceID: String) async throws -> BlueSystemStatus {
         do {
-            return try await blueTerminalRun(
-                deviceID: deviceID,
-                timeoutSeconds: 30.0,
-                action: "STATUS"
-            )
+            return try await BlueGetSystemStatusCommand(sdkService).runAsync(deviceID: deviceID)
         } catch {
             throw BlueError(.sdkGetSystemStatusFailed, cause: error)
         }
@@ -518,24 +494,6 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
             
         } while (sent < limit && offset < entriesCount)
     }
-    
-    internal func updateFirmwareFlags(_ status: inout BlueSystemStatus, _ latestFW: BlueGetLatestFirmwareResult) {
-        if let testFW = latestFW.test {
-            if let testVersion = testFW.testVersion {
-                status.newTestFirmwareVersionAvailable = testVersion != status.applicationVersionTest || testFW.version != status.applicationVersion
-            }
-        }
-        
-        if let productionFW = latestFW.production {
-            let isTestVersion = status.hasApplicationVersionTest && status.applicationVersionTest != 0
-            
-            if isTestVersion {
-                status.newFirmwareVersionAvailable = true
-            } else {
-                status.newFirmwareVersionAvailable = productionFW.version != status.applicationVersion
-            }
-        }
-    }
 }
 
 public class BlueGetAccessObjectsCommand: BlueSdkAsyncCommand {

package/ios/Plugin/BlueIDAccessSDK/BlueBluetooth.swift

@@ -170,6 +170,11 @@ internal func blueDisconnectBluetoothPeripheral(_ peripheral: CBPeripheral) thro
         return
     }
     
+    if peripheral.state == .connecting {
+        blueRemoveSignal(group: "bleCentral", name: "didConnect")
+        return
+    }
+    
     guard peripheral.state == .connected else {
         throw BlueError(.unavailable)
     }

package/ios/Plugin/BlueIDAccessSDK/BlueCommands.swift

@@ -89,7 +89,7 @@ public struct BlueCommands {
     public let clearBlacklist = BlueClearBlacklistCommand()
     public let clearEventLog = BlueClearEventLogCommand()
     public let clearSystemLog = BlueClearSystemLogCommand()
-    public let getSystemStatus = BlueGetSystemStatusCommand()
+    public let getSystemStatus = BlueGetSystemStatusCommand(defaultSdkService)
     
     public let openAppSettings = BlueOpenAppSettingsCommand()
     

package/ios/Plugin/BlueIDAccessSDK/BlueSystem.swift

@@ -7,38 +7,14 @@ public class BlueAsyncTerminalCommand: BlueAsyncCommand {
     init(action: String) { self.action = action }
     
     internal func runAsync(arg0: Any? = nil, arg1: Any? = nil, arg2: Any? = nil) async throws -> Any? {
-        if #available(macOS 10.15, *) {
-            return try await runAsync(deviceID: try blueCastArg(String.self, arg0))
-        } else {
-            throw BlueError(.unavailable)
-        }
+        return try await runAsync(deviceID: try blueCastArg(String.self, arg0))
     }
     
-    @available(macOS 10.15, *)
     public func runAsync(deviceID: String) async throws {
         return try await blueTerminalRun(deviceID: deviceID, timeoutSeconds: 30.0, action: action)
     }
 }
 
-public class BlueAsyncTerminalCommandWithResult<T>: BlueAsyncCommand where T: Message {
-    let action: String
-    
-    init(action: String) { self.action = action }
-    
-    internal func runAsync(arg0: Any? = nil, arg1: Any? = nil, arg2: Any? = nil) async throws -> Any? {
-        if #available(macOS 10.15, *) {
-            return try await runAsync(deviceID: try blueCastArg(String.self, arg0))
-        } else {
-            throw BlueError(.unavailable)
-        }
-    }
-    
-    @available(macOS 10.15, *)
-    public func runAsync(deviceID: String) async throws -> T {
-        return try await blueTerminalRun(deviceID: deviceID, timeoutSeconds: 30.0, action: action)
-    }
-}
-
 public class BlueClearBlacklistCommand: BlueAsyncTerminalCommand {
     init() { super.init(action: "BL_CLEAR") }
 }
@@ -51,6 +27,49 @@ public class BlueClearSystemLogCommand: BlueAsyncTerminalCommand {
     init() { super.init(action: "SL_CLEAR") }
 }
 
-public class BlueGetSystemStatusCommand: BlueAsyncTerminalCommandWithResult<BlueSystemStatus> {
-    init() { super.init(action: "STATUS") }
+public class BlueGetSystemStatusCommand: BlueSdkAsyncCommand {
+    internal override func runAsync(arg0: Any? = nil, arg1: Any? = nil, arg2: Any? = nil) async throws -> Any? {
+        return try await runAsync(
+            deviceID: try blueCastArg(String.self, arg0)
+        )
+    }
+    
+    public func runAsync(deviceID: String) async throws -> BlueSystemStatus {
+        var status: BlueSystemStatus = try await blueTerminalRun(deviceID: deviceID, timeoutSeconds: 30.0, action: "STATUS")
+        
+        do {
+            let credentials = try BlueGetAccessCredentialsCommand().run(credentialType: .maintenance, for: deviceID, includePrivateKey: true)
+            
+            if let credential = credentials.credentials.first {
+                let tokenAuthentication = try await sdkService.authenticationTokenService
+                    .getTokenAuthentication(credential: credential)
+                
+                let latestFW = try await self.sdkService.apiService.getLatestFirmware(deviceID: deviceID, with: tokenAuthentication).getData()
+                
+                self.updateFirmwareFlags(&status, latestFW)
+            }
+        } catch {
+            blueLogError(error.localizedDescription)
+        }
+        
+        return status
+    }
+    
+    internal func updateFirmwareFlags(_ status: inout BlueSystemStatus, _ latestFW: BlueGetLatestFirmwareResult) {
+        if let testFW = latestFW.test {
+            if let testVersion = testFW.testVersion {
+                status.newTestFirmwareVersionAvailable = testVersion != status.applicationVersionTest || testFW.version != status.applicationVersion
+            }
+        }
+        
+        if let productionFW = latestFW.production {
+            let isTestVersion = status.hasApplicationVersionTest && status.applicationVersionTest != 0
+            
+            if isTestVersion {
+                status.newFirmwareVersionAvailable = true
+            } else {
+                status.newFirmwareVersionAvailable = productionFW.version != status.applicationVersion
+            }
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueid/access-capacitor",
-  "version": "0.106.0",
+  "version": "0.108.0",
   "description": "Capacitor JS plugin for the BlueID Access SDK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",