python-engineio 4.14.0__py3-none-any.whl → 4.15.1__py3-none-any.whl

engineio/async_client.py

@@ -226,6 +226,7 @@ class AsyncClient(base_client.BaseClient):
         if not self.external_http:  # pragma: no cover
             if self.http and not self.http.closed:
                 await self.http.close()
+                self.http = None
 
     def __del__(self):  # pragma: no cover
         # try to close the aiohttp session if it is still open
@@ -323,8 +324,13 @@ class AsyncClient(base_client.BaseClient):
             self.logger.info(
                 'Attempting WebSocket connection to ' + websocket_url)
 
-        if self.http is None or self.http.closed:  # pragma: no cover
-            self.http = aiohttp.ClientSession()
+        if self.http is None or self.http.closed:
+            if self.http_factory:
+                self.http = self.http_factory()
+                if inspect.iscoroutine(self.http):
+                    self.http = await self.http
+            else:
+                self.http = aiohttp.ClientSession()
 
         # extract any new cookies passed in a header so that they can also be
         # sent the the WebSocket route
@@ -458,12 +464,17 @@ class AsyncClient(base_client.BaseClient):
 
     async def _send_request(
             self, method, url, headers=None, body=None,
-            timeout=None):  # pragma: no cover
+            timeout=None):
         if self.http is None or self.http.closed:
-            self.http = aiohttp.ClientSession()
+            if self.http_factory:
+                self.http = self.http_factory()
+                if inspect.iscoroutine(self.http):
+                    self.http = await self.http
+            else:
+                self.http = aiohttp.ClientSession()
         http_method = getattr(self.http, method.lower())
 
-        try:
+        try:  # pragma: no cover
             if not self.ssl_verify:
                 return await http_method(
                     url, headers=headers, data=body,
@@ -473,7 +484,8 @@ class AsyncClient(base_client.BaseClient):
                     url, headers=headers, data=body,
                     timeout=aiohttp.ClientTimeout(total=timeout))
 
-        except (aiohttp.ClientError, asyncio.TimeoutError) as exc:
+        except (aiohttp.ClientError, asyncio.TimeoutError) \
+                as exc:  # pragma: no cover
             self.logger.info('HTTP %s request to %s failed with error %s.',
                              method, url, exc)
             return str(exc)

engineio/async_server.py

@@ -298,7 +298,19 @@ class AsyncServer(base_server.BaseServer):
                         self._log_error_once(f'{e} {sid}', 'bad-sid')
                         r = self._bad_request(f'{e} {sid}')
                     else:
