improve node_info_update/node_detail_update logic

Author: dirixmjm

plugwise_usb/nodes/circle.py

@@ -1033,23 +1033,6 @@ async def node_info_update(
             return None
 
         await super().node_info_update(node_info)
-        await self._relay_update_state(
-            node_info.relay_state, timestamp=node_info.timestamp
-        )
-        if self._current_log_address is not None and (
-            self._current_log_address > node_info.current_logaddress_pointer
-            or self._current_log_address == 1
-        ):
-            # Rollover of log address
-            _LOGGER.debug(
-                "Rollover log address from %s into %s for node %s",
-                self._current_log_address,
-                node_info.current_logaddress_pointer,
-                self._mac_in_str,
-            )
-
-        if self._current_log_address != node_info.current_logaddress_pointer:
-            self._current_log_address = node_info.current_logaddress_pointer
 
         return self._node_info
 
@@ -1059,10 +1042,24 @@ async def update_node_details(
     ) -> bool:
         """Process new node info and return true if all fields are updated."""
         if node_info.relay_state is not None:
-            self._relay_state = replace(
-                self._relay_state,
-                state=node_info.relay_state,
-                timestamp=node_info.timestamp,
+            await self._relay_update_state(
+                node_info.relay_state, timestamp=node_info.timestamp
+            )
+
+        if (
+            node_info.current_logaddress_pointer is not None
+            and self._current_log_address is not None
+            and (
+                self._current_log_address > node_info.current_logaddress_pointer
+                or self._current_log_address == 1
+            )
+        ):
+            # Rollover of log address
+            _LOGGER.debug(
+                "Rollover log address from %s into %s for node %s",
+                self._current_log_address,
+                node_info.current_logaddress_pointer,
+                self._mac_in_str,
             )
 
         if node_info.current_logaddress_pointer is not None: