uvicorn 0.30.0__tar.gz → 0.30.2__tar.gz

{uvicorn-0.30.0 → uvicorn-0.30.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uvicorn
-Version: 0.30.0
+Version: 0.30.2
 Summary: The lightning-fast ASGI server.
 Project-URL: Changelog, https://github.com/encode/uvicorn/blob/master/CHANGELOG.md
 Project-URL: Funding, https://github.com/sponsors/encode
@@ -170,6 +170,10 @@ $ hypercorn app:App
 
 [Mangum][mangum] is an adapter for using ASGI applications with AWS Lambda & API Gateway.
 
+### Granian
+
+[Granian][granian] is an ASGI compatible Rust HTTP server which supports HTTP/2, TLS and WebSockets.
+
 ---
 
 <p align="center"><i>Uvicorn is <a href="https://github.com/encode/uvicorn/blob/master/LICENSE.md">BSD licensed</a> code.<br/>Designed & crafted with care.</i><br/>&mdash; 🦄  &mdash;</p>
@@ -177,5 +181,6 @@ $ hypercorn app:App
 [asgi]: https://asgi.readthedocs.io/en/latest/
 [daphne]: https://github.com/django/daphne
 [hypercorn]: https://github.com/pgjones/hypercorn
-[mangum]: https://mangum.io
 [trio]: https://trio.readthedocs.io
+[mangum]: https://github.com/jordaneremieff/mangum
+[granian]: https://github.com/emmett-framework/granian

{uvicorn-0.30.0 → uvicorn-0.30.2}/README.md

@@ -131,6 +131,10 @@ $ hypercorn app:App
 
 [Mangum][mangum] is an adapter for using ASGI applications with AWS Lambda & API Gateway.
 
+### Granian
+
+[Granian][granian] is an ASGI compatible Rust HTTP server which supports HTTP/2, TLS and WebSockets.
+
 ---
 
 <p align="center"><i>Uvicorn is <a href="https://github.com/encode/uvicorn/blob/master/LICENSE.md">BSD licensed</a> code.<br/>Designed & crafted with care.</i><br/>&mdash; 🦄  &mdash;</p>
@@ -138,5 +142,6 @@ $ hypercorn app:App
 [asgi]: https://asgi.readthedocs.io/en/latest/
 [daphne]: https://github.com/django/daphne
 [hypercorn]: https://github.com/pgjones/hypercorn
-[mangum]: https://mangum.io
 [trio]: https://trio.readthedocs.io
+[mangum]: https://github.com/jordaneremieff/mangum
+[granian]: https://github.com/emmett-framework/granian

{uvicorn-0.30.0 → uvicorn-0.30.2}/uvicorn/__init__.py

@@ -1,5 +1,5 @@
 from uvicorn.config import Config
 from uvicorn.main import Server, main, run
 
-__version__ = "0.30.0"
+__version__ = "0.30.2"
 __all__ = ["main", "run", "Config", "Server"]

{uvicorn-0.30.0 → uvicorn-0.30.2}/uvicorn/_types.py

@@ -204,6 +204,7 @@ class WebSocketResponseBodyEvent(TypedDict):
 class WebSocketDisconnectEvent(TypedDict):
     type: Literal["websocket.disconnect"]
     code: int
+    reason: NotRequired[str | None]
 
 
 class WebSocketCloseEvent(TypedDict):

{uvicorn-0.30.0 → uvicorn-0.30.2}/uvicorn/protocols/http/httptools_impl.py

@@ -26,7 +26,7 @@ from uvicorn.protocols.utils import get_client_addr, get_local_addr, get_path_wi
 from uvicorn.server import ServerState
 
 HEADER_RE = re.compile(b'[\x00-\x1f\x7f()<>@,;:[]={} \t\\"]')
-HEADER_VALUE_RE = re.compile(b"[\x00-\x1f\x7f]")
+HEADER_VALUE_RE = re.compile(b"[\x00-\x08\x0a-\x1f\x7f]")
 
 
 def _get_status_line(status_code: int) -> bytes:

{uvicorn-0.30.0 → uvicorn-0.30.2}/uvicorn/protocols/websockets/websockets_impl.py

@@ -382,7 +382,7 @@ class WebSocketProtocol(WebSocketServerProtocol):
             self.closed_event.set()
             if self.ws_server.closing:
                 return {"type": "websocket.disconnect", "code": 1012}
-            return {"type": "websocket.disconnect", "code": exc.code}
+            return {"type": "websocket.disconnect", "code": exc.code, "reason": exc.reason}
 
         if isinstance(data, str):
             return {"type": "websocket.receive", "text": data}

{uvicorn-0.30.0 → uvicorn-0.30.2}/uvicorn/protocols/websockets/wsproto_impl.py

@@ -212,7 +212,7 @@ class WSProtocol(asyncio.Protocol):
     def handle_close(self, event: events.CloseConnection) -> None:
         if self.conn.state == ConnectionState.REMOTE_CLOSING:
             self.transport.write(self.conn.send(event.response()))
-        self.queue.put_nowait({"type": "websocket.disconnect", "code": event.code})
+        self.queue.put_nowait({"type": "websocket.disconnect", "code": event.code, "reason": event.reason})
         self.transport.close()
 
     def handle_ping(self, event: events.Ping) -> None:
@@ -336,7 +336,7 @@ class WSProtocol(asyncio.Protocol):
                     self.close_sent = True
                     code = message.get("code", 1000)
                     reason = message.get("reason", "") or ""
-                    self.queue.put_nowait({"type": "websocket.disconnect", "code": code})
+                    self.queue.put_nowait({"type": "websocket.disconnect", "code": code, "reason": reason})
                     output = self.conn.send(wsproto.events.CloseConnection(code=code, reason=reason))
                     if not self.transport.is_closing():
                         self.transport.write(output)

{uvicorn-0.30.0 → uvicorn-0.30.2}/uvicorn/supervisors/multiprocess.py

@@ -134,7 +134,7 @@ class Multiprocess:
             process.join()
 
     def restart_all(self) -> None:
-        for idx, process in enumerate(tuple(self.processes)):
+        for idx, process in enumerate(self.processes):
             process.terminate()
             process.join()
             new_process = Process(self.config, self.target, self.sockets)
@@ -163,7 +163,7 @@ class Multiprocess:
         if self.should_exit.is_set():
             return  # parent process is exiting, no need to keep subprocess alive
 
-        for idx, process in enumerate(tuple(self.processes)):
+        for idx, process in enumerate(self.processes):
             if process.is_alive():
                 continue
 
@@ -174,10 +174,9 @@ class Multiprocess:
                 return
 
             logger.info(f"Child process [{process.pid}] died")
-            del self.processes[idx]
             process = Process(self.config, self.target, self.sockets)
             process.start()
-            self.processes.append(process)
+            self.processes[idx] = process
 
     def handle_signals(self) -> None:
         for sig in tuple(self.signal_queue):