fix: parse multiple 16-bit and 32-bit Service UUIDs in BLE advertisement data

Author: bdraco

src/bluetooth_data_tools/gap.pxd

@@ -33,6 +33,8 @@ cdef cython.uint TYPE_COMPLETE_LOCAL_NAME
 cdef cython.uint TYPE_MANUFACTURER_SPECIFIC_DATA
 cdef cython.uint TYPE_16BIT_SERVICE_UUID_COMPLETE
 cdef cython.uint TYPE_16BIT_SERVICE_UUID_MORE_AVAILABLE
+cdef cython.uint TYPE_32BIT_SERVICE_UUID_COMPLETE
+cdef cython.uint TYPE_32BIT_SERVICE_UUID_MORE_AVAILABLE
 cdef cython.uint TYPE_128BIT_SERVICE_UUID_COMPLETE
 cdef cython.uint TYPE_128BIT_SERVICE_UUID_MORE_AVAILABLE
 cdef cython.uint TYPE_SERVICE_DATA

src/bluetooth_data_tools/gap.py

@@ -86,6 +86,10 @@ class BLEGAPType(IntEnum):
 TYPE_16BIT_SERVICE_UUID_MORE_AVAILABLE = (
     BLEGAPType.TYPE_16BIT_SERVICE_UUID_MORE_AVAILABLE.value
 )
+TYPE_32BIT_SERVICE_UUID_COMPLETE = BLEGAPType.TYPE_32BIT_SERVICE_UUID_COMPLETE.value
+TYPE_32BIT_SERVICE_UUID_MORE_AVAILABLE = (
+    BLEGAPType.TYPE_32BIT_SERVICE_UUID_MORE_AVAILABLE.value
+)
 TYPE_128BIT_SERVICE_UUID_COMPLETE = BLEGAPType.TYPE_128BIT_SERVICE_UUID_COMPLETE.value
 TYPE_128BIT_SERVICE_UUID_MORE_AVAILABLE = (
     BLEGAPType.TYPE_128BIT_SERVICE_UUID_MORE_AVAILABLE.value
@@ -223,7 +227,24 @@ def _uncached_parse_advertisement_bytes(
         }:
             if service_uuids is _EMPTY_SERVICE_UUIDS:
                 service_uuids = []
-            service_uuids.append(_cached_uint16_bytes_as_uuid(gap_data[start:end]))
+            # Parse multiple 16-bit UUIDs (each is 2 bytes)
+            for i in range(start, end, 2):
+                if i + 2 <= end:
+                    service_uuids.append(
+                        _cached_uint16_bytes_as_uuid(gap_data[i : i + 2])
+                    )
+        elif gap_type_num in {
+            TYPE_32BIT_SERVICE_UUID_COMPLETE,
+            TYPE_32BIT_SERVICE_UUID_MORE_AVAILABLE,
+        }:
+            if service_uuids is _EMPTY_SERVICE_UUIDS:
+                service_uuids = []
+            # Parse multiple 32-bit UUIDs (each is 4 bytes)
+            for i in range(start, end, 4):
+                if i + 4 <= end:
+                    service_uuids.append(
+                        _cached_uint32_bytes_as_uuid(gap_data[i : i + 4])
+                    )
         elif gap_type_num in {
             TYPE_128BIT_SERVICE_UUID_MORE_AVAILABLE,
             TYPE_128BIT_SERVICE_UUID_COMPLETE,

tests/test_gap.py

@@ -311,12 +311,54 @@ def test_parse_adv_data():
     adv = parse_advertisement_data(data)
 
     assert adv.local_name == "M2_B1A8S10P"
-    assert adv.service_uuids == ["0000fee7ffe0-0000-1000-8000-00805f9b34fb"]
+    assert adv.service_uuids == [
+        "0000ffe0-0000-1000-8000-00805f9b34fb",
+        "0000fee7-0000-1000-8000-00805f9b34fb",
+    ]
     assert adv.service_data == {}
     assert adv.manufacturer_data == {2917: b"\x88\xa0\xc8G\x8c\xea\xd1\xc1"}
     assert adv.tx_power is None
 
 
+def test_parse_multiple_16bit_uuids():
+    """Test parsing advertisement data with 3 16-bit service UUIDs."""
+    # Build advertisement data with 3 16-bit UUIDs
+    # Length: 7 (1 byte type + 6 bytes for 3 UUIDs)
+    # Type: 0x02 (16-bit service UUID more available)
+    # UUIDs in little-endian: 0x1234 -> 3412, 0x5678 -> 7856, 0x9ABC -> BC9A
+    data = [bytes.fromhex("070234127856BC9A")]
+    adv = parse_advertisement_data(data)
+
+    assert adv.service_uuids == [
+        "00001234-0000-1000-8000-00805f9b34fb",
+        "00005678-0000-1000-8000-00805f9b34fb",
+        "00009abc-0000-1000-8000-00805f9b34fb",
+    ]
+    assert adv.local_name is None
+    assert adv.service_data == {}
+    assert adv.manufacturer_data == {}
+    assert adv.tx_power is None
+
+
+def test_parse_multiple_32bit_uuids():
+    """Test parsing advertisement data with 2 32-bit service UUIDs."""
+    # Build advertisement data with 2 32-bit UUIDs
+    # Length: 9 (1 byte type + 8 bytes for 2 UUIDs)
+    # Type: 0x04 (32-bit service UUID more available)
+    # UUIDs in little-endian: 0x12345678 -> 78563412, 0x9ABCDEF0 -> F0DEBC9A
+    data = [bytes.fromhex("090478563412F0DEBC9A")]
+    adv = parse_advertisement_data(data)
+
+    assert adv.service_uuids == [
+        "12345678-0000-1000-8000-00805f9b34fb",
+        "9abcdef0-0000-1000-8000-00805f9b34fb",
+    ]
+    assert adv.local_name is None
+    assert adv.service_data == {}
+    assert adv.manufacturer_data == {}
+    assert adv.tx_power is None
+
+
 def test_parse_advertisement_data_zero_padded_scan_included():
     data = [
         b"\x02\x01\x06\t\xffY\x00\xfe\x024\x9e\xa6\xba\x00\x00\x00\x00\x00\x00\x00\x00"