poetry: update to Bleak v0.12.0

This allows us to simplify device scanning by using a new class method
and enables support for Python 3.9.

Author: dlech

CHANGELOG.md

@@ -5,7 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-## Fixed
+
+### Added
+- Support for Python 3.9.
+
+### Changed
+- Update to Bleak v0.12.0
+
+### Fixed
 - Fix `pybricks lwp3 repl` can only connect to remote control.
 - Fix Technic Large hub Bluetooth hub kind.
 

poetry.lock

@@ -41,21 +41,25 @@ async def find_device(
     """
     print(f"Searching for {name or service}")
 
-    queue = asyncio.Queue()
-
-    def handle_detection(device: BLEDevice, adv: AdvertisementData):
+    def match_uuid_and_name(device: BLEDevice, adv: AdvertisementData):
         if service not in adv.service_uuids:
-            return
+            return False
+
         if (
             name is not None
             and adv.local_name != name
             and device.address.upper() != name.upper()
         ):
-            return
-        queue.put_nowait(device)
+            return False
+
+        return True
+
+    device = await BleakScanner.find_device_by_filter(match_uuid_and_name, timeout)
+
+    if device is None:
+        raise asyncio.TimeoutError
 
-    async with BleakScanner(detection_callback=handle_detection):
-        return await asyncio.wait_for(queue.get(), timeout=timeout)
+    return device
 
 
 class BLEConnection:

pybricksdev/ble/__init__.py

@@ -71,11 +71,9 @@ async def repl() -> None:
     os.makedirs(history_file.parent, exist_ok=True)
     session = PromptSession(history=FileHistory(history_file))
 
-    queue = asyncio.Queue()
-
-    def callback(dev: BLEDevice, adv: AdvertisementData) -> None:
+    def match_lwp3_uuid(dev: BLEDevice, adv: AdvertisementData) -> None:
         if LWP3_HUB_SERVICE_UUID.lower() not in adv.service_uuids:
-            return
+            return False
 
         mfg_data = adv.manufacturer_data[LEGO_CID]
         button, kind, cap, last_net, status, opt = struct.unpack("<6B", mfg_data)
@@ -94,18 +92,17 @@ def callback(dev: BLEDevice, adv: AdvertisementData) -> None:
             opt,
         )
 
-        queue.put_nowait(dev)
+        return True
+
+    logger.info("scanning...")
 
-    async with BleakScanner(detection_callback=callback) as scanner:
-        logger.info("scanning...")
-        device = await queue.get()
+    device = await BleakScanner.find_device_by_filter(match_lwp3_uuid)
 
-        # monkey patch for bleak bug
-        # https://github.com/hbldh/bleak/pull/534
-        if hasattr(scanner, "_manager"):
-            device.metadata["delegate"] = scanner._manager.central_manager.delegate()
+    if device is None:
+        logger.error("timed out")
+        return
 
-        logger.info("found device")
+    logger.info("found device")
 
     def handle_disconnect(client: BleakClient):
         logger.info("disconnected")

pybricksdev/cli/lwp3/repl.py

@@ -30,9 +30,9 @@ pybricksdev = 'pybricksdev.cli:main'
 aioserial = "^1.3.0"
 argcomplete = "^1.11.1"
 asyncssh = "^2.2.1"
-bleak = "^0.11.0"
+bleak = "0.12.0"
 mpy-cross = "1.14"
-python = "~3.8"
+python = "^3.8"
 tqdm = "^4.46.1"
 validators = "^0.18.2"
 pyusb = "^1.0.2"