Improve state management

Author: Qard

package.json

@@ -28,7 +28,7 @@
     "build:debug": "napi build --platform --features napi-support",
     "prepublishOnly": "napi prepublish -t npm",
     "lint": "oxlint",
-    "test": "node --test test/**.test.mjs",
+    "test": "node --test test/**/*.test.mjs",
     "universal": "napi universal",
     "version": "napi version"
   }

src/asgi/http.rs

@@ -1,7 +1,7 @@
+use http_handler::{Request, RequestExt, Version};
 use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
 use pyo3::types::{PyAny, PyDict};
-use http_handler::{Request, RequestExt, Version};
 use std::net::SocketAddr;
 
 use crate::asgi::{AsgiInfo, HttpMethod, HttpVersion};
@@ -70,24 +70,18 @@ impl TryFrom<&Request> for HttpConnectionScope {
   fn try_from(request: &Request) -> Result<Self, Self::Error> {
     // Extract HTTP version
     let http_version = match request.version() {
-      Version::HTTP_09 => HttpVersion::V1_0, // fallback for HTTP/0.9
       Version::HTTP_10 => HttpVersion::V1_0,
       Version::HTTP_11 => HttpVersion::V1_1,
       Version::HTTP_2 => HttpVersion::V2_0,
       Version::HTTP_3 => HttpVersion::V2_0, // treat HTTP/3 as HTTP/2 for ASGI
-      _ => HttpVersion::V1_1, // default fallback
+      _ => HttpVersion::V1_1,               // default fallback
     };
 
     // Extract method
-    let method = request.method().try_into()
-      .map_err(PyValueError::new_err)?;
+    let method = request.method().try_into().map_err(PyValueError::new_err)?;
 
     // Extract scheme from URI or default to http
-    let scheme = request
-      .uri()
-      .scheme_str()
-      .unwrap_or("http")
-      .to_string();
+    let scheme = request.uri().scheme_str().unwrap_or("http").to_string();
 
     // Extract path
     let path = request.uri().path().to_string();
@@ -96,11 +90,7 @@ impl TryFrom<&Request> for HttpConnectionScope {
     let raw_path = path.clone();
 
     // Extract query string
-    let query_string = request
-      .uri()
-      .query()
-      .unwrap_or("")
-      .to_string();
+    let query_string = request.uri().query().unwrap_or("").to_string();
 
     // Extract root path from DocumentRoot extension
     let root_path = request
@@ -322,11 +312,9 @@ impl<'py> FromPyObject<'py> for HttpSendMessage {
           })?
           .extract()?;
 
-        let headers_py = dict
-          .get_item("headers")?
-          .ok_or_else(|| {
-            PyValueError::new_err("Missing 'headers' key in HTTP response start message")
-          })?;
+        let headers_py = dict.get_item("headers")?.ok_or_else(|| {
+          PyValueError::new_err("Missing 'headers' key in HTTP response start message")
+        })?;
 
         // Convert headers from list of lists to vec of tuples
         let mut headers: Vec<(String, String)> = Vec::new();
@@ -395,9 +383,12 @@ pub enum HttpSendException {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use http_handler::{RequestExt, extensions::DocumentRoot};
   use http_handler::{Method, Version, request::Builder};
-  use std::{net::{IpAddr, Ipv4Addr, SocketAddr}, path::PathBuf};
+  use http_handler::{RequestExt, extensions::DocumentRoot};
+  use std::{
+    net::{IpAddr, Ipv4Addr, SocketAddr},
+    path::PathBuf,
+  };
 
   macro_rules! dict_get {
     ($dict:expr, $key:expr) => {
@@ -439,10 +430,13 @@ mod tests {
 
     // Set document root extension
     let doc_root = PathBuf::from("/var/www/html");
-    request.set_document_root(DocumentRoot { path: doc_root.clone() });
+    request.set_document_root(DocumentRoot {
+      path: doc_root.clone(),
+    });
 
     // Convert to ASGI scope
-    let scope: HttpConnectionScope = (&request).try_into()
+    let scope: HttpConnectionScope = (&request)
+      .try_into()
       .expect("Failed to convert request to HttpConnectionScope");
 
     // Verify HTTP version
@@ -494,7 +488,8 @@ mod tests {
       .body(bytes::BytesMut::new())
       .unwrap();
 
-    let scope: HttpConnectionScope = (&request).try_into()
+    let scope: HttpConnectionScope = (&request)
+      .try_into()
       .expect("Failed to convert request to HttpConnectionScope");
 
     assert_eq!(scope.http_version, HttpVersion::V1_1);
@@ -520,7 +515,8 @@ mod tests {
       .body(bytes::BytesMut::new())
       .unwrap();
 
-    let scope: HttpConnectionScope = (&request).try_into()
+    let scope: HttpConnectionScope = (&request)
+      .try_into()
       .expect("Failed to convert request to HttpConnectionScope");
 
     assert_eq!(scope.http_version, HttpVersion::V2_0);