Subscribe to messages

Author: brefra

plugwise_usb/connection/__init__.py

@@ -117,21 +117,19 @@ def subscribe_to_stick_events(
             events,
         )
 
-    def subscribe_to_node_responses(
+    async def subscribe_to_messages(
         self,
         node_response_callback: Callable[[PlugwiseResponse], Coroutine[Any, Any, bool]],
         mac: bytes | None = None,
         message_ids: tuple[bytes] | None = None,
+        seq_id: bytes | None = None,
     ) -> Callable[[], None]:
         """Subscribe a awaitable callback to be called when a specific message is received.
 
         Returns function to unsubscribe.
         """
-
-        return self._manager.subscribe_to_node_responses(
-            node_response_callback,
-            mac,
-            message_ids,
+        return await self._manager.subscribe_to_messages(
+            node_response_callback, mac, message_ids, seq_id
         )
 
     async def _handle_stick_event(self, event: StickEvent) -> None:

plugwise_usb/connection/manager.py

@@ -13,7 +13,7 @@
 from ..api import StickEvent
 from ..exceptions import StickError
 from ..messages.requests import PlugwiseRequest
-from ..messages.responses import PlugwiseResponse, StickResponse
+from ..messages.responses import PlugwiseResponse
 from .receiver import StickReceiver
 from .sender import StickSender
 
@@ -94,22 +94,12 @@ def remove_subscription() -> None:
         )
         return remove_subscription
 
-    def subscribe_to_stick_replies(
-        self,
-        callback: Callable[[StickResponse], Coroutine[Any, Any, None]],
-    ) -> Callable[[], None]:
-        """Subscribe to response messages from stick."""
-        if self._receiver is None or not self._receiver.is_connected:
-            raise StickError(
-                "Unable to subscribe to stick response when receiver " + "is not loaded"
-            )
-        return self._receiver.subscribe_to_stick_responses(callback)
-
-    def subscribe_to_node_responses(
+    async def subscribe_to_messages(
         self,
         node_response_callback: Callable[[PlugwiseResponse], Coroutine[Any, Any, bool]],
         mac: bytes | None = None,
         message_ids: tuple[bytes] | None = None,
+        seq_id: bytes | None = None,
     ) -> Callable[[], None]:
         """Subscribe a awaitable callback to be called when a specific message is received.
 
@@ -119,8 +109,8 @@ def subscribe_to_node_responses(
             raise StickError(
                 "Unable to subscribe to node response when receiver " + "is not loaded"
             )
-        return self._receiver.subscribe_to_node_responses(
-            node_response_callback, mac, message_ids
+        return await self._receiver.subscribe_to_node_responses(
+            node_response_callback, mac, message_ids, seq_id
         )
 
     async def setup_connection_to_stick(self, serial_path: str) -> None:

plugwise_usb/network/__init__.py

@@ -170,15 +170,20 @@ def _subscribe_to_protocol_events(self) -> None:
             self._handle_stick_event,
             (StickEvent.CONNECTED, StickEvent.DISCONNECTED),
         )
-        self._unsubscribe_node_awake = self._controller.subscribe_to_node_responses(
+
+    async def _subscribe_to_node_events(self) -> None:
+        """Subscribe to events from protocol."""
+        self._unsubscribe_node_awake = await self._controller.subscribe_to_messages(
             self.node_awake_message,
             None,
             (NODE_AWAKE_RESPONSE_ID,),
-        )
-        self._unsubscribe_node_join = self._controller.subscribe_to_node_responses(
-            self.node_join_available_message,
             None,
-            (NODE_JOIN_ID,),
+        )
+        self._unsubscribe_node_join = await self._controller.subscribe_to_messages(
+            self.node_join_available_message, None, (NODE_JOIN_ID,), None
+        )
+        self._unsubscribe_node_rejoin = await self._controller.subscribe_to_messages(
+            self.node_rejoin_message, None, (NODE_REJOIN_ID,), None
         )
 
     async def _handle_stick_event(self, event: StickEvent) -> None:

plugwise_usb/nodes/node.py

@@ -62,7 +62,7 @@ def __init__(
     ):
         """Initialize Plugwise base node class."""
         self._loaded_callback = loaded_callback
-        self._message_subscribe = controller.subscribe_to_node_responses
+        self._message_subscribe = controller.subscribe_to_messages
         self._features: tuple[NodeFeature, ...] = NODE_FEATURES
         self._last_update = datetime.now(UTC)
         self._node_info = NodeInfo(mac, address)