python-engineio 4.12.1__tar.gz → 4.12.3__tar.gz

{python_engineio-4.12.1/src/python_engineio.egg-info → python_engineio-4.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.12.1
+Version: 4.12.3
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT

{python_engineio-4.12.1 → python_engineio-4.12.3}/pyproject.toml

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

{python_engineio-4.12.1 → python_engineio-4.12.3}/src/engineio/async_client.py

@@ -126,7 +126,6 @@ class AsyncClient(base_client.BaseClient):
             if not transports:
                 raise ValueError('No valid transports provided')
         self.transports = transports or valid_transports
-        self.queue = self.create_queue()
         return await getattr(self, '_connect_' + self.transports[0])(
             url, headers or {}, engineio_path)
 
@@ -199,11 +198,15 @@ class AsyncClient(base_client.BaseClient):
         """
         return await asyncio.sleep(seconds)
 
-    def create_queue(self):
+    def create_queue(self, *args, **kwargs):
         """Create a queue object."""
-        q = asyncio.Queue()
-        q.Empty = asyncio.QueueEmpty
-        return q
+        return asyncio.Queue(*args, **kwargs)
+
+    def get_queue_empty_exception(self):
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        return asyncio.QueueEmpty
 
     def create_event(self):
         """Create an event object."""
@@ -211,6 +214,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()
@@ -624,7 +633,7 @@ class AsyncClient(base_client.BaseClient):
             packets = None
             try:
                 packets = [await asyncio.wait_for(self.queue.get(), timeout)]
-            except (self.queue.Empty, asyncio.TimeoutError):
+            except (self.queue_empty, asyncio.TimeoutError):
                 self.logger.error('packet queue is empty, aborting')
                 break
             except asyncio.CancelledError:  # pragma: no cover
@@ -636,7 +645,7 @@ class AsyncClient(base_client.BaseClient):
                 while True:
                     try:
                         packets.append(self.queue.get_nowait())
-                    except self.queue.Empty:
+                    except self.queue_empty:
                         break
                     if packets[-1] is None:
                         packets = packets[:-1]

{python_engineio-4.12.1 → python_engineio-4.12.3}/src/engineio/async_drivers/asgi.py

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

{python_engineio-4.12.1 → python_engineio-4.12.3}/src/engineio/async_server.py

@@ -56,8 +56,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

{python_engineio-4.12.1 → python_engineio-4.12.3}/src/engineio/base_client.py

@@ -61,7 +61,8 @@ class BaseClient:
         self.ws = None
         self.read_loop_task = None
         self.write_loop_task = None
-        self.queue = None
+        self.queue = self.create_queue()
+        self.queue_empty = self.get_queue_empty_exception()
         self.state = 'disconnected'
         self.ssl_verify = ssl_verify
         self.websocket_extra_options = websocket_extra_options or {}
@@ -156,3 +157,13 @@ class BaseClient:
         if not self.timestamp_requests:
             return ''
         return '&t=' + str(time.time())
+
+    def create_queue(self, *args, **kwargs):  # pragma: no cover
+        """Create a queue object."""
+        raise NotImplementedError('must be implemented in a subclass')
+
+    def get_queue_empty_exception(self):  # pragma: no cover
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        raise NotImplementedError('must be implemented in a subclass')

{python_engineio-4.12.1 → python_engineio-4.12.3}/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.1 → python_engineio-4.12.3}/src/engineio/client.py

@@ -91,7 +91,6 @@ class Client(base_client.BaseClient):
             if not transports:
                 raise ValueError('No valid transports provided')
         self.transports = transports or valid_transports
-        self.queue = self.create_queue()
         return getattr(self, '_connect_' + self.transports[0])(
             url, headers or {}, engineio_path)
 
@@ -162,14 +161,27 @@ class Client(base_client.BaseClient):
 
     def create_queue(self, *args, **kwargs):
         """Create a queue object."""
-        q = queue.Queue(*args, **kwargs)
-        q.Empty = queue.Empty
-        return q
+        return queue.Queue(*args, **kwargs)
+
+    def get_queue_empty_exception(self):
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        return queue.Empty
 
     def create_event(self, *args, **kwargs):
         """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
@@ -566,7 +578,7 @@ class Client(base_client.BaseClient):
             packets = None
             try:
                 packets = [self.queue.get(timeout=timeout)]
-            except self.queue.Empty:
+            except self.queue_empty:
                 self.logger.error('packet queue is empty, aborting')
                 break
             if packets == [None]:
@@ -576,7 +588,7 @@ class Client(base_client.BaseClient):
                 while True:
                     try:
                         packets.append(self.queue.get(block=False))
-                    except self.queue.Empty:
+                    except self.queue_empty:
                         break
                     if packets[-1] is None:
                         packets = packets[:-1]

{python_engineio-4.12.1 → python_engineio-4.12.3}/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.1 → python_engineio-4.12.3/src/python_engineio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.12.1
+Version: 4.12.3
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT

{python_engineio-4.12.1 → python_engineio-4.12.3}/tests/async/test_client.py

@@ -16,6 +16,14 @@ from engineio import payload
 
 
 class TestAsyncClient:
+    def mock_queue(self, client):
+        client.queue = mock.MagicMock()
+        client.queue_empty = RuntimeError
+        client.queue.get_nowait.side_effect = client.queue_empty
+        client.queue.get = mock.AsyncMock()
+        client.queue.put = mock.AsyncMock()
+        client.queue.join = mock.AsyncMock()
+
     async def test_is_asyncio_based(self):
         c = async_client.AsyncClient()
         assert c.is_asyncio_based()
@@ -143,9 +151,7 @@ class TestAsyncClient:
         base_client.connected_clients.append(c)
         c.state = 'connected'
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
-        c.queue.join = mock.AsyncMock()
+        self.mock_queue(c)
         c.read_loop_task = mock.AsyncMock()()
         c.ws = mock.MagicMock()
         c.ws.close = mock.AsyncMock()
@@ -162,9 +168,7 @@ class TestAsyncClient:
         base_client.connected_clients.append(c)
         c.state = 'connected'
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
-        c.queue.join = mock.AsyncMock()
+        self.mock_queue(c)
         c.read_loop_task = mock.AsyncMock()()
         c.ws = mock.MagicMock()
         c.ws.close = mock.AsyncMock()
@@ -181,9 +185,7 @@ class TestAsyncClient:
         base_client.connected_clients.append(c)
         c.state = 'connected'
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
-        c.queue.join = mock.AsyncMock()
+        self.mock_queue(c)
         c.read_loop_task = mock.AsyncMock()()
         c.ws = mock.MagicMock()
         c.ws.close = mock.AsyncMock()
@@ -197,9 +199,7 @@ class TestAsyncClient:
         base_client.connected_clients.append(c)
         c.state = 'connected'
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
-        c.queue.join = mock.AsyncMock()
+        self.mock_queue(c)
         c.read_loop_task = mock.AsyncMock()()
         c.ws = mock.MagicMock()
         c.ws.close = mock.AsyncMock()
@@ -225,7 +225,7 @@ class TestAsyncClient:
     async def test_create_queue(self):
         c = async_client.AsyncClient()
         q = c.create_queue()
-        with pytest.raises(q.Empty):
+        with pytest.raises(c.queue_empty):
             q.get_nowait()
 
     async def test_create_event(self):
@@ -1014,8 +1014,7 @@ class TestAsyncClient:
         c.ping_timeout = 5
         c.state = 'connected'
         c.base_url = 'http://foo'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
+        self.mock_queue(c)
         c._send_request = mock.AsyncMock(return_value=None)
         c._trigger_event = mock.AsyncMock()
         c.write_loop_task = mock.AsyncMock()()
@@ -1036,8 +1035,7 @@ class TestAsyncClient:
         c.ping_timeout = 5
         c.state = 'connected'
         c.base_url = 'http://foo'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
+        self.mock_queue(c)
         c._send_request = mock.AsyncMock()
         c._send_request.return_value.status = 400
         c.write_loop_task = mock.AsyncMock()()
@@ -1055,8 +1053,7 @@ class TestAsyncClient:
         c.ping_timeout = 60
         c.state = 'connected'
         c.base_url = 'http://foo'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
+        self.mock_queue(c)
         c._send_request = mock.AsyncMock()
         c._send_request.return_value.status = 200
         c._send_request.return_value.read = mock.AsyncMock(return_value=b'foo')
@@ -1074,8 +1071,7 @@ class TestAsyncClient:
         c.ping_timeout = 5
         c.state = 'connected'
         c.base_url = 'http://foo'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
+        self.mock_queue(c)
         c._send_request = mock.AsyncMock()
         c._send_request.side_effect = [
             mock.MagicMock(
@@ -1114,8 +1110,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.base_url = 'ws://foo'
         c.state = 'connected'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
+        self.mock_queue(c)
         c.ws = mock.MagicMock()
         c.ws.receive = mock.AsyncMock(side_effect=asyncio.TimeoutError())
         c.write_loop_task = mock.AsyncMock()()
@@ -1129,8 +1124,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.base_url = 'ws://foo'
         c.state = 'connected'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
+        self.mock_queue(c)
         c.ws = mock.MagicMock()
         c.ws.receive = mock.AsyncMock(
             side_effect=aiohttp.client_exceptions.ServerDisconnectedError()
@@ -1146,8 +1140,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.base_url = 'ws://foo'
         c.state = 'connected'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
+        self.mock_queue(c)
         c.ws = mock.MagicMock()
         c.ws.receive = mock.AsyncMock(side_effect=ValueError)
         c.write_loop_task = mock.AsyncMock()()
@@ -1161,8 +1154,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.base_url = 'ws://foo'
         c.state = 'connected'
-        c.queue = mock.MagicMock()
-        c.queue.put = mock.AsyncMock()
+        self.mock_queue(c)
         c.ws = mock.MagicMock()
         c.ws.receive = mock.AsyncMock(
             side_effect=[
@@ -1188,7 +1180,7 @@ class TestAsyncClient:
         c.state = 'connected'
         c.ping_interval = 1
         c.ping_timeout = 2
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(return_value=None)
         await c._write_loop()
         c.queue.task_done.assert_called_once_with()
@@ -1199,9 +1191,8 @@ class TestAsyncClient:
         c.state = 'connected'
         c.ping_interval = 1
         c.ping_timeout = 2
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
-        c.queue.get = mock.AsyncMock(side_effect=RuntimeError)
+        self.mock_queue(c)
+        c.queue.get = mock.AsyncMock(side_effect=c.queue_empty)
         await c._write_loop()
         c.queue.get.assert_awaited_once_with()
 
@@ -1212,15 +1203,14 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-                RuntimeError,
+                c.queue_empty,
             ]
         )
-        c.queue.get_nowait = mock.MagicMock(side_effect=RuntimeError)
+        c.queue.get_nowait = mock.MagicMock(side_effect=c.queue_empty)
         c._send_request = mock.AsyncMock()
         c._send_request.return_value.status = 200
         await c._write_loop()
@@ -1243,19 +1233,18 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-                RuntimeError,
+                c.queue_empty,
             ]
         )
         c.queue.get_nowait = mock.MagicMock(
             side_effect=[
                 packet.Packet(packet.PING),
                 packet.Packet(packet.NOOP),
-                RuntimeError,
+                c.queue_empty,
             ]
         )
         c._send_request = mock.AsyncMock()
@@ -1284,12 +1273,11 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-                RuntimeError,
+                c.queue_empty,
             ]
         )
         c.queue.get_nowait = mock.MagicMock(
@@ -1321,12 +1309,11 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
             side_effect=[packet.Packet(packet.MESSAGE, {'foo': 'bar'})]
         )
