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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.12.2
+Version: 4.13.0
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT
@@ -10,7 +10,7 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: simple-websocket>=0.10.0
@@ -19,6 +19,8 @@ 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"
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Dynamic: license-file

{python_engineio-4.12.2 → python_engineio-4.13.0}/docs/client.rst

@@ -199,9 +199,13 @@ terminal::
     # asyncio
     eio = engineio.AsyncClient(logger=True)
 
-The ``logger`` argument can be set to ``True`` to output logs to ``stderr``, or
-to an object compatible with Python's ``logging`` package where the logs should
-be emitted to. A value of ``False`` disables logging.
+The ``logger`` argument controls logging behavior:
+
+* ``True``: Enables log output to ``stderr`` at the ``INFO`` level.
+* ``False``: Enables log output to ``stderr`` at the ``ERROR`` level. This is
+  the default.
+* A ``logging.Logger`` instance: Uses the provided logger without additional
+  configuration.
 
 Logging can help identify the cause of connection problems, unexpected
 disconnections and other issues.

{python_engineio-4.12.2 → python_engineio-4.13.0}/docs/server.rst

@@ -350,9 +350,13 @@ terminal::
     # asyncio
     eio = engineio.AsyncServer(logger=True)
 
-The ``logger`` argument can be set to ``True`` to output logs to ``stderr``, or
-to an object compatible with Python's ``logging`` package where the logs should
-be emitted to. A value of ``False`` disables logging.
+The ``logger`` argument controls logging behavior:
+
+* ``True``: Enables log output to ``stderr`` at the ``INFO`` level.
+* ``False``: Enables log output to ``stderr`` at the ``ERROR`` level. This is
+  the default.
+* A ``logging.Logger`` instance: Uses the provided logger without additional
+  configuration.
 
 Logging can help identify the cause of connection problems, 400 responses,
 bad performance and other issues.

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

@@ -1,6 +1,6 @@
 [project]
 name = "python-engineio"
-version = "4.12.2"
+version = "4.13.0"
 license = {text = "MIT"}
 authors = [{name = "Miguel Grinberg", email = "miguel.grinberg@gmail.com"}]
 description = "Engine.IO server and client for Python"
@@ -10,7 +10,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
 ]
-requires-python = ">=3.6"
+requires-python = ">=3.8"
 dependencies = ["simple-websocket >= 0.10.0"]
 
 [project.readme]
@@ -26,8 +26,15 @@ client = [
     "requests >= 2.21.0",
     "websocket-client >= 0.54.0",
 ]
-asyncio_client = ["aiohttp >= 3.4"]
-docs = ["sphinx"]
+asyncio_client = [
+    "aiohttp >= 3.4"
+]
+dev = [
+    "tox",
+]
+docs = [
+    "sphinx",
+]
 
 [tool.setuptools]
 zip-safe = false

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

@@ -1,4 +1,6 @@
 import asyncio
+from http.cookies import SimpleCookie
+import inspect
 import signal
 import ssl
 import threading
@@ -214,6 +216,12 @@ class AsyncClient(base_client.BaseClient):
 
     async def _reset(self):
         super()._reset()
+        while True:  # pragma: no cover
+            try:
+                self.queue.get_nowait()
+                self.queue.task_done()
+            except self.queue_empty:
+                break
         if not self.external_http:  # pragma: no cover
             if self.http and not self.http.closed:
                 await self.http.close()
@@ -313,16 +321,16 @@ class AsyncClient(base_client.BaseClient):
 
         # extract any new cookies passed in a header so that they can also be
         # sent the the WebSocket route
-        cookies = {}
         for header, value in headers.items():
             if header.lower() == 'cookie':
-                cookies = dict(
-                    [cookie.split('=', 1) for cookie in value.split('; ')])
+                ck = SimpleCookie(headers[header])
+                self.http.cookie_jar.update_cookies(
+                    {k: m.value for k, m in ck.items()})
                 del headers[header]
                 break
-        self.http.cookie_jar.update_cookies(cookies)
 
-        extra_options = {'timeout': self.request_timeout}
+        extra_options = {
+            'timeout': aiohttp.ClientWSTimeout(ws_close=self.request_timeout)}
         if not self.ssl_verify:
             ssl_context = ssl.create_default_context()
             ssl_context.check_hostname = False
@@ -462,7 +470,7 @@ class AsyncClient(base_client.BaseClient):
         run_async = kwargs.pop('run_async', False)
         ret = None
         if event in self.handlers:
-            if asyncio.iscoroutinefunction(self.handlers[event]) is True:
+            if inspect.iscoroutinefunction(self.handlers[event]) is True:
                 if run_async:
                     task = self.start_background_task(self.handlers[event],
                                                       *args)

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

@@ -1,6 +1,5 @@
-import asyncio
+import inspect
 import sys
-from urllib.parse import urlsplit
 
 from aiohttp.web import Response, WebSocketResponse
 
@@ -22,12 +21,8 @@ def translate_request(request):
     """This function takes the arguments passed to the request handler and
     uses them to generate a WSGI compatible environ dictionary.
     """
