HttpRequest improvements for middlewares (#126)

RomanEmreis · web-flow · commit 7f74a7b3bea5 · 2025-11-20T17:47:13.000+04:00
* added path_args method for http request to simplify path params extraction in middlewares
* fixed a bug with Next; added `query_args` method
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Volga
 Fast, Easy, and very flexible Web Framework for Rust based on [Tokio](https://tokio.rs/) runtime and [hyper](https://hyper.rs/) for fun and painless microservices crafting.
 
-[![latest](https://img.shields.io/badge/latest-0.7.0-blue)](https://crates.io/crates/volga)
+[![latest](https://img.shields.io/badge/latest-0.7.1-blue)](https://crates.io/crates/volga)
 [![latest](https://img.shields.io/badge/rustc-1.90+-964B00)](https://crates.io/crates/volga)
 [![License: MIT](https://img.shields.io/badge/License-MIT-violet.svg)](https://github.com/RomanEmreis/volga/blob/main/LICENSE)
 [![Build](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml/badge.svg)](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml)
@@ -23,7 +23,7 @@ Fast, Easy, and very flexible Web Framework for Rust based on [Tokio](https://to
 ### Dependencies
 ```toml
 [dependencies]
-volga = "0.7.0"
+volga = "0.7.1"
 tokio = { version = "1", features = ["full"] }
 ```
 ### Simple request handler
diff --git a/volga-dev-cert/Cargo.toml b/volga-dev-cert/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volga-dev-cert"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 rust-version = "1.90.0"
 authors = ["Roman Emreis <roman.emreis@outlook.com>"]
diff --git a/volga-dev-cert/README.md b/volga-dev-cert/README.md
@@ -1,7 +1,7 @@
 # Volga Development Certificates
 A Rust library for generating self-signed TLS certificates for local development.
 
-[![latest](https://img.shields.io/badge/latest-0.7.0-blue)](https://crates.io/crates/volga)
+[![latest](https://img.shields.io/badge/latest-0.7.1-blue)](https://crates.io/crates/volga)
 [![latest](https://img.shields.io/badge/rustc-1.90+-964B00)](https://crates.io/crates/volga)
 [![License: MIT](https://img.shields.io/badge/License-MIT-violet.svg)](https://github.com/RomanEmreis/volga/blob/main/LICENSE)
 [![Build](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml/badge.svg)](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml)
diff --git a/volga-di/Cargo.toml b/volga-di/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volga-di"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 rust-version = "1.90.0"
 authors = ["Roman Emreis <roman.emreis@outlook.com>"]
diff --git a/volga-di/README.md b/volga-di/README.md
@@ -1,7 +1,7 @@
 # Volga DI
 A standalone, flexible, and easy-to-configure DI container.
 
-[![latest](https://img.shields.io/badge/latest-0.7.0-blue)](https://crates.io/crates/volga)
+[![latest](https://img.shields.io/badge/latest-0.7.1-blue)](https://crates.io/crates/volga)
 [![latest](https://img.shields.io/badge/rustc-1.90+-964B00)](https://crates.io/crates/volga)
 [![License: MIT](https://img.shields.io/badge/License-MIT-violet.svg)](https://github.com/RomanEmreis/volga/blob/main/LICENSE)
 [![Build](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml/badge.svg)](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml)
@@ -14,12 +14,12 @@ A standalone, flexible, and easy-to-configure DI container.
 #### Standalone
 ```toml
 [dependencies]
-volga-di = "0.7.0"
+volga-di = "0.7.1"
 ```
 #### Part of Volga Web Framework
 ```toml
 [dependencies]
-volga = { version = "0.7.0", features = ["di"] }
+volga = { version = "0.7.1", features = ["di"] }
 ```
 
 ### Example
diff --git a/volga-macros/Cargo.toml b/volga-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volga-macros"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 rust-version = "1.90.0"
 authors = ["Roman Emreis <roman.emreis@outlook.com>"]
diff --git a/volga-macros/README.md b/volga-macros/README.md
@@ -1,7 +1,7 @@
 # Volga Macros
 Macros library for Volga Web Framework
 
-[![latest](https://img.shields.io/badge/latest-0.7.0-blue)](https://crates.io/crates/volga)
+[![latest](https://img.shields.io/badge/latest-0.7.1-blue)](https://crates.io/crates/volga)
 [![latest](https://img.shields.io/badge/rustc-1.90+-964B00)](https://crates.io/crates/volga)
 [![License: MIT](https://img.shields.io/badge/License-MIT-violet.svg)](https://github.com/RomanEmreis/volga/blob/main/LICENSE)
 [![Build](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml/badge.svg)](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml)
@@ -12,6 +12,6 @@ Macros library for Volga Web Framework
 ## Dependencies
 ```toml
 [dependencies]
-volga = { version = "0.7.0", features = ["macros"] }
+volga = { version = "0.7.1", features = ["macros"] }
 ```
 
diff --git a/volga/Cargo.toml b/volga/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volga"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 rust-version = "1.90.0"
 authors = ["Roman Emreis <roman.emreis@outlook.com>"]
@@ -53,9 +53,9 @@ tokio-tungstenite = { version = "0.28.0", optional = true }
 tracing = { version = "0.1.41", default-features = false, optional = true }
 
 # volga
-volga-dev-cert = { path = "../volga-dev-cert", version = "0.7.0", optional = true }
-volga-di = { path = "../volga-di", version = "0.7.0", optional = true }
-volga-macros = { path = "../volga-macros", version = "0.7.0", optional = true }
+volga-dev-cert = { path = "../volga-dev-cert", version = "0.7.1", optional = true }
+volga-di = { path = "../volga-di", version = "0.7.1", optional = true }
+volga-macros = { path = "../volga-macros", version = "0.7.1", optional = true }
 
 [dev-dependencies]
 base64 = { version = "0.22.1" }
diff --git a/volga/README.md b/volga/README.md
@@ -1,7 +1,7 @@
 # Volga
 Fast, Easy, and very flexible Web Framework for Rust based on [Tokio](https://tokio.rs/) runtime and [hyper](https://hyper.rs/) for fun and painless microservices crafting.
 
-[![latest](https://img.shields.io/badge/latest-0.7.0-blue)](https://crates.io/crates/volga)
+[![latest](https://img.shields.io/badge/latest-0.7.1-blue)](https://crates.io/crates/volga)
 [![latest](https://img.shields.io/badge/rustc-1.90+-964B00)](https://crates.io/crates/volga)
 [![License: MIT](https://img.shields.io/badge/License-MIT-violet.svg)](https://github.com/RomanEmreis/volga/blob/main/LICENSE)
 [![Build](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml/badge.svg)](https://github.com/RomanEmreis/volga/actions/workflows/rust.yml)
@@ -23,7 +23,7 @@ Fast, Easy, and very flexible Web Framework for Rust based on [Tokio](https://to
 ### Dependencies
 ```toml
 [dependencies]
-volga = "0.7.0"
+volga = "0.7.1"
 tokio = { version = "1", features = ["full"] }
 ```
 ### Simple request handler
diff --git a/volga/src/http.rs b/volga/src/http.rs
@@ -2,7 +2,7 @@
 
 // Re-exporting HTTP status codes, Response and some headers from hyper/http
 pub use hyper::{
-    http::{Extensions, Method, Uri},
+    http::{request::Parts, Extensions, Method, Uri},
     Response,
     StatusCode,
 };
diff --git a/volga/src/http/request.rs b/volga/src/http/request.rs
@@ -17,7 +17,7 @@ use crate::{
 };
 
 use crate::http::{
-    endpoints::args::FromRequestRef, 
+    endpoints::{args::FromRequestRef, route::PathArgs}, 
     request::request_body_limit::RequestBodyLimit
 };
 
@@ -162,12 +162,16 @@ impl HttpRequest {
     ///
     /// #[derive(Deserialize)]
     /// struct Params {
-    ///     id: u32,
-    ///     key: String
+    ///     key: u32,
+    ///     value: String
     /// }
     ///
     /// # fn docs(req: HttpRequest) -> std::io::Result<()> {
+    /// // https://www.example.com?key=1&value=test
     /// let params: Query<Params> = req.extract()?;
+    /// 
+    /// assert_eq!(params.key, 1u32);
+    /// assert_eq!(params.value, "test");
     /// # Ok(())
     /// # }
     /// ```
@@ -176,6 +180,61 @@ impl HttpRequest {
         T::from_request(self)
     }
 
+    /// Returns iterator of URL path params
+    ///
+    /// # Example
+    /// ```no_run
+    /// use volga::HttpRequest;
+    ///
+    /// # fn docs(req: HttpRequest) -> std::io::Result<()> {
+    /// // https://www.example.com/{key}/{value}
+    /// // https://www.example.com/1/test
+    /// let mut args = req.path_args();
+    /// 
+    /// assert_eq!(args.next().unwrap(), ("key", "1"));
+    /// assert_eq!(args.next().unwrap(), ("value", "test"));
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn path_args(&self) -> impl Iterator<Item = (&str, &str)> {
+        self.extensions()
+            .get::<PathArgs>()
+            .map(|args| args
+                .iter()
+                .map(|arg| (arg.name.as_ref(), arg.value.as_ref())))
+            .into_iter()
+            .flatten()
+    }
+
+    /// Returns iterator of URL query params
+    ///
+    /// # Example
+    /// ```no_run
+    /// use volga::HttpRequest;
+    ///
+    /// # fn docs(req: HttpRequest) -> std::io::Result<()> {
+    /// // https://www.example.com?key=1&value=test
+    /// let mut args = req.query_args();
+    /// 
+    /// assert_eq!(args.next().unwrap(), ("key", "1"));
+    /// assert_eq!(args.next().unwrap(), ("value", "test"));
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn query_args(&self) -> impl Iterator<Item = (&str, &str)> {
+        self.uri()
+            .query()
+            .map(|query| query.split('&')
+                .map(|arg| {
+                    let mut parts = arg.split('=');
+                    let key = parts.next().unwrap();
+                    let value = parts.next().unwrap();
+                    (key, value)
+                }))
+            .into_iter()
+            .flatten()
+    }
+
     /// Inserts the [`Header<T>`] to HTTP request headers
     #[inline]
     pub fn insert_header<T: FromHeaders>(&mut self, header: Header<T>) {
@@ -189,6 +248,7 @@ impl HttpRequest {
 mod tests {
     use http_body_util::BodyExt;
     use crate::headers::{Header, Vary, custom_headers};
+    use crate::http::endpoints::route::PathArg;
     use super::*;
     
     #[cfg(feature = "di")]
@@ -356,6 +416,70 @@ mod tests {
         assert_eq!(parts.uri, "/test")
     }
 
+    #[test]
+    fn it_returns_url_path() {
+        let args: PathArgs = smallvec::smallvec![
+            PathArg { name: "id".into(), value: "123".into() },
+            PathArg { name: "name".into(), value: "John".into() }
+        ];
+
+        let req = Request::get("/")
+            .extension(args)
+            .body(HttpBody::empty())
+            .unwrap();
+
+        let (parts, body) = req.into_parts();
+        let req = HttpRequest::from_parts(parts, body);
+
+        let mut args = req.path_args();
+
+        assert_eq!(args.next().unwrap(), ("id", "123"));
+        assert_eq!(args.next().unwrap(), ("name", "John"));
+    }
+
+    #[test]
+    fn it_returns_url_query() {
+        let req = Request::get("/test?id=123&name=John")
+            .body(HttpBody::empty())
+            .unwrap();
+
+        let (parts, body) = req.into_parts();
+        let req = HttpRequest::from_parts(parts, body);
+
+        let mut args = req.query_args();
+
+        assert_eq!(args.next().unwrap(), ("id", "123"));
+        assert_eq!(args.next().unwrap(), ("name", "John"));
+    }
+
+    #[test]
+    fn it_returns_empty_iter_if_no_path_params() {
+        let req = Request::get("/")
+            .body(HttpBody::empty())
+            .unwrap();
+
+        let (parts, body) = req.into_parts();
+        let req = HttpRequest::from_parts(parts, body);
+
+        let mut args = req.path_args();
+
+        assert!(args.next().is_none());
+    }
+
+    #[test]
+    fn it_returns_empty_iter_if_no_query_params() {
+        let req = Request::get("/")
+            .body(HttpBody::empty())
+            .unwrap();
+
+        let (parts, body) = req.into_parts();
+        let req = HttpRequest::from_parts(parts, body);
+
+        let mut args = req.query_args();
+
+        assert!(args.next().is_none());
+    }
+
     #[test]
     fn it_inserts_and_header() {
         let (parts, body) = Request::get("/test")
diff --git a/volga/src/middleware/handler.rs b/volga/src/middleware/handler.rs
@@ -3,6 +3,7 @@
 use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};
+
 use crate::error::Error;
 use crate::{HttpRequest, HttpResponse, HttpResult};
 use super::{HttpContext, NextFn};
@@ -20,8 +21,7 @@ use super::{HttpContext, NextFn};
 /// });
 /// ```
 pub struct Next {
-    next: NextFn,
-    ctx: Option<HttpContext>
+    inner: Option<Pin<Box<dyn Future<Output = HttpResult> + Send>>>
 }
 
 impl std::fmt::Debug for Next {
@@ -35,19 +35,26 @@ impl Future for Next {
     type Output = HttpResult;
 
     #[inline]
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let ctx = self.ctx
-            .take()
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.get_mut();
+        let fut = this
+            .inner
+            .as_mut()
             .ok_or_else(|| Error::server_error("Next polled after completion"))?;
-        let fut = (self.next)(ctx);
-        Box::pin(fut).as_mut().poll(cx)
+
+        let poll = fut.as_mut().poll(cx);
+        if matches!(poll, Poll::Ready(_)) {
+            this.inner = None;
+        }
+        poll
     }
 }
 
 impl Next {
     /// Creates a new [`Next`]
     pub fn new(ctx: HttpContext, next: NextFn) -> Self {
-        Self { ctx: Some(ctx), next }
+        Self { inner: Some(Box::pin(next(ctx))) }
+        //Self { ctx: Some(ctx), next }
     }
 }
 
diff --git a/volga/src/middleware/http_context.rs b/volga/src/middleware/http_context.rs
diff --git a/volga/tests/middleware_mapping_tests.rs b/volga/tests/middleware_mapping_tests.rs
