fix: add back the bleak overall safety timeout (#7)

pyproject.toml

@@ -30,6 +30,7 @@ Sphinx = {version = "^5.0", optional = true}
 sphinx-rtd-theme = {version = "^1.0", optional = true}
 myst-parser = {version = "^0.18", optional = true}
 bleak = ">=0.14.3"
+async-timeout = ">=4.0.1"
 
 [tool.poetry.extras]
 docs = [

src/bleak_retry_connector/__init__.py

@@ -8,6 +8,7 @@
 from collections.abc import Callable
 from typing import Any
 
+import async_timeout
 from bleak import BleakClient, BleakError
 from bleak.backends.device import BLEDevice
 
@@ -27,6 +28,12 @@
 MAX_CONNECT_ATTEMPTS = 5
 BLEAK_TIMEOUT = 10
 
+# Bleak may not always timeout
+# since the dbus connection can stall
+# so we have an additional timeout to
+# be sure we do not block forever
+BLEAK_SAFETY_TIMEOUT = 12
+
 # These errors are transient with dbus, and we should retry
 TRANSIENT_ERRORS = {"le-connection-abort-by-local", "br-connection-canceled"}
 
@@ -74,7 +81,8 @@ def _raise_if_needed(name: str, exc: Exception) -> None:
         attempt += 1
         _LOGGER.debug("%s: Connecting (attempt: %s)", name, attempt)
         try:
-            await client.connect(timeout=BLEAK_TIMEOUT)
+            async with async_timeout.timeout(BLEAK_SAFETY_TIMEOUT):
+                await client.connect(timeout=BLEAK_TIMEOUT)
         except asyncio.TimeoutError as exc:
             timeouts += 1
             _LOGGER.debug(

tests/test_init.py

@@ -1,9 +1,10 @@
 import asyncio
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, patch
 
 import pytest
 from bleak import BleakClient, BleakError
 
+import bleak_retry_connector
 from bleak_retry_connector import (
     MAX_TRANSIENT_ERRORS,
     BleakConnectionError,
@@ -132,3 +133,21 @@ async def disconnect(self, *args, **kwargs):
 
     with pytest.raises(BleakConnectionError):
         await establish_connection(FakeBleakClient, MagicMock(), "test")
+
+
+@pytest.mark.asyncio
+async def test_bleak_connect_overruns_timeout():
+    class FakeBleakClient(BleakClient):
+        def __init__(self, *args, **kwargs):
+            pass
+
+        async def connect(self, *args, **kwargs):
+            await asyncio.sleep(40)
+
+        async def disconnect(self, *args, **kwargs):
+            pass
+
+    with patch.object(bleak_retry_connector, "BLEAK_SAFETY_TIMEOUT", 0), pytest.raises(
+        BleakNotFoundError
+    ):
+        await establish_connection(FakeBleakClient, MagicMock(), "test")