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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.13.0
+Version: 4.13.2
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT
@@ -18,11 +18,12 @@ Provides-Extra: client
 Requires-Dist: requests>=2.21.0; extra == "client"
 Requires-Dist: websocket-client>=0.54.0; extra == "client"
 Provides-Extra: asyncio-client
-Requires-Dist: aiohttp>=3.4; extra == "asyncio-client"
+Requires-Dist: aiohttp>=3.11; extra == "asyncio-client"
 Provides-Extra: dev
 Requires-Dist: tox; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: furo; extra == "docs"
 Dynamic: license-file
 
 python-engineio

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

@@ -1,6 +1,6 @@
 [project]
 name = "python-engineio"
-version = "4.13.0"
+version = "4.13.2"
 license = {text = "MIT"}
 authors = [{name = "Miguel Grinberg", email = "miguel.grinberg@gmail.com"}]
 description = "Engine.IO server and client for Python"
@@ -27,13 +27,14 @@ client = [
     "websocket-client >= 0.54.0",
 ]
 asyncio_client = [
-    "aiohttp >= 3.4"
+    "aiohttp >= 3.11"
 ]
 dev = [
     "tox",
 ]
 docs = [
     "sphinx",
+    "furo",
 ]
 
 [tool.setuptools]

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

@@ -55,10 +55,11 @@ class AsyncClient(base_client.BaseClient):
                    use. To disable logging set to ``False``. The default is
                    ``False``. Note that fatal errors are logged even when
                    ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param request_timeout: A timeout in seconds for requests. The default is
                             5 seconds.
     :param http_session: an initialized ``aiohttp.ClientSession`` object to be

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/engineio/async_drivers/aiohttp.py

