python-engineio 4.11.2__py3-none-any.whl → 4.12.1__py3-none-any.whl

engineio/async_drivers/asgi.py

@@ -280,7 +280,12 @@ class WebSocket:  # pragma: no cover
         event = await self.asgi_receive()
         if event['type'] != 'websocket.receive':
             raise OSError()
-        return event.get('bytes') or event.get('text')
+        if 'bytes' in event:
+            return event['bytes']
+        elif 'text' in event:
+            return event['text']
+        else:  # pragma: no cover
+            raise OSError()
 
 
 _async = {

engineio/base_server.py

@@ -282,29 +282,33 @@ class BaseServer:
                 'response': message.encode('utf-8')}
 
     def _cors_allowed_origins(self, environ):
-        default_origins = []
-        if 'wsgi.url_scheme' in environ and 'HTTP_HOST' in environ:
-            default_origins.append('{scheme}://{host}'.format(
-                scheme=environ['wsgi.url_scheme'], host=environ['HTTP_HOST']))
-            if 'HTTP_X_FORWARDED_PROTO' in environ or \
-                    'HTTP_X_FORWARDED_HOST' in environ:
-                scheme = environ.get(
-                    'HTTP_X_FORWARDED_PROTO',
-                    environ['wsgi.url_scheme']).split(',')[0].strip()
-                default_origins.append('{scheme}://{host}'.format(
-                    scheme=scheme, host=environ.get(
-                        'HTTP_X_FORWARDED_HOST', environ['HTTP_HOST']).split(
-                            ',')[0].strip()))
         if self.cors_allowed_origins is None:
-            allowed_origins = default_origins
+            allowed_origins = []
+            if 'wsgi.url_scheme' in environ and 'HTTP_HOST' in environ:
+                allowed_origins.append('{scheme}://{host}'.format(
+                    scheme=environ['wsgi.url_scheme'],
+                    host=environ['HTTP_HOST']))
+                if 'HTTP_X_FORWARDED_PROTO' in environ or \
+                        'HTTP_X_FORWARDED_HOST' in environ:
+                    scheme = environ.get(
+                        'HTTP_X_FORWARDED_PROTO',
+                        environ['wsgi.url_scheme']).split(',')[0].strip()
+                    allowed_origins.append('{scheme}://{host}'.format(
+                        scheme=scheme, host=environ.get(
+                            'HTTP_X_FORWARDED_HOST',
+                            environ['HTTP_HOST']).split(
+                                ',')[0].strip()))
         elif self.cors_allowed_origins == '*':
             allowed_origins = None
         elif isinstance(self.cors_allowed_origins, str):
             allowed_origins = [self.cors_allowed_origins]
         elif callable(self.cors_allowed_origins):
             origin = environ.get('HTTP_ORIGIN')
-            allowed_origins = [origin] \
-                if self.cors_allowed_origins(origin) else []
+            try:
+                is_allowed = self.cors_allowed_origins(origin, environ)
+            except TypeError:
+                is_allowed = self.cors_allowed_origins(origin)
+            allowed_origins = [origin] if is_allowed else []
         else:
             allowed_origins = self.cors_allowed_origins
         return allowed_origins

engineio/packet.py

@@ -72,11 +72,11 @@ class Packet:
             else:
                 self.packet_type = int(encoded_packet[0])
                 try:
-                    self.data = self.json.loads(encoded_packet[1:])
-                    if isinstance(self.data, int):
+                    if encoded_packet[1].isnumeric():
                         # do not allow integer payloads, see
                         # github.com/miguelgrinberg/python-engineio/issues/75
                         # for background on this decision
                         raise ValueError
-                except ValueError:
+                    self.data = self.json.loads(encoded_packet[1:])
+                except (ValueError, IndexError):
                     self.data = encoded_packet[1:]

{python_engineio-4.11.2.dist-info → python_engineio-4.12.1.dist-info}/METADATA

@@ -1,14 +1,14 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.11.2
+Version: 4.12.1
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+License: MIT
 Project-URL: Homepage, https://github.com/miguelgrinberg/python-engineio
 Project-URL: Bug Tracker, https://github.com/miguelgrinberg/python-engineio/issues
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
@@ -21,6 +21,7 @@ Provides-Extra: asyncio-client
 Requires-Dist: aiohttp>=3.4; extra == "asyncio-client"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
+Dynamic: license-file
 
 python-engineio
 ===============

{python_engineio-4.11.2.dist-info → python_engineio-4.12.1.dist-info}/RECORD