-        c.queue.get_nowait = mock.MagicMock(side_effect=[RuntimeError])
+        c.queue.get_nowait = mock.MagicMock(side_effect=[c.queue_empty])
         c._send_request = mock.AsyncMock(return_value=None)
         await c._write_loop()
         assert c.queue.task_done.call_count == 1
@@ -1349,12 +1336,11 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
             side_effect=[packet.Packet(packet.MESSAGE, {'foo': 'bar'})]
         )
-        c.queue.get_nowait = mock.MagicMock(side_effect=[RuntimeError])
+        c.queue.get_nowait = mock.MagicMock(side_effect=[c.queue_empty])
         c._send_request = mock.AsyncMock()
         c._send_request.return_value.status = 500
         await c._write_loop()
@@ -1378,15 +1364,14 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-                RuntimeError,
+                c.queue_empty,
             ]
         )
-        c.queue.get_nowait = mock.MagicMock(side_effect=[RuntimeError])
+        c.queue.get_nowait = mock.MagicMock(side_effect=[c.queue_empty])
         c.ws = mock.MagicMock()
         c.ws.send_str = mock.AsyncMock()
         await c._write_loop()
@@ -1400,19 +1385,18 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-                RuntimeError,
+                c.queue_empty,
             ]
         )
         c.queue.get_nowait = mock.MagicMock(
             side_effect=[
                 packet.Packet(packet.PING),
                 packet.Packet(packet.NOOP),
-                RuntimeError,
+                c.queue_empty,
             ]
         )
         c.ws = mock.MagicMock()
