From 78d1124c50cff149051fb89bf6f08000bf184da5 Mon Sep 17 00:00:00 2001 From: Arseny <36441601+arkuzo@users.noreply.github.com> Date: Sat, 14 Dec 2024 03:21:21 +0300 Subject: [PATCH] fix AsyncClient::wait unexpected return after success reconnect (#1407) * fix AsyncClient::wait unexpected return after success reconnect AsyncClient::wait use sleep(1) call to wait to start reconnect task. Sometimes reconnect is faster then 1 second, and wait returns while connection to server is established. Added one check to avoid this situation * Making added check easier to understand in source code * fix Client::wait unexpected return after success reconnect * fixes --------- Co-authored-by: Miguel Grinberg --- src/socketio/async_client.py | 3 +++ src/socketio/client.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/socketio/async_client.py b/src/socketio/async_client.py index 7bfd1ac3..0d85aa18 100644 --- a/src/socketio/async_client.py +++ b/src/socketio/async_client.py @@ -189,6 +189,9 @@ async def wait(self): await self.eio.wait() await self.sleep(1) # give the reconnect task time to start up if not self._reconnect_task: + if self.eio.state == 'connected': # pragma: no cover + # connected while sleeping above + continue break await self._reconnect_task if self.eio.state != 'connected': diff --git a/src/socketio/client.py b/src/socketio/client.py index b5fa0b4e..00d7961e 100644 --- a/src/socketio/client.py +++ b/src/socketio/client.py @@ -180,7 +180,12 @@ def wait(self): self.eio.wait() self.sleep(1) # give the reconnect task time to start up if not self._reconnect_task: - break + if self.eio.state == 'connected': # pragma: no cover + # connected while sleeping above + continue + else: + # the reconnect task gave up + break self._reconnect_task.join() if self.eio.state != 'connected': break