@@ -1142,24 +1142,23 @@ async def _relay_init_get(self) -> bool | None:
11421142 + f"supported for device { self .name } "
11431143 )
11441144
1145- request = CircleRelayInitStateRequest (
1146- self ._send , self ._mac_in_bytes , False , False
1147- )
1145+ try :
1146+ request = CircleRelayInitStateRequest (
1147+ self ._send , self ._mac_in_bytes , False , False
1148+ )
1149+ except MessageError as err :
1150+ raise NodeError (f"{ self ._mac_in_str } error: { err } " )
1151+
11481152 if (response := await request .send ()) is None :
11491153 _LOGGER .warning (
11501154 "No response from %s to get relay init setting" , self ._mac_in_str
11511155 )
1152- return None
1156+ return
11531157
11541158 if isinstance (response , CircleRelayInitStateResponse ):
11551159 _LOGGER .debug ("Successful get of relay init state for %s" , self ._mac_in_str )
11561160 await self ._relay_init_update_state (response .relay .value == 1 )
11571161
1158- _LOGGER .warning (
1159- "Unexpected response type %s for %s" ,
1160- response .__class__ .__name__ ,
1161- self ._mac_in_str ,
1162- )
11631162 return
11641163
11651164 async def _relay_init_set (self , state : bool ) -> None :
@@ -1170,9 +1169,13 @@ async def _relay_init_set(self, state: bool) -> None:
11701169 + f"supported for device { self .name } "
11711170 )
11721171
1173- request = CircleRelayInitStateRequest (
1174- self ._send , self ._mac_in_bytes , True , state
1175- )
1172+ try :
1173+ request = CircleRelayInitStateRequest (
1174+ self ._send , self ._mac_in_bytes , True , state
1175+ )
1176+ except MessageError as err :
1177+ raise NodeError (f"{ self ._mac_in_str } error: { err } " )
1178+
11761179 if (response := await request .send ()) is None :
11771180 _LOGGER .warning (
11781181 "No response from %s to configure relay init setting" , self ._mac_in_str
@@ -1186,13 +1189,7 @@ async def _relay_init_set(self, state: bool) -> None:
11861189 if response .node_ack_type == NodeAckResponseType .DEFAULT_ACK :
11871190 _LOGGER .debug ("Successful set relay init state for %s" , self ._mac_in_str )
11881191 await self ._relay_init_update_state (response .relay .value == 1 )
1189- return
11901192
1191- _LOGGER .warning (
1192- "Unexpected response ack type %s for %s" ,
1193- response .node_ack_type ,
1194- self .name ,
1195- )
11961193 return
11971194
11981195 async def _relay_init_load_from_cache (self ) -> bool :
0 commit comments