@@ -1430,12 +1414,11 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
-            side_effect=[packet.Packet(packet.MESSAGE, b'foo'), RuntimeError]
+            side_effect=[packet.Packet(packet.MESSAGE, b'foo'), c.queue_empty]
         )
-        c.queue.get_nowait = mock.MagicMock(side_effect=[RuntimeError])
+        c.queue.get_nowait = mock.MagicMock(side_effect=[c.queue_empty])
         c.ws = mock.MagicMock()
         c.ws.send_bytes = mock.AsyncMock()
         await c._write_loop()
@@ -1449,15 +1432,14 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-                RuntimeError,
+                c.queue_empty,
             ]
         )
-        c.queue.get_nowait = mock.MagicMock(side_effect=[RuntimeError])
+        c.queue.get_nowait = mock.MagicMock(side_effect=[c.queue_empty])
         c.ws = mock.MagicMock()
         c.ws.send_str = mock.AsyncMock(
             side_effect=aiohttp.client_exceptions.ServerDisconnectedError()

{python_engineio-4.12.1 → python_engineio-4.12.3}/tests/async/test_server.py

@@ -454,7 +454,7 @@ class TestAsyncServer:
         assert ('Access-Control-Allow-Origin', '*') not in headers
 
     @mock.patch('importlib.import_module')
-    async def test_connect_cors_all_origins(self, import_module):
+    async def test_connect_str_cors_all_origins(self, import_module):
         a = self.get_async_mock(
             {'REQUEST_METHOD': 'GET', 'QUERY_STRING': '', 'HTTP_ORIGIN': 'foo'}
         )
@@ -466,6 +466,19 @@ class TestAsyncServer:
         assert ('Access-Control-Allow-Origin', 'foo') in headers
         assert ('Access-Control-Allow-Credentials', 'true') in headers
 
+    @mock.patch('importlib.import_module')
+    async def test_connect_list_cors_all_origins(self, import_module):
+        a = self.get_async_mock(
+            {'REQUEST_METHOD': 'GET', 'QUERY_STRING': '', 'HTTP_ORIGIN': 'foo'}
+        )
+        import_module.side_effect = [a]
+        s = async_server.AsyncServer(cors_allowed_origins=['*'])
+        await s.handle_request('request')
+        assert a._async['make_response'].call_args[0][0] == '200 OK'
+        headers = a._async['make_response'].call_args[0][1]
+        assert ('Access-Control-Allow-Origin', 'foo') in headers
+        assert ('Access-Control-Allow-Credentials', 'true') in headers
+
     @mock.patch('importlib.import_module')
     async def test_connect_cors_one_origin(self, import_module):
         a = self.get_async_mock(
@@ -564,7 +577,7 @@ class TestAsyncServer:
             assert header[0] != 'Access-Control-Allow-Origin'
 
     @mock.patch('importlib.import_module')
-    async def test_connect_cors_all_no_origin(self, import_module):
+    async def test_connect_str_cors_all_no_origin(self, import_module):
         a = self.get_async_mock({'REQUEST_METHOD': 'GET', 'QUERY_STRING': ''})
         import_module.side_effect = [a]
         s = async_server.AsyncServer(cors_allowed_origins='*')
@@ -574,6 +587,17 @@ class TestAsyncServer:
         for header in headers:
             assert header[0] != 'Access-Control-Allow-Origin'
 
+    @mock.patch('importlib.import_module')
+    async def test_connect_list_cors_all_no_origin(self, import_module):
+        a = self.get_async_mock({'REQUEST_METHOD': 'GET', 'QUERY_STRING': ''})
+        import_module.side_effect = [a]
+        s = async_server.AsyncServer(cors_allowed_origins=['*'])
+        await s.handle_request('request')
+        assert a._async['make_response'].call_args[0][0] == '200 OK'
+        headers = a._async['make_response'].call_args[0][1]
+        for header in headers:
+            assert header[0] != 'Access-Control-Allow-Origin'
+
     @mock.patch('importlib.import_module')
     async def test_connect_cors_disabled_no_origin(self, import_module):
         a = self.get_async_mock({'REQUEST_METHOD': 'GET', 'QUERY_STRING': ''})

{python_engineio-4.12.1 → python_engineio-4.12.3}/tests/common/test_client.py

@@ -15,6 +15,11 @@ from engineio import payload
 
 
 class TestClient:
+    def mock_queue(self, client):
+        client.queue = mock.MagicMock()
+        client.queue_empty = RuntimeError
+        client.queue.get_nowait.side_effect = client.queue_empty
+
     def test_is_asyncio_based(self):
         c = client.Client()
         assert not c.is_asyncio_based()
@@ -33,10 +38,11 @@ class TestClient:
             'ws',
             'read_loop_task',
             'write_loop_task',
-            'queue',
         ]:
             assert getattr(c, attr) is None, attr + ' is not None'
         assert c.state == 'disconnected'
+        assert c.queue.__class__.__name__ == 'Queue'
+        assert c.queue_empty.__name__ == 'Empty'
 
     def test_custom_json(self):
         client.Client()
@@ -208,7 +214,7 @@ class TestClient:
         base_client.connected_clients.append(c)
         c.state = 'connected'
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.read_loop_task = mock.MagicMock()
         c.ws = mock.MagicMock()
         c._trigger_event = mock.MagicMock()
@@ -224,7 +230,7 @@ class TestClient:
         base_client.connected_clients.append(c)
         c.state = 'connected'
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.read_loop_task = mock.MagicMock()
         c.ws = mock.MagicMock()
         c._trigger_event = mock.MagicMock()
@@ -240,7 +246,7 @@ class TestClient:
         base_client.connected_clients.append(c)
         c.state = 'connected'
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.read_loop_task = mock.MagicMock()
         c.ws = mock.MagicMock()
         c.disconnect(abort=True)
@@ -254,7 +260,7 @@ class TestClient:
         base_client.connected_clients.append(c)
         c.state = 'connected'
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.read_loop_task = mock.MagicMock()
         c.ws = mock.MagicMock()
         c.disconnect(abort=True)
@@ -289,7 +295,7 @@ class TestClient:
     def test_create_queue(self):
         c = client.Client()
         q = c.create_queue()
-        with pytest.raises(q.Empty):
+        with pytest.raises(c.queue_empty):
             q.get(timeout=0.01)
 
     def test_create_event(self):
@@ -1331,7 +1337,7 @@ class TestClient:
         c.ping_timeout = 5
         c.state = 'connected'
         c.base_url = 'http://foo'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c._send_request = mock.MagicMock(return_value=None)
         c._trigger_event = mock.MagicMock()
         c.write_loop_task = mock.MagicMock()
@@ -1352,7 +1358,7 @@ class TestClient:
         c.ping_timeout = 5
         c.state = 'connected'
         c.base_url = 'http://foo'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c._send_request = mock.MagicMock()
         c._send_request.return_value.status_code = 400
         c.write_loop_task = mock.MagicMock()
@@ -1371,7 +1377,7 @@ class TestClient:
         c.ping_timeout = 60
         c.state = 'connected'
         c.base_url = 'http://foo'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c._send_request = mock.MagicMock()
         c._send_request.return_value.status_code = 200
         c._send_request.return_value.content = b'foo'
@@ -1390,7 +1396,7 @@ class TestClient:
         c.ping_timeout = 5
         c.state = 'connected'
         c.base_url = 'http://foo'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c._send_request = mock.MagicMock()
         c._send_request.side_effect = [
             mock.MagicMock(
@@ -1424,7 +1430,7 @@ class TestClient:
     def test_read_loop_websocket_timeout(self):
         c = client.Client()
         c.state = 'connected'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.ws = mock.MagicMock()
         c.ws.recv.side_effect = websocket.WebSocketTimeoutException
         c.write_loop_task = mock.MagicMock()
@@ -1436,7 +1442,7 @@ class TestClient:
     def test_read_loop_websocket_no_response(self):
         c = client.Client()
         c.state = 'connected'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.ws = mock.MagicMock()
         c.ws.recv.side_effect = websocket.WebSocketConnectionClosedException
         c.write_loop_task = mock.MagicMock()
@@ -1448,7 +1454,7 @@ class TestClient:
     def test_read_loop_websocket_unexpected_error(self):
         c = client.Client()
         c.state = 'connected'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.ws = mock.MagicMock()
         c.ws.recv.side_effect = ValueError
         c.write_loop_task = mock.MagicMock()
@@ -1462,7 +1468,7 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.state = 'connected'
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.ws = mock.MagicMock()
         c.ws.recv.side_effect = [
             packet.Packet(packet.PING).encode(),
@@ -1487,7 +1493,7 @@ class TestClient:
         c.state = 'connected'
         c.ping_interval = 1
         c.ping_timeout = 2
-        c.queue = mock.MagicMock()
+        self.mock_queue(c)
         c.queue.get.return_value = None
         c._write_loop()
         c.queue.task_done.assert_called_once_with()
@@ -1498,9 +1504,8 @@ class TestClient:
         c.state = 'connected'
         c.ping_interval = 1
         c.ping_timeout = 2
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
-        c.queue.get.side_effect = RuntimeError
+        self.mock_queue(c)
+        c.queue.get.side_effect = c.queue_empty
         c._write_loop()
         c.queue.get.assert_called_once_with(timeout=7)
 
@@ -1511,12 +1516,11 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-            RuntimeError,
-            RuntimeError,
+            c.queue_empty,
+            c.queue_empty,
         ]
         c._send_request = mock.MagicMock()
         c._send_request.return_value.status_code = 200
@@ -1540,14 +1544,13 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             packet.Packet(packet.PING),
             packet.Packet(packet.NOOP),
-            RuntimeError,
-            RuntimeError,
+            c.queue_empty,
+            c.queue_empty,
         ]
         c._send_request = mock.MagicMock()
         c._send_request.return_value.status_code = 200
@@ -1575,13 +1578,12 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             packet.Packet(packet.PING),
             None,
-            RuntimeError,
+            c.queue_empty,
         ]
         c._send_request = mock.MagicMock()
         c._send_request.return_value.status_code = 200
@@ -1609,11 +1611,10 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-            RuntimeError,
+            c.queue_empty,
         ]
         c._send_request = mock.MagicMock()
         c._send_request.return_value = None
