python-engineio 4.8.0__tar.gz → 4.8.2__tar.gz

{python-engineio-4.8.0/src/python_engineio.egg-info → python-engineio-4.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-engineio
-Version: 4.8.0
+Version: 4.8.2
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 Project-URL: Homepage, https://github.com/miguelgrinberg/python-engineio
@@ -27,7 +27,7 @@ python-engineio
 
 [![Build status](https://github.com/miguelgrinberg/python-engineio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/python-engineio/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/python-engineio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/python-engineio)
 
-Python implementation of the `Engine.IO`_ realtime client and server.
+Python implementation of the `Engine.IO` realtime client and server.
 
 Sponsors
 --------
@@ -42,7 +42,7 @@ Many individual sponsors also support this project through small ongoing contrib
 Resources
 ---------
 
--  [Documentation](https://python-engineio.readthedocs.io/en/latest/)
+-  [Documentation](https://python-engineio.readthedocs.io/)
 -  [PyPI](https://pypi.python.org/pypi/python-engineio)
 -  [Change Log](https://github.com/miguelgrinberg/python-engineio/blob/main/CHANGES.md)
 -  Questions? See the [questions](https://stackoverflow.com/questions/tagged/python-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+python-socketio) your own question.

{python-engineio-4.8.0 → python-engineio-4.8.2}/README.md

@@ -3,7 +3,7 @@ python-engineio
 
 [![Build status](https://github.com/miguelgrinberg/python-engineio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/python-engineio/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/python-engineio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/python-engineio)
 
-Python implementation of the `Engine.IO`_ realtime client and server.
+Python implementation of the `Engine.IO` realtime client and server.
 
 Sponsors
 --------
@@ -18,7 +18,7 @@ Many individual sponsors also support this project through small ongoing contrib
 Resources
 ---------
 
--  [Documentation](https://python-engineio.readthedocs.io/en/latest/)
+-  [Documentation](https://python-engineio.readthedocs.io/)
 -  [PyPI](https://pypi.python.org/pypi/python-engineio)
 -  [Change Log](https://github.com/miguelgrinberg/python-engineio/blob/main/CHANGES.md)
 -  Questions? See the [questions](https://stackoverflow.com/questions/tagged/python-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+python-socketio) your own question.

{python-engineio-4.8.0 → python-engineio-4.8.2}/pyproject.toml

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

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/async_client.py

@@ -15,6 +15,11 @@ from . import payload
 
 async_signal_handler_set = False
 
+# this set is used to keep references to background tasks to prevent them from
+# being garbage collected mid-execution. Solution taken from
+# https://docs.python.org/3/library/asyncio-task.html#asyncio.create_task
+task_reference_holder = set()
+
 
 def async_signal_handler():
     """SIGINT handler.
@@ -450,8 +455,11 @@ class AsyncClient(base_client.BaseClient):
         if event in self.handlers:
             if asyncio.iscoroutinefunction(self.handlers[event]) is True:
                 if run_async:
-                    return self.start_background_task(self.handlers[event],
+                    task = self.start_background_task(self.handlers[event],
                                                       *args)
+                    task_reference_holder.add(task)
+                    task.add_done_callback(task_reference_holder.discard)
+                    return task
                 else:
                     try:
                         ret = await self.handlers[event](*args)
@@ -468,7 +476,10 @@ class AsyncClient(base_client.BaseClient):
                     async def async_handler():
                         return self.handlers[event](*args)
 
-                    return self.start_background_task(async_handler)
+                    task = self.start_background_task(async_handler)
+                    task_reference_holder.add(task)
+                    task.add_done_callback(task_reference_holder.discard)
+                    return task
                 else:
                     try:
                         ret = self.handlers[event](*args)

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/async_drivers/asgi.py

@@ -233,9 +233,14 @@ class WebSocket(object):  # pragma: no cover
         self.asgi_send = environ['asgi.send']
         await self.asgi_send({'type': 'websocket.accept'})
         await self.handler(self)
+        return ''  # send nothing as response
 
     async def close(self):
-        pass
+        try:
+            await self.asgi_send({'type': 'websocket.close'})
+        except Exception:
+            # if the socket is already close we don't care
+            pass
 
     async def send(self, message):
         msg_bytes = None

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/async_drivers/gevent_uwsgi.py

@@ -61,6 +61,7 @@ class uWSGIWebSocket(object):  # pragma: no cover
 
         self.app(self)
         uwsgi.disconnect()
+        return ''  # send nothing as response
 
     def close(self):
         """Disconnects uWSGI from the client."""

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/async_drivers/sanic.py

@@ -114,6 +114,7 @@ class WebSocket(object):  # pragma: no cover
     """
     def __init__(self, handler, server):
         self.handler = handler
+        self.server = server
         self._sock = None
 
     async def __call__(self, environ):
@@ -123,6 +124,7 @@ class WebSocket(object):  # pragma: no cover
 
         self.environ = environ
         await self.handler(self)
+        return self.server._ok()
 
     async def close(self):
         await self._sock.close()

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/async_server.py

@@ -6,6 +6,11 @@ from . import exceptions
 from . import packet
 from . import async_socket
 
+# this set is used to keep references to background tasks to prevent them from
+# being garbage collected mid-execution. Solution taken from
+# https://docs.python.org/3/library/asyncio-task.html#asyncio.create_task
+task_reference_holder = set()
+
 
 class AsyncServer(base_server.BaseServer):
     """An Engine.IO server for asyncio.
@@ -30,8 +35,11 @@ class AsyncServer(base_server.BaseServer):
     :param ping_timeout: The time in seconds that the client waits for the
                          server to respond before disconnecting. The default
                          is 20 seconds.
-    :param max_http_buffer_size: The maximum size of a message.  The default
-                                 is 1,000,000 bytes.
+    :param max_http_buffer_size: The maximum size that is accepted for incoming
+                                 messages.  The default is 1,000,000 bytes. In
+                                 spite of its name, the value set in this
+                                 argument is enforced for HTTP long-polling and
+                                 WebSocket connections.
     :param allow_upgrades: Whether to allow transport upgrades or not.
     :param http_compression: Whether to compress packages when using the
                              polling transport.
@@ -484,6 +492,8 @@ class AsyncServer(base_server.BaseServer):
 
                 if run_async:
                     ret = self.start_background_task(run_async_handler)
+                    task_reference_holder.add(ret)
+                    ret.add_done_callback(task_reference_holder.discard)
                 else:
                     ret = await run_async_handler()
             else:
@@ -499,6 +509,8 @@ class AsyncServer(base_server.BaseServer):
 
                 if run_async:
                     ret = self.start_background_task(run_sync_handler)
+                    task_reference_holder.add(ret)
+                    ret.add_done_callback(task_reference_holder.discard)
                 else:
                     ret = await run_sync_handler()
         return ret

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/async_socket.py

@@ -140,7 +140,7 @@ class AsyncSocket(base_socket.BaseSocket):
             return self.server._bad_request()
         ws = self.server._async['websocket'](
             self._websocket_handler, self.server)
-        await ws(environ)
+        return await ws(environ)
 
     async def _websocket_handler(self, ws):
         """Engine.IO handler for websocket transport."""

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/client.py

@@ -309,7 +309,10 @@ class Client(base_client.BaseClient):
                 self.ssl_verify = False
 
         if not self.ssl_verify:
-            extra_options['sslopt'] = {"cert_reqs": ssl.CERT_NONE}
+            if 'sslopt' in extra_options:
+                extra_options['sslopt'].update({"cert_reqs": ssl.CERT_NONE})
+            else:
+                extra_options['sslopt'] = {"cert_reqs": ssl.CERT_NONE}
 
         # combine internally generated options with the ones supplied by the
         # caller. The caller's options take precedence.

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/server.py

@@ -31,8 +31,11 @@ class Server(base_server.BaseServer):
     :param ping_timeout: The time in seconds that the client waits for the
                          server to respond before disconnecting. The default
                          is 20 seconds.
-    :param max_http_buffer_size: The maximum size of a message.  The default
-                                 is 1,000,000 bytes.
+    :param max_http_buffer_size: The maximum size that is accepted for incoming
+                                 messages.  The default is 1,000,000 bytes. In
+                                 spite of its name, the value set in this
+                                 argument is enforced for HTTP long-polling and
+                                 WebSocket connections.
     :param allow_upgrades: Whether to allow transport upgrades or not. The
                            default is ``True``.
     :param http_compression: Whether to compress packages when using the
@@ -306,7 +309,7 @@ class Server(base_server.BaseServer):
             r = self._method_not_found()
 
         if not isinstance(r, dict):
-            return r or []
+            return r
         if self.http_compression and \
                 len(r['response']) >= self.compression_threshold:
             encodings = [e.split(';')[0].strip() for e in

{python-engineio-4.8.0 → python-engineio-4.8.2}/src/engineio/socket.py

@@ -143,8 +143,7 @@ class Socket(base_socket.BaseSocket):
             return self.server._bad_request()
         ws = self.server._async['websocket'](
             self._websocket_handler, self.server)
-        ws(environ, start_response)
-        return self.server._ok()
+        return ws(environ, start_response)
 
     def _websocket_handler(self, ws):
         """Engine.IO handler for websocket transport."""

{python-engineio-4.8.0 → python-engineio-4.8.2/src/python_engineio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-engineio
-Version: 4.8.0
+Version: 4.8.2
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 Project-URL: Homepage, https://github.com/miguelgrinberg/python-engineio
@@ -27,7 +27,7 @@ python-engineio
 
 [![Build status](https://github.com/miguelgrinberg/python-engineio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/python-engineio/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/python-engineio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/python-engineio)
 
-Python implementation of the `Engine.IO`_ realtime client and server.
+Python implementation of the `Engine.IO` realtime client and server.
 
 Sponsors
 --------
@@ -42,7 +42,7 @@ Many individual sponsors also support this project through small ongoing contrib
 Resources
 ---------
 
--  [Documentation](https://python-engineio.readthedocs.io/en/latest/)
+-  [Documentation](https://python-engineio.readthedocs.io/)
 -  [PyPI](https://pypi.python.org/pypi/python-engineio)
 -  [Change Log](https://github.com/miguelgrinberg/python-engineio/blob/main/CHANGES.md)
 -  Questions? See the [questions](https://stackoverflow.com/questions/tagged/python-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+python-socketio) your own question.

{python-engineio-4.8.0 → python-engineio-4.8.2}/tests/common/test_client.py

@@ -879,7 +879,7 @@ class TestClient(unittest.TestCase):
         http.auth = None
         http.proxies = None
         http.cert = 'foo.crt'
-        c = client.Client(http_session=http)
+        c = client.Client(http_session=http, ssl_verify=False)
         c._read_loop_polling = mock.MagicMock()
         c._read_loop_websocket = mock.MagicMock()
         c._write_loop = mock.MagicMock()
@@ -889,7 +889,7 @@ class TestClient(unittest.TestCase):
 
         assert len(create_connection.call_args_list) == 1
         assert create_connection.call_args[1] == {
-            'sslopt': {'certfile': 'foo.crt'},
+            'sslopt': {'cert_reqs': ssl.CERT_NONE, 'certfile': 'foo.crt'},
             'header': {},
             'cookie': '',
             'enable_multithread': True,