Recover from mid-auth BLE link loss instead of hanging

Author: GnoX

custom_components/ef_ble/__init__.py

@@ -1,5 +1,6 @@
 """The unofficial EcoFlow BLE devices integration"""
 
+import asyncio
 import logging
 from collections.abc import Callable
 from functools import partial
@@ -130,8 +131,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: DeviceConfigEntry) -> bo
                 max_attempts=0 if eflib.is_solar_only(device) else None,
             )
         )
-        state = await device.wait_until_authenticated_or_error(raise_on_error=True)
+        async with asyncio.timeout(timeout):
+            state = await device.wait_until_authenticated_or_error(raise_on_error=True)
     except (ConnectionTimeout, BleakError, TimeoutError) as e:
+        await device.disconnect()
         raise ConfigEntryNotReady(
             translation_key="could_not_connect",
             translation_placeholders={"time": str(timeout), "error_msg": str(e)},

custom_components/ef_ble/eflib/connection.py

@@ -809,6 +809,17 @@ async def sendRequest(self, send_data: bytes, response_handler=None):
             try:
                 await self._sendRequest(send_data, response_handler)
             except Exception as e:  # noqa: BLE001
+                if self._client is None or not self._client.is_connected:
+                    # The BLE link dropped mid-request - e.g. BlueZ raising "Remote peer
+                    # disconnected" synchronously from start_notify. bleak does not
+                    # always fire its disconnected callback for a synchronous GATT
+                    # failure, so nothing else would drive a reconnect and
+                    # `wait_until_authenticated_or_error` hangs forever.
+                    self._logger.warning(
+                        "BLE link lost while sending request (%s); reconnecting", e
+                    )
+                    self.disconnected()
+                    return
                 self._logger.log_filtered(
                     LogOptions.CONNECTION_DEBUG,
                     (