Move pair_plus_device() to connection

Author: bouwew

plugwise_usb/__init__.py

@@ -266,6 +266,10 @@ async def connect(self, port: str | None = None) -> None:
             self._port,
         )
 
+    async def plus_pair_request(self, mac: str) -> bool:
+        """Send a pair request to a Plus device."""
+        return await self._controller.pair_plus_device(mac)
+
     @raise_not_connected
     async def initialize(self, create_root_cache_folder: bool = False) -> None:
         """Initialize connection to USB-Stick."""
@@ -278,10 +282,6 @@ async def initialize(self, create_root_cache_folder: bool = False) -> None:
             if self._cache_enabled:
                 await self._network.initialize_cache()
 
-    async def plus_pair_request(self, mac: str) -> bool:
-        """Send a pair request to a Plus device."""
-        return await self._network.pair_plus_device(mac)
-
     @raise_not_connected
     @raise_not_initialized
     async def start_network(self) -> None:

plugwise_usb/connection/__init__.py

@@ -9,12 +9,14 @@
 from ..api import StickEvent
 from ..constants import UTF8
 from ..exceptions import NodeError, StickError
-from ..helpers.util import version_to_model
+from ..helpers.util import validate_mac, version_to_model
 from ..messages.requests import (
+    CirclePlusConnectRequest,
     NodeInfoRequest,
     NodePingRequest,
     PlugwiseRequest,
     StickInitRequest,
+    StickNetworkInfoRequest,
 )
 from ..messages.responses import (
     NodeInfoResponse,
@@ -202,6 +204,55 @@ async def initialize_stick(self) -> None:
         if not self._network_online:
             raise StickError("Zigbee network connection to Circle+ is down.")
 
+    async def pair_plus_device(self, mac: str) -> bool:
+        """Pair Plus-device to Plugwise Stick.
+
+        According to https://roheve.wordpress.com/author/roheve/page/2/
+        The pairing process should look like:
+        0001 - 0002 (- 0003): StickNetworkInfoRequest - StickNetworkInfoResponse - (PlugwiseQueryCirclePlusEndResponse - @SevenW),
+        000A - 0011: StickInitRequest - StickInitResponse,
+        0004 - 0005: CirclePlusConnectRequest - CirclePlusConnectResponse,
+        the Plus-device will then send a NodeRejoinResponse (0061).
+
+        Todo(?): Does this need repeating until pairing is successful?
+        """
+        _LOGGER.debug("Pair Plus-device with mac: %s", mac)
+        if not validate_mac(mac):
+            raise NodeError(f"Pairing failed: MAC {mac} invalid")
+
+        # Collect network info
+        try:
+            request = StickNetworkInfoRequest(self.send, None)
+            info_response = await request.send()
+        except MessageError as exc:
+            raise NodeError(f"Pairing failed: {exc}") from exc
+        if info_response is None:
+            raise NodeError(
+                "Pairing failed, StickNetworkInfoResponse is None"
+            ) from None
+
+        # Init Stick
+        try:
+            await self.initialize_stick()
+        except StickError as exc:
+            raise NodeError(
+                f"Pairing failed, failed to initialize Stick: {exc}"
+            ) from exc
+
+        try:
+            request = CirclePlusConnectRequest(self.send, bytes(mac, UTF8))
+            response = await request.send()
+        except MessageError as exc:
+            raise NodeError(f"Pairing failed: {exc}") from exc
+        if response is None:
+            raise NodeError(
+                "Pairing failed, CirclePlusConnectResponse is None"
+            ) from None
+        if response.allowed.value != 1:
+            raise NodeError("Pairing failed, not allowed")
+
+        return True
+
     async def get_node_details(
         self, mac: str, ping_first: bool
     ) -> tuple[NodeInfoResponse | None, NodePingResponse | None]:

plugwise_usb/network/__init__.py

@@ -22,9 +22,7 @@
 from ..helpers.util import validate_mac
 from ..messages.requests import (
     CircleMeasureIntervalRequest,
-    CirclePlusConnectRequest,
     NodePingRequest,
-    StickNetworkInfoRequest,
 )
 from ..messages.responses import (
     NODE_AWAKE_RESPONSE_ID,
@@ -157,55 +155,6 @@ def registry(self) -> list[str]:
 
     # endregion
 
-    async def pair_plus_device(self, mac: str) -> bool:
-        """Pair Plus-device to Plugwise Stick.
-
-        According to https://roheve.wordpress.com/author/roheve/page/2/
-        The pairing process should look like:
-        0001 - 0002 (- 0003): StickNetworkInfoRequest - StickNetworkInfoResponse - (PlugwiseQueryCirclePlusEndResponse - @SevenW),
-        000A - 0011: StickInitRequest - StickInitResponse,
-        0004 - 0005: CirclePlusConnectRequest - CirclePlusConnectResponse,
-        the Plus-device will then send a NodeRejoinResponse (0061).
-
-        Todo(?): Does this need repeating until pairing is successful?
-        """
-        _LOGGER.debug("Pair Plus-device with mac: %s", mac)
-        if not validate_mac(mac):
-            raise NodeError(f"Pairing failed: MAC {mac} invalid")
-
-        # Collect network info
-        try:
-            request = StickNetworkInfoRequest(self._controller.send, None)
-            info_response = await request.send()
-        except MessageError as exc:
-            raise NodeError(f"Pairing failed: {exc}") from exc
-        if info_response is None:
-            raise NodeError(
-                "Pairing failed, StickNetworkInfoResponse is None"
-            ) from None
-
-        # Init Stick
-        try:
-            await self._controller.initialize_stick()
-        except StickError as exc:
-            raise NodeError(
-                f"Pairing failed, failed to initialize Stick: {exc}"
-            ) from exc
-
-        try:
-            request = CirclePlusConnectRequest(self._controller.send, bytes(mac, UTF8))
-            response = await request.send()
-        except MessageError as exc:
-            raise NodeError(f"Pairing failed: {exc}") from exc
-        if response is None:
-            raise NodeError(
-                "Pairing failed, CirclePlusConnectResponse is None"
-            ) from None
-        if response.allowed.value != 1:
-            raise NodeError("Pairing failed, not allowed")
-
-        return True
-
     async def register_node(self, mac: str) -> bool:
         """Register node to Plugwise network."""
         try: