Improve relay_init related

Author: bouwew

plugwise_usb/messages/requests.py

@@ -26,6 +26,7 @@
     CirclePlusRealTimeClockResponse,
     CirclePlusScanResponse,
     CirclePowerUsageResponse,
+    CircleRelayInitStateResponse,
     EnergyCalibrationResponse,
     NodeAckResponse,
     NodeFeaturesResponse,
@@ -1510,11 +1511,12 @@ class CircleRelayInitStateRequest(PlugwiseRequest):
     """Get or set initial relay state after power-up of Circle.
 
     Supported protocols : 2.6
-    Response message    : NodeAckResponse  # CircleInitRelayStateResponse
+    Response message    : NodeAckResponse for set
+                        : CircleInitRelayStateResponse for get
     """
 
     _identifier = b"0138"  # PWCircleGetSetInitialRelaisStateRequestV2_6
-    _reply_identifier = b"0100"  # b"0139"  # PWCircleGetSetInitialRelaisStateReplyV2_6
+    _reply_identifier = b"0139" | b"0100" # PWCircleGetSetInitialRelaisStateReplyV2_6
 
     def __init__(
         self,
@@ -1530,13 +1532,13 @@ def __init__(
         self.relay = Int(1 if relay_state else 0, length=2)
         self._args += [self.set_or_get, self.relay]
 
-    async def send(self) -> NodeAckResponse | None:
+    async def send(self) -> CircleRelayInitStateResponse | NodeAckResponse | None:
         """Send request."""
         result = await self._send_request()
-        if isinstance(result, NodeAckResponse):
+        if isinstance(result, CircleRelayInitStateResponse | NodeAckResponse):
             return result
         if result is None:
             return None
         raise MessageError(
-            f"Invalid response message. Received {result.__class__.__name__}, expected NodeAckResponse"
+            f"Invalid response message. Received {result.__class__.__name__}, expected CircleRelayInitStateResponse or NodeAckResponse"
         )

plugwise_usb/nodes/circle.py

@@ -1140,28 +1140,59 @@ async def _relay_init_get(self) -> bool | None:
                 "Retrieval of initial state of relay is not "
                 + f"supported for device {self.name}"
             )
+
         request = CircleRelayInitStateRequest(
             self._send, self._mac_in_bytes, False, False
         )
-        if (response := await request.send()) is not None:
+        if (response := await request.send()) is None:
+            _LOGGER.warning(
+                "No response from %s to get relay init setting", self._mac_in_str
+            )
+            return None
+
+        if isinstance(response, CircleRelayInitStateResponse):
+            _LOGGER.debug("Successful get of relay init state for %s", self._mac_in_str)
             await self._relay_init_update_state(response.relay.value == 1)
-            return self._relay_config.init_state
-        return None
 
-    async def _relay_init_set(self, state: bool) -> bool | None:
+        _LOGGER.warning(
+            "Unexpected response type %s for %s",
+            response_type,
+            self._mac_in_str,
+        )
+        return
+
+    async def _relay_init_set(self, state: bool) -> None:
         """Configure relay init state."""
         if NodeFeature.RELAY_INIT not in self._features:
             raise NodeError(
                 "Configuring of initial state of relay is not"
                 + f"supported for device {self.name}"
             )
+
         request = CircleRelayInitStateRequest(
             self._send, self._mac_in_bytes, True, state
         )
-        if (response := await request.send()) is not None:
+        if (response := await request.send()) is None:
+            _LOGGER.warning(
+                "No response from %s to configure relay init setting", self._mac_in_str
+            )
+            return None
+
+        if response.node_ack_type == NodeAckResponseType.DEFAULT_FAIL:
+            _LOGGER.warning("Failed to set relay init state for %s", self._mac_in_str)
+            return None
+
+        if response.node_ack_type == NodeAckResponseType.DEFAULT_ACK:
+            _LOGGER.debug("Successful set relay init state for %s", self._mac_in_str)
             await self._relay_init_update_state(response.relay.value == 1)
-            return self._relay_config.init_state
-        return None
+            return
+
+        _LOGGER.warning(
+            "Unexpected response ack type %s for %s",
+            response.node_ack_type,
+            self.name,
+        )
+        return
 
     async def _relay_init_load_from_cache(self) -> bool:
         """Load relay init state from cache. Returns True if retrieval was successful."""