react-native-ble-manager 10.1.4 → 11.0.0

package/ios/BleManager.xcodeproj/project.pbxproj

@@ -7,10 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		A908F1921CEEFEB500BE1488 /* NSData+Conversion.m in Sources */ = {isa = PBXBuildFile; fileRef = A908F18B1CEEFEB500BE1488 /* NSData+Conversion.m */; };
-		A908F1931CEEFEB500BE1488 /* CBPeripheral+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = A908F18D1CEEFEB500BE1488 /* CBPeripheral+Extensions.m */; };
-		A908F1941CEEFEB500BE1488 /* BLECommandContext.m in Sources */ = {isa = PBXBuildFile; fileRef = A908F18F1CEEFEB500BE1488 /* BLECommandContext.m */; };
 		A908F1951CEEFEB500BE1488 /* BleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A908F1911CEEFEB500BE1488 /* BleManager.m */; };
+		A918B6872B15F605006EC956 /* BleManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A918B6862B15F605006EC956 /* BleManager.swift */; };
+		A918B68D2B162CF2006EC956 /* Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A918B68C2B162CF2006EC956 /* Helper.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -27,14 +26,11 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libBleManager.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBleManager.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		A908F18A1CEEFEB500BE1488 /* NSData+Conversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Conversion.h"; sourceTree = "<group>"; };
-		A908F18B1CEEFEB500BE1488 /* NSData+Conversion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Conversion.m"; sourceTree = "<group>"; };
-		A908F18C1CEEFEB500BE1488 /* CBPeripheral+Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CBPeripheral+Extensions.h"; sourceTree = "<group>"; };
-		A908F18D1CEEFEB500BE1488 /* CBPeripheral+Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CBPeripheral+Extensions.m"; sourceTree = "<group>"; };
-		A908F18E1CEEFEB500BE1488 /* BLECommandContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BLECommandContext.h; sourceTree = "<group>"; };
-		A908F18F1CEEFEB500BE1488 /* BLECommandContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BLECommandContext.m; sourceTree = "<group>"; };
 		A908F1901CEEFEB500BE1488 /* BleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BleManager.h; sourceTree = "<group>"; };
 		A908F1911CEEFEB500BE1488 /* BleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BleManager.m; sourceTree = "<group>"; };
+		A918B6852B15F605006EC956 /* BleManager-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BleManager-Bridging-Header.h"; sourceTree = "<group>"; };
+		A918B6862B15F605006EC956 /* BleManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BleManager.swift; sourceTree = "<group>"; };
+		A918B68C2B162CF2006EC956 /* Helper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Helper.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -67,14 +63,11 @@
 		A908F1891CEEFE0F00BE1488 /* BleManager */ = {
 			isa = PBXGroup;
 			children = (
-				A908F18A1CEEFEB500BE1488 /* NSData+Conversion.h */,
-				A908F18B1CEEFEB500BE1488 /* NSData+Conversion.m */,
-				A908F18C1CEEFEB500BE1488 /* CBPeripheral+Extensions.h */,
-				A908F18D1CEEFEB500BE1488 /* CBPeripheral+Extensions.m */,
-				A908F18E1CEEFEB500BE1488 /* BLECommandContext.h */,
-				A908F18F1CEEFEB500BE1488 /* BLECommandContext.m */,
+				A918B68C2B162CF2006EC956 /* Helper.swift */,
 				A908F1901CEEFEB500BE1488 /* BleManager.h */,
 				A908F1911CEEFEB500BE1488 /* BleManager.m */,
+				A918B6862B15F605006EC956 /* BleManager.swift */,
+				A918B6852B15F605006EC956 /* BleManager-Bridging-Header.h */,
 			);
 			name = BleManager;
 			sourceTree = "<group>";
@@ -110,6 +103,7 @@
 				TargetAttributes = {
 					58B511DA1A9E6C8500147676 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 1500;
 					};
 				};
 			};
@@ -118,6 +112,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 58B511D21A9E6C8500147676;
@@ -135,10 +130,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A908F1931CEEFEB500BE1488 /* CBPeripheral+Extensions.m in Sources */,
 				A908F1951CEEFEB500BE1488 /* BleManager.m in Sources */,