-    message = request._message
-    payload = request._payload
-
-    uri_parts = urlsplit(message.path)
     environ = {
-        'wsgi.input': payload,
+        'wsgi.input': request.content,
         'wsgi.errors': sys.stderr,
         'wsgi.version': (1, 0),
         'wsgi.async': True,
@@ -35,10 +30,10 @@ def translate_request(request):
         'wsgi.multiprocess': False,
         'wsgi.run_once': False,
         'SERVER_SOFTWARE': 'aiohttp',
-        'REQUEST_METHOD': message.method,
-        'QUERY_STRING': uri_parts.query or '',
-        'RAW_URI': message.path,
-        'SERVER_PROTOCOL': 'HTTP/%s.%s' % message.version,
+        'REQUEST_METHOD': request.method,
+        'QUERY_STRING': request.query_string or '',
+        'RAW_URI': request.path_qs,
+        'SERVER_PROTOCOL': f'HTTP/{request.version[0]}.{request.version[1]}',
         'REMOTE_ADDR': '127.0.0.1',
         'REMOTE_PORT': '0',
         'SERVER_NAME': 'aiohttp',
@@ -46,7 +41,7 @@ def translate_request(request):
         'aiohttp.request': request
     }
 
-    for hdr_name, hdr_value in message.headers.items():
+    for hdr_name, hdr_value in request.headers.items():
         hdr_name = hdr_name.upper()
         if hdr_name == 'CONTENT-TYPE':
             environ['CONTENT_TYPE'] = hdr_value
@@ -63,9 +58,7 @@ def translate_request(request):
 
     environ['wsgi.url_scheme'] = environ.get('HTTP_X_FORWARDED_PROTO', 'http')
 
-    path_info = uri_parts.path
-
-    environ['PATH_INFO'] = path_info
+    environ['PATH_INFO'] = request.path
     environ['SCRIPT_NAME'] = ''
 
     return environ
@@ -105,7 +98,7 @@ class WebSocket:  # pragma: no cover
             f = self._sock.send_bytes
         else:
             f = self._sock.send_str
-        if asyncio.iscoroutinefunction(f):
+        if inspect.iscoroutinefunction(f):
             await f(message)
         else:
             f(message)

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

@@ -1,6 +1,6 @@
+import inspect
 import os
 import sys
-import asyncio
 
 from engineio.static_files import get_static_file
 
@@ -102,7 +102,7 @@ class ASGIApp:
                 if self.on_startup:
                     try:
                         await self.on_startup() \
-                            if asyncio.iscoroutinefunction(self.on_startup) \
+                            if inspect.iscoroutinefunction(self.on_startup) \
                             else self.on_startup()
                     except:
                         await send({'type': 'lifespan.startup.failed'})
@@ -112,7 +112,7 @@ class ASGIApp:
                 if self.on_shutdown:
                     try:
                         await self.on_shutdown() \
-                            if asyncio.iscoroutinefunction(self.on_shutdown) \
+                            if inspect.iscoroutinefunction(self.on_shutdown) \
                             else self.on_shutdown()
                     except:
                         await send({'type': 'lifespan.shutdown.failed'})

{python_engineio-4.12.2 → python_engineio-4.13.0}/src/engineio/async_drivers/tornado.py

@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import sys
 from urllib.parse import urlsplit
 from .. import exceptions
@@ -24,7 +25,7 @@ def get_tornado_handler(engineio_server):
         async def get(self, *args, **kwargs):
             if self.request.headers.get('Upgrade', '').lower() == 'websocket':
                 ret = super().get(*args, **kwargs)
-                if asyncio.iscoroutine(ret):
+                if inspect.iscoroutine(ret):
                     await ret
             else:
                 await engineio_server.handle_request(self)

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

@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import urllib
 
 from . import base_server
@@ -56,8 +57,8 @@ class AsyncServer(base_server.BaseServer):
     :param cors_allowed_origins: Origin or list of origins that are allowed to
                                  connect to this server. Only the same origin
                                  is allowed by default. Set this argument to
-                                 ``'*'`` to allow all origins, or to ``[]`` to
-                                 disable CORS handling.
+                                 ``'*'`` or ``['*']`` to allow all origins, or
+                                 to ``[]`` to disable CORS handling.
     :param cors_credentials: Whether credentials (cookies, authentication) are
                              allowed in requests to this server.
     :param logger: To enable logging set to ``True`` or pass a logger object to
