#161 Fix BluetoothGATT data serialization

PureSwift · Nov 5, 2024 · 0aee5ce · 0aee5ce
1 parent 59f8b88
commit 0aee5ce
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 35 deletions.
diff --git a/Sources/BluetoothGATT/ATTFindInformationResponse.swift b/Sources/BluetoothGATT/ATTFindInformationResponse.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import Bluetooth
 
 /// Find Information Response
 ///
@@ -227,7 +228,7 @@ public extension ATTFindInformationResponse {
                     let uuid = UInt16(littleEndian: UInt16(bytes: (pairBytes[2], pairBytes[3])))
                     bit16Pairs.append(Attribute16Bit(handle: handle, uuid: uuid))
                 case .bit128:
-                    let uuidBytes = pairBytes.subdataNoCopy(in: 2 ..< 18)
+                    let uuidBytes = pairBytes.subdata(in: 2 ..< 18)
                     let uuid = UInt128(littleEndian: UInt128(data: uuidBytes)!)
                     bit128Pairs.append(Attribute128Bit(handle: handle, uuid: uuid))
                 }

diff --git a/Sources/BluetoothGATT/GAPUUIDList.swift b/Sources/BluetoothGATT/GAPUUIDList.swift
@@ -7,14 +7,14 @@
 //
 
 import Foundation
+import Bluetooth
 
 /// GAP UUID List
 internal struct GAPUUIDList <Element: GAPUUIDElement> {
 
     internal var uuids: [Element]
 
     internal init(uuids: [Element]) {
-
         self.uuids = uuids
     }
 
@@ -96,7 +96,7 @@ extension GAPUUIDList: Collection {
 
 internal protocol GAPUUIDElement: UnsafeDataConvertible {
 
-    init? <T: DataContainer> (data: T)
+    init?<Data: DataContainer>(data: Data)
 
     init(littleEndian: Self)
 
@@ -107,7 +107,7 @@ internal protocol GAPUUIDElement: UnsafeDataConvertible {
 
 extension UInt16: GAPUUIDElement {
 
-    init? <T: DataContainer> (data: T) {
+    init?<Data: DataContainer>(data: Data) {
 
         guard data.count == MemoryLayout<UInt16>.size
             else { return nil }
@@ -119,7 +119,7 @@ extension UInt16: GAPUUIDElement {
 
 extension UInt32: GAPUUIDElement {
 
-    init? <T: DataContainer> (data: T) {
+    init?<Data: DataContainer>(data: Data) {
 
         guard data.count == MemoryLayout<UInt32>.size
             else { return nil }
@@ -131,28 +131,4 @@ extension UInt32: GAPUUIDElement {
     }
 }
 
-extension UInt128: GAPUUIDElement {
-
-    init? <T: DataContainer> (data: T) {
-
-        guard data.count == MemoryLayout<UInt128>.size
-            else { return nil }
-
-        self.init(bytes: (data[0],
-                          data[1],
-                          data[2],
-                          data[3],
-                          data[4],
-                          data[5],
-                          data[6],
-                          data[7],
-                          data[8],
-                          data[9],
-                          data[10],
-                          data[11],
-                          data[12],
-                          data[13],
-                          data[14],
-                          data[15]))
-    }
-}
+extension Bluetooth.UInt128: GAPUUIDElement { }
diff --git a/Sources/BluetoothGATT/GATTClient.swift b/Sources/BluetoothGATT/GATTClient.swift
@@ -433,7 +433,7 @@ public actor GATTClient {
                 startHandle: start,
                 endHandle: end,
                 attributeType: attributeType.rawValue,
-                attributeValue: uuid.littleEndian.data
+                attributeValue: Data(uuid.littleEndian)
             )
             let response = try await send(request, response: ATTFindByTypeResponse.self)
             try await findByTypeResponse(response, &operation)
@@ -766,7 +766,7 @@ public actor GATTClient {
                     startHandle: operation.start,
                     endHandle: operation.end,
                     attributeType: operation.type.rawValue,
-                    attributeValue: serviceUUID.littleEndian.data
+                    attributeValue: Data(serviceUUID.littleEndian)
                 )
                 let response = try await send(request, response: ATTFindByTypeResponse.self)
                 try await findByTypeResponse(response, &operation)

diff --git a/Sources/BluetoothGATT/GATTDatabase.swift b/Sources/BluetoothGATT/GATTDatabase.swift
@@ -472,7 +472,7 @@ internal extension GATTDatabase {
             return Attribute(
                 handle: handle,
                 uuid: serviceUUID,
-                value: self.uuid.littleEndian.data,
+                value: Data(self.uuid.littleEndian),
                 permissions: [.read]
             )
         }

diff --git a/Sources/BluetoothGATT/GATTExternalReportReference.swift b/Sources/BluetoothGATT/GATTExternalReportReference.swift
@@ -33,8 +33,7 @@ public struct GATTExternalReportReference: GATTDescriptor {
     }
 
     public var data: Data {
-
-        return uuid.data
+        return Data(uuid)
     }
 
     public var descriptor: GATTAttribute.Descriptor {