zach
/
eufy-robovac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move message handling call to inside the send command so that we can retry if necessary

This commit is contained in:
Luke Bonaccorsi 2023-08-31 11:06:52 +01:00
parent bba9febbb3
commit 7f344d38bf
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
custom_components/robovac/tuyalocalapi.py
View File

@ -681,9 +681,6 @@ class TuyaDevice:
raise ConnectionTimeoutException("Connection timed out") from e raise ConnectionTimeoutException("Connection timed out") from e
self.reader, self.writer = await asyncio.open_connection(sock=sock) self.reader, self.writer = await asyncio.open_connection(sock=sock)
self._connected = True self._connected = True
asyncio.ensure_future(self._async_handle_message())
asyncio.ensure_future(self._async_ping(self.ping_interval))
asyncio.ensure_future(self.async_get(callback))
async def async_disconnect(self): async def async_disconnect(self):
_LOGGER.debug("Disconnected from {}".format(self)) _LOGGER.debug("Disconnected from {}".format(self))
@ -737,16 +734,7 @@ class TuyaDevice:
asyncio.ensure_future(self.async_set(new_values)) asyncio.ensure_future(self.async_set(new_values))
async def _async_handle_message(self): async def _async_handle_message(self):
try: response_data = await self.reader.readuntil(MAGIC_SUFFIX_BYTES)
response_data = await self.reader.readuntil(MAGIC_SUFFIX_BYTES)
except socket.error as e:
_LOGGER.error("Connection to {} failed: {}".format(self, e))
self._dps["106"] = "CONNECTION_FAILED"
asyncio.ensure_future(self.async_disconnect())
return
except asyncio.IncompleteReadError as e:
_LOGGER.error("Incomplete read from: {} : {}".format(self, e))
return
try: try:
message = Message.from_bytes(response_data, self.cipher) message = Message.from_bytes(response_data, self.cipher)
@ -759,17 +747,40 @@ class TuyaDevice:
for c in self._handlers.get(message.command, []): for c in self._handlers.get(message.command, []):
asyncio.ensure_future(c(message, self)) asyncio.ensure_future(c(message, self))
asyncio.ensure_future(self._async_handle_message())
async def _async_send(self, message, retries=4): async def _async_send(self, message, retries=4):
try: try:
await self.async_connect() await self.async_connect()
except (socket.timeout, socket.error, OSError) as e: _LOGGER.debug("Sending to {}: {}".format(self, message))
self.writer.write(message.bytes())
await self.writer.drain()
await self._async_handle_message()
except Exception as e:
if retries == 0: if retries == 0:
raise ConnectionException( if isinstance(e, socket.error):
"Failed to send data to {}".format(self) _LOGGER.error("Connection to {} failed: {}".format(self, e))
) from e self._dps["106"] = "CONNECTION_FAILED"
await self.async_connect() asyncio.ensure_future(self.async_disconnect())
elif isinstance(e, asyncio.IncompleteReadError):
_LOGGER.error("Incomplete read from: {} : {}".format(self, e))
else:
_LOGGER.error("Failed to send data to {}".format(self))
return
if isinstance(e, socket.error):
_LOGGER.debug(
"Retrying send due to error. Connection to {} failed: {}".format(
self, e
)
)
elif isinstance(e, asyncio.IncompleteReadError):
_LOGGER.debug(
"Retrying send due to error.Incomplete read from: {} : {}".format(
self, e
)
)
else:
_LOGGER.debug(
"Retrying send due to error. Failed to send data to {}".format(self)
)
await self._async_send(message, retries=retries - 1) await self._async_send(message, retries=retries - 1)
_LOGGER.debug("Sending to {}: {}".format(self, message))
self.writer.write(message.bytes())