fixup! feat(python): BLE support via bleak

Author: mmilata

python/src/trezorlib/transport/ble.py

@@ -76,7 +76,7 @@ def enumerate(
         # TODO use manufacturer_data
         if models and T3W1 not in models:
             return []
-        devices = cls.ble().scan()
+        devices = cls.ble_proxy().scan()
         return [BleTransport(device[0]) for device in devices]
 
     @classmethod
@@ -98,26 +98,26 @@ def find_by_path(cls, path: str, prefix_search: bool = False) -> BleTransport:
             raise TransportException(f"No BLE device: {path}")
 
     def open(self) -> None:
-        self.ble().connect(self.device)
+        self.ble_proxy().connect(self.device)
 
     def close(self) -> None:
-        # would be a logical place to call self.ble().disconnect()
+        # would be a logical place to call self.ble_proxy().disconnect()
         # instead we rely on atexit handler to avoid reconnecting
         pass
 
     def write_chunk(self, chunk: bytes) -> None:
         LOG.log(DUMP_PACKETS, f"sending packet: {chunk.hex()}")
-        self.ble().write(self.device, chunk)
+        self.ble_proxy().write(self.device, chunk)
 
     def read_chunk(self, timeout: float | None = None) -> bytes:
-        chunk = self.ble().read(self.device, timeout)
+        chunk = self.ble_proxy().read(self.device, timeout)
         LOG.log(DUMP_PACKETS, f"received packet: {chunk.hex()}")
         if len(chunk) not in (64, 244):
             LOG.error(f"{__name__}: unexpected chunk size: {len(chunk)}")
         return bytearray(chunk)
 
     @classmethod
-    def ble(cls) -> BleProxy:
+    def ble_proxy(cls) -> BleProxy:
         if cls._ble is None:
             cls._ble = BleProxy()
         return cls._ble
@@ -188,14 +188,22 @@ async def main(self, pipe: Connection):
         self.did_scan = False
         LOG.debug("async BLE process started")
 
+        try:
+            await self._main_loop(pipe)
+        finally:
+            for address in self.devices.keys():
+                await self.disconnect(address)
+
+    # returns after shutdown, or raises an exception
+    async def _main_loop(self, pipe: Connection):
         while True:
             await ready(pipe)
             cmd, args, kwargs = pipe.recv()
             try:
                 result = await getattr(self, cmd)(*args, **kwargs)
             except self.Shutdown:
                 LOG.debug("async BLE exit loop")
-                break
+                return
             except Timeout as e:
                 await ready(pipe, write=True)
                 pipe.send(e)
@@ -207,9 +215,6 @@ async def main(self, pipe: Connection):
                 await ready(pipe, write=True)
                 pipe.send(result)
 
-        for address in self.devices.keys():
-            await self.disconnect(address)
-
     # throws exception when no adapters found
     async def scan(self) -> list[tuple[str, str]]:
         LOG.debug("scanning BLE")