husqvarna_automower_ble: Try to be more robust against drop outs

Signed-off-by: Alistair Francis <alistair@alistair23.me>

homeassistant/components/husqvarna_automower_ble/__init__.py

@@ -7,6 +7,10 @@
 from automower_ble.mower import Mower
 
 from bleak.backends.device import BLEDevice
+from bleak_retry_connector import (
+    close_stale_connections_by_address,
+    get_device,
+)
 
 from homeassistant.components import bluetooth
 from homeassistant.config_entries import ConfigEntry
@@ -33,10 +37,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     mower = Mower(channel_id, address)
 
+    await close_stale_connections_by_address(address)
+
     LOGGER.debug(
         "connecting to " + address + " with channel ID " + str(channel_id) + "..."
     )
-    device = bluetooth.async_ble_device_from_address(hass, address, connectable=True)
+    device = bluetooth.async_ble_device_from_address(
+        hass, address, connectable=True
+    ) or await get_device(address)
     if await mower.connect(device) == False:
         return False
     LOGGER.debug("connected and paired")

homeassistant/components/husqvarna_automower_ble/coordinator.py

@@ -7,6 +7,12 @@
 
 from automower_ble.mower import Mower
 
+from bleak import BleakError
+from bleak_retry_connector import (
+    close_stale_connections_by_address,
+    get_device,
+)
+
 from homeassistant.components import bluetooth
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -54,25 +60,51 @@ async def async_shutdown(self) -> None:
         if await self.mower.is_connected():
             await self.mower.disconnect()
 
+    async def _async_find_device(self):
+        _LOGGER.debug("Trying to reconnect")
+        await close_stale_connections_by_address(self.address)
+
+        device = bluetooth.async_ble_device_from_address(
+            self.hass, self.address, connectable=True
+        ) or await get_device(self.address)
+        if not device:
+            raise UpdateFailed(f"Can't find device")
+
+        if await self.mower.connect(device) == False:
+            raise UpdateFailed(f"Failed to connect")
+
     async def _async_update_data(self) -> dict[str, bytes]:
         """Poll the device."""
         _LOGGER.debug("Polling device")
 
         data: dict[str, bytes] = {}
 
         if not await self.mower.is_connected():
-            device = bluetooth.async_ble_device_from_address(
-                self.hass, self.address, connectable=True
-            )
-            if await self.mower.connect(device) == False:
-                return
-
-        data["battery_level"] = await self.mower.battery_level()
-        _LOGGER.debug(data["battery_level"])
-        data["activity"] = await self.mower.mower_activity()
-        _LOGGER.debug(data["activity"])
-        data["state"] = await self.mower.mower_state()
-        _LOGGER.debug(data["state"])
+            await self._async_find_device()
+
+        try:
+            data["battery_level"] = await self.mower.battery_level()
+            _LOGGER.debug(data["battery_level"])
+            if data["battery_level"] is None:
+                await self._async_find_device()
+                raise UpdateFailed("Error getting data from device")
+
+            data["activity"] = await self.mower.mower_activity()
+            _LOGGER.debug(data["activity"])
+            if data["activity"] is None:
+                await self._async_find_device()
+                raise UpdateFailed("Error getting data from device")
+
+            data["state"] = await self.mower.mower_state()
+            _LOGGER.debug(data["state"])
+            if data["state"] is None:
+                await self._async_find_device()
+                raise UpdateFailed("Error getting data from device")
+
+        except BleakError as err:
+            _LOGGER.error("Error getting data from device")
+            await self._async_find_device()
+            raise UpdateFailed("Error getting data from device") from err
 
         return data