-                        if self.transport(sid) != transport and \
+                        if not socket.connected:
+                            # cannot accept requests before connecting
+                            self._log_error_once(
+                                f'Socket for session {sid} is not connected',
+                                'not-connected')
+                            r = self._bad_request('Not connected')
+                        elif socket.upgraded:
+                            # cannot accept HTTP requests once upgraded
+                            self._log_error_once(
+                                f'Unexpected HTTP request for session {sid}',
+                                'unexpected-http')
+                            r = self._bad_request('Unexpected HTTP request')
+                        elif transport != 'polling' and \
                                 transport != upgrade_header:
                             self._log_error_once(
                                 f'Invalid transport for session {sid}',
@@ -326,18 +338,31 @@ class AsyncServer(base_server.BaseServer):
                 r = self._bad_request(f'Invalid session {sid}')
             else:
                 socket = self._get_socket(sid)
-                try:
-                    await socket.handle_post_request(environ)
-                    r = self._ok(jsonp_index=jsonp_index)
-                except exceptions.EngineIOError:
-                    if sid in self.sockets:  # pragma: no cover
-                        await self.disconnect(sid)
-                    r = self._bad_request()
-                except:  # pragma: no cover
-                    # for any other unexpected errors, we log the error
-                    # and keep going
-                    self.logger.exception('post request handler error')
-                    r = self._ok(jsonp_index=jsonp_index)
+                if not socket.connected:
+                    # cannot accept requests before connecting
+                    self._log_error_once(
+                        f'Socket for session {sid} is not connected',
+                        'not-connected')
+                    r = self._bad_request('Not connected')
+                elif not socket.upgraded:
+                    try:
+                        await socket.handle_post_request(environ)
+                        r = self._ok(jsonp_index=jsonp_index)
+                    except exceptions.EngineIOError:
+                        if sid in self.sockets:  # pragma: no cover
+                            await self.disconnect(sid)
+                            r = self._bad_request()
+                    except:  # pragma: no cover
+                        # for any other unexpected errors, we log the error
+                        # and keep going
+                        self.logger.exception('post request handler error')
+                        r = self._ok(jsonp_index=jsonp_index)
+                else:
+                    # cannot accept HTTP requests once upgraded
+                    self._log_error_once(
+                        f'Unexpected HTTP request for session {sid}',
+                        'unexpected-http')
+                    r = self._bad_request('Unexpected HTTP request')
         elif method == 'OPTIONS':
             r = self._ok()
         else:

engineio/async_socket.py

@@ -56,8 +56,8 @@ class AsyncSocket(base_socket.BaseSocket):
         """Make sure the client is still sending pings."""
         if self.closed:
             raise exceptions.SocketIsClosedError()
-        if self.last_ping and \
-                time.time() - self.last_ping > self.server.ping_timeout:
+        last_ping = self.last_ping
+        if last_ping and time.time() - last_ping > self.server.ping_timeout:
             self.server.logger.info('%s: Client is gone, closing socket',
                                     self.sid)
             # Passing abort=False here will cause close() to write a

engineio/base_client.py

@@ -55,8 +55,14 @@ class BaseClient:
         self.upgrades = None
         self.ping_interval = None
         self.ping_timeout = None
-        self.http = http_session
-        self.external_http = http_session is not None
+        self.http = None
+        self.http_factory = None
+        if http_session is not None:
+            if callable(http_session):
+                self.http_factory = http_session
+            else:
+                self.http = http_session
+        self.external_http = self.http is not None
         self.handle_sigint = handle_sigint
         self.ws = None
         self.read_loop_task = None

engineio/client.py

@@ -183,6 +183,8 @@ class Client(base_client.BaseClient):
                 self.queue.task_done()
             except self.queue_empty:
                 break
+        if not self.external_http:  # pragma: no cover
+            self.http = None
 
     def _connect_polling(self, url, headers, engineio_path):
         """Establish a long-polling connection to the Engine.IO server."""
@@ -274,6 +276,8 @@ class Client(base_client.BaseClient):
         # so that they are preserved when connecting to the WebSocket route
         cookies = None
         extra_options = {}
+        if self.http is None and self.http_factory:
+            self.http = self.http_factory()
         if self.http:
             # cookies
             ck = SimpleCookie()
@@ -458,7 +462,10 @@ class Client(base_client.BaseClient):
             self, method, url, headers=None, body=None,
             timeout=None):  # pragma: no cover
         if self.http is None:
-            self.http = requests.Session()
+            if self.http_factory:
+                self.http = self.http_factory()
+            else:
+                self.http = requests.Session()
         if not self.ssl_verify:
             self.http.verify = False
         try:

engineio/server.py

@@ -276,7 +276,19 @@ class Server(base_server.BaseServer):
                         self._log_error_once(f'{e} {sid}', 'bad-sid')
                         r = self._bad_request(f'{e} {sid}')
                     else:
