@iotize/device-com-ble.cordova 3.6.2-alpha.2 → 3.6.4

package/src/ios/BLEManager.swift

@@ -13,6 +13,10 @@ typealias Completion = (IoTizeBleError?) -> ()
 //Callback type, methods with returning values
 typealias CompletionWithResponse = (Any? , IoTizeBleError?) -> ()
 
+struct BLEConstants {
+    static let serviceUUID = CBUUID(string: "6C7B16C2-2A5B-8C9F-CF42-D31425470E7B")
+}
+
 //Central manager handling devices and ble callbacks.
 class BLEManager: NSObject, CBCentralManagerDelegate
 {
@@ -20,7 +24,6 @@ class BLEManager: NSObject, CBCentralManagerDelegate
     private var centralManager: CBCentralManager!
     
     //IoTize devices are filtered using the UUID of the service used for data exchange
-    let serviceUUID = CBUUID(string: "6C7B16C2-2A5B-8C9F-CF42-D31425470E7B")
     
     var blestateChangeCompletion: Completion?           //callback called when the ble state is changing
     var connectionChangeCompletion: CompletionWithResponse?         //callback called when the ble connection states is changing
@@ -29,7 +32,7 @@ class BLEManager: NSObject, CBCentralManagerDelegate
     
     var useBLETapPeripheral: Bool = false
     
-    var discoveredPeripherals = [CBPeripheral]()        //list of discovered devices
+    var discoveredPeripherals = [ExtendedCBPeripheral]()        //list of discovered devices
     
     //currently connected device
     private var bleTapPeripheral: BLETapPeripheral?
@@ -50,14 +53,15 @@ class BLEManager: NSObject, CBCentralManagerDelegate
     }
        
     
