Change handling of 000A-responses

Author: bouwew

plugwise_usb/connection/__init__.py

@@ -151,6 +151,21 @@ async def _handle_stick_event(self, event: StickEvent) -> None:
         elif event == StickEvent.DISCONNECTED and self._queue.is_running:
             await self._queue.stop()
 
+    async def _handle_stick_init_response(self, response: PlugwiseResponse) -> None:
+        """Handle the received Stick init response."""
+        if not isinstance(response, StickInitResponse | StickInitShortResponse):
+            raise MessageError(
+                f"Invalid response message type ({response.__class__.__name__}) received, expected StickInitResponse, StickInitShortResponse"
+            )
+        self._mac_stick = response.mac_decoded
+        self.stick_name = f"Stick {self._mac_stick[-5:]}"
+        self._network_online = response.network_online
+        if self._network_online:
+            # Replace first 2 characters by 00 for mac of circle+ node
+            self._mac_nc = response.mac_network_controller
+            self._network_id = response.network_id
+
+
     async def initialize_stick(self, node_info=True) -> None:
         """Initialize connection to the USB-stick."""
         if not self._manager.is_connected:
@@ -162,9 +177,7 @@ async def initialize_stick(self, node_info=True) -> None:
 
         try:
             request = StickInitRequest(self.send)
-            init_response: (
-                StickInitResponse | StickInitShortResponse | None
-            ) = await request.send()
+            init_response: (NodeSpecificResponse | None) = await request.send()
         except StickError as err:
             raise StickError(
                 "No response from USB-Stick to initialization request."
@@ -177,13 +190,6 @@ async def initialize_stick(self, node_info=True) -> None:
                 + " Validate USB-stick is connected to port "
                 + f"' {self._manager.serial_path}'"
             )
-        self._mac_stick = init_response.mac_decoded
-        self.stick_name = f"Stick {self._mac_stick[-5:]}"
-        self._network_online = init_response.network_online
-        if self._network_online:
-            # Replace first 2 characters by 00 for mac of circle+ node
-            self._mac_nc = init_response.mac_network_controller
-            self._network_id = init_response.network_id
 
         self._is_initialized = True
 

plugwise_usb/messages/requests.py

@@ -522,7 +522,8 @@ class StickInitRequest(PlugwiseRequest):
     """
 
     _identifier = b"000A"
-    _reply_identifier = b"0011"
+    _reply_identifier = b"0003"  
+    # The 0011-response is handled by a separate subscription
 
     def __init__(
         self,
@@ -532,17 +533,17 @@ def __init__(
         super().__init__(send_fn, None)
         self._max_retries = 1
 
-    async def send(self) -> StickInitResponse | StickInitShortResponse | None:
+    async def send(self) -> NodeSpecificResponse | None:
         """Send request."""
         if self._send_fn is None:
             raise MessageError("Send function missing")
         result = await self._send_request()
-        if isinstance(result, StickInitResponse | StickInitShortResponse):
+        if isinstance(result, NodeSpecificResponse):
             return result
         if result is None:
             return None
         raise MessageError(
-            f"Invalid response message. Received {result.__class__.__name__}, expected StickInitResponse/StickInitShortResponse"
+            f"Invalid response message. Received {result.__class__.__name__}, expected NodeSpecificResponse"
         )