-                        if self.transport(sid) != transport and \
+                        if not socket.connected:
+                            # cannot accept requests before connecting
+                            self._log_error_once(
+                                f'Socket for session {sid} is not connected',
+                                'not-connected')
+                            r = self._bad_request('Not connected')
+                        elif socket.upgraded:
+                            # cannot accept HTTP requests once upgraded
+                            self._log_error_once(
+                                f'Unexpected HTTP request for session {sid}',
+                                'unexpected-http')
+                            r = self._bad_request('Unexpected HTTP request')
+                        elif transport != 'polling' and \
                                 transport != upgrade_header:
                             self._log_error_once(
                                 f'Invalid transport for session {sid}',
@@ -304,18 +316,31 @@ class Server(base_server.BaseServer):
                 r = self._bad_request(f'Invalid session {sid}')
             else:
                 socket = self._get_socket(sid)
-                try:
-                    socket.handle_post_request(environ)
-                    r = self._ok(jsonp_index=jsonp_index)
-                except exceptions.EngineIOError:
-                    if sid in self.sockets:  # pragma: no cover
-                        self.disconnect(sid)
-                    r = self._bad_request()
-                except:  # pragma: no cover
-                    # for any other unexpected errors, we log the error
-                    # and keep going
-                    self.logger.exception('post request handler error')
-                    r = self._ok(jsonp_index=jsonp_index)
+                if not socket.connected:
+                    # cannot accept requests before connecting
+                    self._log_error_once(
+                        f'Socket for session {sid} is not connected',
+                        'not-connected')
+                    r = self._bad_request('Not connected')
+                elif not socket.upgraded:
+                    try:
+                        socket.handle_post_request(environ)
+                        r = self._ok(jsonp_index=jsonp_index)
+                    except exceptions.EngineIOError:
+                        if sid in self.sockets:  # pragma: no cover
+                            self.disconnect(sid)
+                        r = self._bad_request()
+                    except:  # pragma: no cover
+                        # for any other unexpected errors, we log the error
+                        # and keep going
+                        self.logger.exception('post request handler error')
+                        r = self._ok(jsonp_index=jsonp_index)
+                else:
+                    # cannot accept HTTP requests once upgraded
+                    self._log_error_once(
+                        f'Unexpected HTTP request for session {sid}',
+                        'unexpected-http')
+                    r = self._bad_request('Unexpected HTTP request')
         elif method == 'OPTIONS':
             r = self._ok()
         else:

engineio/socket.py

@@ -57,8 +57,8 @@ class Socket(base_socket.BaseSocket):
         """Make sure the client is still responding to pings."""
         if self.closed:
             raise exceptions.SocketIsClosedError()
-        if self.last_ping and \
-                time.time() - self.last_ping > self.server.ping_timeout:
+        last_ping = self.last_ping
+        if last_ping and time.time() - last_ping > self.server.ping_timeout:
             self.server.logger.info('%s: Client is gone, closing socket',
                                     self.sid)
             # Passing abort=False here will cause close() to write a

engineio/static_files.py

@@ -35,6 +35,8 @@ def get_static_file(path, static_files):
             elif path + '/' in static_files:
                 f = static_files[path + '/']
                 break
+    if '../' in extra_path:
+        return None
     if f:
         if isinstance(f, str):
             f = {'filename': f}

{python_engineio-4.14.0.dist-info → python_engineio-4.15.1.dist-info}/METADATA

@@ -1,14 +1,15 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.14.0
+Version: 4.15.1
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
-License: MIT
-Project-URL: homepage, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio
-Project-URL: documentation, https://python-engineio.readthedocs.io/
-Project-URL: repository, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio
-Project-URL: issues, https://github.com/miguelgrinberg/python-engineio/issues
-Project-URL: changelog, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/src/branch/main/CHANGES.md
+License-Expression: MIT
+Project-URL: Homepage, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio
+Project-URL: Documentation, https://python-engineio.readthedocs.io/
+Project-URL: Source Code, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio
+Project-URL: Issue Tracker, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/issues
+Project-URL: Changelog, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/src/branch/main/CHANGES.md
+Project-URL: Funding, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio#sponsor-this-project
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3

{python_engineio-4.14.0.dist-info → python_engineio-4.15.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
 engineio/__init__.py,sha256=0R2PY1EXu3sicP7mkA0_QxEVGRlFlgvsxfhByqREE1A,481
-engineio/async_client.py,sha256=MuqDjXx7W-Fe8dr29kncI-2BMO0XzvqZHdZ2-kmJThQ,30539
-engineio/async_server.py,sha256=7oQClUwwSiPlFFUSEBeE6VuOYnbK2z8FCmRqeWoiiVE,27558
-engineio/async_socket.py,sha256=2agIDyicauuHuDHf_2WtUWreq1BP5iu5FQu9tSHWdtY,10827
-engineio/base_client.py,sha256=oOdq-zR7kg8QpvAGti0zBIiFBQGyEELwVMZNtcoJ2ig,5827
+engineio/async_client.py,sha256=QIeN6WREOpPOXGk_c4z0HFuUZ-krcb0VNRJdYn3TptE,30996
+engineio/async_server.py,sha256=j9nYtucVXquHvodl0GC_mws6E606JFuImEvtV7TbhEU,29008
+engineio/async_socket.py,sha256=qZYv0BagtaxQvrKK3fwrI4cgf3ShtIRLKdjwxw43WdQ,10834
+engineio/base_client.py,sha256=75L-ydpGSedVLph46aLiwpf8DNPhdgmbkXxH-nSso4E,6033
 engineio/base_server.py,sha256=tTCqc65Vzf-0Be1uunt1FuGxPOvcpOUCxnT5V2mZCWo,14763
 engineio/base_socket.py,sha256=PWiJC1msNo-0ctlP3JAwWsngKvnYM-ZjS6B6zzfu-eM,420
-engineio/client.py,sha256=STXw-UI3CD9VizbT6A3bbyL2_a1mpRm8TiU6fxJJg7Q,29255
+engineio/client.py,sha256=_pboeKZil8q8kWvQcxYe6Jdu_5IfT5iNpjIDLtbXWUs,29539
 engineio/exceptions.py,sha256=FyuMb5qhX9CUYP3fEoe1m-faU96ApdQTSbblaaoo8LA,292
 engineio/json.py,sha256=SG5FTojqd1ix6u0dKXJsZVqqdYioZLO4S2GPL7BKl3U,405
 engineio/middleware.py,sha256=5NKBXz-ftuFErUB_V9IDvRHaSOsjhtW-NnuJtquB1nc,3750
 engineio/packet.py,sha256=YO3gmeKUoKyIsUq2e1z7Zifr5PGeS3gnaCeqR7wj5hQ,3198
 engineio/payload.py,sha256=GIWu0Vnay4WNZlDxHqVgP34tKTBXX58OArJ-mO5zD3E,1539
-engineio/server.py,sha256=P6Pa53MRJVoXL_n5tEONuIQoBtOvsdFR5GylKgu5oUE,23088
-engineio/socket.py,sha256=WUwGT9MByp04KjHiEnDaESosNsxYxp6AG1tB3pei9eQ,10454
-engineio/static_files.py,sha256=pwez9LQFaSQXMbtI0vLyD6UDiokQ4rNfmRYgVLKOthc,2064
+engineio/server.py,sha256=hl7UrTFp6gJT-SCtvJMh9CdUSHr3RqNk5-Hav5sIDH8,24534
+engineio/socket.py,sha256=1xCvZpaoqnud2HNJEs5FXOjOlycjNG5RtSgnHEv8yoE,10461
+engineio/static_files.py,sha256=5h_SMrTbBITg9mYPswe2voA2u3tj9aXz_PuS4OLALj8,2112
 engineio/async_drivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 engineio/async_drivers/_websocket_wsgi.py,sha256=8kutiYG0syg3rFeqzMU3Pm-QQwaUx0F9EUUaOfKwPAU,1026
 engineio/async_drivers/aiohttp.py,sha256=SOU9KOoru_OzxLioSKCYNIZQZLoyf-oxw6-bXc6-_L8,3697
@@ -24,8 +24,8 @@ engineio/async_drivers/gevent_uwsgi.py,sha256=m6ay5dov9FDQl0fbeiKeE-Orh5LiF6zLlY
 engineio/async_drivers/sanic.py,sha256=GYX8YWR1GbRm-GkMTAQkfkWbY12MOT1IV2DzH0Xx8Ns,4495
 engineio/async_drivers/threading.py,sha256=ywmG59d4H6OHZjKarBN97-9BHEsRxFEz9YN-E9QAu_I,463
 engineio/async_drivers/tornado.py,sha256=v9uuGk8_HS6DjhoEKXfjHpki1FnydN4wi7eyBMsUTJA,5908
-python_engineio-4.14.0.dist-info/licenses/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
-python_engineio-4.14.0.dist-info/METADATA,sha256=QZLd2QwRscNvl5JYnURoE2Zu0RhcE5dd_tt4plhmZfA,2496
-python_engineio-4.14.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_engineio-4.14.0.dist-info/top_level.txt,sha256=u8PmNisCZLwRYcWrNLe9wutQ2tt4zNi8IH362c-HWuA,9
-python_engineio-4.14.0.dist-info/RECORD,,
+python_engineio-4.15.1.dist-info/licenses/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
+python_engineio-4.15.1.dist-info/METADATA,sha256=OUrDPraYcxJjKEZ4L87sn22DnY2pqcSPHximPyUyQvo,2634
+python_engineio-4.15.1.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+python_engineio-4.15.1.dist-info/top_level.txt,sha256=u8PmNisCZLwRYcWrNLe9wutQ2tt4zNi8IH362c-HWuA,9
+python_engineio-4.15.1.dist-info/RECORD,,

{python_engineio-4.14.0.dist-info → python_engineio-4.15.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (84.0.0)
+Generator: setuptools (84.2.1)
 Root-Is-Purelib: true
 Tag: py3-none-any