Simplify NodeAddRequest and adapt related

Author: bouwew

plugwise_usb/__init__.py

@@ -350,10 +350,12 @@ async def register_node(self, mac: str) -> bool:
         """Add node to plugwise network."""
         if self._network is None:
             return False
+
         try:
-            return await self._network.register_node(mac)
+            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

@@ -410,6 +410,8 @@ 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)
     """
@@ -428,21 +430,12 @@ def __init__(
         accept_value = 1 if accept else 0
         self._args.append(Int(accept_value, length=2))
 
-        self.max_retries = 6
+        self.max_retries = 1  # No retrying, will delay the NodeRejoinResponse
         self.no_stick_response = True
 
-    async def send(self) -> NodeRejoinResponse | None:
+    async def send(self) -> None:
         """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"
-        )
+        await self._send_request()
 
     # 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

@@ -152,12 +152,10 @@ async def register_node(self, mac: str) -> bool:
             return False
 
         try:
-            address = await self._register.register_node(mac)
-        except (MessageError, NodeError) as exc:
+            await self._register.register_node(mac)
+        except NodeError as exc:
             raise NodeError(f"{exc}") from exc
 
-        return await self._discover_node(address, mac, None)
-
     async def clear_cache(self) -> None:
         """Clear register cache."""
         await self._register.clear_register_cache()

plugwise_usb/network/registry.py

@@ -245,21 +245,13 @@ async def save_registry_to_cache(self) -> None:
         await self._network_cache.save_cache()
         _LOGGER.debug("save_registry_to_cache finished")
 
-    async def register_node(self, mac: str) -> int:
+    async def register_node(self, mac: str) -> None:
         """Register node to Plugwise network and return network address."""
         if not validate_mac(mac):
             raise NodeError(f"MAC '{mac}' invalid")
 
         request = NodeAddRequest(self._send_to_controller, bytes(mac, UTF8), True)
-        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
-
-        return self.update_node_registration(mac)
+        await request.send()
 
     async def update_node_registration(self, mac: str) -> int:
         """Register (re)joined node to Plugwise network and return network address."""