Branch P5.

Author: janiversen

custom_components/modbus/entity.py

@@ -177,9 +177,20 @@ def async_hold(self) -> None:
         self._attr_available = False
         self.async_write_ha_state()
 
+    async def async_await_connection(self, _now: Any) -> None:
+        """Wait for first connect."""
+        await self._hub.event_connected.wait()
+        # await self._async_update_if_not_in_progress()
+        # self._async_schedule_future_update(0.0)
+        self.async_run()
+
     async def async_base_added_to_hass(self) -> None:
         """Handle entity which will be added."""
-        self.async_run()
+        async_call_later(
+            self.hass,
+            self._hub.config_delay + 0.1,
+            self.async_await_connection,
+        )
         self.async_on_remove(
             async_dispatcher_connect(self.hass, SIGNAL_STOP_ENTITY, self.async_hold)
         )

custom_components/modbus/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "local_polling",
   "loggers": ["pymodbus"],
   "requirements": ["pymodbus==3.9.2"],
-  "version": "1.4.0"
+  "version": "1.5.0"
 }

custom_components/modbus/modbus.py

@@ -4,7 +4,6 @@
 
 import asyncio
 from collections import namedtuple
-from collections.abc import Callable
 from typing import Any
 
 from pymodbus.client import (
@@ -28,11 +27,10 @@
     CONF_TYPE,
     EVENT_HOMEASSISTANT_STOP,
 )
-from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
+from homeassistant.core import Event, HomeAssistant, ServiceCall
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
 
@@ -254,13 +252,13 @@ def __init__(self, hass: HomeAssistant, client_config: dict[str, Any]) -> None:
         self._client: (
             AsyncModbusSerialClient | AsyncModbusTcpClient | AsyncModbusUdpClient | None
         ) = None
-        self._async_cancel_listener: Callable[[], None] | None = None
         self._in_error = False
         self._lock = asyncio.Lock()
+        self.event_connected = asyncio.Event()
         self.hass = hass
         self.name = client_config[CONF_NAME]
         self._config_type = client_config[CONF_TYPE]
-        self._config_delay = client_config[CONF_DELAY]
+        self.config_delay = client_config[CONF_DELAY]
         self._pb_request: dict[str, RunEntry] = {}
         self._connect_task: asyncio.Task
         self._last_log_error: str = ""
@@ -325,10 +323,10 @@ async def async_pb_connect(self) -> None:
             _LOGGER.info(message)
 
         # Start counting down to allow modbus requests.
-        if self._config_delay:
-            self._async_cancel_listener = async_call_later(
-                self.hass, self._config_delay, self.async_end_delay
-            )
+        if self.config_delay:
+            await asyncio.sleep(self.config_delay)
+        self.config_delay = 0
+        self.event_connected.set()
 
     async def async_setup(self) -> bool:
         """Set up pymodbus client."""
@@ -349,12 +347,6 @@ async def async_setup(self) -> bool:
         )
         return True
 
-    @callback
-    def async_end_delay(self, args: Any) -> None:
-        """End startup delay."""
-        self._async_cancel_listener = None
-        self._config_delay = 0
-
     async def async_restart(self) -> None:
         """Reconnect client."""
         if self._client:
@@ -364,9 +356,6 @@ async def async_restart(self) -> None:
 
     async def async_close(self) -> None:
         """Disconnect client."""
-        if self._async_cancel_listener:
-            self._async_cancel_listener()
-            self._async_cancel_listener = None
         if not self._connect_task.done():
             self._connect_task.cancel()
 
@@ -426,8 +415,6 @@ async def async_pb_call(
         use_call: str,
     ) -> ModbusPDU | None:
         """Convert async to sync pymodbus call."""
-        if self._config_delay:
-            return None
         async with self._lock:
             if not self._client:
                 return None