nitro-framework 0.2.0__tar.gz → 0.3.1__tar.gz

{nitro_framework-0.2.0 → nitro_framework-0.3.1}/Cargo.lock

@@ -214,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "combine"
-version = "4.6.7"
+version = "4.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e"
 dependencies = [
  "bytes",
  "futures-core",
@@ -690,16 +690,17 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
+checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.23.1",
  "bytes",
  "futures-channel",
  "futures-util",
  "http",
  "http-body",
+ "httparse",
  "hyper",
  "ipnet",
  "libc",
@@ -826,7 +827,7 @@ dependencies = [
 
 [[package]]
 name = "intercom-core"
-version = "0.2.0"
+version = "0.3.1"
 dependencies = [
  "bytes",
  "futures-util",
@@ -841,7 +842,7 @@ dependencies = [
 
 [[package]]
 name = "intercom-py"
-version = "0.2.0"
+version = "0.3.1"
 dependencies = [
  "bytes",
  "futures-util",
@@ -1029,7 +1030,7 @@ dependencies = [
 
 [[package]]
 name = "nitro-core"
-version = "0.2.0"
+version = "0.3.1"
 dependencies = [
  "base64 0.23.1",
  "bytes",
@@ -1071,7 +1072,7 @@ dependencies = [
 
 [[package]]
 name = "nitro-observability"
-version = "0.2.0"
+version = "0.3.1"
 dependencies = [
  "bytes",
  "futures-util",
@@ -1089,7 +1090,7 @@ dependencies = [
 
 [[package]]
 name = "nitro-py"
-version = "0.2.0"
+version = "0.3.1"
 dependencies = [
  "bytes",
  "futures-util",
@@ -1368,9 +1369,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.11"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8"
+checksum = "4051e23e9185c255a7e33ef59cdbca87a22d359052eecd22fc6b901fb37d9d11"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -1389,9 +1390,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.16"
+version = "0.11.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
+checksum = "0e750cca55fe4f0439a15d0bb529da9651e79993e8e72c61a899a36d462befbe"
 dependencies = [
  "bytes",
  "getrandom 0.4.3",
@@ -1480,9 +1481,9 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37a4ca5c6ca42aa3e6df2fd32b987a65d32a4c2159a6f3fe0fd1df306a2658f"
+checksum = "ed5b98ae99461e02895c3a96a25dbe4d852a3d5e5b815d31d5d9e4b5344d99e9"
 dependencies = [
  "arc-swap",
  "arcstr",
@@ -1544,11 +1545,11 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "reqwest"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
+checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.23.1",
  "bytes",
  "futures-core",
  "futures-util",
@@ -1661,9 +1662,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.43"
+version = "0.23.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0283386ce02abc0151e1761d08802dfe86c173b0b494af5cbc086574e453da06"
+checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -1735,9 +1736,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.13"
+version = "0.103.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
+checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -2013,18 +2014,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.20"
+version = "2.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f"
+checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.20"
+version = "2.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
+checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2125,9 +2126,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.4"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db"
 dependencies = [
  "rustls",
  "tokio",

{nitro_framework-0.2.0 → nitro_framework-0.3.1}/Cargo.toml

@@ -5,14 +5,14 @@ members = ["crates/nitro-core", "crates/nitro-observability", "crates/nitro-py",
 [workspace.package]
 edition = "2024"
 license = "MIT OR Apache-2.0"
-version = "0.2.0"
+version = "0.3.1"
 authors = ["Mario Ritzerfeld <oss@jaldis.com>"]
 repository = "https://github.com/jaldisdev/nitro"
 
 [workspace.dependencies]
-nitro-core = { path = "crates/nitro-core", version = "0.2.0" }
-nitro-observability = { path = "crates/nitro-observability", version = "0.2.0" }
-intercom-core = { path = "crates/intercom-core", version = "0.2.0" }
+nitro-core = { path = "crates/nitro-core", version = "0.3.1" }
+nitro-observability = { path = "crates/nitro-observability", version = "0.3.1" }
+intercom-core = { path = "crates/intercom-core", version = "0.3.1" }
 
 # Async runtime
 tokio = { version = "1.53.1", features = ["full"] }
@@ -34,7 +34,7 @@ h3-webtransport = "0.1.2"
 h3-datagram = "0.0.2"
 
 # TLS
-rustls = { version = "0.23.43", default-features = false, features = ["tls12", "ring", "logging", "std"] }
+rustls = { version = "0.23.45", default-features = false, features = ["tls12", "ring", "logging", "std"] }
 rustls-pemfile = "2.2.0"
 # Default features would bring aws-lc-rs. Everything here uses ring, and a
 # second crypto provider compiled into the wheel is weight nothing calls.

{nitro_framework-0.2.0 → nitro_framework-0.3.1}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: nitro-framework
-Version: 0.2.0
+Version: 0.3.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: AsyncIO
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Rust
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
@@ -34,7 +35,7 @@ Requires-Dist: pytest-asyncio>=1.0 ; extra == 'dev'
 Requires-Dist: pytest-timeout>=2.4 ; extra == 'dev'
 Requires-Dist: cryptography>=50.0.0 ; extra == 'dev'
 Requires-Dist: websockets>=15 ; extra == 'dev'
-Requires-Dist: aioquic>=1.3 ; extra == 'dev'
+Requires-Dist: aioquic>=1.3,<1.6 ; extra == 'dev'
 Requires-Dist: authlib>=1.7.2 ; extra == 'email-oauth'
 Requires-Dist: emcache>=1.3.3 ; python_full_version < '3.14' and extra == 'memcached'
 Requires-Dist: redis[hiredis]>=8.0.0 ; extra == 'redis'

{nitro_framework-0.2.0 → nitro_framework-0.3.1}/crates/nitro-core/src/websocket.rs

@@ -384,11 +384,29 @@ impl WebSocketReceiver {
     }
 }
 
+/// A peer that goes away without closing is an ended connection, not a failure:
+/// a browser tab closing, a reloading server, a dropped network. Reporting those
+/// as transport failures would make every handler recognise them by their text.
 fn transport_error(error: tokio_tungstenite::tungstenite::Error) -> WebSocketError {
+    use std::io::ErrorKind;
+
     use tokio_tungstenite::tungstenite::Error;
+    use tokio_tungstenite::tungstenite::error::ProtocolError;
 
     match error {
         Error::ConnectionClosed | Error::AlreadyClosed => WebSocketError::Closed,
+        Error::Protocol(ProtocolError::ResetWithoutClosingHandshake) => WebSocketError::Closed,
+        Error::Io(failure)
+            if matches!(
+                failure.kind(),
+                ErrorKind::ConnectionReset
+                    | ErrorKind::ConnectionAborted
+                    | ErrorKind::BrokenPipe
+                    | ErrorKind::UnexpectedEof
+            ) =>
+        {
+            WebSocketError::Closed
+        }
         other => WebSocketError::Transport(other.to_string()),
     }
 }
@@ -413,6 +431,48 @@ mod tests {
         headers
     }
 
+    #[test]
+    fn a_peer_that_vanishes_reads_as_a_closed_connection() {
+        use std::io::ErrorKind;
+
+        use tokio_tungstenite::tungstenite::Error;
+        use tokio_tungstenite::tungstenite::error::ProtocolError;
+
+        let vanished = [
+            Error::ConnectionClosed,
+            Error::AlreadyClosed,
+            Error::Protocol(ProtocolError::ResetWithoutClosingHandshake),
+            Error::Io(ErrorKind::ConnectionReset.into()),
+            Error::Io(ErrorKind::BrokenPipe.into()),
+            Error::Io(ErrorKind::UnexpectedEof.into()),
+        ];
+
+        for error in vanished {
+            let reported = transport_error(error);
+            assert!(
+                matches!(reported, WebSocketError::Closed),
+                "expected a closed connection, got {reported:?}"
+            );
+        }
+    }
+
+    #[test]
+    fn a_real_transport_failure_is_still_reported_as_one() {
+        use std::io::ErrorKind;
+
+        use tokio_tungstenite::tungstenite::Error;
+        use tokio_tungstenite::tungstenite::error::ProtocolError;
+
+        assert!(matches!(
+            transport_error(Error::Io(ErrorKind::PermissionDenied.into())),
+            WebSocketError::Transport(_)
+        ));
+        assert!(matches!(
+            transport_error(Error::Protocol(ProtocolError::WrongHttpMethod)),
+            WebSocketError::Transport(_)
+        ));
+    }
+
     #[test]
     fn a_complete_upgrade_request_is_recognised() {
         assert!(is_upgrade_request(&upgrade_headers()));

{nitro_framework-0.2.0 → nitro_framework-0.3.1}/crates/nitro-py/src/protocol.rs

@@ -610,7 +610,18 @@ async fn next_message(
             return Ok(None);
         };
 
-        match message.map_err(socket_error)? {
+        let message = match message {
+            Ok(message) => message,
+            // The connection ending is the end of the stream, however it ended
+            Err(WebSocketError::Closed) => {
+                *guard = None;
+                phase.store(PHASE_CLOSED, Ordering::Release);
+                return Ok(None);
+            }
+            Err(failure) => return Err(socket_error(failure)),
+        };
+
+        match message {
             WebSocketMessage::Text(text) => {
                 return Python::attach(|python| {
                     Ok(Some(text.into_pyobject(python)?.into_any().unbind()))

{nitro_framework-0.2.0 → nitro_framework-0.3.1}/nitro/__init__.py

@@ -21,6 +21,6 @@
 
 from nitro.app import Nitro
 
-__version__ = "0.2.0"
+__version__ = "0.3.1"
 
 __all__ = ["Nitro", "__version__"]

{nitro_framework-0.2.0 → nitro_framework-0.3.1}/nitro/cli/__init__.py

@@ -71,6 +71,32 @@ class RootCommand(click.Group):
         }
         settings.update(kwargs.pop("context_settings", None) or {})
         super().__init__(*args, context_settings=settings, **kwargs)
+        self._project_commands_loaded = False
+
+    def get_command(self, context: click.Context, name: str) -> click.Command | None:
+        command = super().get_command(context, name)
+        # An application specifier always carries a colon, and naming one is
+        # no reason to import the project's commands.
+        if command is None and ":" not in name and self._load_project_commands():
+            command = super().get_command(context, name)
+        return command
+
+    def list_commands(self, context: click.Context) -> list[str]:
+        self._load_project_commands()
+        return super().list_commands(context)
+
+    def _load_project_commands(self) -> bool:
+        """Register the project's commands the first time one could be meant.
+
+        Importing them imports the project, which neither a built-in command
+        nor serving has any use for — and a reload supervisor would pay for it
+        on every start. Returns whether this call was the one that loaded them.
+        """
+        if self._project_commands_loaded:
+            return False
+        self._project_commands_loaded = True
+        load_project_commands(self)
+        return True
 
     def resolve_command(
         self, context: click.Context, args: list[str]
@@ -165,7 +191,21 @@ def _commands_in_module(module: object) -> list[click.Command]:
 
 
 def register_commands(group: click.Group, package_name: str) -> None:
+    """Add the commands of `package_name` to `group`, never replacing one.
+
+    Project commands are registered only once one is asked for, so a built-in
+    has already answered to its name by then; letting a project command take
+    it over would make the name mean one thing or the other depending on what
+    was run first.
+    """
     for command in commands_in(package_name):
+        if command.name in group.commands:
+            logger.warning(
+                "command %r from %r is already taken; keeping the one registered first",
+                command.name,
+                package_name,
+            )
+            continue
         group.add_command(command)
 
 
@@ -200,5 +240,4 @@ def main() -> None:
 
     configure_logging()
     register_commands(cli, BUILTIN_COMMAND_PACKAGE)
-    load_project_commands(cli)
     cli()

{nitro_framework-0.2.0 → nitro_framework-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "nitro-framework"
-version = "0.2.0"
+version = "0.3.1"
 description = "Async-first Python web framework with a bundled Rust server"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -19,6 +19,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Rust",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
@@ -61,7 +62,10 @@ dev = [
     "pytest-timeout>=2.4",
     "cryptography>=50.0.0",
     "websockets>=15",
-    "aioquic>=1.3",
+    # 1.6.0 checks a response's content-length against the bytes it
+    # received without exempting HEAD, so it rejects the HEAD responses
+    # RFC 9110 §9.3.2 asks for and drops the events for them.
+    "aioquic>=1.3,<1.6",
 ]
 
 [project.urls]