Add NodeReJoin feature

Author: brefra

plugwise_usb/messages/responses.py

@@ -25,6 +25,7 @@
 
 NODE_JOIN_ID: Final = b"0006"
 NODE_AWAKE_RESPONSE_ID: Final = b"004F"
+NODE_REJOIN_ID: Final = b"0061"
 NODE_SWITCH_GROUP_ID: Final = b"0056"
 SENSE_REPORT_ID: Final = b"0105"
 
@@ -896,7 +897,7 @@ class NodeRejoinResponse(PlugwiseResponse):
 
     def __init__(self) -> None:
         """Initialize NodeRejoinResponse message object."""
-        super().__init__(b"0061")
+        super().__init__(NODE_REJOIN_ID)
 
 
 class NodeAckResponse(PlugwiseResponse):

plugwise_usb/network/__init__.py

@@ -23,10 +23,12 @@
 from ..messages.responses import (
     NODE_AWAKE_RESPONSE_ID,
     NODE_JOIN_ID,
+    NODE_REJOIN_ID,
     NodeAwakeResponse,
     NodeInfoResponse,
     NodeJoinAvailableResponse,
     NodePingResponse,
+    NodeRejoinResponse,
     NodeResponseType,
     PlugwiseResponse,
 )
@@ -74,6 +76,7 @@ def __init__(
         self._unsubscribe_stick_event: Callable[[], None] | None = None
         self._unsubscribe_node_awake: Callable[[], None] | None = None
         self._unsubscribe_node_join: Callable[[], None] | None = None
+        self._unsubscribe_node_rejoin: Callable[[], None] | None = None
 
     # region - Properties
 
@@ -244,6 +247,31 @@ async def node_join_available_message(self, response: PlugwiseResponse) -> bool:
         await self._notify_node_event_subscribers(NodeEvent.JOIN, mac)
         return True
 
+    async def node_rejoin_message(self, response: PlugwiseResponse) -> bool:
+        """Handle NodeRejoinResponse messages."""
+        if not isinstance(response, NodeRejoinResponse):
+            raise MessageError(
+                f"Invalid response message type ({response.__class__.__name__}) received, expected NodeRejoinResponse"
+            )
+        mac = response.mac_decoded
+        address = self._register.network_address(mac)
+        if (address := self._register.network_address(mac)) is not None:
+            if self._nodes.get(mac) is None:
+                if self._discover_sed_tasks.get(mac) is None:
+                    self._discover_sed_tasks[mac] = create_task(
+                        self._discover_battery_powered_node(address, mac)
+                    )
+                elif self._discover_sed_tasks[mac].done():
+                    self._discover_sed_tasks[mac] = create_task(
+                        self._discover_battery_powered_node(address, mac)
+                    )
+                else:
+                    _LOGGER.debug("duplicate awake discovery for %s", mac)
+                return True
+        else:
+            raise NodeError("Unknown network address for node {mac}")
+        return True
+
     def _unsubscribe_to_protocol_events(self) -> None:
         """Unsubscribe to events from protocol."""
         if self._unsubscribe_node_awake is not None:
@@ -478,6 +506,7 @@ async def start(self) -> None:
         self._register.full_scan_finished(self._discover_registered_nodes)
         await self._register.start()
         self._subscribe_to_protocol_events()
+        await self._subscribe_to_node_events()
         self._is_running = True
 
     async def discover_nodes(self, load: bool = True) -> bool: