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

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

@@ -826,7 +826,7 @@ dependencies = [
 
 [[package]]
 name = "intercom-core"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "bytes",
  "futures-util",
@@ -841,7 +841,7 @@ dependencies = [
 
 [[package]]
 name = "intercom-py"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "bytes",
  "futures-util",
@@ -1029,7 +1029,7 @@ dependencies = [
 
 [[package]]
 name = "nitro-core"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "base64 0.23.1",
  "bytes",
@@ -1071,7 +1071,7 @@ dependencies = [
 
 [[package]]
 name = "nitro-observability"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "bytes",
  "futures-util",
@@ -1089,7 +1089,7 @@ dependencies = [
 
 [[package]]
 name = "nitro-py"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "bytes",
  "futures-util",

{nitro_framework-0.2.0 → nitro_framework-0.3.0}/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.0"
 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.0" }
+nitro-observability = { path = "crates/nitro-observability", version = "0.3.0" }
+intercom-core = { path = "crates/intercom-core", version = "0.3.0" }
 
 # Async runtime
 tokio = { version = "1.53.1", features = ["full"] }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nitro-framework
-Version: 0.2.0
+Version: 0.3.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: AsyncIO
 Classifier: Intended Audience :: Developers

{nitro_framework-0.2.0 → nitro_framework-0.3.0}/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.0}/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.0}/nitro/__init__.py

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

{nitro_framework-0.2.0 → nitro_framework-0.3.0}/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.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "nitro-framework"
-version = "0.2.0"
+version = "0.3.0"
 description = "Async-first Python web framework with a bundled Rust server"
 readme = "README.md"
 requires-python = ">=3.13"