@@ -1638,11 +1639,10 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'polling'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-            RuntimeError,
+            c.queue_empty,
         ]
         c._send_request = mock.MagicMock()
         c._send_request.return_value.status_code = 500
@@ -1667,12 +1667,11 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-            RuntimeError,
-            RuntimeError,
+            c.queue_empty,
+            c.queue_empty,
         ]
         c.ws = mock.MagicMock()
         c._write_loop()
@@ -1687,14 +1686,13 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             packet.Packet(packet.PING),
             packet.Packet(packet.NOOP),
-            RuntimeError,
-            RuntimeError,
+            c.queue_empty,
+            c.queue_empty,
         ]
         c.ws = mock.MagicMock()
         c._write_loop()
@@ -1711,12 +1709,11 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, b'foo'),
-            RuntimeError,
-            RuntimeError,
+            c.queue_empty,
+            c.queue_empty,
         ]
         c.ws = mock.MagicMock()
         c._write_loop()
@@ -1731,12 +1728,11 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.current_transport = 'websocket'
-        c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        self.mock_queue(c)
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
-            RuntimeError,
-            RuntimeError,
+            c.queue_empty,
+            c.queue_empty,
         ]
         c.ws = mock.MagicMock()
         c.ws.send.side_effect = websocket.WebSocketConnectionClosedException