@@ -212,7 +213,7 @@ class AsyncServer(base_server.BaseServer):
         Note: this method is a coroutine.
         """
         translate_request = self._async['translate_request']
-        if asyncio.iscoroutinefunction(translate_request):
+        if inspect.iscoroutinefunction(translate_request):
             environ = await translate_request(*args, **kwargs)
         else:
             environ = translate_request(*args, **kwargs)
@@ -427,7 +428,7 @@ class AsyncServer(base_server.BaseServer):
     async def _make_response(self, response_dict, environ):
         cors_headers = self._cors_headers(environ)
         make_response = self._async['make_response']
-        if asyncio.iscoroutinefunction(make_response):
+        if inspect.iscoroutinefunction(make_response):
             response = await make_response(
                 response_dict['status'],
                 response_dict['headers'] + cors_headers,
@@ -502,7 +503,7 @@ class AsyncServer(base_server.BaseServer):
         run_async = kwargs.pop('run_async', False)
         ret = None
         if event in self.handlers:
-            if asyncio.iscoroutinefunction(self.handlers[event]):
+            if inspect.iscoroutinefunction(self.handlers[event]):
                 async def run_async_handler():
                     try:
                         try:

{python_engineio-4.12.2 → python_engineio-4.13.0}/src/engineio/base_server.py

@@ -310,7 +310,10 @@ class BaseServer:
                 is_allowed = self.cors_allowed_origins(origin)
             allowed_origins = [origin] if is_allowed else []
         else:
-            allowed_origins = self.cors_allowed_origins
+            if '*' in self.cors_allowed_origins:
+                allowed_origins = None
+            else:
+                allowed_origins = self.cors_allowed_origins
         return allowed_origins
 
     def _cors_headers(self, environ):

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

@@ -1,11 +1,12 @@
 from base64 import b64encode
-from engineio.json import JSONDecodeError
+from http.cookies import SimpleCookie
 import logging
 import queue
 import ssl
 import threading
 import time
 import urllib
+from engineio.json import JSONDecodeError
 
 try:
     import requests
@@ -173,6 +174,15 @@ class Client(base_client.BaseClient):
         """Create an event object."""
         return threading.Event(*args, **kwargs)
 
+    def _reset(self):
+        super()._reset()
+        while True:  # pragma: no cover
+            try:
+                self.queue.get_nowait()
+                self.queue.task_done()
+            except self.queue_empty:
+                break
+
     def _connect_polling(self, url, headers, engineio_path):
         """Establish a long-polling connection to the Engine.IO server."""
         if requests is None:  # pragma: no cover
@@ -259,8 +269,10 @@ class Client(base_client.BaseClient):
         extra_options = {}
         if self.http:
             # cookies
-            cookies = '; '.join([f"{cookie.name}={cookie.value}"
-                                 for cookie in self.http.cookies])
+            ck = SimpleCookie()
+            for cookie in self.http.cookies:
+                ck[cookie.name] = cookie.value
+            cookies = ck.output(header='', sep=';').strip()
             for header, value in headers.items():
                 if header.lower() == 'cookie':
                     if cookies:

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

@@ -54,8 +54,8 @@ class Server(base_server.BaseServer):
     :param cors_allowed_origins: Origin or list of origins that are allowed to
                                  connect to this server. Only the same origin
                                  is allowed by default. Set this argument to
-                                 ``'*'`` to allow all origins, or to ``[]`` to
-                                 disable CORS handling.
+                                 ``'*'`` or ``['*']`` to allow all origins, or
+                                 to ``[]`` to disable CORS handling.
     :param cors_credentials: Whether credentials (cookies, authentication) are
                              allowed in requests to this server. The default
                              is ``True``.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.12.2
+Version: 4.13.0
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT
@@ -10,7 +10,7 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: simple-websocket>=0.10.0
@@ -19,6 +19,8 @@ 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"
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Dynamic: license-file

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

@@ -7,5 +7,8 @@ aiohttp>=3.4
 requests>=2.21.0
 websocket-client>=0.54.0
 
+[dev]
+tox
+
 [docs]
 sphinx

{python_engineio-4.12.2 → python_engineio-4.13.0}/tests/async/test_aiohttp.py

@@ -1,5 +1,8 @@
 from unittest import mock
 
+import yarl
+from aiohttp.web import Request
+
 from engineio.async_drivers import aiohttp as async_aiohttp
 
 
@@ -12,18 +15,28 @@ class TestAiohttp:
         app.router.add_post.assert_any_call('/foo', mock_server.handle_request)
 
     def test_translate_request(self):
-        request = mock.MagicMock()
-        request._message.method = 'PUT'
-        request._message.path = '/foo/bar?baz=1'
-        request._message.version = (1, 1)
-        request._message.headers = {
+        message = mock.MagicMock()
+        message.url = yarl.URL('https://example.com/foo/bar?baz=1')
+        message.method = 'PUT'
+        message.path = '/foo/bar?baz=1'
+        message.version = (1, 1)
+        message.headers = {
             'a': 'b',
             'c-c': 'd',
             'c_c': 'e',
             'content-type': 'application/json',
             'content-length': 123,
         }
-        request._payload = b'hello world'
+
+        request = Request(
+            message,
+            payload=b'hello world',
+            protocol=mock.MagicMock(),
+            payload_writer=mock.MagicMock(),
+            task=mock.MagicMock(),
+            loop=mock.MagicMock(),
+        )
+
         environ = async_aiohttp.translate_request(request)
         expected_environ = {
             'REQUEST_METHOD': 'PUT',