@blueid/access-capacitor 0.108.0 → 0.109.0

package/ios/CBlueIDAccess.xcframework/ios-arm64/Headers/core/BlueCore.pb.h

@@ -34,6 +34,7 @@ typedef enum BlueReturnCode {
     BlueReturnCode_Disconnected = -19,
     BlueReturnCode_PointerConversionFailed = -20,
     BlueReturnCode_Unavailable = -21,
+    BlueReturnCode_Aborted = -22,
     BlueReturnCode_Test = -29,
     BlueReturnCode_EncodeDataWriteFailed = -30,
     BlueReturnCode_EncodeDataWriteNothingWritten = -31,

package/ios/CBlueIDAccess.xcframework/ios-arm64_x86_64-simulator/Headers/core/BlueCore.pb.h

@@ -34,6 +34,7 @@ typedef enum BlueReturnCode {
     BlueReturnCode_Disconnected = -19,
     BlueReturnCode_PointerConversionFailed = -20,
     BlueReturnCode_Unavailable = -21,
+    BlueReturnCode_Aborted = -22,
     BlueReturnCode_Test = -29,
     BlueReturnCode_EncodeDataWriteFailed = -30,
     BlueReturnCode_EncodeDataWriteNothingWritten = -31,

package/ios/CBlueIDAccess.xcframework/macos-arm64_x86_64/Headers/core/BlueCore.pb.h

@@ -34,6 +34,7 @@ typedef enum BlueReturnCode {
     BlueReturnCode_Disconnected = -19,
     BlueReturnCode_PointerConversionFailed = -20,
     BlueReturnCode_Unavailable = -21,
+    BlueReturnCode_Aborted = -22,
     BlueReturnCode_Test = -29,
     BlueReturnCode_EncodeDataWriteFailed = -30,
     BlueReturnCode_EncodeDataWriteNothingWritten = -31,

package/ios/Plugin/BlueIDAccessSDK/BlueAPIProtocol.swift

@@ -1,8 +1,11 @@
 import Foundation
 
-// TODO: implement .xconfig files
-// private let baseURL = "http://localhost:3000"
-private let baseURL = "https://api.dev.blue-id.com"
+#if DEBUG
+    private let baseURL = BlueEnvironment.getEnvVar(key: "BLUE_API_ENDPOINT", defaultValue: "https://api.dev.blue-id.com")
+#else
+    private let baseURL = BlueEnvironment.getEnvVar(key: "BLUE_API_ENDPOINT", defaultValue: "https://api.blue-id.com")
+#endif
+
 
 public enum BlueAPIEndpoints: String {
     case AccessAuthenticationToken = "/access/authenticationToken"

package/ios/Plugin/BlueIDAccessSDK/BlueBluetooth.swift

@@ -170,15 +170,13 @@ internal func blueDisconnectBluetoothPeripheral(_ peripheral: CBPeripheral) thro
         return
     }
     
-    if peripheral.state == .connecting {
-        blueRemoveSignal(group: "bleCentral", name: "didConnect")
-        return
-    }
-    
-    guard peripheral.state == .connected else {
+    guard peripheral.state == .connected || peripheral.state == .connecting else {
         throw BlueError(.unavailable)
     }
     
+    // Remove all signals in case of disconnection, as some of them may not have been properly removed in the event of an abnormal disconnection, such as a timeout.
+    blueSignalAbort(group: "bleCentral")
+    
     try blueAddSignal(group: "bleCentral", name: "didDisconnectPeripheral")
     
     defer { blueRemoveSignal(group: "bleCentral", name: "didDisconnectPeripheral") }

package/ios/Plugin/BlueIDAccessSDK/BlueCore.pb.swift

@@ -49,6 +49,7 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
   case disconnected // = -19
   case pointerConversionFailed // = -20
   case unavailable // = -21
+  case aborted // = -22
   case test // = -29
   case encodeDataWriteFailed // = -30
   case encodeDataWriteNothingWritten // = -31
@@ -218,6 +219,7 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
     case -31: self = .encodeDataWriteNothingWritten
     case -30: self = .encodeDataWriteFailed
     case -29: self = .test
+    case -22: self = .aborted
     case -21: self = .unavailable
     case -20: self = .pointerConversionFailed
     case -19: self = .disconnected
@@ -323,6 +325,7 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
     case .encodeDataWriteNothingWritten: return -31
     case .encodeDataWriteFailed: return -30
     case .test: return -29
+    case .aborted: return -22
     case .unavailable: return -21
     case .pointerConversionFailed: return -20
     case .disconnected: return -19
@@ -3735,6 +3738,7 @@ extension BlueReturnCode: SwiftProtobuf._ProtoNameProviding {
     -31: .same(proto: "EncodeDataWriteNothingWritten"),
     -30: .same(proto: "EncodeDataWriteFailed"),
     -29: .same(proto: "Test"),
+    -22: .same(proto: "Aborted"),
     -21: .same(proto: "Unavailable"),
     -20: .same(proto: "PointerConversionFailed"),
     -19: .same(proto: "Disconnected"),

package/ios/Plugin/BlueIDAccessSDK/BlueDeviceBluetooth.swift

@@ -352,10 +352,7 @@ internal class BlueDeviceBluetooth: BlueDevice, CBPeripheralDelegate {
         try blueDisconnectBluetoothPeripheral(peripheral)
         
         // Remove all signals in case of disconnection, as some of them may not have been properly removed in the event of an abnormal disconnection, such as a timeout.
-        if (peripheral.state == .disconnected) {
-            blueRemoveSignal(group: "blePeripheral", name: "didUpdateValueFor")
-            blueRemoveSignal(group: "blePeripheral", name: "didWriteValueFor")
-        }
+        blueSignalAbort(group: "blePeripheral")
         
         blueNotifyUpdatedDevice(self)
     }

package/ios/Plugin/BlueIDAccessSDK/BlueEnvironment.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+/**
+ * @class BlueEnvironment
+ * This class provides access to environment-specific configurations and settings related to the SDK environment.
+ */
+internal class BlueEnvironment {
+    /// Gets the value of an environment variable.
+    ///
+    /// - parameters:
+    ///   - key: The key of the environment variable.
+    ///   - defaultValue: The default value to return if the environment variable is not found.
+    /// - returns: The value of the environment variable if found, otherwise the defaultValue.
+    static func getEnvVar(key: String, defaultValue: String) -> String {
+        guard let infoDictionary: [String: Any] = Bundle.main.infoDictionary else { return defaultValue }
+        
+        guard let value: String = infoDictionary[key] as? String else { return defaultValue }
+        
+        return value
+    }
+}

package/ios/Plugin/BlueIDAccessSDK/BlueSignal.swift

@@ -45,6 +45,14 @@ fileprivate class BlueSignal {
             semaphore.signal()
         }
     }
+    
+    internal func abort() {
+        if let semaphore = self.semaphore {
+            self.error = BlueError(.aborted)
+            self.result = nil
+            semaphore.signal()
+        }
+    }
 }
 
 private var blueSignalMap: [String: BlueSignal] = [:]
@@ -66,10 +74,12 @@ internal func blueRemoveSignal(group: String, name: String) {
     
     if blueSignalMap[key] != nil {
         blueSignalMap.removeValue(forKey: key)
+        blueLogDebug("BlueSignal \(name) in group \(group) has been removed")
     }
     
     if blueHistoryMap[key] != nil {
         blueHistoryMap.removeValue(forKey: key)
+        blueLogDebug("BlueSignal \(name) in group \(group) has been removed from history map")
     }
 }
 
@@ -120,6 +130,22 @@ internal func blueSignalFailure(group: String, name: String, error: Error) {
     signal.failure(error)
 }
 
+/// Aborts the blue signal for a specified group.
+///
+/// - parameters:
+///   - group: A string indicating the group for which the blue signal should be aborted.
+internal func blueSignalAbort(group: String) {
+    for (key, value) in blueSignalMap {
+        let keyComponents = key.components(separatedBy: ":")
+        
+        if keyComponents.count >= 2 {
+            if (keyComponents[0] == group) {
+                value.abort()
+            }
+        }
+    }
+}
+
 internal func blueSignalFailureGroup(group: String, error: Error) {
     for (key, value) in blueSignalMap {
         let keyComponents = key.components(separatedBy: ":")

package/ios/Plugin/BlueIDAccessSDK/BlueTerminal.swift

@@ -418,7 +418,7 @@ public func blueTerminalRun<HandlerResult>(
                 do {
                     try device.disconnect()
                 } catch {
-                    blueLogError("Unable to disconnect from peripheral after error")
+                    blueLogError("Unable to disconnect from peripheral after error: \(error.localizedDescription)")
                 }
             }
             

package/package.json

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