Option to disable chunking feature to improve compatibility with non bluetoothKit devices

BluetoothKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'BluetoothKit'
-  s.version  = '0.4.0'
+  s.version  = '0.4.1'
   s.license  = { :type => 'MIT' }
   s.homepage = 'https://github.com/rasmusth/BluetoothKit'
   s.authors  = { 'Rasmus Taulborg Hummelmose' => 'rasmus@hummelmose.dk' }

Source/BKCBCentralManagerDelegateProxy.swift

@@ -30,7 +30,7 @@ internal protocol BKCBCentralManagerStateDelegate: class {
 }
 
 internal protocol BKCBCentralManagerDiscoveryDelegate: class {
-    func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String : Any], rssi RSSI: NSNumber)
+    func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String: Any], rssi RSSI: NSNumber)
 }
 
 internal protocol BKCBCentralManagerConnectionDelegate: class {
@@ -62,7 +62,7 @@ internal class BKCBCentralManagerDelegateProxy: NSObject, CBCentralManagerDelega
         stateDelegate?.centralManagerDidUpdateState(central)
     }
 
-    internal func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String : Any], rssi RSSI: NSNumber) {
+    internal func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String: Any], rssi RSSI: NSNumber) {
         discoveryDelegate?.centralManager(central, didDiscover: peripheral, advertisementData: advertisementData, rssi: RSSI)
     }
 
@@ -78,8 +78,4 @@ internal class BKCBCentralManagerDelegateProxy: NSObject, CBCentralManagerDelega
         connectionDelegate?.centralManager(central, didDisconnectPeripheral: peripheral, error: error)
     }
 
-
-
-
-
 }

Source/BKCentral.swift

@@ -75,7 +75,7 @@ public class BKCentral: BKPeer, BKCBCentralManagerStateDelegate, BKConnectionPoo
         guard let centralManager = _centralManager else {
             return nil
         }
-        
+
         if #available(tvOS 10.0, iOS 10.0, OSX 10.13, *) {
             return BKAvailability(managerState: centralManager.state)
         } else {
@@ -292,7 +292,7 @@ public class BKCentral: BKPeer, BKCBCentralManagerStateDelegate, BKConnectionPoo
             }
 
             var remotePeripherals: [BKRemotePeripheral] = []
-            
+
             #if os(OSX)
                 if #available(OSX 10.13, *) {
                     for peripheral in peripherals {
@@ -310,12 +310,12 @@ public class BKCentral: BKPeer, BKCBCentralManagerStateDelegate, BKConnectionPoo
                     remotePeripherals.append(remotePeripheral)
                 }
             #endif
-            
+
             return remotePeripherals
         }
         return nil
     }