-    // Start Scanning Iotize devices
-    func beginScan(completion: @escaping CompletionWithResponse){
+    // Start Scanning BLE devices
+    func beginScan(completion: @escaping CompletionWithResponse, serviceUUIDs: [CBUUID]?){
         printBLE("--> Start Scanning")
         if #available(iOS 10.0, *) {
             if (centralManager.state == CBManagerState.poweredOn){
                 discoveryCompletion = completion
                 discoveredPeripherals.removeAll()
-                centralManager.scanForPeripherals(withServices: [serviceUUID], options: nil)
+                let actualServiceUUIDs = serviceUUIDs ?? [BLEConstants.serviceUUID]
+                centralManager.scanForPeripherals(withServices: serviceUUIDs, options: nil)
                 
                
                 discoveryCompletion!("Ok", nil)
@@ -118,16 +122,19 @@ class BLEManager: NSObject, CBCentralManagerDelegate
         
         //in ios the device should be scanned in order 
         //to enable connection
-        for item : CBPeripheral in discoveredPeripherals{
+        for item : ExtendedCBPeripheral in discoveredPeripherals{
             
-            let name = item.identifier.uuidString
+            let name = item.peripheral.identifier.uuidString
                 
             if (name == device){
-                connect(item)
-                break;
+                connect(item.peripheral)
+                return;
 
             }
         }
+        
+        connectionChangeCompletion?(nil, IoTizeBleError.NoDeviceConnected())
+        connectionChangeCompletion = nil
     }
     
     // Disconnect from the currently selected device
@@ -189,17 +196,29 @@ class BLEManager: NSObject, CBCentralManagerDelegate
     
     //Called when a new device has been detected
     func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String : Any], rssi RSSI: NSNumber){
-        //do we know this device
-        if (!(discoveredPeripherals.contains(peripheral))){
+        //get element from discoveredPeripherals
+        if let registeredPeripheral = discoveredPeripherals.first(where: {$0.peripheral.identifier == peripheral.identifier}) {
+            // we update its values
+            
+        } else
+//        if (!(discoveredPeripherals.contains(where peripheral)))
+        {
             //do we have a name
-            if let name = advertisementData[CBAdvertisementDataLocalNameKey] as? String{
+            if let name = advertisementData[CBAdvertisementDataLocalNameKey] as? String {
                 printBLE("### Did discover \(name)")
-                //add peripheral to the table
-                discoveredPeripherals.append(peripheral)
+                //store manufacturer data in peripheral if any
+                let extendedPeripheral = ExtendedCBPeripheral(peripheral: peripheral)
+                let manufacturerData = advertisementData[CBAdvertisementDataManufacturerDataKey] ?? nil
+                let txPower = advertisementData[CBAdvertisementDataTxPowerLevelKey] ?? nil
+//                if (!(discoveredPeripherals.contains(where peripheral))) {
+                if (!(discoveredPeripherals.contains(where: {$0.peripheral.identifier == peripheral.identifier}))) {
+                    //add peripheral to the table
+                    discoveredPeripherals.append(extendedPeripheral)
+                }
                 //call the discovery callback
                 if ( discoveryCompletion != nil){
                     discoveryCompletion!(
-                        CBPeripheralConverter.toDiscoveredDeviceType(device: peripheral, rssi: RSSI as? Int)
+                        CBPeripheralConverter.toDiscoveredDeviceType(device: peripheral, rssi: RSSI as? Int, txPower: txPower as? Int, scanRecord: manufacturerData as? NSData)
                         , nil)
                 }
             }
@@ -211,16 +230,15 @@ class BLEManager: NSObject, CBCentralManagerDelegate
         
         printBLE("### Did connect \(String(describing: peripheral.name))")
         if ( connectionChangeCompletion != nil){
-            
             if (useBLETapPeripheral) {
-                bleTapPeripheral?.connect(device: peripheral, manager: self, connectionChangeCompletion: connectionChangeCompletion)
+                bleTapPeripheral?.connect(device: peripheral, manager: self)
             } else {
                 bleGenericPeripheral?.connect(device: peripheral, manager: self)
             }
 
             //callback without error
         
-            //    connectionChangeCompletion!("CONNECTED", nil) callback moved to didDiscoverCharacteristics
+                connectionChangeCompletion!("CONNECTED", nil)
 //                connectionChangeCompletion = nil
                     
         }
@@ -254,9 +272,10 @@ class BLEManager: NSObject, CBCentralManagerDelegate
         //callback without error, if we have requested this disconnection
         if ( disconnectionCompletion != nil){
             disconnectionCompletion!(nil)
+            disconnectionCompletion = nil
+            connectionChangeCompletion = nil
+            return
         }
-        disconnectionCompletion = nil
-        connectionChangeCompletion = nil
 
         if (bleGenericPeripheral != nil) {
             bleGenericPeripheral!.connectedDevice = nil
@@ -264,8 +283,7 @@ class BLEManager: NSObject, CBCentralManagerDelegate
         }
         if (bleTapPeripheral != nil) {
             bleTapPeripheral!.bleDevice = nil
-        }    
-    }
+        }    }
     
     func checkConnection(completion: @escaping Completion){
         if (useBLETapPeripheral) {
@@ -311,7 +329,7 @@ class BLEManager: NSObject, CBCentralManagerDelegate
     func isConnected(_ deviceUUID: String) throws -> Bool {
         
         // check if device is in the scan list
-        guard let device = discoveredPeripherals.first(where: {$0.identifier.uuidString == deviceUUID}) else {
+        guard let device = discoveredPeripherals.first(where: {$0.peripheral.identifier.uuidString == deviceUUID})?.peripheral else {
             throw CordovaBLEError.InternalError("Peripheral does not exist")
         }
         if (useBLETapPeripheral) {

package/src/ios/BLETapPeripheral.swift

@@ -66,12 +66,6 @@ class BLETapPeripheral:  NSObject, CBPeripheralDelegate{
     private static var LEN_PACKET = 19         // MTU = 23 - 3 - 1 num packet
     private let requestQueueManagementDelay = 0.002
     
-    var connectionStateCompletion: CompletionWithResponse?
-    
-    init(connectionState: CompletionWithResponse?) {
-        connectionStateCompletion = connectionState
-    }
-    
     override init(){
         super.init()
         DispatchQueue.global(qos: .background).async {
@@ -79,12 +73,12 @@ class BLETapPeripheral:  NSObject, CBPeripheralDelegate{
         }
     }
     
-    func connect( device: CBPeripheral, manager: BLEManager, connectionChangeCompletion: CompletionWithResponse?){
+    func connect( device: CBPeripheral, manager: BLEManager){
         bleManager = manager
         lastError = nil
         bleDevice = device
         bleDevice.delegate = self
-        connectionStateCompletion = connectionChangeCompletion
+        printBLE("Discover Services of connected device")
         bleDevice.discoverServices([UUID_UPGRADE_SERVICE, SPPoverLE_SERVICE_UUID, SPPoverLE_SERVICE_UUID_FAST])
     }
     
@@ -92,7 +86,7 @@ class BLETapPeripheral:  NSObject, CBPeripheralDelegate{
         
         //cleanup
         self.cancelRequests()
-        
+        self.isReady = false
         bleDevice = nil
         bleManager = nil
     }
@@ -107,6 +101,8 @@ class BLETapPeripheral:  NSObject, CBPeripheralDelegate{
             return
         }
         
+        printBLE("discovered services")
+        
         for service in peripheral.services!{
             if service.uuid == UUID_UPGRADE_SERVICE{
                 peripheral.discoverCharacteristics([UUID_UPGRADE_APP_INFO], for: service)
@@ -162,7 +158,6 @@ class BLETapPeripheral:  NSObject, CBPeripheralDelegate{
             lastError = IoTizeBleError.CharacteristicSPPNotFound(peripheral: peripheral)
         } else {
             self.isReady = true
-            connectionStateCompletion?("CONNECTED", nil)
         }
     }
     

package/src/ios/CBPeripheralConverter.swift

@@ -1,139 +1,164 @@
-//
-//  Copyright 2018 IoTize SAS Inc.  Licensed under the MIT license.
-//
-//  CBPeripheralConverter.swift
-//  device-com-ble.cordova BLE Cordova Plugin
-//
-
-import CoreBluetooth
-
-struct DiscoveredDeviceType : Codable{
-    public var name: String = ""
-    public var address: String = ""
-    public var rssi: Int?
-    
-    init(newName: String, newAddress: String, newRssi: Int?) {
-        name = newName
-        address = newAddress
-        if (newRssi != nil) {
-            rssi = newRssi
-        }
-    }
-    
-    func ToJSON() -> [AnyHashable: Any] {
-        if self.rssi == nil {
-            return ["name": name, "address": address]
-        }
-        return ["name": name, "address": address, "rssi": rssi!]
-    }
-    
-    func toJSONString() throws -> String {
-        let jsonEncoder = JSONEncoder()
-        let jsonData = try jsonEncoder.encode(self)
-        
-        return String(data: jsonData, encoding: .utf8)!
-        
-    }
-}
-
-
-import Foundation
-
-class CBPeripheralConverter {
-    
-    public static func toDiscoveredDeviceType(device: CBPeripheral, rssi: Int? = nil) -> DiscoveredDeviceType {
-        return DiscoveredDeviceType(newName: device.name!, newAddress: device.identifier.uuidString as String, newRssi: rssi)
-    }
-    
-    public static func toJSONObject(device: CBPeripheral) -> [AnyHashable: Any] {
-        return toDiscoveredDeviceType(device: device).ToJSON()
-    }
-    public static func toJSONString(device: CBPeripheral) throws -> String {
-        return try toDiscoveredDeviceType(device: device).toJSONString()
-    }
-    public static func toServiceDescriptionsJSON(device: CBPeripheral) -> [[AnyHashable: Any]] {
-        if let services = device.services {
-            var serviceDescriptions: [ServiceDescription] = []
-            for service in services {
-                serviceDescriptions.append(ServiceDescription(service: service))
-            }
-            
-            return serviceDescriptions.map {$0.toDictionary()}
-            
-        }
-        return []
-        
-    }
-}
-
-struct DescriptorDescription: Codable {
-    var uuid: String
-    var permissions: UInt
-    
-    init (descriptor: CBDescriptor) {
-        uuid = descriptor.uuid.uuidString
-        permissions = descriptor.characteristic!.properties.rawValue
-    }
-    func toDictionary() -> [AnyHashable: Any] {
-        return ["uuid": uuid, "permissions": permissions]
-    }
-}
-
-struct CharacteristicDescription: Codable {
-    var uuid: String
-    var descriptors: [DescriptorDescription]?
-    
-    init(characteristic: CBCharacteristic) {
-        uuid = characteristic.uuid.uuidString
-        if let characteristicDescriptors = characteristic.descriptors {
-            descriptors = []
-            for desc in characteristicDescriptors {
-                descriptors?.append( DescriptorDescription(descriptor: desc) )
-            }
-        }
-    }
-    func toDictionary() -> [AnyHashable: Any] {
-        return ["uuid": uuid, "descriptors": descriptors?.map {$0.toDictionary()} ?? [] ]
-    }
-}
-
-struct ServiceDescription: Codable {
-    var uuid: String
-    var characteristics: [CharacteristicDescription]?
-    
-    init(service: CBService) {
-        uuid = service.uuid.uuidString
-        if let serviceCharacteristics = service.characteristics {
-            characteristics = []
-            for char in serviceCharacteristics {
-                characteristics?.append( CharacteristicDescription(characteristic: char) )
-            }
-        }
-    }
-    
-    func toDictionary() -> [AnyHashable: Any] {
-        return ["uuid": uuid, "characteristics": characteristics?.map {$0.toDictionary()} ?? [] ]
-    }
-}
-
-struct CBUUIDHelper {
-    
-    static let UUID_BASE = "0000XXXX-0000-1000-8000-00805f9b34fb";
-
-    static func fromString(_ string: String) -> CBUUID? {
-        
-        let stringUUID:UUID?
-        if (string.count == 4) {
-            let actualUUID = UUID_BASE.replacingOccurrences(of: "XXXX", with: string)
-            printBLE(">>>Short UUID \(string) replaced by \(actualUUID)")
-            stringUUID = UUID(uuidString: actualUUID)
-        } else {
-            stringUUID = UUID(uuidString: string)
-        }
-        if (stringUUID == nil) {
-            return nil
-        }
-        return CBUUID(nsuuid: stringUUID!)
-        
-    }
-}
+//
+//  Copyright 2018 IoTize SAS Inc.  Licensed under the MIT license.
+//
+//  CBPeripheralConverter.swift
+//  device-com-ble.cordova BLE Cordova Plugin
+//
+
+import CoreBluetooth
+
+struct DiscoveredDeviceType : Codable{
+    public var name: String = ""
+    public var address: String = ""
+    public var rssi: Int?
+    public var txPower: Int?
+    public var scanRecord: [UInt8]?
+    
+    init(newName: String, newAddress: String, newRssi: Int?, newTxPower: Int?, newScanRecord: NSData?) {
+        name = newName
+        address = newAddress
+        if (newRssi != nil) {
+            rssi = newRssi
+        }
+        if (newTxPower != nil) {
+            txPower = newTxPower
+        }
+        if let record = newScanRecord {
+            scanRecord = [UInt8](record)
+        }
+    }
+    
+    func ToJSON() -> [AnyHashable: Any] {
+        var result: NSMutableDictionary = ["name": name, "address": address]
+        if let rssi = self.rssi {
+            result.setValue(rssi, forKey: "rssi")
+        }
+        if let txPower = self.txPower {
+            result.setValue(txPower, forKey: "txPower")
+        }
+        if let scanRecord = self.scanRecord {
+            result.setValue(scanRecord, forKey: "scanRecord")
+        }
+        return result as! [AnyHashable: Any]
+    }
+    
+    func toJSONString() throws -> String {
+        let jsonEncoder = JSONEncoder()
+        let jsonData = try jsonEncoder.encode(self)
+        
+        return String(data: jsonData, encoding: .utf8)!
+        
+    }
+}
+
+
+import Foundation
+
+class CBPeripheralConverter {
+    
+    public static func toDiscoveredDeviceType(device: CBPeripheral, rssi: Int? = nil, txPower: Int? = nil, scanRecord: NSData? = nil) -> DiscoveredDeviceType {
+        return DiscoveredDeviceType(newName: device.name!, newAddress: device.identifier.uuidString as String, newRssi: rssi, newTxPower: txPower, newScanRecord: scanRecord)
+    }
+    
+    public static func toJSONObject(device: CBPeripheral) -> [AnyHashable: Any] {
+        return toDiscoveredDeviceType(device: device).ToJSON()
+    }
+    public static func toJSONString(device: CBPeripheral) throws -> String {
+        return try toDiscoveredDeviceType(device: device).toJSONString()
+    }
+    public static func toServiceDescriptionsJSON(device: CBPeripheral) -> [[AnyHashable: Any]] {
+        if let services = device.services {
+            var serviceDescriptions: [ServiceDescription] = []
+            for service in services {
+                serviceDescriptions.append(ServiceDescription(service: service))
+            }
+            
+            return serviceDescriptions.map {$0.toDictionary()}
+            
+        }
+        return []
+        
+    }
+}
+
+struct DescriptorDescription: Codable {
+    var uuid: String
+    var permissions: UInt
+    
+    init (descriptor: CBDescriptor) {
+        uuid = descriptor.uuid.uuidString
+        permissions = descriptor.characteristic!.properties.rawValue
+    }
+    func toDictionary() -> [AnyHashable: Any] {
+        return ["uuid": uuid, "permissions": permissions]
+    }
+}
+
+struct CharacteristicDescription: Codable {
+    var uuid: String
+    var descriptors: [DescriptorDescription]?
+    
+    init(characteristic: CBCharacteristic) {
+        uuid = characteristic.uuid.uuidString
+        if let characteristicDescriptors = characteristic.descriptors {
+            descriptors = []
+            for desc in characteristicDescriptors {
+                descriptors?.append( DescriptorDescription(descriptor: desc) )
+            }
+        }
+    }
+    func toDictionary() -> [AnyHashable: Any] {
+        return ["uuid": uuid, "descriptors": descriptors?.map {$0.toDictionary()} ?? [] ]
+    }
+}
+
+struct ServiceDescription: Codable {
+    var uuid: String
+    var characteristics: [CharacteristicDescription]?
+    
+    init(service: CBService) {
+        uuid = service.uuid.uuidString
+        if let serviceCharacteristics = service.characteristics {
+            characteristics = []
+            for char in serviceCharacteristics {
+                characteristics?.append( CharacteristicDescription(characteristic: char) )
+            }
+        }
+    }
+    
+    func toDictionary() -> [AnyHashable: Any] {
+        return ["uuid": uuid, "characteristics": characteristics?.map {$0.toDictionary()} ?? [] ]
+    }
+}
+
+struct CBUUIDHelper {
+    
+    static let UUID_BASE = "0000XXXX-0000-1000-8000-00805f9b34fb";
+
+    static func fromString(_ string: String) -> CBUUID? {
+        
+        let stringUUID:UUID?
+        if (string.count == 4) {
+            let actualUUID = UUID_BASE.replacingOccurrences(of: "XXXX", with: string)
+            printBLE(">>>Short UUID \(string) replaced by \(actualUUID)")
+            stringUUID = UUID(uuidString: actualUUID)
+        } else {
+            stringUUID = UUID(uuidString: string)
+        }
+        if (stringUUID == nil) {
+            return nil
+        }
+        return CBUUID(nsuuid: stringUUID!)
+        
+    }
+}
+
+class ExtendedCBPeripheral {
+    public var peripheral: CBPeripheral
+    public var manufacturerData: NSData?
+    public var rssi: Int?
+    
+    init(peripheral: CBPeripheral) {
+        self.peripheral = peripheral
+    }
+}