react-native-ble-manager 11.5.7 → 12.0.0-rc.0

package/ios/{BleManager.swift → SwiftBleManager.swift}

@@ -2,17 +2,14 @@ import Foundation
 import CoreBluetooth
 
 
-@objc(BleManager)
-class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegate {
-    
-    static var shared:BleManager?
+@objc public class SwiftBleManager: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate {
+    static var shared:SwiftBleManager?
     static var sharedManager:CBCentralManager?
-    
-    private var hasListeners:Bool = false
-    
+
+    private weak var bleManager: BleManager?
     private var manager: CBCentralManager?
     private var scanTimer: Timer?
-    
+
     private var peripherals: Dictionary<String, Peripheral>
     private var connectCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
     private var readCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
@@ -24,19 +21,19 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
     private var writeQueue: Array<Any>
     private var notificationCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
     private var stopNotificationCallbacks: Dictionary<String, [RCTResponseSenderBlock]>
-    
+
     private var connectedPeripherals: Set<String>
-    
+
     private var retrieveServicesLatches: Dictionary<String, Set<CBService>>
     private var characteristicsLatches: Dictionary<String, Set<CBCharacteristic>>
-    
+
     private let serialQueue = DispatchQueue(label: "BleManager.serialQueue")
-    
+
     private var exactAdvertisingName: [String]
-    
+
     static var verboseLogging = false
-    
-    private override init() {
+
+    @objc public init(bleManager:BleManager) {
         peripherals = [:]
         connectCallbacks = [:]
         readCallbacks = [:]
@@ -52,31 +49,19 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         characteristicsLatches = [:]
         exactAdvertisingName = []
         connectedPeripherals = []
-        
+        self.bleManager = bleManager
+
         super.init()
-        
+
         NSLog("BleManager created");
-        
-        BleManager.shared = self
-        
-        
+
+        SwiftBleManager.shared = self
+
+
         NotificationCenter.default.addObserver(self, selector: #selector(bridgeReloading), name: NSNotification.Name(rawValue: "RCTBridgeWillReloadNotification"), object: nil)
     }
     
-    @objc override static func requiresMainQueueSetup() -> Bool { return true }
-    
-    @objc override func supportedEvents() -> [String]! {
-        return ["BleManagerDidUpdateValueForCharacteristic", "BleManagerStopScan", "BleManagerDiscoverPeripheral", "BleManagerConnectPeripheral", "BleManagerDisconnectPeripheral", "BleManagerDidUpdateState", "BleManagerCentralManagerWillRestoreState", "BleManagerDidUpdateNotificationStateFor"]
-    }
-    
-    @objc override func startObserving() {
-        hasListeners = true
-    }
-    
-    @objc override func stopObserving() {
-        hasListeners = false
-    }
-    
+
     @objc func bridgeReloading() {
         if let manager = manager {
             if let scanTimer = self.scanTimer {
@@ -84,32 +69,33 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                 self.scanTimer = nil
                 manager.stopScan()
             }
-            
+
             manager.delegate = nil
         }
-        
+
         serialQueue.sync {
             for p in peripherals.values {
                 p.instance.delegate = nil
             }
         }
-        
+
         peripherals = [:]
     }
-    
+     
+        
     // Helper method to find a peripheral by UUID
     func findPeripheral(byUUID uuid: String) -> Peripheral? {
         var foundPeripheral: Peripheral? = nil
-        
+
         serialQueue.sync {
             if let peripheral = peripherals[uuid] {
                 foundPeripheral = peripheral;
             }
         }
-        
+
         return foundPeripheral
     }
-    
+
     // Helper method to insert callback in different queues
     func insertCallback(_ callback: @escaping RCTResponseSenderBlock, intoDictionary dictionary: inout Dictionary<String, [RCTResponseSenderBlock]>, withKey key: String) {
         serialQueue.sync {
@@ -118,7 +104,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             dictionary[key] = peripheralCallbacks
         }
     }
-    
+
     // 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 {
@@ -131,22 +117,22 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             for callback in peripheralCallbacks {
                 callback(parameters)
             }
-            
+
             dictionary.removeValue(forKey: key)
         }
     }
-    
+
     @objc func getContext(_ peripheralUUIDString: String, serviceUUIDString: String, characteristicUUIDString: String, prop: CBCharacteristicProperties, callback: @escaping RCTResponseSenderBlock) -> BLECommandContext? {
         let serviceUUID = CBUUID(string: serviceUUIDString)
         let characteristicUUID = CBUUID(string: characteristicUUIDString)
-        
+
         guard let peripheral = peripherals[peripheralUUIDString] else {
             let error = String(format: "Could not find peripheral with UUID %@", peripheralUUIDString)
             NSLog(error)
             callback([error])
             return nil
         }
-        
+
         guard let service = Helper.findService(fromUUID: serviceUUID, peripheral: peripheral.instance) else {
             let error = String(format: "Could not find service with UUID %@ on peripheral with UUID %@",
                                serviceUUIDString,
@@ -155,19 +141,19 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             callback([error])
             return nil
         }
-        
+
         var characteristic = Helper.findCharacteristic(fromUUID: characteristicUUID, service: service, prop: prop)
-        
+
         // Special handling for INDICATE. If characteristic with notify is not found, check for indicate.
         if prop == CBCharacteristicProperties.notify && characteristic == nil {
             characteristic = Helper.findCharacteristic(fromUUID: characteristicUUID, service: service, prop: CBCharacteristicProperties.indicate)
         }
-        
+
         // As a last resort, try to find ANY characteristic with this UUID, even if it doesn't have the correct properties
         if characteristic == nil {
             characteristic = Helper.findCharacteristic(fromUUID: characteristicUUID, service: service)
         }
-        
+
         guard let finalCharacteristic = characteristic else {
             let error = String(format: "Could not find characteristic with UUID %@ on service with UUID %@ on peripheral with UUID %@",
                                characteristicUUIDString,
@@ -177,55 +163,55 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             callback([error])
             return nil
         }
-        
+
         let context = BLECommandContext()
         context.peripheral = peripheral
         context.service = service
         context.characteristic = finalCharacteristic
         return context
     }
-    
-    
+
+
     @objc public func start(_ options: NSDictionary,
                             callback: RCTResponseSenderBlock) {
-        if BleManager.verboseLogging {
+        if SwiftBleManager.verboseLogging {
             NSLog("BleManager initialized")
         }
         var initOptions = [String: Any]()
-        
+
         if let showAlert = options["showAlert"] as? Bool {
             initOptions[CBCentralManagerOptionShowPowerAlertKey] = showAlert
         }
-        
+
         if let verboseLogging = options["verboseLogging"] as? Bool {
-            BleManager.verboseLogging = verboseLogging
+            SwiftBleManager.verboseLogging = verboseLogging
         }
-        
+
         var queue: DispatchQueue
         if let queueIdentifierKey = options["queueIdentifierKey"] as? String {
             queue = DispatchQueue(label: queueIdentifierKey, qos: DispatchQoS.background)
         } else {
             queue = DispatchQueue.main
         }
-        
+
         if let restoreIdentifierKey = options["restoreIdentifierKey"] as? String {
             initOptions[CBCentralManagerOptionRestoreIdentifierKey] = restoreIdentifierKey
-            
-            if let sharedManager = BleManager.sharedManager {
+
+            if let sharedManager = SwiftBleManager.sharedManager {
                 manager = sharedManager
                 manager?.delegate = self
             } else {
                 manager = CBCentralManager(delegate: self, queue: queue, options: initOptions)
-                BleManager.sharedManager = manager
+                SwiftBleManager.sharedManager = manager
             }
         } else {
             manager = CBCentralManager(delegate: self, queue: queue, options: initOptions)
-            BleManager.sharedManager = manager
+            SwiftBleManager.sharedManager = manager
         }
-        
+
         callback([])
     }
-    
+
     @objc public func scan(_ serviceUUIDStrings: [Any],
                            timeoutSeconds: NSNumber,
                            allowDuplicates: Bool,
@@ -236,7 +222,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         } else {
             NSLog("scan")
         }
-        
+
         // Clear the peripherals before scanning again, otherwise cannot connect again after disconnection
         // Only clear peripherals that are not connected - otherwise connections fail silently (without any
         // onDisconnect* callback).
@@ -247,24 +233,24 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                 peripherals.removeValue(forKey: uuid)
             }
         }
-        
+
         var serviceUUIDs = [CBUUID]()
         if let serviceUUIDStrings = serviceUUIDStrings as? [String] {
             serviceUUIDs = serviceUUIDStrings.map { CBUUID(string: $0) }
         }
-        
+
         var options: [String: Any]?
         if allowDuplicates {
             options = [CBCentralManagerScanOptionAllowDuplicatesKey: true]
         }
-        
+
         exactAdvertisingName.removeAll()
         if let names = scanningOptions["exactAdvertisingName"] as? [String] {
             exactAdvertisingName.append(contentsOf: names)
         }
-        
+
         manager?.scanForPeripherals(withServices: serviceUUIDs, options: options)
-        
+
         if timeoutSeconds.doubleValue > 0 {
             if let scanTimer = scanTimer {
                 scanTimer.invalidate()
@@ -274,50 +260,46 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                 self.scanTimer = Timer.scheduledTimer(timeInterval: timeoutSeconds.doubleValue, target: self, selector: #selector(self.stopTimer), userInfo: nil, repeats: false)
             }
         }
-        
+
         callback([])
     }
-    
+
     @objc func stopTimer() {
         NSLog("Stop scan");
         scanTimer = nil;
         manager?.stopScan()
-        if hasListeners {
-            sendEvent(withName: "BleManagerStopScan", body: ["status": 10])
-        }
+        bleManager?.emit(onStopScan: ["status": 10])
     }
-    
-    
+
+
     @objc public func stopScan(_ callback: @escaping RCTResponseSenderBlock) {
         if let scanTimer = self.scanTimer {
             scanTimer.invalidate()
             self.scanTimer = nil
         }
-        
+
         manager?.stopScan()
-        
-        if hasListeners {
-            sendEvent(withName: "BleManagerStopScan", body: ["status": 0])
-        }
-        
+
+        bleManager?.emit(onStopScan: ["status": 0])
+
         callback([])
     }
-    
-    
-    @objc func connect(_ peripheralUUID: String,
+
+
+    @objc public func connect(_ peripheralUUID: String,
                        options: NSDictionary,
                        callback: @escaping RCTResponseSenderBlock) {
-        
+
         if let peripheral = peripherals[peripheralUUID] {
             // Found the peripheral, connect to it
             NSLog("Connecting to peripheral with UUID: \(peripheralUUID)")
-            
+
             insertCallback(callback, intoDictionary: &connectCallbacks, withKey: peripheral.instance.uuidAsString())
             manager?.connect(peripheral.instance)
         } else {
             // Try to retrieve the peripheral
             NSLog("Retrieving peripheral with UUID: \(peripheralUUID)")
-            
+
             if let uuid = UUID(uuidString: peripheralUUID) {
                 let peripheralArray = manager?.retrievePeripherals(withIdentifiers: [uuid])
                 if let retrievedPeripheral = peripheralArray?.first {
@@ -325,7 +307,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                         peripherals[retrievedPeripheral.uuidAsString()] = Peripheral(peripheral:retrievedPeripheral)
                     }
                     NSLog("Successfully retrieved and connecting to peripheral with UUID: \(peripheralUUID)")
-                    
+
                     // Connect to the retrieved peripheral
                     insertCallback(callback, intoDictionary: &connectCallbacks, withKey: retrievedPeripheral.uuidAsString())
                     manager?.connect(retrievedPeripheral, options: nil)
@@ -340,13 +322,13 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-    
-    @objc func disconnect(_ peripheralUUID: String,
+
+    @objc public func disconnect(_ peripheralUUID: String,
                           force: Bool,
                           callback: @escaping RCTResponseSenderBlock) {
         if let peripheral = peripherals[peripheralUUID] {
             NSLog("Disconnecting from peripheral with UUID: \(peripheralUUID)")
-            
+
             if let services = peripheral.instance.services {
                 for service in services {
                     if let characteristics = service.characteristics {
@@ -359,46 +341,46 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                     }
                 }
             }
-            
+
             manager?.cancelPeripheralConnection(peripheral.instance)
             callback([])
-            
+
         } else {
             let error = "Could not find peripheral \(peripheralUUID)."
             NSLog(error)
             callback([error])
         }
     }
-    
-    @objc func retrieveServices(_ peripheralUUID: String,
+
+    @objc public func retrieveServices(_ peripheralUUID: String,
                                 services: [String],
                                 callback: @escaping RCTResponseSenderBlock) {
         NSLog("retrieveServices \(services)")
-        
+
         if let peripheral = peripherals[peripheralUUID], peripheral.instance.state == .connected {
             insertCallback(callback, intoDictionary: &retrieveServicesCallbacks, withKey: peripheral.instance.uuidAsString())
-            
+
             var uuids: [CBUUID] = []
             for string in services {
                 let uuid = CBUUID(string: string)
                 uuids.append(uuid)
             }
-            
+
             if !uuids.isEmpty {
                 peripheral.instance.discoverServices(uuids)
             } else {
                 peripheral.instance.discoverServices(nil)
             }
-            
+
         } else {
             callback(["Peripheral not found or not connected"])
         }
     }
-    
-    @objc func readRSSI(_ peripheralUUID: String,
+
+    @objc public func readRSSI(_ peripheralUUID: String,
                         callback: @escaping RCTResponseSenderBlock) {
         NSLog("readRSSI")
-        
+
         if let peripheral = peripherals[peripheralUUID], peripheral.instance.state == .connected {
             insertCallback(callback, intoDictionary: &readRSSICallbacks, withKey: peripheral.instance.uuidAsString())
             peripheral.instance.readRSSI()
@@ -406,93 +388,93 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             callback(["Peripheral not found or not connected"])
         }
     }
-    
-    @objc func readDescriptor(_ peripheralUUID: String,
+
+    @objc public func readDescriptor(_ peripheralUUID: String,
                               serviceUUID: String,
                               characteristicUUID: String,
                               descriptorUUID: String,
                               callback: @escaping RCTResponseSenderBlock) {
         NSLog("readDescriptor")
-        
+
         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: &readDescriptorCallbacks, withKey: key)
-            
+
         }
-        
+
         peripheral?.instance.readValue(for: descriptor)
     }
-    
-    @objc func writeDescriptor(_ peripheralUUID: String,
+
+    @objc public 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) {
+
+    @objc public func getDiscoveredPeripherals(_ callback: @escaping RCTResponseSenderBlock) {
         NSLog("Get discovered peripherals")
         var discoveredPeripherals: [[String: Any]] = []
-        
+
         serialQueue.sync {
             for (_, peripheral) in peripherals {
                 discoveredPeripherals.append(peripheral.advertisingInfo())
             }
         }
-        
+
         callback([NSNull(), discoveredPeripherals])
     }
-    
-    @objc func getConnectedPeripherals(_ serviceUUIDStrings: [String],
+
+    @objc public func getConnectedPeripherals(_ serviceUUIDStrings: [String],
                                        callback: @escaping RCTResponseSenderBlock) {
         NSLog("Get connected peripherals")
         var serviceUUIDs: [CBUUID] = []
-        
+
         for uuidString in serviceUUIDStrings {
             serviceUUIDs.append(CBUUID(string: uuidString))
         }
-        
+
         var connectedPeripherals: [Peripheral] = []
-        
+
         if serviceUUIDs.isEmpty {
             serialQueue.sync {
                 connectedPeripherals = peripherals.filter({ $0.value.instance.state == .connected }).map({ p in
@@ -501,7 +483,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         } else {
             let connectedCBPeripherals: [CBPeripheral] = manager?.retrieveConnectedPeripherals(withServices: serviceUUIDs) ?? []
-            
+
             serialQueue.sync {
                 for ph in connectedCBPeripherals {
                     if let peripheral = peripherals[ph.uuidAsString()] {
@@ -512,65 +494,65 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                 }
             }
         }
-        
+
         var foundedPeripherals: [[String: Any]] = []
-        
+
         for peripheral in connectedPeripherals {
             foundedPeripherals.append(peripheral.advertisingInfo())
         }
-        
+
         callback([NSNull(), foundedPeripherals])
     }
-    
-    @objc func isPeripheralConnected(_ peripheralUUID: String,
+
+    @objc public func isPeripheralConnected(_ peripheralUUID: String,
                                      callback: @escaping RCTResponseSenderBlock) {
-        
+
         if let peripheral = peripherals[peripheralUUID] {
             callback([NSNull(), peripheral.instance.state == .connected])
         } else {
             callback(["Peripheral not found"])
         }
     }
-    
-    @objc func isScanning(_ callback: @escaping RCTResponseSenderBlock) {        
+
+    @objc public func isScanning(_ callback: @escaping RCTResponseSenderBlock) {
         if let manager = manager {
             callback([NSNull(), manager.isScanning])
         } else {
             callback(["CBCentralManager not found"])
         }
     }
-    
-    @objc func checkState(_ callback: @escaping RCTResponseSenderBlock) {
+
+    @objc public func checkState(_ callback: @escaping RCTResponseSenderBlock) {
         if let manager = manager {
             centralManagerDidUpdateState(manager)
-            
+
             let stateName = Helper.centralManagerStateToString(manager.state)
             callback([stateName])
         }
     }
-    
-    @objc func write(_ peripheralUUID: String,
+
+    @objc public func write(_ peripheralUUID: String,
                      serviceUUID: String,
                      characteristicUUID: String,
                      message: [UInt8],
                      maxByteSize: Int,
                      callback: @escaping RCTResponseSenderBlock) {
         NSLog("write")
-        
+
         guard let context = getContext(peripheralUUID, serviceUUIDString: serviceUUID, characteristicUUIDString: characteristicUUID, prop: CBCharacteristicProperties.write, callback: callback) else {
             return
         }
-        
+
         let dataMessage = Data(message)
-        
+
         if let peripheral = context.peripheral, let characteristic = context.characteristic {
             let key = Helper.key(forPeripheral:peripheral.instance, andCharacteristic: characteristic)
             insertCallback(callback, intoDictionary: &writeCallbacks, withKey: key)
-            
-            if BleManager.verboseLogging {
+
+            if SwiftBleManager.verboseLogging {
                 NSLog("Message to write(\(dataMessage.count)): \(dataMessage.hexadecimalString())")
             }
-            
+
             if dataMessage.count > maxByteSize {
                 var count = 0
                 var offset = 0
@@ -580,16 +562,16 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                     count += maxByteSize
                     offset += maxByteSize
                 }
-                
+
                 if count < dataMessage.count {
                     let splitMessage = dataMessage.subdata(in: offset..<dataMessage.count)
                     writeQueue.append(splitMessage)
                 }
-                
-                if BleManager.verboseLogging {
+
+                if SwiftBleManager.verboseLogging {
                     NSLog("Queued splitted message: \(writeQueue.count)")
                 }
-                
+
                 if case let firstMessage as Data = writeQueue.removeFirst() {
                     peripheral.instance.writeValue(firstMessage, for: characteristic, type: .withResponse)
                 }
@@ -598,8 +580,8 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-    
-    @objc func writeWithoutResponse(_ peripheralUUID: String,
+
+    @objc public func writeWithoutResponse(_ peripheralUUID: String,
                                     serviceUUID: String,
                                     characteristicUUID: String,
                                     message: [UInt8],
@@ -607,94 +589,94 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                                     queueSleepTime: Int,
                                     callback: @escaping RCTResponseSenderBlock) {
         NSLog("writeWithoutResponse")
-        
+
         guard let context = getContext(peripheralUUID, serviceUUIDString: serviceUUID, characteristicUUIDString: characteristicUUID, prop: CBCharacteristicProperties.writeWithoutResponse, callback: callback) else {
             return
         }
-        
+
         let dataMessage = Data(message)
-        
-        if BleManager.verboseLogging {
+
+        if SwiftBleManager.verboseLogging {
             NSLog("Message to write(\(dataMessage.count)): \(dataMessage.hexadecimalString())")
         }
-        
+
         if dataMessage.count > maxByteSize {
             var offset = 0
             let peripheral = context.peripheral
             guard let characteristic = context.characteristic else { return }
-            
+
             repeat {
                 let thisChunkSize = min(maxByteSize, dataMessage.count - offset)
                 let chunk = dataMessage.subdata(in: offset..<offset + thisChunkSize)
-                
+
                 offset += thisChunkSize
                 peripheral?.instance.writeValue(chunk, for: characteristic, type: .withoutResponse)
-                
+
                 let sleepTimeSeconds = TimeInterval(queueSleepTime) / 1000
                 Thread.sleep(forTimeInterval: sleepTimeSeconds)
             } while offset < dataMessage.count
-            
+
             callback([])
         } else {
             let peripheral = context.peripheral
             guard let characteristic = context.characteristic else { return }
-            
+
             peripheral?.instance.writeValue(dataMessage, for: characteristic, type: .withoutResponse)
             callback([])
         }
     }
-    
-    @objc func read(_ peripheralUUID: String,
+
+    @objc public func read(_ peripheralUUID: String,
                     serviceUUID: String,
                     characteristicUUID: String,
                     callback: @escaping RCTResponseSenderBlock) {
         NSLog("read")
-        
+
         guard let context = getContext(peripheralUUID, serviceUUIDString: serviceUUID, characteristicUUIDString: characteristicUUID, prop: CBCharacteristicProperties.read, callback: callback) else {
             return
         }
-        
+
         let peripheral = context.peripheral
         let characteristic = context.characteristic
-        
+
         let key = Helper.key(forPeripheral:peripheral!.instance as CBPeripheral, andCharacteristic: characteristic!)
         insertCallback(callback, intoDictionary: &readCallbacks, withKey: key)
-        
+
         peripheral?.instance.readValue(for: characteristic!)  // callback sends value
     }
-    
-    @objc func startNotification(_ peripheralUUID: String,
+
+    @objc public func startNotification(_ peripheralUUID: String,
                                  serviceUUID: String,
                                  characteristicUUID: String,
                                  callback: @escaping RCTResponseSenderBlock) {
         NSLog("startNotification")
-        
+
         guard let context = getContext(peripheralUUID, serviceUUIDString: serviceUUID, characteristicUUIDString: characteristicUUID, prop: CBCharacteristicProperties.notify, callback: callback) else {
             return
         }
-        
+
         guard let peripheral = context.peripheral else { return }
         guard let characteristic = context.characteristic else { return }
-        
+
         let key = Helper.key(forPeripheral: (peripheral.instance as CBPeripheral?)!, andCharacteristic: characteristic)
         insertCallback(callback, intoDictionary: &notificationCallbacks, withKey: key)
-        
+
         peripheral.instance.setNotifyValue(true, for: characteristic)
     }
-    
-    @objc func stopNotification(_ peripheralUUID: String,
+
+    @objc public func stopNotification(_ peripheralUUID: String,
                                 serviceUUID: String,
                                 characteristicUUID: String,
                                 callback: @escaping RCTResponseSenderBlock) {
         NSLog("stopNotification")
-        
+
         guard let context = getContext(peripheralUUID, serviceUUIDString: serviceUUID, characteristicUUIDString: characteristicUUID, prop: CBCharacteristicProperties.notify, callback: callback) else {
             return
         }
-        
+
         let peripheral = context.peripheral
         guard let characteristic = context.characteristic else { return }
-        
+
         if characteristic.isNotifying {
             let key = Helper.key(forPeripheral: (peripheral?.instance as CBPeripheral?)!, andCharacteristic: characteristic)
             insertCallback(callback, intoDictionary: &stopNotificationCallbacks, withKey: key)
@@ -705,16 +687,16 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             callback([])
         }
     }
-    
-    @objc func getMaximumWriteValueLengthForWithoutResponse(_ peripheralUUID: String,
+
+    @objc public func getMaximumWriteValueLengthForWithoutResponse(_ peripheralUUID: String,
                                                             callback: @escaping RCTResponseSenderBlock) {
         NSLog("getMaximumWriteValueLengthForWithoutResponse")
-        
+
         guard let peripheral = peripherals[peripheralUUID] else {
             callback(["Peripheral not found or not connected"])
             return
         }
-        
+
         if peripheral.instance.state == .connected {
             let max = NSNumber(value: peripheral.instance.maximumWriteValueLength(for: .withoutResponse))
             callback([NSNull(), max])
@@ -722,16 +704,16 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             callback(["Peripheral not found or not connected"])
         }
     }
-    
-    @objc func getMaximumWriteValueLengthForWithResponse(_ peripheralUUID: String,
+
+    @objc public func getMaximumWriteValueLengthForWithResponse(_ peripheralUUID: String,
                                                          callback: @escaping RCTResponseSenderBlock) {
         NSLog("getMaximumWriteValueLengthForWithResponse")
-        
+
         guard let peripheral = peripherals[peripheralUUID] else {
             callback(["Peripheral not found or not connected"])
             return
         }
-        
+
         if peripheral.instance.state == .connected {
             let max = NSNumber(value: peripheral.instance.maximumWriteValueLength(for: .withResponse))
             callback([NSNull(), max])
@@ -739,8 +721,8 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             callback(["Peripheral not found or not connected"])
         }
     }
-    
-    func centralManager(_ central: CBCentralManager, willRestoreState dict: [String : Any]) {
+
+    public func centralManager(_ central: CBCentralManager, willRestoreState dict: [String : Any]) {
         if let restoredPeripherals = dict[CBCentralManagerRestoredStatePeripheralsKey] as? [CBPeripheral], restoredPeripherals.count > 0 {
             serialQueue.sync {
                 var data = [[String: Any]]()
@@ -750,18 +732,17 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                     data.append(p.advertisingInfo())
                     peripheral.delegate = self
                 }
-                
-                self.sendEvent(withName:"BleManagerCentralManagerWillRestoreState", body: ["peripherals": data])
+                self.bleManager?.emit(onCentralManagerWillRestoreState: ["peripherals": data])
             }
         }
     }
-    
-    
-    func centralManager(_ central: CBCentralManager,
+
+
+    public func centralManager(_ central: CBCentralManager,
                         didConnect peripheral: CBPeripheral) {
         NSLog("Peripheral Connected: \(peripheral.uuidAsString() )")
         peripheral.delegate = self
-        
+
         /*
          The state of the peripheral isn't necessarily updated until a small
          delay after didConnectPeripheral is called and in the meantime
@@ -771,87 +752,81 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             Timer.scheduledTimer(withTimeInterval: 0.002, repeats: false) { timer in
                 // didFailToConnectPeripheral should have been called already if not connected by now
                 self.invokeAndClearDictionary(&self.connectCallbacks, withKey: peripheral.uuidAsString(), usingParameters: [NSNull()])
-                
-                if self.hasListeners {
-                    self.connectedPeripherals.insert(peripheral.uuidAsString())
-                    self.sendEvent(withName: "BleManagerConnectPeripheral", body: ["peripheral": peripheral.uuidAsString()])
-                }
+
+                self.connectedPeripherals.insert(peripheral.uuidAsString())
+                self.bleManager?.emit(onConnectPeripheral: ["peripheral": peripheral.uuidAsString()])
             }
         }
     }
-    
-    func centralManager(_ central: CBCentralManager,
+
+    public func centralManager(_ central: CBCentralManager,
                         didFailToConnect peripheral: CBPeripheral,
                         error: Error?) {
         let errorStr = "Peripheral connection failure: \(peripheral.uuidAsString() ) (\(error?.localizedDescription ?? "")"
         NSLog(errorStr)
-        
+
         invokeAndClearDictionary(&connectCallbacks, withKey: peripheral.uuidAsString(), usingParameters: [errorStr])
     }
-    
-    func centralManager(_ central: CBCentralManager,
+
+    public func centralManager(_ central: CBCentralManager,
                         didDisconnectPeripheral peripheral:
                         CBPeripheral, error: Error?) {
         let peripheralUUIDString:String = peripheral.uuidAsString()
         NSLog("Peripheral Disconnected: \(peripheralUUIDString)")
-        
+
         if let error = error {
             NSLog("Error: \(error)")
         }
-        
+
         let errorStr = "Peripheral did disconnect: \(peripheralUUIDString)"
-        
+
         invokeAndClearDictionary(&connectCallbacks, withKey: peripheralUUIDString, usingParameters: [errorStr])
         invokeAndClearDictionary(&readRSSICallbacks, withKey: peripheralUUIDString, usingParameters: [errorStr])
         invokeAndClearDictionary(&retrieveServicesCallbacks, withKey: peripheralUUIDString, usingParameters: [errorStr])
-        
-        
+
+
         for key in readCallbacks.keys {
             if let keyString = key as String?, keyString.hasPrefix(peripheralUUIDString) {
                 invokeAndClearDictionary(&readCallbacks, withKey: key, usingParameters: [errorStr])
             }
         }
-        
+
         for key in writeCallbacks.keys {
             if let keyString = key as String?, keyString.hasPrefix(peripheralUUIDString) {
                 invokeAndClearDictionary(&writeCallbacks, withKey: key, usingParameters: [errorStr])
             }
         }
-        
+
         for key in notificationCallbacks.keys {
             if let keyString = key as String?, keyString.hasPrefix(peripheralUUIDString) {
                 invokeAndClearDictionary(&notificationCallbacks, withKey: key, usingParameters: [errorStr])
             }
         }
-        
+
         for key in readDescriptorCallbacks.keys {
             if let keyString = key as String?, keyString.hasPrefix(peripheralUUIDString) {
                 invokeAndClearDictionary(&readDescriptorCallbacks, withKey: key, usingParameters: [errorStr])
             }
         }
-        
+
         for key in stopNotificationCallbacks.keys {
             if let keyString = key as String?, keyString.hasPrefix(peripheralUUIDString) {
                 invokeAndClearDictionary(&stopNotificationCallbacks, withKey: key, usingParameters: [errorStr])
             }
         }
-        
-        if hasListeners {
-            connectedPeripherals.remove(peripheralUUIDString)
-            if let e:Error = error {
-                sendEvent(withName: "BleManagerDisconnectPeripheral", body: ["peripheral": peripheralUUIDString, "domain": e._domain, "code": e._code, "description": e.localizedDescription])
-            } else {
-                sendEvent(withName: "BleManagerDisconnectPeripheral", body: ["peripheral": peripheralUUIDString])
-            }
+
+        connectedPeripherals.remove(peripheralUUIDString)
+        if let e:Error = error {
+            self.bleManager?.emit(onDisconnectPeripheral: ["peripheral": peripheralUUIDString, "domain": e._domain, "code": e._code, "description": e.localizedDescription])
+        } else {
+            self.bleManager?.emit(onDisconnectPeripheral: ["peripheral": peripheralUUIDString])
         }
     }
-    
-    
-    func centralManagerDidUpdateState(_ central: CBCentralManager) {
+
+
+    public func centralManagerDidUpdateState(_ central: CBCentralManager) {
         let stateName = Helper.centralManagerStateToString(central.state)
-        if hasListeners {
-            sendEvent(withName: "BleManagerDidUpdateState", body: ["state": stateName])
-        }
+        self.bleManager?.emit(onDidUpdateState: ["state": stateName])
         if stateName == "off" {
             for peripheralUUID in connectedPeripherals {
                 if let peripheral = peripherals[peripheralUUID] {
@@ -862,14 +837,14 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-    
+
     func handleDiscoveredPeripheral(_ peripheral: CBPeripheral,
                                     advertisementData: [String : Any],
                                     rssi : NSNumber) {
-        if BleManager.verboseLogging {
+        if SwiftBleManager.verboseLogging {
             NSLog("Discover peripheral: \(peripheral.name ?? "NO NAME")");
         }
-        
+
         var cp: Peripheral? = nil
         serialQueue.sync {
             if let p = peripherals[peripheral.uuidAsString()] {
@@ -881,13 +856,11 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                 peripherals[peripheral.uuidAsString()] = cp
             }
         }
-        
-        if (hasListeners) {
-            sendEvent(withName: "BleManagerDiscoverPeripheral", body: cp?.advertisingInfo())
-        }
+
+        self.bleManager?.emit(onDiscoverPeripheral: cp?.advertisingInfo())
     }
-    
-    func centralManager(_ central: CBCentralManager,
+
+    public func centralManager(_ central: CBCentralManager,
                         didDiscover peripheral: CBPeripheral,
                         advertisementData: [String : Any],
                         rssi RSSI: NSNumber) {
@@ -906,27 +879,27 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         } else {
             handleDiscoveredPeripheral(peripheral, advertisementData: advertisementData, rssi: RSSI)
         }
-        
-        
+
+
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didDiscoverServices error: Error?) {
         if let error = error {
             NSLog("Error: \(error)")
             return
         }
-        if BleManager.verboseLogging {
+        if SwiftBleManager.verboseLogging {
             NSLog("Services Discover")
         }
-        
+
         var servicesForPeripheral = Set<CBService>()
         servicesForPeripheral.formUnion(peripheral.services ?? [])
         retrieveServicesLatches[peripheral.uuidAsString()] = servicesForPeripheral
-        
+
         if let services = peripheral.services {
             for service in services {
-                if BleManager.verboseLogging {
+                if SwiftBleManager.verboseLogging {
                     NSLog("Service \(service.uuid.uuidString) \(service.description)")
                 }
                 peripheral.discoverIncludedServices(nil, for: service) // discover included services
@@ -934,8 +907,8 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didDiscoverIncludedServicesFor service: CBService,
                     error: Error?) {
         if let error = error {
@@ -944,30 +917,30 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         }
         peripheral.discoverCharacteristics(nil, for: service) // discover characteristics for included service
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didDiscoverCharacteristicsFor service: CBService,
                     error: Error?) {
         if let error = error {
             NSLog("Error: \(error)")
             return
         }
-        if BleManager.verboseLogging {
+        if SwiftBleManager.verboseLogging {
             NSLog("Characteristics For Service Discover")
         }
-        
+
         var characteristicsForService = Set<CBCharacteristic>()
         characteristicsForService.formUnion(service.characteristics ?? [])
         characteristicsLatches[service.uuid.uuidString] = characteristicsForService
-        
+
         if let characteristics = service.characteristics {
             for characteristic in characteristics {
                 peripheral.discoverDescriptors(for: characteristic)
             }
         }
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didDiscoverDescriptorsFor characteristic: CBCharacteristic,
                     error: Error?) {
         if let error = error {
@@ -976,21 +949,21 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
         }
         let peripheralUUIDString:String = peripheral.uuidAsString()
         let serviceUUIDString:String = (characteristic.service?.uuid.uuidString)!
-        
-        if BleManager.verboseLogging {
+
+        if SwiftBleManager.verboseLogging {
             NSLog("Descriptor For Characteristic Discover \(serviceUUIDString) \(characteristic.uuid.uuidString)")
         }
-        
+
         if var servicesLatch = retrieveServicesLatches[peripheralUUIDString], var characteristicsLatch = characteristicsLatches[serviceUUIDString] {
-            
+
             characteristicsLatch.remove(characteristic)
             characteristicsLatches[serviceUUIDString] = characteristicsLatch
-            
+
             if characteristicsLatch.isEmpty {
                 // All characteristics for this service have been checked
                 servicesLatch.remove(characteristic.service!)
                 retrieveServicesLatches[peripheralUUIDString] = servicesLatch
-                
+
                 if servicesLatch.isEmpty {
                     // All characteristics and services have been checked
                     if let peripheral = peripherals[peripheral.uuidAsString()] {
@@ -1000,58 +973,58 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                     retrieveServicesLatches.removeValue(forKey: peripheralUUIDString)
                 }
             }
-            
+
         }
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didReadRSSI RSSI: NSNumber,
                     error: Error?) {
-        if BleManager.verboseLogging {
+        if SwiftBleManager.verboseLogging {
             print("didReadRSSI \(RSSI)")
         }
-        
+
         if let error = error {
             invokeAndClearDictionary(&readRSSICallbacks, withKey: peripheral.uuidAsString(), usingParameters: [error.localizedDescription, RSSI])
         } else {
             invokeAndClearDictionary(&readRSSICallbacks, withKey: peripheral.uuidAsString(), usingParameters: [NSNull(), RSSI])
         }
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didUpdateValueFor descriptor: CBDescriptor,
                     error: Error?) {
         let key = Helper.key(forPeripheral: peripheral, andCharacteristic: descriptor.characteristic!, andDescriptor: descriptor)
-        
+
         if let error = error {
             NSLog("Error reading descriptor value for \(descriptor.uuid) on characteristic \(descriptor.characteristic!.uuid) :\(error)")
             invokeAndClearDictionary(&readDescriptorCallbacks, withKey: key, usingParameters: [error.localizedDescription, NSNull()])
             return
         }
-        
+
         if let descriptorValue = descriptor.value as? Data {
             NSLog("Read value [descriptor: \(descriptor.uuid), characteristic: \(descriptor.characteristic!.uuid)]: (\(descriptorValue.count)) \(descriptorValue.hexadecimalString())")
         } else {
             NSLog("Read value [descriptor: \(descriptor.uuid), characteristic: \(descriptor.characteristic!.uuid)]: \(String(describing: descriptor.value))")
         }
-        
+
         if readDescriptorCallbacks[key] != nil {
             // The most future proof way of doing this that I could find, other option would be running strcmp on CBUUID strings
             // https://developer.apple.com/documentation/corebluetooth/cbuuid/characteristic_descriptors
             if let descriptorValue = descriptor.value as? Data {
-                if (BleManager.verboseLogging) {
+                if (SwiftBleManager.verboseLogging) {
                     NSLog("Descriptor value is Data")
                 }
                 invokeAndClearDictionary(&readDescriptorCallbacks, withKey: key, usingParameters: [NSNull(), descriptorValue.toArray()])
             } else if let descriptorValue = descriptor.value as? NSNumber {
-                if (BleManager.verboseLogging) {
+                if (SwiftBleManager.verboseLogging) {
                     NSLog("Descriptor value is NSNumber")
                 }
                 var value = descriptorValue.uint64Value
                 let byteData = Data(bytes: &value, count: MemoryLayout.size(ofValue: value))
                 invokeAndClearDictionary(&readDescriptorCallbacks, withKey: key, usingParameters: [NSNull(), byteData.toArray()])
             } else if let descriptorValue = descriptor.value as? String {
-                if (BleManager.verboseLogging) {
+                if (SwiftBleManager.verboseLogging) {
                     NSLog("Descriptor value is String")
                 }
                 if let byteData = descriptorValue.data(using: .utf8) {
@@ -1065,65 +1038,59 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didUpdateValueFor characteristic: CBCharacteristic,
                     error: Error?) {
         let key = Helper.key(forPeripheral: peripheral, andCharacteristic: characteristic)
-        
+
         if let error = error {
             NSLog("Error \(characteristic.uuid) :\(error)")
             invokeAndClearDictionary(&readCallbacks, withKey: key, usingParameters: [error.localizedDescription, NSNull()])
             return
         }
-        
-        if BleManager.verboseLogging, let value = characteristic.value {
+
+        if SwiftBleManager.verboseLogging, let value = characteristic.value {
             NSLog("Read value [\(characteristic.uuid)]: \( value.hexadecimalString())")
         }
-        
+
         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()
-                    ])
-                }
+                self.bleManager?.emitOnDidUpdateValue(forCharacteristic: [
+                    "peripheral": peripheral.uuidAsString(),
+                    "characteristic": characteristic.uuid.uuidString.lowercased(),
+                    "service": characteristic.service!.uuid.uuidString.lowercased(),
+                    "value": characteristic.value!.toArray()
+                ])
             }
         }
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didUpdateNotificationStateFor characteristic: CBCharacteristic,
                     error: Error?) {
         if let error = error {
             NSLog("Error in didUpdateNotificationStateForCharacteristic: \(error)")
-            
-            if hasListeners {
-                sendEvent(withName: "BleManagerDidUpdateNotificationStateFor", body: [
-                    "peripheral": peripheral.uuidAsString(),
-                    "characteristic": characteristic.uuid.uuidString.lowercased(),
-                    "isNotifying": false,
-                    "domain": error._domain,
-                    "code": error._code
-                ])
-            }
+
+            self.bleManager?.emitOnDidUpdateNotificationState(for: [
+                "peripheral": peripheral.uuidAsString(),
+                "characteristic": characteristic.uuid.uuidString.lowercased(),
+                "isNotifying": false,
+                "domain": error._domain,
+                "code": error._code
+            ])
         } else {
-            if hasListeners {
-                sendEvent(withName: "BleManagerDidUpdateNotificationStateFor", body: [
-                    "peripheral": peripheral.uuidAsString(),
-                    "characteristic": characteristic.uuid.uuidString.lowercased(),
-                    "isNotifying": characteristic.isNotifying
-                ])
-            }
+            self.bleManager?.emitOnDidUpdateNotificationState(for: [
+                "peripheral": peripheral.uuidAsString(),
+                "characteristic": characteristic.uuid.uuidString.lowercased(),
+                "isNotifying": characteristic.isNotifying
+            ])            
         }
-        
+
         let key = Helper.key(forPeripheral: peripheral, andCharacteristic: characteristic)
-        
+
         if let error = error {
             if notificationCallbacks[key] != nil {
                 invokeAndClearDictionary(&notificationCallbacks, withKey: key, usingParameters: [error])
@@ -1133,7 +1100,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         } else {
             if characteristic.isNotifying {
-                if BleManager.verboseLogging {
+                if SwiftBleManager.verboseLogging {
                     NSLog("Notification began on \(characteristic.uuid)")
                 }
                 if notificationCallbacks[key] != nil {
@@ -1141,7 +1108,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                 }
             } else {
                 // Notification has stopped
-                if BleManager.verboseLogging {
+                if SwiftBleManager.verboseLogging {
                     NSLog("Notification ended on \(characteristic.uuid)")
                 }
                 if stopNotificationCallbacks[key] != nil {
@@ -1150,12 +1117,12 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public 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 {
@@ -1167,15 +1134,15 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-    
-    func peripheral(_ peripheral: CBPeripheral,
+
+    public func peripheral(_ peripheral: CBPeripheral,
                     didWriteValueFor characteristic: CBCharacteristic,
                     error: Error?) {
         NSLog("didWrite")
-        
+
         let key = Helper.key(forPeripheral:peripheral, andCharacteristic: characteristic)
         let peripheralWriteCallbacks = writeCallbacks[key]
-        
+
         if peripheralWriteCallbacks != nil {
             if let error = error {
                 NSLog("\(error)")
@@ -1191,76 +1158,76 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-    
-    
+
+
     static func getCentralManager() -> CBCentralManager? {
         return sharedManager
     }
-    
-    static func getInstance() -> BleManager? {
+
+    static func getInstance() -> SwiftBleManager? {
         return shared
     }
-    
-    @objc func enableBluetooth(_ callback: @escaping RCTResponseSenderBlock) {
+
+    @objc public func enableBluetooth(_ callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func getBondedPeripherals(_ callback: @escaping RCTResponseSenderBlock) {
+
+    @objc public func getBondedPeripherals(_ callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func createBond(_ peripheralUUID: String,
+
+    @objc public func createBond(_ peripheralUUID: String,
                           devicePin: String,
                           callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func removeBond(_ peripheralUUID: String,
+
+    @objc public func removeBond(_ peripheralUUID: String,
                           callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func removePeripheral(_ peripheralUUID: String,
+
+    @objc public func removePeripheral(_ peripheralUUID: String,
                                 callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func requestMTU(_ peripheralUUID: String,
+
+    @objc public func requestMTU(_ peripheralUUID: String,
                           mtu: Int,
                           callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func requestConnectionPriority(_ peripheralUUID: String,
-                                         mtu: Int,
+
+    @objc public func requestConnectionPriority(_ peripheralUUID: String,
+                                         connectionPriority: Int,
                                          callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func refreshCache(_ peripheralUUID: String,
+
+    @objc public func refreshCache(_ peripheralUUID: String,
                             callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func setName(_ name: String,
-                       callback: @escaping RCTResponseSenderBlock) {
-        callback(["Not supported"])
+
+    @objc public func setName(_ name: String) {
+        // Not supported
     }
-    
-    @objc func getAssociatedPeripherals(_ callback: @escaping RCTResponseSenderBlock) {
+
+    @objc public func getAssociatedPeripherals(_ callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func removeAssociatedPeripheral(_ peripheralUUID: String,
+
+    @objc public func removeAssociatedPeripheral(_ peripheralUUID: String,
                                           callback: @escaping RCTResponseSenderBlock) {
         callback(["Not supported"])
     }
-    
-    @objc func supportsCompanion(_ callback: @escaping RCTResponseSenderBlock) {
-        callback(["Not supported"])
+
+    @objc public func supportsCompanion(_ callback: @escaping RCTResponseSenderBlock) {
+        callback([NSNull(), false])
     }
-    
+
     @objc public func companionScan(_ serviceUUIDs: [Any],
+                                    option: NSDictionary,
                                     callback:RCTResponseSenderBlock) {
         callback(["Not supported"])
     }