-    
+
     // MARK: Internal Functions
 
     internal func setUnavailable(_ cause: BKUnavailabilityCause, oldCause: BKUnavailabilityCause?) {
@@ -344,20 +344,19 @@ public class BKCentral: BKPeer, BKCBCentralManagerStateDelegate, BKConnectionPoo
 
     // MARK: BKCBCentralManagerStateDelegate
 
-
     internal func centralManagerDidUpdateState(_ central: CBCentralManager) {
         switch central.state {
             case .unknown, .resetting:
                 break
             case .unsupported, .unauthorized, .poweredOff:
-                
+
                 let newCause: BKUnavailabilityCause
                 if #available(iOS 10.0, tvOS 10.0, OSX 10.13, *) {
                     newCause = BKUnavailabilityCause(managerState: central.state)
                 } else {
                     newCause = BKUnavailabilityCause(centralManagerState: central.centralManagerState)
                 }
-                
+
                 switch stateMachine.state {
                     case let .unavailable(cause):
                         let oldCause = cause

Source/BKConfiguration.swift

@@ -41,8 +41,9 @@ public class BKConfiguration {
     /// Data used to indicate that no more data is coming when communicating.
     public var endOfDataMark: Data
 
-    /// Data used to indicate that a transfer was cancellen when communicating.
-    public var dataCancelledMark: Data
+    /// Enabled by default. This config will automatically chunk data sent and received.
+    /// Disable this if you want to talk to devices that are not using bluetoothKit and then add your own logic for large payloads.
+    public var chunkingEnabled: Bool
 
     internal var serviceUUIDs: [CBUUID] {
         let serviceUUIDs = [ dataServiceUUID ]
@@ -51,14 +52,14 @@ public class BKConfiguration {
 
     // MARK: Initialization
 
-    public init(dataServiceUUID: UUID, dataServiceCharacteristicUUID: UUID) {
+    public init(dataServiceUUID: UUID, dataServiceCharacteristicUUID: UUID, chunkingEnabled: Bool) {
         self.dataServiceUUID = CBUUID(nsuuid: dataServiceUUID)
         self.dataServiceCharacteristicUUID = CBUUID(nsuuid: dataServiceCharacteristicUUID)
-        endOfDataMark = "EOD".data(using: String.Encoding.utf8)!
-        dataCancelledMark = "COD".data(using: String.Encoding.utf8)!
+        self.endOfDataMark = "EOD".data(using: String.Encoding.utf8)!
+        self.chunkingEnabled = chunkingEnabled
     }
 
-    // MARK Functions
+    // MARK: Functions
 
     internal func characteristicUUIDsForServiceUUID(_ serviceUUID: CBUUID) -> [CBUUID] {
         if serviceUUID == dataServiceUUID {

Source/BKContinuousScanner.swift

@@ -60,7 +60,7 @@ internal class BKContinousScanner {
         state = .stopped
     }
 
-    // MARK Internal Functions
+    // MARK: Internal Functions
 
     internal func scanContinuouslyWithChangeHandler(_ changeHandler: @escaping ChangeHandler, stateHandler: StateHandler? = nil, duration: TimeInterval = 3, inBetweenDelay: TimeInterval = 3, errorHandler: ErrorHandler?) {
         guard !busy else {

Source/BKErrorDomain.swift

@@ -30,10 +30,12 @@ import Foundation
     - FailedToConnectDueToTimeout: The time out elapsed while attempting to connect to a peripheral.
     - RemotePeerNotConnected: The action failed because the remote peer attempted to interact with, was not connected.
     - InternalError(underlyingError): Will be returned if any of the internal or private classes returns an unhandled error.
+    - SendFailure(reason): Will be returned if wasn't able to send data. This could be cause the payload was too big etc.
  */
 public enum BKError: Error {
     case interruptedByUnavailability(cause: BKUnavailabilityCause)
     case failedToConnectDueToTimeout
     case remotePeerNotConnected
     case internalError(underlyingError: Error?)
+    case sendFailure(reason: String)
 }

Source/BKPeer.swift

@@ -53,6 +53,23 @@ public class BKPeer {
      - parameter completionHandler: A completion handler allowing you to react in case the data failed to send or once it was sent succesfully.
      */
     public func sendData(_ data: Data, toRemotePeer remotePeer: BKRemotePeer, completionHandler: BKSendDataCompletionHandler?) {
+        if configuration?.chunkingEnabled == false {
+            if data.count > remotePeer.maximumUpdateValueLength {
+                if let handler = completionHandler {
+                    handler(data, remotePeer, BKError.sendFailure(reason: "data.count(\(data.count) is exceeding maximum payload length of \(remotePeer.maximumUpdateValueLength)"))
+                }
+                return
+            }
+            let result = sendData(data, toRemotePeer: remotePeer)
+            if let handler = completionHandler {
+                handler(data, remotePeer, result ? nil : .remotePeerNotConnected)
+            }
+            return
+        }
+        sendDataInTasks(data, toRemotePeer: remotePeer, completionHandler: completionHandler)
+    }
+
+    private func sendDataInTasks(_ data: Data, toRemotePeer remotePeer: BKRemotePeer, completionHandler: BKSendDataCompletionHandler?) {
         guard connectedRemotePeers.contains(remotePeer) else {
             completionHandler?(data, remotePeer, BKError.remotePeerNotConnected)
             return

Source/BKPeripheral.swift

@@ -187,14 +187,14 @@ public class BKPeripheral: BKPeer, BKCBPeripheralManagerDelegate, BKAvailability
         case .unknown, .resetting:
             break
         case .unsupported, .unauthorized, .poweredOff:
-            
+
             let newCause: BKUnavailabilityCause
             if #available(iOS 10.0, tvOS 10.0, OSX 10.13, *) {
                 newCause = BKUnavailabilityCause(managerState: peripheralManager.state)
             } else {
                 newCause = BKUnavailabilityCause(peripheralManagerState: peripheralManager.peripheralManagerState)
             }
-            
+
             switch stateMachine.state {
                 case let .unavailable(cause):
                     let oldCause = cause
@@ -216,7 +216,6 @@ public class BKPeripheral: BKPeer, BKCBPeripheralManagerDelegate, BKAvailability
         }
     }
 
-
     internal func peripheralManagerDidStartAdvertising(_ peripheral: CBPeripheralManager, error: Error?) {
 
     }
@@ -239,7 +238,7 @@ public class BKPeripheral: BKPeer, BKCBPeripheralManagerDelegate, BKAvailability
     }
 
     internal func peripheralManager(_ peripheral: CBPeripheralManager, central: CBCentral, didUnsubscribeFromCharacteristic characteristic: CBCharacteristic) {
-        
+
         #if os(OSX)
             if #available(OSX 10.13, *) {
                 if let remoteCentral = connectedRemotePeers.filter({ ($0.identifier == central.identifier) }).last as? BKRemoteCentral {
@@ -260,7 +259,7 @@ public class BKPeripheral: BKPeer, BKCBPeripheralManagerDelegate, BKAvailability
             guard writeRequest.characteristic.uuid == characteristicData.uuid else {
                 continue
             }
-            
+
             #if os(OSX)
                 if #available(OSX 10.13, *) {
                     guard let remotePeer = (connectedRemotePeers.filter { $0.identifier == writeRequest.central.identifier } .last),

Source/BKPeripheralConfiguration.swift

@@ -37,9 +37,9 @@ public class BKPeripheralConfiguration: BKConfiguration {
 
     // MARK: Initialization
 
-    public init(dataServiceUUID: UUID, dataServiceCharacteristicUUID: UUID, localName: String? = nil) {
+    public init(dataServiceUUID: UUID, dataServiceCharacteristicUUID: UUID, localName: String? = nil, chunkingEnabled: Bool) {
         self.localName = localName
-        super.init(dataServiceUUID: dataServiceUUID, dataServiceCharacteristicUUID: dataServiceCharacteristicUUID)
+        super.init(dataServiceUUID: dataServiceUUID, dataServiceCharacteristicUUID: dataServiceCharacteristicUUID, chunkingEnabled: chunkingEnabled)
     }
 
 }

Source/BKRemotePeer.swift

@@ -56,6 +56,10 @@ public class BKRemotePeer: Equatable {
     }
 
     internal func handleReceivedData(_ receivedData: Data) {
+        if configuration?.chunkingEnabled == false {
+            delegate?.remotePeer(self, didSendArbitraryData: receivedData)
+            return
+        }
         if receivedData == configuration!.endOfDataMark {
             if let finalData = data {
                 delegate?.remotePeer(self, didSendArbitraryData: finalData)

Source/BKRemotePeripheral.swift

@@ -184,5 +184,4 @@ public class BKRemotePeripheral: BKRemotePeer, BKCBPeripheralDelegate {
         handleReceivedData(characteristic.value!)
     }
 
-
 }

Source/BKScanner.swift

@@ -104,14 +104,14 @@ internal class BKScanner: BKCBCentralManagerDiscoveryDelegate {
 
     // MARK: BKCBCentralManagerDiscoveryDelegate
 
-    internal func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String : Any], rssi RSSI: NSNumber) {
+    internal func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String: Any], rssi RSSI: NSNumber) {
         guard busy else {
             return
         }
-    
+
         let RSSI = Int(RSSI.intValue)
         var remotePeripheral: BKRemotePeripheral
-        
+
         #if os(OSX)
             if #available(OSX 10.13, *) {
                 remotePeripheral = BKRemotePeripheral(identifier: peripheral.identifier, peripheral: peripheral)
@@ -121,7 +121,7 @@ internal class BKScanner: BKCBCentralManagerDiscoveryDelegate {
         #else
             remotePeripheral = BKRemotePeripheral(identifier: peripheral.identifier, peripheral: peripheral)
         #endif
-        
+
         remotePeripheral.configuration = configuration
         let discovery = BKDiscovery(advertisementData: advertisementData, remotePeripheral: remotePeripheral, RSSI: RSSI)
         if !discoveries.contains(discovery) {