python-engineio 4.13.2__tar.gz → 4.13.4__tar.gz

{python_engineio-4.13.2/src/python_engineio.egg-info → python_engineio-4.13.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.13.2
+Version: 4.13.4
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT

{python_engineio-4.13.2 → python_engineio-4.13.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-engineio"
-version = "4.13.2"
+version = "4.13.4"
 license = {text = "MIT"}
 authors = [{name = "Miguel Grinberg", email = "miguel.grinberg@gmail.com"}]
 description = "Engine.IO server and client for Python"

{python_engineio-4.13.2 → python_engineio-4.13.4}/src/engineio/async_client.py

@@ -571,7 +571,7 @@ class AsyncClient(base_client.BaseClient):
 
     async def _read_loop_websocket(self):
         """Read packets from the Engine.IO WebSocket connection."""
-        while self.state == 'connected':
+        while self.state == 'connected' and self.write_loop_task:
             p = None
             try:
                 p = await asyncio.wait_for(
@@ -672,7 +672,6 @@ class AsyncClient(base_client.BaseClient):
                 if r.status < 200 or r.status >= 300:
                     self.logger.warning('Unexpected status code %s in server '
                                         'response, aborting', r.status)
-                    self.write_loop_task = None
                     break
             else:
                 # websocket
@@ -690,3 +689,4 @@ class AsyncClient(base_client.BaseClient):
                         'aborting')
                     break
         self.logger.info('Exiting write loop task')
+        self.write_loop_task = None

{python_engineio-4.13.2 → python_engineio-4.13.4}/src/engineio/async_drivers/_websocket_wsgi.py

@@ -15,6 +15,8 @@ class SimpleWebSocketWSGI:  # pragma: no cover
         ret = self.app(self)
         if self.ws.mode == 'gunicorn':
             raise StopIteration()
+        elif self.ws.mode == 'werkzeug':
+            raise ConnectionError()
         return ret
 
     def close(self):

{python_engineio-4.13.2 → python_engineio-4.13.4}/src/engineio/client.py

@@ -508,7 +508,13 @@ class Client(base_client.BaseClient):
 
         if self.write_loop_task:  # pragma: no branch
             self.logger.info('Waiting for write loop task to end')
-            self.write_loop_task.join()
+            try:
+                # the write loop task cleans its own task when it ends, so we
+                # avoid a race condition when using threads with a try/catch
+                self.write_loop_task.join()
+            except AttributeError:  # pragma: no cover
+                if self.write_loop_task is not None:
+                    raise  # for any erros not related to task == None we raise
         if self.state == 'connected':
             self._trigger_event('disconnect', self.reason.TRANSPORT_ERROR,
                                 run_async=False)
@@ -521,7 +527,7 @@ class Client(base_client.BaseClient):
 
     def _read_loop_websocket(self):
         """Read packets from the Engine.IO WebSocket connection."""
-        while self.state == 'connected':
+        while self.state == 'connected' and self.write_loop_task:
             p = None
             try:
                 p = self.ws.recv()
@@ -559,7 +565,13 @@ class Client(base_client.BaseClient):
 
         if self.write_loop_task:  # pragma: no branch
             self.logger.info('Waiting for write loop task to end')
-            self.write_loop_task.join()
+            try:
+                # the write loop task cleans its own task when it ends, so we
+                # avoid a race condition when using threads with a try/catch
+                self.write_loop_task.join()
+            except AttributeError:  # pragma: no cover
+                if self.write_loop_task is not None:
+                    raise  # for any erros not related to task == None we raise
         if self.state == 'connected':
             self._trigger_event('disconnect', self.reason.TRANSPORT_ERROR,
                                 run_async=False)
@@ -616,7 +628,6 @@ class Client(base_client.BaseClient):
                 if r.status_code < 200 or r.status_code >= 300:
                     self.logger.warning('Unexpected status code %s in server '
                                         'response, aborting', r.status_code)
-                    self.write_loop_task = None
                     break
             else:
                 # websocket
@@ -634,3 +645,4 @@ class Client(base_client.BaseClient):
                         'WebSocket connection was closed, aborting')
                     break
         self.logger.info('Exiting write loop task')
+        self.write_loop_task = None

{python_engineio-4.13.2 → python_engineio-4.13.4/src/python_engineio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.13.2
+Version: 4.13.4
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT

{python_engineio-4.13.2 → python_engineio-4.13.4}/tests/async/test_socket.py

@@ -105,13 +105,13 @@ class TestSocket:
 
     async def test_schedule_ping_twice(self):
         mock_server = self._get_mock_server()
-        mock_server.ping_interval = 0.01
+        mock_server.ping_interval = 0.1
         s = async_socket.AsyncSocket(mock_server, 'sid')
         s.send = mock.AsyncMock()
 
         async def schedule_ping_and_sleep():
             s.schedule_ping()
-            await asyncio.sleep(0.05)
+            await asyncio.sleep(0.2)
 
         s.schedule_ping()
         assert s.last_ping is None

{python_engineio-4.13.2 → python_engineio-4.13.4}/tests/common/test_socket.py

@@ -101,7 +101,10 @@ class TestSocket:
         s = socket.Socket(mock_server, 'sid')
         s.send = mock.MagicMock()
         s.schedule_ping()
-        time.sleep(0.05)
+        for _ in range(10):
+            time.sleep(0.05)
+            if s.last_ping is not None:
+                break
         assert s.last_ping is not None
         assert s.send.call_args_list[0][0][0].encode() == '2'
 
@@ -114,7 +117,7 @@ class TestSocket:
         assert s.last_ping is None
         time.sleep(0.01)
         s.schedule_ping()
-        time.sleep(0.1)
+        time.sleep(0.2)
         assert s.last_ping is not None
         assert s.send.call_count == 1