-				A908F1921CEEFEB500BE1488 /* NSData+Conversion.m in Sources */,
-				A908F1941CEEFEB500BE1488 /* BLECommandContext.m in Sources */,
+				A918B6872B15F605006EC956 /* BleManager.swift in Sources */,
+				A918B68D2B162CF2006EC956 /* Helper.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -255,6 +249,7 @@
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -265,17 +260,22 @@
 					"$(SRCROOT)/node_modules/react-native/React/**",
 					"$(SRCROOT)/../../../ios/Pods/Headers/Public/**",
 				);
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = BleManager;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "BleManager-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -286,11 +286,14 @@
 					"$(SRCROOT)/node_modules/react-native/React/**",
 					"$(SRCROOT)/../../../ios/Pods/Headers/Public/**",
 				);
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = BleManager;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "BleManager-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

package/ios/Helper.swift

@@ -0,0 +1,364 @@
+import Foundation
+
+class Helper {
+    static func centralManagerStateToString(_ state: CBManagerState) -> String {
+        switch state {
+        case .unknown:
+            return "unknown"
+        case .resetting:
+            return "resetting"
+        case .unsupported:
+            return "unsupported"
+        case .unauthorized:
+            return "unauthorized"
+        case .poweredOff:
+            return "poweredOff"
+        case .poweredOn:
+            return "poweredOn"
+        @unknown default:
+            return "unknown"
+        }
+    }
+    
+    static func dataToArrayBuffer(_ data: Data) -> [String: Any] {
+        return [
+            "CDVType": "ArrayBuffer",
+            "data": data.base64EncodedString(options: []),
+            "bytes": data.map { $0 }
+        ]
+    }
+    
+    static func reformatAdvertisementData(_ advertisementData: [String:Any]) -> [String:Any] {
+        var adv = advertisementData
+        // Rename 'local name' key
+        if let localName = adv[CBAdvertisementDataLocalNameKey] {
+            adv.removeValue(forKey: CBAdvertisementDataLocalNameKey)
+            adv["localName"] = localName
+        }
+        
+        // Rename 'isConnectable' key
+        if let isConnectable = adv[CBAdvertisementDataIsConnectable] {
+            adv.removeValue(forKey: CBAdvertisementDataIsConnectable)
+            adv["isConnectable"] = isConnectable
+        }
+        
+        // Rename 'power level' key
+        if let powerLevel = adv[CBAdvertisementDataTxPowerLevelKey] {
+            adv.removeValue(forKey: CBAdvertisementDataTxPowerLevelKey)
+            adv["txPowerLevel"] = powerLevel
+        }
+        
+        // Service Data is a dictionary of CBUUID and NSData
+        // Convert to String keys with Array Buffer values
+        if let serviceData = adv[CBAdvertisementDataServiceDataKey] as? NSMutableDictionary {
+            for (key, value) in serviceData {
+                if let uuidKey = key as? CBUUID, let dataValue = value as? Data {
+                    serviceData.removeObject(forKey: uuidKey)
+                    serviceData[uuidKey.uuidString.lowercased()] = Helper.dataToArrayBuffer(dataValue)
+                }
+            }
+            
+            adv.removeValue(forKey: CBAdvertisementDataServiceDataKey)
+            adv["serviceData"] = serviceData
+        }
+        
+        // Create a new list of Service UUIDs as Strings instead of CBUUIDs
+        if let serviceUUIDs = adv[CBAdvertisementDataServiceUUIDsKey] as? NSMutableArray {
+            var serviceUUIDStrings:Array<String> = []
+            for value in serviceUUIDs {
+                if let uuid = value as? CBUUID {
+                    serviceUUIDStrings.append(uuid.uuidString.lowercased())
+                }
+            }
+            
+            adv.removeValue(forKey: CBAdvertisementDataServiceUUIDsKey)
+            adv["serviceUUIDs"] = serviceUUIDStrings
+        }
+        // Solicited Services UUIDs is an array of CBUUIDs, convert into Strings
+        if let solicitiedServiceUUIDs = adv[CBAdvertisementDataSolicitedServiceUUIDsKey] as? NSMutableArray {
+            var solicitiedServiceUUIDStrings:Array<String> = []
+            for value in solicitiedServiceUUIDs {
+                if let uuid = value as? CBUUID {
+                    solicitiedServiceUUIDStrings.append(uuid.uuidString.lowercased())
+                }
+            }
+            
+            adv.removeValue(forKey: CBAdvertisementDataSolicitedServiceUUIDsKey)
+            adv["solicitedServiceUUIDs"] = solicitiedServiceUUIDStrings
+        }
+        
+        // Overflow Services UUIDs is an array of CBUUIDs, convert into Strings
+        if let overflowServiceUUIDs = adv[CBAdvertisementDataOverflowServiceUUIDsKey] as? NSMutableArray {
+            var overflowServiceUUIDStrings:Array<String> = []
+            for value in overflowServiceUUIDs {
+                if let uuid = value as? CBUUID {
+                    overflowServiceUUIDStrings.append(uuid.uuidString.lowercased())
+                }
+            }
+            
+            adv.removeValue(forKey: CBAdvertisementDataOverflowServiceUUIDsKey)
+            adv["overflowServiceUUIDs"] = overflowServiceUUIDStrings
+        }
+        
+        // Convert the manufacturer data
+        if let mfgData = adv[CBAdvertisementDataManufacturerDataKey] as? Data {
+            if mfgData.count > 1 {
+                let manufactureID = UInt16(mfgData[0]) + UInt16(mfgData[1]) << 8
+                var manInfo: [String: Any] = [:]
+                manInfo[String(format: "%04X", manufactureID)] = mfgData.subdata(in: 2..<mfgData.endIndex)
+                adv["manufacturerData"] = mfgData
+            }
+            adv.removeValue(forKey: CBAdvertisementDataManufacturerDataKey)
+            adv["manufacturerRawData"] = mfgData
+            
+        }
+        
+        return adv
+    }
+    
+    static func decodeCharacteristicProperties(_ p: CBCharacteristicProperties) -> Dictionary<String, Any> {
+        var props: [String: Any] = [:]
+        
+        // NOTE: props strings need to be consistent across iOS and Android
+        if p.contains(.broadcast) {
+            props["Broadcast"] = "Broadcast"
+        }
+        
+        if p.contains(.read) {
+            props["Read"] = "Read"
+        }
+        
+        if p.contains(.writeWithoutResponse) {
+            props["WriteWithoutResponse"] = "WriteWithoutResponse"
+        }
+        
+        if p.contains(.write) {
+            props["Write"] = "Write"
+        }
+        
+        if p.contains(.notify) {
+            props["Notify"] = "Notify"
+        }
+        
+        if p.contains(.indicate) {
+            props["Indicate"] = "Indicate"
+        }
+        
+        if p.contains(.authenticatedSignedWrites) {
+            props["AuthenticateSignedWrites"] = "AuthenticateSignedWrites"
+        }
+        
+        if p.contains(.extendedProperties) {
+            props["ExtendedProperties"] = "ExtendedProperties"
+        }
+        
+        if p.contains(.notifyEncryptionRequired) {
+            props["NotifyEncryptionRequired"] = "NotifyEncryptionRequired"
+        }
+        
+        if p.contains(.indicateEncryptionRequired) {
+            props["IndicateEncryptionRequired"] = "IndicateEncryptionRequired"
+        }
+        
+        return props
+    }
+    
+    static func key(forPeripheral peripheral: CBPeripheral,
+                    andCharacteristic characteristic: CBCharacteristic) -> String {
+        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)"
+    }
+    
+    static func findDescriptor(fromUUID UUID: CBUUID, characteristic: CBCharacteristic) -> CBDescriptor? {
+        if BleManager.verboseLogging {
+            NSLog("Looking for descriptor \(UUID) on characteristic \(characteristic.uuid)")
+        }
+        for descriptor in characteristic.descriptors ?? [] {
+            if descriptor.uuid.isEqual(UUID) {
+                if BleManager.verboseLogging {
+                    NSLog("Found descriptor \(UUID)")
+                }
+                return descriptor
+            }
+        }
+        return nil // Descriptor not found on this characteristic
+    }
+    
+    // Find a service in a peripheral
+    static func findService(fromUUID UUID: CBUUID, peripheral p: CBPeripheral) -> CBService? {
+        for service in p.services ?? [] {
+            if compareCBUUID(service.uuid, UUID2: UUID) {
+                return service
+            }
+        }
+        
+        return nil // Service not found on this peripheral
+    }
+    
+    static func compareCBUUID(_ UUID1: CBUUID, UUID2: CBUUID) -> Bool {
+        return UUID1.uuidString.caseInsensitiveCompare(UUID2.uuidString) == .orderedSame
+    }
+    
+    // Find a characteristic in service with a specific property
+    static func findCharacteristic(fromUUID UUID: CBUUID, service: CBService, prop: CBCharacteristicProperties) -> CBCharacteristic? {
+        if BleManager.verboseLogging {
+            NSLog("Looking for \(UUID) with properties \(prop.rawValue)")
+        }
+        for characteristic in service.characteristics ?? [] {
+            if (characteristic.properties.contains(prop) && characteristic.uuid.isEqual(UUID)) {
+                if BleManager.verboseLogging {
+                    NSLog("Found \(UUID)")
+                }
+                return characteristic
+            }
+        }
+        return nil // Characteristic with prop not found on this service
+    }
+    
+    // Find a characteristic in service by UUID
+    static func findCharacteristic(fromUUID UUID: CBUUID, service: CBService) -> CBCharacteristic? {
+        if BleManager.verboseLogging {
+            NSLog("Looking for \(UUID)")
+        }
+        for characteristic in service.characteristics ?? [] {
+            if characteristic.uuid.isEqual(UUID) {
+                if BleManager.verboseLogging {
+                    NSLog("Found \(UUID)")
+                }
+                return characteristic
+            }
+        }
+        return nil // Characteristic not found on this service
+    }
+    
+    
+}
+
+class Peripheral:Hashable {
+    var instance: CBPeripheral
+    var rssi: NSNumber?
+    var advertisementData: [String:Any]?
+    
+    init(peripheral: CBPeripheral, rssi: NSNumber? = nil, advertisementData: [String:Any]? = nil) {
+        self.instance = peripheral
+        self.rssi = rssi
+        self.advertisementData = advertisementData
+    }
+    
+    func setRSSI(_ newRSSI: NSNumber?) {
+        self.rssi = newRSSI
+    }
+    
+    func setAdvertisementData(_ advertisementData: [String:Any]) {
+        self.advertisementData = advertisementData
+    }
+    
+    func advertisingInfo() -> Dictionary<String, Any> {
+        var peripheralInfo: [String: Any] = [:]
+        
+        peripheralInfo["name"] = instance.name
+        peripheralInfo["id"] = instance.uuidAsString()
+        peripheralInfo["rssi"] = self.rssi
+        if let adv = self.advertisementData {
+            peripheralInfo["advertising"] = Helper.reformatAdvertisementData(adv)
+        }
+        
+        return peripheralInfo
+    }
+    
+    func servicesInfo() -> Dictionary<String, Any> {
+        var servicesInfo: [String: Any] = [:]
+        
+        var serviceList = [[String: Any]]()
+        var characteristicList = [[String: Any]]()
+        
+        for service in instance.services ?? [] {
+            var serviceDictionary = [String: Any]()
+            serviceDictionary["uuid"] = service.uuid.uuidString.lowercased()
+            serviceList.append(serviceDictionary)
+            
+            for characteristic in service.characteristics ?? [] {
+                var characteristicDictionary = [String: Any]()
+                characteristicDictionary["service"] = service.uuid.uuidString.lowercased()
+                characteristicDictionary["characteristic"] = characteristic.uuid.uuidString.lowercased()
+                
+                if let value = characteristic.value, value.count > 0 {
+                    characteristicDictionary["value"] = Helper.dataToArrayBuffer(value)
+                }
+                
+                characteristicDictionary["properties"] = Helper.decodeCharacteristicProperties(characteristic.properties)
+                
+                characteristicDictionary["isNotifying"] = characteristic.isNotifying
+                
+                var descriptorList = [[String: Any]]()
+                for descriptor in characteristic.descriptors ?? [] {
+                    var descriptorDictionary = [String: Any]()
+                    descriptorDictionary["uuid"] = descriptor.uuid.uuidString.lowercased()
+                    
+                    if let value = descriptor.value {
+                        descriptorDictionary["value"] = value
+                    }
+                    
+                    descriptorList.append(descriptorDictionary)
+                }
+                
+                if descriptorList.count > 0 {
+                    characteristicDictionary["descriptors"] = descriptorList
+                }
+                
+                characteristicList.append(characteristicDictionary)
+            }
+        }
+        
+        servicesInfo["services"] = serviceList
+        servicesInfo["characteristics"] = characteristicList
+        
+        return servicesInfo
+    }
+    
+    
+    static func == (lhs: Peripheral, rhs: Peripheral) -> Bool {
+        return lhs.instance.uuidAsString() == rhs.instance.uuidAsString()
+    }
+    
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(instance.uuidAsString())
+    }
+}
+
+class BLECommandContext:NSObject {
+    var peripheral: Peripheral?
+    var service: CBService?
+    var characteristic: CBCharacteristic?
+}
+
+extension Data {
+    func hexadecimalString() -> String {
+        /* Returns hexadecimal string of Data. Empty string if data is empty. */
+        return map { String(format: "%02hhx", $0) }.joined()
+    }
+    
+    func toArray() -> [NSNumber] {
+        /* Returns an array of NSNumber representing the hexadecimal values of the bytes in the data. Empty array if data is empty. */
+        
+        let dataBuffer = [UInt8](self)
+        
+        if dataBuffer.isEmpty {
+            return []
+        }
+        
+        return dataBuffer.map { NSNumber(value: $0) }
+    }
+}
+
+extension CBPeripheral {
+    
+    func uuidAsString() -> String {
+        return self.identifier.uuidString.lowercased()
+    }
+}