{python_engineio-4.12.1 → python_engineio-4.12.3}/tests/common/test_server.py

@@ -615,7 +615,7 @@ class TestServer:
         assert ('Access-Control-Allow-Origin', 'c') not in headers
         assert ('Access-Control-Allow-Origin', '*') not in headers
 
-    def test_connect_cors_headers_all_origins(self):
+    def test_connect_str_cors_headers_all_origins(self):
         s = server.Server(cors_allowed_origins='*')
         environ = {
             'REQUEST_METHOD': 'GET',
@@ -629,6 +629,20 @@ class TestServer:
         assert ('Access-Control-Allow-Origin', 'foo') in headers
         assert ('Access-Control-Allow-Credentials', 'true') in headers
 
+    def test_connect_list_cors_headers_all_origins(self):
+        s = server.Server(cors_allowed_origins=['*'])
+        environ = {
+            'REQUEST_METHOD': 'GET',
+            'QUERY_STRING': 'EIO=4',
+            'HTTP_ORIGIN': 'foo',
+        }
+        start_response = mock.MagicMock()
+        s.handle_request(environ, start_response)
+        assert start_response.call_args[0][0] == '200 OK'
+        headers = start_response.call_args[0][1]
+        assert ('Access-Control-Allow-Origin', 'foo') in headers
+        assert ('Access-Control-Allow-Credentials', 'true') in headers
+
     def test_connect_cors_headers_one_origin(self):
         s = server.Server(cors_allowed_origins='a')
         environ = {
@@ -762,7 +776,7 @@ class TestServer:
         for header in headers:
             assert header[0] != 'Access-Control-Allow-Origin'
 
-    def test_connect_cors_all_no_origin(self):
+    def test_connect_str_cors_all_no_origin(self):
         s = server.Server(cors_allowed_origins='*')
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'EIO=4'}
         start_response = mock.MagicMock()
@@ -771,6 +785,15 @@ class TestServer:
         for header in headers:
             assert header[0] != 'Access-Control-Allow-Origin'
 
+    def test_connect_list_cors_all_no_origin(self):
+        s = server.Server(cors_allowed_origins=['*'])
+        environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'EIO=4'}
+        start_response = mock.MagicMock()
+        s.handle_request(environ, start_response)
+        headers = start_response.call_args[0][1]
+        for header in headers:
+            assert header[0] != 'Access-Control-Allow-Origin'
+
     def test_connect_cors_disabled_no_origin(self):
         s = server.Server(cors_allowed_origins=[])
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'EIO=4'}