@@ -79,11 +79,13 @@ class WebSocket:  # pragma: no cover
     """
     def __init__(self, handler, server):
         self.handler = handler
+        self.server = server
         self._sock = None
 
     async def __call__(self, environ):
         request = environ['aiohttp.request']
-        self._sock = WebSocketResponse(max_msg_size=0)
+        self._sock = WebSocketResponse(
+            max_msg_size=self.server.max_http_buffer_size)
         await self._sock.prepare(request)
 
         self.environ = environ

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/engineio/async_drivers/asgi.py

@@ -136,10 +136,18 @@ class ASGIApp:
 
 async def translate_request(scope, receive, send):
     class AwaitablePayload:  # pragma: no cover
-        def __init__(self, payload):
-            self.payload = payload or b''
+        def __init__(self, event):
+            self.event = event
+            self.payload = None
 
         async def read(self, length=None):
+            if self.payload is None and event['type'] == 'http.request':
+                # read payload from http request
+                self.payload = self.event.get('body') or b''
+                while self.event.get('more_body'):
+                    self.event = await receive()
+                    if self.event['type'] == 'http.request':
+                        self.payload += self.event.get('body') or b''
             if length is None:
                 r = self.payload
                 self.payload = b''
@@ -149,16 +157,7 @@ async def translate_request(scope, receive, send):
             return r
 
     event = await receive()
-    payload = b''
-    if event['type'] == 'http.request':
-        payload += event.get('body') or b''
-        while event.get('more_body'):
-            event = await receive()
-            if event['type'] == 'http.request':
-                payload += event.get('body') or b''
-    elif event['type'] == 'websocket.connect':
-        pass
-    else:
+    if event['type'] not in ['http.request', 'websocket.connect']:
         return {}
 
     raw_uri = scope['path']
@@ -171,7 +170,7 @@ async def translate_request(scope, receive, send):
         else:
             raw_uri += '?' + query_string
     environ = {
-        'wsgi.input': AwaitablePayload(payload),
+        'wsgi.input': AwaitablePayload(event),
         'wsgi.errors': sys.stderr,
         'wsgi.version': (1, 0),
         'wsgi.async': True,

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/engineio/async_server.py

@@ -64,10 +64,11 @@ class AsyncServer(base_server.BaseServer):
     :param logger: To enable logging set to ``True`` or pass a logger object to
                    use. To disable logging set to ``False``. Note that fatal
                    errors are logged even when ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
-                 packets. Custom json modules must have ``dumps`` and ``loads``
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom JSON modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param async_handlers: If set to ``True``, run message event handlers in
                            non-blocking threads. To run handlers synchronously,
                            set to ``False``. The default is ``True``.
@@ -461,7 +462,6 @@ class AsyncServer(base_server.BaseServer):
             'maxPayload': self.max_http_buffer_size,
         })
         await s.send(pkt)
-        s.schedule_ping()
 
         ret = await self._trigger_event('connect', sid, environ,
                                         run_async=False)
@@ -470,6 +470,8 @@ class AsyncServer(base_server.BaseServer):
             self.logger.warning('Application rejected connection')
             return self._unauthorized(ret or None)
 
+        s.schedule_ping()
+
         if transport == 'websocket':
             ret = await s.handle_get_request(environ)
             if s.closed and sid in self.sockets:

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/engineio/async_socket.py

@@ -128,10 +128,12 @@ class AsyncSocket(base_socket.BaseSocket):
                 await self.queue.join()
 
     def schedule_ping(self):
-        self.server.start_background_task(self._send_ping)
+        # only schedule a new ping if the previous ping wait cycle completed
+        if self.last_ping:
+            self.last_ping = None
+            self.server.start_background_task(self._send_ping)
 
     async def _send_ping(self):
-        self.last_ping = None
         await asyncio.sleep(self.server.ping_interval)
         if not self.closing and not self.closed:
             self.last_ping = time.time()

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/engineio/base_socket.py

@@ -1,3 +1,6 @@
+import time
+
+
 class BaseSocket:
     upgrade_protocols = ['websocket']
 
@@ -5,7 +8,7 @@ class BaseSocket:
         self.server = server
         self.sid = sid
         self.queue = self.server.create_queue()
-        self.last_ping = None
+        self.last_ping = time.time()
         self.connected = False
         self.upgrading = False
         self.upgraded = False

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

@@ -34,10 +34,11 @@ class Client(base_client.BaseClient):
                    use. To disable logging set to ``False``. The default is
                    ``False``. Note that fatal errors are logged even when
                    ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param request_timeout: A timeout in seconds for requests. The default is
                             5 seconds.
     :param http_session: an initialized ``requests.Session`` object to be used

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/engineio/server.py

@@ -63,10 +63,11 @@ class Server(base_server.BaseServer):
                    use. To disable logging set to ``False``. The default is
                    ``False``. Note that fatal errors are logged even when
                    ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
-                 packets. Custom json modules must have ``dumps`` and ``loads``
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom JSON modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param async_handlers: If set to ``True``, run message event handlers in
                            non-blocking threads. To run handlers synchronously,
                            set to ``False``. The default is ``True``.
@@ -400,7 +401,6 @@ class Server(base_server.BaseServer):
             'maxPayload': self.max_http_buffer_size,
         })
         s.send(pkt)
-        s.schedule_ping()
 
         # NOTE: some sections below are marked as "no cover" to workaround
         # what seems to be a bug in the coverage package. All the lines below
@@ -412,6 +412,8 @@ class Server(base_server.BaseServer):
             self.logger.warning('Application rejected connection')
             return self._unauthorized(ret or None)
 
+        s.schedule_ping()
+
         if transport == 'websocket':  # pragma: no cover
             ret = s.handle_get_request(environ, start_response)
             if s.closed and sid in self.sockets:

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/engineio/socket.py

@@ -130,10 +130,12 @@ class Socket(base_socket.BaseSocket):
                 self.queue.join()
 
     def schedule_ping(self):
-        self.server.start_background_task(self._send_ping)
+        # only schedule a new ping if the previous ping wait cycle completed
+        if self.last_ping:
+            self.last_ping = None
+            self.server.start_background_task(self._send_ping)
 
     def _send_ping(self):
-        self.last_ping = None
         self.server.sleep(self.server.ping_interval)
         if not self.closing and not self.closed:
             self.last_ping = time.time()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.13.0
+Version: 4.13.2
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT
@@ -18,11 +18,12 @@ Provides-Extra: client
 Requires-Dist: requests>=2.21.0; extra == "client"
 Requires-Dist: websocket-client>=0.54.0; extra == "client"
 Provides-Extra: asyncio-client
-Requires-Dist: aiohttp>=3.4; extra == "asyncio-client"
+Requires-Dist: aiohttp>=3.11; extra == "asyncio-client"
 Provides-Extra: dev
 Requires-Dist: tox; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: furo; extra == "docs"
 Dynamic: license-file
 
 python-engineio

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/python_engineio.egg-info/SOURCES.txt

@@ -3,14 +3,6 @@ MANIFEST.in
 README.md
 pyproject.toml
 tox.ini
-docs/Makefile
-docs/api.rst
-docs/client.rst
-docs/conf.py
-docs/index.rst
-docs/intro.rst
-docs/make.bat
-docs/server.rst
 docs/_static/README.md
 src/engineio/__init__.py
 src/engineio/async_client.py
@@ -44,7 +36,6 @@ src/python_engineio.egg-info/dependency_links.txt
 src/python_engineio.egg-info/not-zip-safe
 src/python_engineio.egg-info/requires.txt
 src/python_engineio.egg-info/top_level.txt
-tests/__init__.py
 tests/async/__init__.py
 tests/async/index.html
 tests/async/test_aiohttp.py

{python_engineio-4.13.0 → python_engineio-4.13.2}/src/python_engineio.egg-info/requires.txt

@@ -1,7 +1,7 @@
 simple-websocket>=0.10.0
 
 [asyncio_client]
-aiohttp>=3.4
+aiohttp>=3.11
 
 [client]
 requests>=2.21.0
@@ -12,3 +12,4 @@ tox
 
 [docs]
 sphinx
+furo

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

@@ -95,14 +95,30 @@ class TestSocket:
         s = async_socket.AsyncSocket(mock_server, 'sid')
         s.send = mock.AsyncMock()
 
-        async def schedule_ping():
+        async def schedule_ping_and_sleep():
             s.schedule_ping()
             await asyncio.sleep(0.05)
 
-        await schedule_ping()
+        await schedule_ping_and_sleep()
         assert s.last_ping is not None
         assert s.send.await_args_list[0][0][0].encode() == '2'
 
+    async def test_schedule_ping_twice(self):
+        mock_server = self._get_mock_server()
+        mock_server.ping_interval = 0.01
+        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)
+
+        s.schedule_ping()
+        assert s.last_ping is None
+        await schedule_ping_and_sleep()
+        assert s.last_ping is not None
+        assert s.send.await_count == 1
+
     async def test_schedule_ping_closed_socket(self):
         mock_server = self._get_mock_server()
         mock_server.ping_interval = 0.01

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

@@ -21,6 +21,7 @@ class TestSocket:
         mock_server.ping_interval_grace_period = 0.001
         mock_server.async_handlers = True
         mock_server.max_http_buffer_size = 128
+        mock_server.sleep = time.sleep
 
         try:
             import queue
@@ -104,6 +105,19 @@ class TestSocket:
         assert s.last_ping is not None
         assert s.send.call_args_list[0][0][0].encode() == '2'
 
+    def test_schedule_ping_twice(self):
+        mock_server = self._get_mock_server()
+        mock_server.ping_interval = 0.1
+        s = socket.Socket(mock_server, 'sid')
+        s.send = mock.MagicMock()
+        s.schedule_ping()
+        assert s.last_ping is None
+        time.sleep(0.01)
+        s.schedule_ping()
+        time.sleep(0.1)
+        assert s.last_ping is not None
+        assert s.send.call_count == 1
+
     def test_schedule_ping_closed_socket(self):
         mock_server = self._get_mock_server()
         mock_server.ping_interval = 0.01

{python_engineio-4.13.0 → python_engineio-4.13.2}/tox.ini

@@ -1,16 +1,3 @@
-[tox]
-envlist=flake8,py310,py311,py312,py313,py314,pypy3,docs
-skip_missing_interpreters=True
-
-[gh-actions]
-python =
-    3.10: py310
-    3.11: py311
-    3.12: py312
-    3.13: py313
-    3.14: py314
-    pypy-3: pypy3
-
 [testenv]
 commands=
     pip install -e .
@@ -24,8 +11,6 @@ deps=
     requests
     websocket-client
 
-[testenv:pypy3]
-
 [testenv:flake8]
 deps=
     flake8
@@ -36,6 +21,7 @@ commands=
 changedir=docs
 deps=
     sphinx
+    furo
 allowlist_externals=
     make
 commands=

python_engineio-4.13.0/docs/Makefile

@@ -1,19 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-SOURCEDIR     = .
-BUILDDIR      = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

python_engineio-4.13.0/docs/api.rst

@@ -1,33 +0,0 @@
-API Reference
-=============
-
-.. toctree::
-   :maxdepth: 3
-
-.. module:: engineio
-
-.. autoclass:: Client
-   :members:
-   :inherited-members:
-
-.. autoclass:: AsyncClient
-   :members:
-   :inherited-members:
-
-.. autoclass:: Server
-   :members:
-   :inherited-members:
-
-.. autoclass:: AsyncServer
-   :members:
-   :inherited-members:
-
-.. autoclass:: WSGIApp
-   :members:
-
-.. autoclass:: ASGIApp
-   :members:
-
-.. autoclass:: Middleware
-   :members:
-