update node loading strategy, maybe this can be improved to load instantly after discover happens

Author: dirixmjm

plugwise_usb/network/__init__.py

@@ -482,6 +482,10 @@ async def _load_discovered_nodes(self) -> bool:
                 )
             result_index += 1
         _LOGGER.debug("_load_discovered_nodes | END")
+        if not all(load_result) and (
+            self._load_stragglers_task is None or self._load_stragglers_task.done()
+        ):
+            self._load_stragglers_task = create_task(self._load_stragglers())
         return all(load_result)
 
     async def _unload_discovered_nodes(self) -> None:
@@ -491,9 +495,11 @@ async def _unload_discovered_nodes(self) -> None:
     # endregion
 
     # region - Network instance
-    async def start(self) -> None:
+    async def start(self, load: bool = True) -> None:
         """Start and activate network."""
         self._register.start_node_discover(self._discover_node)
+        if load:
+            self._register.scan_completed_callback(self._load_discovered_nodes)
         await self._register.start()
         self._subscribe_to_protocol_events()
         await self._subscribe_to_node_events()
@@ -508,10 +514,8 @@ async def discover_nodes(self, load: bool = True) -> bool:
         """Discover nodes."""
         await self.discover_network_coordinator(load=load)
         if not self._is_running:
-            await self.start()
-        if load and not await self._load_discovered_nodes():
-            self._load_stragglers_task = create_task(self._load_stragglers())
-            return False
+            await self.start(load=load)
+        return True
 
         return True
 

plugwise_usb/network/registry.py

@@ -50,6 +50,7 @@ def __init__(
         self._full_scan_finished: Callable[[], Awaitable[None]] | None = None
         self._registration_scan_delay: float = CIRCLEPLUS_SCANREQUEST_MAINTENANCE
         self._scan_completed = False
+        self._scan_completed_callback: Callable[[], Awaitable[None]] | None = None
 
     # region Properties
 
@@ -102,6 +103,10 @@ def start_node_discover(self, callback: Callable[[], Awaitable[None]]) -> None:
         """Register method to be called when a node is found."""
         self._start_node_discover = callback
 
+    def scan_completed_callback(self, callback: Callable[[], Awaitable[None]]) -> None:
+        """Register method to be called when a node is found."""
+        self._scan_completed_callback = callback
+
     def full_scan_finished(self, callback: Callable[[], Awaitable[None]]) -> None:
         """Register method to be called when full scan is finished."""
         self._full_scan_finished = callback
@@ -200,6 +205,8 @@ async def update_missing_registrations_circleplus(self) -> None:
         self._scan_completed = True
         if self._network_cache is not None:
             await self._network_cache.prune_cache(_maintenance_registry)
+        if self._scan_completed_callback is not None:
+            await self._scan_completed_callback()
 
     async def load_registrations_from_cache(self) -> None:
         """Quick retrieval of all unknown network registrations from cache."""
@@ -216,6 +223,8 @@ async def load_registrations_from_cache(self) -> None:
             await self._start_node_discover(mac, nodetype, True)
             await sleep(0.1)
         _LOGGER.info("Cache network registration discovery finished")
+        if self._scan_completed_callback is not None:
+            await self._scan_completed_callback()
 
     async def update_node_registration(self, mac: str) -> bool:
         """Register (re)joined node to Plugwise network and return network address."""