Revert NodeAddRequest related changes

Author: bouwew

plugwise_usb/__init__.py

@@ -352,10 +352,9 @@ async def register_node(self, mac: str) -> bool:
             return False
 
         try:
-            await self._network.register_node(mac)
+            return await self._network.register_node(mac)
         except NodeError as exc:
             raise NodeError(f"Unable to add Node ({mac}): {exc}") from exc
-        return True
 
     @raise_not_connected
     @raise_not_initialized

plugwise_usb/messages/requests.py

@@ -34,6 +34,7 @@
     NodeImageValidationResponse,
     NodeInfoResponse,
     NodePingResponse,
+    NodeRejoinResponse,
     NodeRemoveResponse,
     NodeResponse,
     NodeSpecificResponse,
@@ -107,9 +108,6 @@ def __init__(
         self._response_future: Future[PlugwiseResponse] = self._loop.create_future()
         self._waiting_for_response = False
 
-        self.no_stick_response = False
-
-
     def __repr__(self) -> str:
         """Convert request into writable str."""
         if self._seq_id is None:
@@ -409,8 +407,6 @@ def serialize(self) -> bytes:
 class NodeAddRequest(PlugwiseRequest):
     """Add node to the Plugwise Network and add it to memory of Circle+ node.
 
-    The Stick does not respond with ACCEPT to this request (@bouwew)
-
     Supported protocols : 1.0, 2.0
     Response message    : NodeRejoinResponse, b"0061" (@bouwew)
     """
@@ -430,11 +426,19 @@ def __init__(
         self._args.append(Int(accept_value, length=2))
 
         self.max_retries = 1  # No retrying, will delay the NodeRejoinResponse
-        self.no_stick_response = True
 
-    async def send(self) -> None:
+    async def send(self) -> NodeRejoinResponse | None:
         """Send request."""
-        await self._send_request()
+        result = await self._send_request()
+        if isinstance(result, NodeRejoinResponse):
+            return result
+        
+        if result is None:
+            return None
+
+        raise MessageError(
+            f"Invalid response message. Received {result.__class__.__name__}, expected NodeRejoinResponse"
+        )
 
     # This message has an exceptional format (MAC at end of message)
     # and therefore a need to override the serialize method

plugwise_usb/network/__init__.py

@@ -153,8 +153,9 @@ async def register_node(self, mac: str) -> bool:
 
         try:
             await self._register.register_node(mac)
-        except NodeError as exc:
+        except (MessageError, NodeError) as exc:
             raise NodeError(f"{exc}") from exc
+        return True
 
     async def clear_cache(self) -> None:
         """Clear register cache."""

plugwise_usb/network/registry.py

@@ -13,6 +13,7 @@
 from ..helpers.util import validate_mac
 from ..messages.requests import (
     CirclePlusScanRequest,
+    MessageError,
     NodeAddRequest,
     NodeRemoveRequest,
     PlugwiseRequest,
@@ -251,7 +252,13 @@ async def register_node(self, mac: str) -> None:
             raise NodeError(f"MAC '{mac}' invalid")
 
         request = NodeAddRequest(self._send_to_controller, bytes(mac, UTF8), True)
-        await request.send()
+        try:
+            response = await request.send()
+            # pylint: disable-next=consider-using-assignment-expr
+            if response is None:
+                raise NodeError(f"Failed to register node {mac}, no response received")
+        except MessageError as exc:
+            raise MessageError(f"Failed to register Node ({mac}) due to {exc}") from exc
 
     async def update_node_registration(self, mac: str) -> int:
         """Register (re)joined node to Plugwise network and return network address."""