react-native-ble-manager 11.0.8 → 11.2.0

package/ios/BleManager.m

@@ -43,6 +43,14 @@ RCT_EXTERN_METHOD(readDescriptor:
                   descriptorUUID:(NSString*)descriptorUUID
                   callback:(nonnull RCTResponseSenderBlock)callback)
 
+RCT_EXTERN_METHOD(writeDescriptor:
+                  (NSString *)peripheralUUID
+                  serviceUUID:(NSString*)serviceUUID
+                  characteristicUUID:(NSString*)characteristicUUID
+                  descriptorUUID:(NSString*)descriptorUUID
+                  message:(NSArray*)message
+                  callback:(nonnull RCTResponseSenderBlock)callback)
+
 RCT_EXTERN_METHOD(getDiscoveredPeripherals:
                   (nonnull RCTResponseSenderBlock)callback)
 
@@ -90,6 +98,9 @@ RCT_EXTERN_METHOD(isPeripheralConnected:
                   (NSString *)peripheralUUID
                   callback:(nonnull RCTResponseSenderBlock)callback)
 
+RCT_EXTERN_METHOD(isScanning:
+                  callback:(nonnull RCTResponseSenderBlock)callback)
+
 RCT_EXTERN_METHOD(getMaximumWriteValueLengthForWithoutResponse:
                   (NSString *)peripheralUUID
                   callback:(nonnull RCTResponseSenderBlock)callback)

package/ios/BleManager.swift

@@ -18,6 +18,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
     private var readCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
     private var readRSSICallbacks: Dictionary<String, [RCTResponseSenderBlock]>
     private var readDescriptorCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
+    private var writeDescriptorCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
     private var retrieveServicesCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
     private var writeCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
     private var writeQueue: Array<Any>
@@ -41,6 +42,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         readCallbacks = [:]
         readRSSICallbacks = [:]
         readDescriptorCallbacks = [:]
+        writeDescriptorCallbacks = [:]
         retrieveServicesCallbacks = [:]
         writeCallbacks = [:]
         writeQueue = []
@@ -432,6 +434,38 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         peripheral?.instance.readValue(for: descriptor)
     }
     
+    @objc func writeDescriptor(_ peripheralUUID: String,
+                              serviceUUID: String,
+                              characteristicUUID: String,
+                              descriptorUUID: String,
+                              message: [UInt8],
+                              callback: @escaping RCTResponseSenderBlock) {
+        NSLog("writeDescriptor")
+        
+        guard let context = getContext(peripheralUUID, serviceUUIDString: serviceUUID, characteristicUUIDString: characteristicUUID, prop: CBCharacteristicProperties.read, callback: callback) else {
+            return
+        }
+        
+        let peripheral = context.peripheral
+        let characteristic = context.characteristic
+        
+        guard let descriptor = Helper.findDescriptor(fromUUID: CBUUID(string: descriptorUUID), characteristic: characteristic!) else {
+            let error = "Could not find descriptor with UUID \(descriptorUUID) on characteristic with UUID \(String(describing: characteristic?.uuid.uuidString)) on peripheral with UUID \(peripheralUUID)"
+            NSLog(error)
+            callback([error])
+            return
+        }
+        
+        if let peripheral = peripheral?.instance {
+            let key = Helper.key(forPeripheral: peripheral, andCharacteristic: characteristic!, andDescriptor: descriptor)
+            insertCallback(callback, intoDictionary: &writeDescriptorCallbacks, withKey: key)
+            
+        }
+        
+        let dataMessage = Data(message)
+        peripheral?.instance.writeValue(dataMessage, for: descriptor)
+    }
+    
     @objc func getDiscoveredPeripherals(_ callback: @escaping RCTResponseSenderBlock) {
         NSLog("Get discovered peripherals")
         var discoveredPeripherals: [[String: Any]] = []
@@ -495,6 +529,14 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         }
     }
     
+    @objc func isScanning(_ callback: @escaping RCTResponseSenderBlock) {        
+        if let manager = manager {
+            callback([NSNull(), manager.isScanning])
+        } else {
+            callback(["CBCentralManager not found"])
+        }
+    }
+    
     @objc func checkState(_ callback: @escaping RCTResponseSenderBlock) {
         if let manager = manager {
             centralManagerDidUpdateState(manager)
@@ -1104,6 +1146,23 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         }
     }
     
+    func peripheral(_ peripheral: CBPeripheral,
+                    didWriteValueFor descriptor: CBDescriptor,
+                    error: Error?) {
+        NSLog("didWrite descriptor")
+        
+        let key = Helper.key(forPeripheral: peripheral, andCharacteristic: descriptor.characteristic!, andDescriptor: descriptor)
+        let callbacks = writeDescriptorCallbacks[key]
+        if callbacks != nil {
+            if let error = error {
+                NSLog("\(error)")
+                invokeAndClearDictionary(&writeDescriptorCallbacks, withKey: key, usingParameters: [error.localizedDescription])
+            } else {
+                invokeAndClearDictionary(&writeDescriptorCallbacks, withKey: key, usingParameters: [])
+            }
+        }
+    }
+    
     func peripheral(_ peripheral: CBPeripheral,
                     didWriteValueFor characteristic: CBCharacteristic,
                     error: Error?) {
@@ -1120,7 +1179,6 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                 if writeQueue.isEmpty {
                     invokeAndClearDictionary(&writeCallbacks, withKey: key, usingParameters: [])
                 } else {
-                    // Rimuovi e scrivi il messaggio in coda
                     let message = writeQueue.removeFirst() as! Data
                     NSLog("Message to write \(message.hexadecimalString())")
                     peripheral.writeValue(message, for: characteristic, type: .withResponse)

package/ios/Helper.swift

@@ -105,7 +105,7 @@ class Helper {
             if mfgData.count > 1 {
                 let manufactureID = UInt16(mfgData[0]) + UInt16(mfgData[1]) << 8
                 var manInfo: [String: Any] = [:]
-                manInfo[String(format: "%04X", manufactureID)] = Helper.dataToArrayBuffer(mfgData.subdata(in: 2..<mfgData.endIndex))
+                manInfo[String(format: "%04x", manufactureID)] = Helper.dataToArrayBuffer(mfgData.subdata(in: 2..<mfgData.endIndex))
                 adv["manufacturerData"] = manInfo
             }
             adv.removeValue(forKey: CBAdvertisementDataManufacturerDataKey)

package/package.json

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