Upstream/aioesphomeapi
1
0
Fork 0
mirror of https://github.com/esphome/aioesphomeapi.git synced 2024-06-26 10:35:00 +02:00
Code Issues Projects Releases Wiki Activity

Avoid a few calls to fetch loop time (#533)

Browse Source
This commit is contained in:
J. Nick Koston 2023-09-04 12:56:23 -05:00 committed by GitHub
parent 4c992365e0
commit 11a19438cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aioesphomeapi/_frame_helper/base.py
View File

@ -75,8 +75,10 @@ class APIFrameHelper(asyncio.Protocol):
async def perform_handshake(self, timeout: float) -> None: async def perform_handshake(self, timeout: float) -> None:
"""Perform the handshake with the server.""" """Perform the handshake with the server."""
handshake_handle = self._loop.call_later( handshake_handle = self._loop.call_at(
timeout, self._set_ready_future_exception, asyncio.TimeoutError() self._loop.time() + timeout,
self._set_ready_future_exception,
asyncio.TimeoutError,
) )
try: try:
await self._ready_future await self._ready_future

4
aioesphomeapi/client.py
View File

@ -649,7 +649,9 @@ class APIClient:
) )
loop = self._loop loop = self._loop
timeout_handle = loop.call_later(timeout, self._handle_timeout, connect_future) timeout_handle = loop.call_at(
loop.time() + timeout, self._handle_timeout, connect_future
)
timeout_expired = False timeout_expired = False
connect_ok = False connect_ok = False
try: try:

20
aioesphomeapi/connection.py
View File

@ -396,11 +396,11 @@ class APIConnection:
received_name, received_name,
) )
def _async_schedule_keep_alive(self) -> None: def _async_schedule_keep_alive(self, now: float) -> None:
"""Start the keep alive task.""" """Start the keep alive task."""
self._send_pending_ping = True self._send_pending_ping = True
self._ping_timer = self._loop.call_later( self._ping_timer = self._loop.call_at(
self._keep_alive_interval, self._async_send_keep_alive now + self._keep_alive_interval, self._async_send_keep_alive
) )
def _async_send_keep_alive(self) -> None: def _async_send_keep_alive(self) -> None:
@ -408,14 +408,16 @@ class APIConnection:
if not self._is_socket_open: if not self._is_socket_open:
return return
now = self._loop.time()
if self._send_pending_ping: if self._send_pending_ping:
self.send_message(PING_REQUEST_MESSAGE) self.send_message(PING_REQUEST_MESSAGE)
if self._pong_timer is None: if self._pong_timer is None:
# Do not reset the timer if it's already set # Do not reset the timer if it's already set
# since the only thing we want to reset the timer # since the only thing we want to reset the timer
# is if we receive a pong. # is if we receive a pong.
self._pong_timer = self._loop.call_later( self._pong_timer = self._loop.call_at(
self._keep_alive_timeout, self._async_pong_not_received now + self._keep_alive_timeout, self._async_pong_not_received
) )
else: else:
# #
@ -434,7 +436,7 @@ class APIConnection:
self._keep_alive_interval, self._keep_alive_interval,
) )
self._async_schedule_keep_alive() self._async_schedule_keep_alive(now)
def _async_cancel_pong_timer(self) -> None: def _async_cancel_pong_timer(self) -> None:
"""Cancel the pong timer.""" """Cancel the pong timer."""
@ -466,7 +468,7 @@ class APIConnection:
await self._connect_hello() await self._connect_hello()
if login: if login:
await self.login(check_connected=False) await self.login(check_connected=False)
self._async_schedule_keep_alive() self._async_schedule_keep_alive(self._loop.time())
async def connect(self, *, login: bool) -> None: async def connect(self, *, login: bool) -> None:
if self._connection_state != ConnectionState.INITIALIZED: if self._connection_state != ConnectionState.INITIALIZED:
@ -661,7 +663,9 @@ class APIConnection:
# We must not await without a finally or # We must not await without a finally or
# the message could fail to be removed if the # the message could fail to be removed if the
# the await is cancelled # the await is cancelled
timeout_handle = self._loop.call_later(timeout, self._handle_timeout, fut) timeout_handle = self._loop.call_at(
self._loop.time() + timeout, self._handle_timeout, fut
)
timeout_expired = False timeout_expired = False
try: try:
await fut await fut

4
aioesphomeapi/reconnect_logic.py
View File

@ -146,7 +146,9 @@ class ReconnectLogic(zeroconf.RecordUpdateListener):
if not delay: if not delay:
self._call_connect_once() self._call_connect_once()
return return
self._connect_timer = self.loop.call_later(delay, self._call_connect_once) self._connect_timer = self.loop.call_at(
self.loop.time() + delay, self._call_connect_once
)
def _call_connect_once(self) -> None: def _call_connect_once(self) -> None:
"""Call the connect logic once. """Call the connect logic once.