package/package.json

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

package/react-native-ble-manager.podspec

@@ -9,9 +9,9 @@ Pod::Spec.new do |s|
   s.authors		= { "Innove" => "https://github.com/innoveit" }
   s.homepage    	= "https://github.com/innoveit/react-native-ble-manager"
   s.license     	= "Apache-2.0"
-  s.platform    	= :ios, "8.0"
+  s.platform    	= :ios, "9.0"
   s.source      	= { :git => "https://github.com/innoveit/react-native-ble-manager.git" }
-  s.source_files	= "ios/**/*.{h,m}"
+  s.source_files = "ios/**/*.{h,c,cc,cpp,m,mm,swift}"
 
   s.dependency 'React-Core'
 end

package/src/index.ts

@@ -405,11 +405,15 @@ class BleManager {
         scanningOptions.reportDelay = 0;
       }
 
-      // (ANDROID) ScanFilter used to restrict search to devices with a specific advertising name.
+      // In Android ScanFilter used to restrict search to devices with a specific advertising name.
       // https://developer.android.com/reference/android/bluetooth/le/ScanFilter.Builder#setDeviceName(java.lang.String)
-      if (!scanningOptions.exactAdvertisingName
-        || typeof scanningOptions.exactAdvertisingName !== 'string') {
+      // In iOS, this is a whole word match, not a partial search.
+      if (!scanningOptions.exactAdvertisingName) {
         delete scanningOptions.exactAdvertisingName;
+      } else {
+        if (typeof scanningOptions.exactAdvertisingName === 'string') {
+          scanningOptions.exactAdvertisingName = [scanningOptions.exactAdvertisingName];
+        }
       }
 
       bleManager.scan(

package/src/types.ts

@@ -38,7 +38,8 @@ export interface Peripheral {
 export interface AdvertisingData {
   isConnectable?: boolean;
   localName?: string;
-  manufacturerData?: CustomAdvertisingData;
+  rawData?: CustomAdvertisingData;
+  manufacturerData?: Record<string, CustomAdvertisingData>;
   serviceData?: Record<string, CustomAdvertisingData>;
   serviceUUIDs?: string[];
   txPowerLevel?: number;
@@ -136,7 +137,7 @@ export interface ScanOptions {
    * if `callbackType` is set to `FirstMatch`, the shortenedLocalName will be used for filtering.
    * https://developer.android.com/reference/android/bluetooth/le/ScanFilter.Builder#setDeviceName(java.lang.String)
    */
-  exactAdvertisingName?: string;
+  exactAdvertisingName?: string|string[];
 }
 
 /**

package/ios/BLECommandContext.h

@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <CoreBluetooth/CoreBluetooth.h>
-
-@interface BLECommandContext : NSObject
-
-@property CBPeripheral *peripheral;
-@property CBService *service;
-@property CBCharacteristic *characteristic;
-
-@end

package/ios/BLECommandContext.m

@@ -1,5 +0,0 @@
-#import "BLECommandContext.h"
-
-@implementation BLECommandContext
-
-@end

package/ios/CBPeripheral+Extensions.h

@@ -1,16 +0,0 @@
-#import <objc/runtime.h>
-#import <Foundation/Foundation.h>
-#import <CoreBluetooth/CoreBluetooth.h>
-#import "CBPeripheral+Extensions.h"
-
-
-@interface CBPeripheral(com_megster_ble_extension)
-
-@property (nonatomic, retain) NSDictionary *advertising;
-@property (nonatomic, retain) NSNumber *advertisementRSSI;
-
--(void)setAdvertisementData:(NSDictionary *)advertisementData RSSI:(NSNumber*)rssi;
--(NSDictionary *)asDictionary;
--(NSString *)uuidAsString;
-
-@end