Update network files

Author: bouwew

plugwise_usb/network/__init__.py

@@ -14,7 +14,6 @@
 from ..connection import StickController
 from ..constants import UTF8
 from ..exceptions import CacheError, MessageError, NodeError, StickError, StickTimeout
-from ..helpers.util import validate_mac
 from ..messages.requests import CirclePlusAllowJoiningRequest, NodePingRequest
 from ..messages.responses import (
     NODE_AWAKE_RESPONSE_ID,
@@ -149,8 +148,6 @@ def registry(self) -> dict[int, tuple[str, NodeType | None]]:
 
     async def register_node(self, mac: str) -> bool:
         """Register node to Plugwise network."""
-        if not validate_mac(mac):
-            raise NodeError(f"Invalid mac '{mac}' to register")
         address = await self._register.register_node(mac)
         return await self._discover_node(address, mac, None)
 
@@ -247,8 +244,12 @@ async def node_join_available_message(self, response: PlugwiseResponse) -> bool:
                 f"Invalid response message type ({response.__class__.__name__}) received, expected NodeJoinAvailableResponse"
             )
         mac = response.mac_decoded
-        await self._notify_node_event_subscribers(NodeEvent.JOIN, mac)
-        return True
+        if await self.register_node(mac):
+            await self._notify_node_event_subscribers(NodeEvent.JOIN, mac)
+            return True
+        
+        _LOGGER.debug("Joining of available Node %s failed", mac)
+        return False
 
     async def node_rejoin_message(self, response: PlugwiseResponse) -> bool:
         """Handle NodeRejoinResponse messages."""
@@ -257,7 +258,6 @@ async def node_rejoin_message(self, response: PlugwiseResponse) -> bool:
                 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:
@@ -319,6 +319,7 @@ async def discover_network_coordinator(self, load: bool = False) -> bool:
             if load:
                 return await self._load_node(self._controller.mac_coordinator)
             return True
+
         return False
 
     # endregion
@@ -485,9 +486,11 @@ async def discover_nodes(self, load: bool = True) -> bool:
         await self.discover_network_coordinator(load=load)
         if not self._is_running:
             await self.start()
+
         await self._discover_registered_nodes()
         if load:
             return await self._load_discovered_nodes()
+
         return True
 
     async def stop(self) -> None:
@@ -506,11 +509,14 @@ async def stop(self) -> None:
 
     async def allow_join_requests(self, state: bool) -> None:
         """Enable or disable Plugwise network."""
+        _LOGGER.debug("Send AllowJoiningRequest to Circle+ with state=%s", state)
         request = CirclePlusAllowJoiningRequest(self._controller.send, state)
-        response = await request.send()
         if (response := await request.send()) is None:
-            raise NodeError("No response to get notifications for join request.")
-        if response.response_type != NodeResponseType.JOIN_ACCEPTED:
+            raise NodeError("No response for CirclePlusAllowJoiningRequest.")
+
+        if response.response_type not in (
+            NodeResponseType.JOIN_ACCEPTED, NodeResponseType.CIRCLE_PLUS
+        ):
             raise MessageError(
                 f"Unknown NodeResponseType '{response.response_type.name}' received"
             )
@@ -544,3 +550,4 @@ async def _notify_node_event_subscribers(self, event: NodeEvent, mac: str) -> No
                 callback_list.append(callback(event, mac))
         if len(callback_list) > 0:
             await gather(*callback_list)
+

plugwise_usb/network/registry.py

@@ -17,7 +17,7 @@
     NodeRemoveRequest,
     PlugwiseRequest,
 )
-from ..messages.responses import NodeResponseType, PlugwiseResponse
+from ..messages.responses import PlugwiseResponse  #, StickResponseType
 from .cache import NetworkRegistrationCache
 
 _LOGGER = logging.getLogger(__name__)
@@ -246,20 +246,20 @@ async def save_registry_to_cache(self) -> None:
     async def register_node(self, mac: str) -> int:
         """Register node to Plugwise network and return network address."""
         if not validate_mac(mac):
-            raise NodeError(f"Invalid mac '{mac}' to register")
+            raise NodeError(f"MAC '{mac}' invalid")
 
         request = NodeAddRequest(self._send_to_controller, bytes(mac, UTF8), True)
-        response = await request.send()
-        if response is None or response.ack_id != NodeResponseType.JOIN_ACCEPTED:
-            raise NodeError(f"Failed to register node {mac}")
+        await request.send()
+        # if response is None or response.ack_id != StickResponseType.ACCEPT:
+        #     raise NodeError(f"Failed to register node {mac}")
         self.update_network_registration(self._first_free_address, mac, None)
         self._first_free_address += 1
         return self._first_free_address - 1
 
     async def unregister_node(self, mac: str) -> None:
         """Unregister node from current Plugwise network."""
         if not validate_mac(mac):
-            raise NodeError(f"Invalid mac '{mac}' to unregister")
+            raise NodeError(f"MAC '{mac}' invalid")
 
         mac_registered = False
         for registration in self._registry.values():
@@ -270,7 +270,6 @@ async def unregister_node(self, mac: str) -> None:
             raise NodeError(f"No existing registration '{mac}' found to unregister")
 
         request = NodeRemoveRequest(self._send_to_controller, self._mac_nc, mac)
-        response = await request.send()
         if (response := await request.send()) is None:
             raise NodeError(
                 f"The Zigbee network coordinator '{self._mac_nc!r}'"