From 5efc2f4fda5264638152626f9581e4a392637840 Mon Sep 17 00:00:00 2001
From: Arthur Crepin-Leblond <arthur.crepin@proglove.de>
Date: Tue, 25 Oct 2022 17:03:13 +0200
Subject: [PATCH] backends/bluezdbus/manager: Cancel the discovery on
 disconnect to avoid a timeout

If a device disconnects while waiting for the services to be
discovered, the manager will wait forever.
This commit fixes that by throwing an exception in case of a disconnect.
---
 CHANGELOG.rst                       |  2 ++
 bleak/backends/bluezdbus/manager.py | 29 +++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3637b082..440c35be 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,8 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
 Fixed
 -----
 * Fixed crash in Android backend introduced in v0.19.0. Fixes #1085.
+* BlueZ: Cancel the device discovery wait task if the device disconnects in
+  between to avoid a timeout
 
 `0.19.0`_ (2022-10-13)
 ======================
diff --git a/bleak/backends/bluezdbus/manager.py b/bleak/backends/bluezdbus/manager.py
index 936aa1d6..5cc2bff9 100644
--- a/bleak/backends/bluezdbus/manager.py
+++ b/bleak/backends/bluezdbus/manager.py
@@ -665,20 +665,41 @@ async def _wait_condition(
         ):
             return
 
-        event = asyncio.Event()
+        services_discovered_event = asyncio.Event()
+        device_disconnected_event = asyncio.Event()
 
         def callback():
             if (
+                self._properties[device_path][defs.DEVICE_INTERFACE]["Connected"]
+                is False
+            ):
+                device_disconnected_event.set()
+            elif (
                 self._properties[device_path][defs.DEVICE_INTERFACE][property_name]
                 == property_value
             ):
-                event.set()
+                services_discovered_event.set()
 
         self._condition_callbacks.add(callback)
 
         try:
-            # can be canceled
-            await event.wait()
+            services_discovered_wait_task = asyncio.create_task(
+                services_discovered_event.wait()
+            )
+            device_disconnected_wait_task = asyncio.create_task(
+                device_disconnected_event.wait()
+            )
+            done, pending = await asyncio.wait(
+                {services_discovered_wait_task, device_disconnected_wait_task},
+                return_when=asyncio.FIRST_COMPLETED,
+            )
+
+            for p in pending:
+                p.cancel()
+
+            # device disconnected before the completion of the services discovery
+            if device_disconnected_wait_task in done:
+                raise BleakError("failed to discover services, device disconnected")
         finally:
             self._condition_callbacks.remove(callback)