@@ -3,13 +3,13 @@ engineio/async_client.py,sha256=ZrK9j_sUNKRwjqeT6W26d1TtjoGAp2nULhIbX_1iivs,2944
 engineio/async_server.py,sha256=8Af_uwf8mKOCJGqVKa3QN0kz7_B2K1cdpSmsvkAoBR4,27412
 engineio/async_socket.py,sha256=nHY0DPPk0FtI9djUnQWtzZ3ce2OD184Tu-Dop7JLg9I,10715
 engineio/base_client.py,sha256=uEI6OglvhdIGD1DAZuptbn0KXQMk_o3w0AH4wJvPwZ0,5322
-engineio/base_server.py,sha256=H-aKQ9hMQjiIrjDaqbw_edw9yUVIbCQMzyIy9egLv-g,14458
+engineio/base_server.py,sha256=S_O5ZWSzdKn4CBC3UjrhZ_Oarw35ge3Gmg5M3CV5C9k,14653
 engineio/base_socket.py,sha256=sQqbNSfGhMQG3xzwar6IXMal28C7Q5TIAQRGp74Wt2o,399
 engineio/client.py,sha256=wfgB_MrpEh-v4dBt6W2eW6i0CRNEP0CIJ6d4Ap4CnZE,27227
 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=Tejm9U5JcYs5LwZ_n_Xh0PIRv-U_JbHwGEivNXQN4eg,3181
+engineio/packet.py,sha256=YO3gmeKUoKyIsUq2e1z7Zifr5PGeS3gnaCeqR7wj5hQ,3198
 engineio/payload.py,sha256=GIWu0Vnay4WNZlDxHqVgP34tKTBXX58OArJ-mO5zD3E,1539
 engineio/server.py,sha256=4_xdtH0tyusigQurwOeDFrHtodthFTOIbOVZ-_ckh5U,22957
 engineio/socket.py,sha256=Oaw1E7ZDyOCaS7KV151g1u9rqOf1JJHh5gttEU0cSeA,10342
@@ -17,15 +17,15 @@ engineio/static_files.py,sha256=pwez9LQFaSQXMbtI0vLyD6UDiokQ4rNfmRYgVLKOthc,2064
 engineio/async_drivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 engineio/async_drivers/_websocket_wsgi.py,sha256=LuOEfKhbAw8SplB5PMpYKIUqfCPEadQEpqeiq_leOIA,949
 engineio/async_drivers/aiohttp.py,sha256=OBDGhaNXWHxQkwhzZT2vlTAOqWReGS6Sjk9u3BEh_Mc,3754
-engineio/async_drivers/asgi.py,sha256=mBu109j7R6esH-wI62jvTnfVAEjWvw2YNp0dZ74NyHg,11210
+engineio/async_drivers/asgi.py,sha256=v0FlBQT6iHmrhlDbVAM5ZjLni22utLiV0f5XyDeTlzY,11343
 engineio/async_drivers/eventlet.py,sha256=n1y4OjPdj4J2GIep5N56O29oa5NQgFJVcTBjyO1C-Gs,1735
 engineio/async_drivers/gevent.py,sha256=hnJHeWdDQE2jfoLCP5DnwVPzsQlcTLJUMA5EVf1UL-k,2962
 engineio/async_drivers/gevent_uwsgi.py,sha256=m6ay5dov9FDQl0fbeiKeE-Orh5LiF6zLlYQ64Oa3T5g,5954
 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=mbVHs1mECfzFSNv33uigkpTBtNPT0u49k5zaybewdIo,5893
-python_engineio-4.11.2.dist-info/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
-python_engineio-4.11.2.dist-info/METADATA,sha256=WfrX2DOOQdxr6FoiFDIuNe8lorFgUdilJYBfWuD2-Kw,2237
-python_engineio-4.11.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-python_engineio-4.11.2.dist-info/top_level.txt,sha256=u8PmNisCZLwRYcWrNLe9wutQ2tt4zNi8IH362c-HWuA,9
-python_engineio-4.11.2.dist-info/RECORD,,
+python_engineio-4.12.1.dist-info/licenses/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
+python_engineio-4.12.1.dist-info/METADATA,sha256=wiaRuG1XGttR3GGc2Xm7hP9opjQC-PRAANPplk3gq3c,2221
+python_engineio-4.12.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+python_engineio-4.12.1.dist-info/top_level.txt,sha256=u8PmNisCZLwRYcWrNLe9wutQ2tt4zNi8IH362c-HWuA,9
+python_engineio-4.12.1.dist-info/RECORD,,

{python_engineio-4.11.2.dist-info → python_engineio-4.12.1.dist-info}/WHEEL

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