Merge pull request #534 from WillCodeForCats/coordinator-timeout

Disconnect and retry on timeouts

Author: WillCodeForCats

custom_components/solaredge_modbus_multi/__init__.py

@@ -225,8 +225,7 @@ async def _refresh_modbus_data_with_retry(
         attempt = 1
         while True:
             try:
-                async with asyncio.timeout(self._hub.coordinator_timeout):
-                    return await self._hub.async_refresh_modbus_data()
+                return await self._hub.async_refresh_modbus_data()
             except Exception as ex:
                 if not isinstance(ex, ex_type):
                     raise ex

custom_components/solaredge_modbus_multi/hub.py

@@ -23,6 +23,7 @@
     DOMAIN,
     METER_REG_BASE,
     ModbusDefaults,
+    RetrySettings,
     SolarEdgeTimeouts,
     SunSpecNotImpl,
 )
@@ -148,6 +149,7 @@ def __init__(
 
         self._initalized = False
         self._online = True
+        self._timeout_counter = 0
 
         self._client = None
 
@@ -316,9 +318,10 @@ async def async_refresh_modbus_data(self) -> bool:
         if not self.initalized:
             try:
                 async with self._lock:
-                    await self._async_init_solaredge()
+                    async with asyncio.timeout(self.coordinator_timeout):
+                        await self._async_init_solaredge()
 
-            except (ConnectionException, ModbusIOException) as e:
+            except (ConnectionException, ModbusIOException, TimeoutError) as e:
                 self.disconnect()
                 ir.async_create_issue(
                     self._hass,
@@ -357,20 +360,20 @@ async def async_refresh_modbus_data(self) -> bool:
 
         try:
             async with self._lock:
-                for inverter in self.inverters:
-                    await inverter.read_modbus_data()
-                for meter in self.meters:
-                    await meter.read_modbus_data()
-                for battery in self.batteries:
-                    await battery.read_modbus_data()
+                async with asyncio.timeout(self.coordinator_timeout):
+                    for inverter in self.inverters:
+                        await inverter.read_modbus_data()
+                    for meter in self.meters:
+                        await meter.read_modbus_data()
+                    for battery in self.batteries:
+                        await battery.read_modbus_data()
 
         except ModbusReadError as e:
             self.disconnect()
             raise DataUpdateFailed(f"Update failed: {e}")
 
         except DeviceInvalid as e:
-            if not self._keep_modbus_open:
-                self.disconnect()
+            self.disconnect()
             raise DataUpdateFailed(f"Invalid device: {e}")
 
         except ConnectionException as e:
@@ -381,9 +384,29 @@ async def async_refresh_modbus_data(self) -> bool:
             self.disconnect()
             raise DataUpdateFailed(f"Modbus error: {e}")
 
+        except TimeoutError as e:
+            self.disconnect()
+            self._timeout_counter += 1
+
+            _LOGGER.warning(
+                f"Refresh timeout {self._timeout_counter} limit {RetrySettings.Limit}"
+            )
+
+            if self._timeout_counter >= RetrySettings.Limit:
+                self._timeout_counter = 0
+                raise TimeoutError
+
+            raise DataUpdateFailed(f"Timeout error: {e}")
+
         if not self._keep_modbus_open:
             self.disconnect()
 
+        if self._timeout_counter > 0:
+            _LOGGER.warning(
+                f"Timeout count {self._timeout_counter} limit {RetrySettings.Limit}"
+            )
+            self._timeout_counter = 0
+
         return True
 
     async def connect(self) -> None: