feat: reduce overhead to convert non-connectable BluetoothServiceInfoBleak to connectable (#135)

Author: bdraco

src/habluetooth/manager.py

@@ -605,20 +605,7 @@ def scanner_adv_received(self, service_info: BluetoothServiceInfoBleak) -> None:
             # route any connection attempts to the connectable path, we
             # mark the service_info as connectable so that the callbacks
             # will be called and the device can be discovered.
-            service_info = BluetoothServiceInfoBleak(
-                service_info.name,
-                address,
-                service_info.rssi,
-                service_info.manufacturer_data,
-                service_info.service_data,
-                service_info.service_uuids,
-                service_info.source,
-                service_info.device,
-                service_info._advertisement,
-                True,
-                service_info.time,
-                service_info.tx_power,
-            )
+            service_info = service_info._as_connectable()
 
         if (connectable or old_connectable_service_info is not None) and (
             bleak_callbacks := self._bleak_callbacks

src/habluetooth/models.pxd

@@ -1,3 +1,4 @@
+import cython
 
 cdef object BLEDevice
 cdef object AdvertisementData
@@ -29,3 +30,6 @@ cdef class BluetoothServiceInfoBleak(BluetoothServiceInfo):
     cdef public bint connectable
     cdef public double time
     cdef public object tx_power
+
+    @cython.locals(new_obj=BluetoothServiceInfoBleak)
+    cpdef BluetoothServiceInfoBleak _as_connectable(self)

src/habluetooth/models.py

@@ -316,3 +316,20 @@ def from_device_and_advertisement_data(
             time,
             advertisement_data.tx_power,
         )
+
+    def _as_connectable(self) -> BluetoothServiceInfoBleak:
+        """Return a connectable version of this object."""
+        new_obj = BluetoothServiceInfoBleak.__new__(BluetoothServiceInfoBleak)
+        new_obj.name = self.name
+        new_obj.address = self.address
+        new_obj.rssi = self.rssi
+        new_obj.manufacturer_data = self.manufacturer_data
+        new_obj.service_data = self.service_data
+        new_obj.service_uuids = self.service_uuids
+        new_obj.source = self.source
+        new_obj.device = self.device
+        new_obj._advertisement = self._advertisement
+        new_obj.connectable = True
+        new_obj.time = self.time
+        new_obj.tx_power = self.tx_power
+        return new_obj

tests/test_models.py

@@ -238,3 +238,40 @@ class pyobjc_int(int):
         "time": now,
         "tx_power": 1,
     }
+
+
+def test_as_connectable():
+    switchbot_device = BLEDevice("44:44:33:11:23:45", "wohand", {}, -127)
+    switchbot_adv = generate_advertisement_data(
+        local_name="wohand", service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"]
+    )
+    now = time.monotonic()
+    service_info = BluetoothServiceInfoBleak(
+        name="wohand",
+        address="44:44:33:11:23:45",
+        rssi=-127,
+        manufacturer_data=switchbot_adv.manufacturer_data,
+        service_data=switchbot_adv.service_data,
+        service_uuids=switchbot_adv.service_uuids,
+        source=SOURCE_LOCAL,
+        device=switchbot_device,
+        advertisement=switchbot_adv,
+        connectable=False,
+        time=now,
+        tx_power=1,
+    )
+    connectable_service_info = service_info._as_connectable()
+    assert connectable_service_info.connectable is True
+    assert service_info.connectable is False
+    assert connectable_service_info is not service_info
+    assert service_info.name == connectable_service_info.name
+    assert service_info.address == connectable_service_info.address
+    assert service_info.rssi == connectable_service_info.rssi
+    assert service_info.manufacturer_data == connectable_service_info.manufacturer_data
+    assert service_info.service_data == connectable_service_info.service_data
+    assert service_info.service_uuids == connectable_service_info.service_uuids
+    assert service_info.source == connectable_service_info.source
+    assert service_info.device == connectable_service_info.device
+    assert service_info.advertisement == connectable_service_info.advertisement
+    assert service_info.time == connectable_service_info.time
+    assert service_info.tx_power == connectable_service_info.tx_power