react-native-ble-manager 11.5.3 → 11.5.5

package/ios/BleManager.swift

@@ -122,14 +122,17 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
     // Helper method to call the callbacks for a specific peripheral and clear the queue
     func invokeAndClearDictionary(_ dictionary: inout Dictionary<String, [RCTResponseSenderBlock]>, withKey key: String, usingParameters parameters: [Any]) {
         serialQueue.sync {
-            
-            if let peripheralCallbacks = dictionary[key] {
-                for callback in peripheralCallbacks {
-                    callback(parameters)
-                }
-                
-                dictionary.removeValue(forKey: key)
+            invokeAndClearDictionary_THREAD_UNSAFE(&dictionary, withKey: key, usingParameters: parameters)
+        }
+    }
+
+    func invokeAndClearDictionary_THREAD_UNSAFE(_ dictionary: inout Dictionary<String, [RCTResponseSenderBlock]>, withKey key: String, usingParameters parameters: [Any]) {
+        if let peripheralCallbacks = dictionary[key] {
+            for callback in peripheralCallbacks {
+                callback(parameters)
             }
+            
+            dictionary.removeValue(forKey: key)
         }
     }
     
@@ -1078,16 +1081,18 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             NSLog("Read value [\(characteristic.uuid)]: \( value.hexadecimalString())")
         }
         
-        if readCallbacks[key] != nil {
-            invokeAndClearDictionary(&readCallbacks, withKey: key, usingParameters: [NSNull(), characteristic.value!.toArray()])
-        } else {
-            if hasListeners {
-                sendEvent(withName: "BleManagerDidUpdateValueForCharacteristic", body: [
-                    "peripheral": peripheral.uuidAsString(),
-                    "characteristic": characteristic.uuid.uuidString.lowercased(),
-                    "service": characteristic.service!.uuid.uuidString.lowercased(),
-                    "value": characteristic.value!.toArray()
-                ])
+        serialQueue.sync {
+            if readCallbacks[key] != nil {
+                invokeAndClearDictionary_THREAD_UNSAFE(&readCallbacks, withKey: key, usingParameters: [NSNull(), characteristic.value!.toArray()])
+            } else {
+                if hasListeners {
+                    sendEvent(withName: "BleManagerDidUpdateValueForCharacteristic", body: [
+                        "peripheral": peripheral.uuidAsString(),
+                        "characteristic": characteristic.uuid.uuidString.lowercased(),
+                        "service": characteristic.service!.uuid.uuidString.lowercased(),
+                        "value": characteristic.value!.toArray()
+                    ])
+                }
             }
         }
     }

package/ios/Helper.swift

@@ -165,13 +165,13 @@ class Helper {
     
     static func key(forPeripheral peripheral: CBPeripheral,
                     andCharacteristic characteristic: CBCharacteristic) -> String {
-        return "\(String(describing: peripheral.uuidAsString))|\(characteristic.uuid)"
+        return "\(String(describing: peripheral.uuidAsString()))|\(characteristic.uuid)"
     }
     
     static func key(forPeripheral peripheral: CBPeripheral,
                     andCharacteristic characteristic: CBCharacteristic,
                     andDescriptor descriptor: CBDescriptor) -> String {
-        return "\(String(describing: peripheral.uuidAsString))|\(characteristic.uuid)|\(descriptor.uuid)"
+        return "\(String(describing: peripheral.uuidAsString()))|\(characteristic.uuid)|\(descriptor.uuid)"
     }
     
     static func findDescriptor(fromUUID UUID: CBUUID, characteristic: CBCharacteristic) -> CBDescriptor? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ble-manager",
-  "version": "11.5.3",
+  "version": "11.5.5",
   "description": "A BLE module for react native.",
   "repository": {
     "type": "git",