@blueid/access-capacitor 1.9.0 → 1.18.0

package/ios/Plugin/BlueIDAccessSDK/BlueSystem.swift

@@ -37,6 +37,12 @@ public class BlueGetSystemStatusCommand: BlueSdkAsyncCommand {
     public func runAsync(deviceID: String) async throws -> BlueSystemStatus {
         var status: BlueSystemStatus = try await blueTerminalRun(deviceID: deviceID, timeoutSeconds: 30.0, action: "STATUS")
         
+        await self.tryUpdateWithOnlineInformation(deviceID, &status)
+        
+        return status
+    }
+    
+    private func tryUpdateWithOnlineInformation(_ deviceID: String, _ status: inout BlueSystemStatus) async {
         do {
             let credentials = try BlueGetAccessCredentialsCommand().run(credentialType: .maintenance, for: deviceID, includePrivateKey: true)
             
@@ -44,32 +50,52 @@ public class BlueGetSystemStatusCommand: BlueSdkAsyncCommand {
                 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)
+                await self.tryUpdateFirmwareFlags(deviceID, &status, tokenAuthentication)
+                await self.tryUpdateHardwareInformation(deviceID, &status, tokenAuthentication)
             }
         } 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
+    internal func tryUpdateFirmwareFlags(_ deviceID: String, _ status: inout BlueSystemStatus, _ tokenAuthentication: BlueTokenAuthentication) async {
+        do {
+            let latestFW = try await self.sdkService.apiService.getLatestFirmware(deviceID: deviceID, with: tokenAuthentication).getData()
+            
+            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
+            if let productionFW = latestFW.production {
+                let isTestVersion = status.hasApplicationVersionTest && status.applicationVersionTest != 0
+                
+                if isTestVersion {
+                    status.newFirmwareVersionAvailable = true
+                } else {
+                    status.newFirmwareVersionAvailable = productionFW.version != status.applicationVersion
+                }
             }
+        } catch {
+            blueLogError(error.localizedDescription)
+        }
+    }
+    
+    internal func tryUpdateHardwareInformation(_ deviceID: String, _ status: inout BlueSystemStatus, _ tokenAuthentication: BlueTokenAuthentication) async {
+        do {
+            let device = try await self.sdkService.apiService.getDevice(deviceID: deviceID, with: tokenAuthentication).getData()
+            
+            status.hardwareInfo = BlueHardwareInfo()
+            status.hardwareInfo.name = device.hardware.name
+            status.hardwareInfo.vendor = device.hardware.vendor
+            status.hardwareInfo.vendorName = device.hardware.vendorName
+            status.hardwareInfo.version = UInt32(device.hardware.version)
+            status.hardwareInfo.type = BlueHardwareType(rawValue: device.hardware.type) ?? status.hardwareType
+            
+            status.newConfigurationAvailable = status.configID != device.configId
+        } catch {
+            blueLogError(error.localizedDescription)
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueid/access-capacitor",
-  "version": "1.9.0",
+  "version": "1.18.0",
   "description": "Capacitor JS plugin for the BlueID Access SDK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -8,10 +8,8 @@
   "unpkg": "dist/plugin.js",
   "files": [
     "android/src/main/",
-    "android/sdk/",
-    "android/repo/",
     "android/build.gradle",
-    "android/settings.gradle",
+    "android/repo/",
     "dist/",
     "ios/Plugin/",
     "ios/CBlueIDAccess.xcframework/",

package/android/settings.gradle

@@ -1,4 +0,0 @@
-rootProject.name = "AndroidCapacitorPlugin"
-include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
-//include ':sdk'