Upstream/aioesphomeapi
1
0
Fork 0
mirror of https://github.com/esphome/aioesphomeapi.git synced 2025-01-22 21:41:26 +01:00
Code Issues Projects Releases Wiki Activity

Handle socket reset errors while reading (#333)

Browse Source
This commit is contained in:
J. Nick Koston 2022-12-04 12:18:38 -10:00 committed by GitHub
parent f794984a1b
commit e588e84e17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aioesphomeapi/_frame_helper.py
View File

@ -21,6 +21,13 @@ from .util import bytes_to_varuint, varuint_to_bytes
_LOGGER = logging.getLogger(__name__)
SOCKET_ERRORS = (
ConnectionResetError,
asyncio.IncompleteReadError,
OSError,
TimeoutError,
)
@dataclass
class Packet:
@ -143,7 +150,7 @@ class APIPlaintextFrameHelper(APIFrameHelper):
data = await self._reader.readexactly(length_int)
return Packet(type=msg_type_int, data=data)
except (asyncio.IncompleteReadError, OSError, TimeoutError) as err:
except SOCKET_ERRORS as err:
if (
isinstance(err, asyncio.IncompleteReadError)
and self._closed_event.is_set()
@ -227,7 +234,7 @@ class APINoiseFrameHelper(APIFrameHelper):
raise ProtocolAPIError(f"Marker byte invalid: {header[0]}")
msg_size = (header[1] << 8) | header[2]
frame = await self._reader.readexactly(msg_size)
except (asyncio.IncompleteReadError, OSError, TimeoutError) as err:
except SOCKET_ERRORS as err:
if (
isinstance(err, asyncio.IncompleteReadError)
and self._closed_event.is_set()