feat(viz): add serve function

Cargo.toml

@@ -66,6 +66,7 @@ http = "0.2"
 http-body = "=1.0.0-rc.2"
 http-body-util = "=0.1.0-rc.3"
 hyper = { version = "=1.0.0-rc.4", features = ["server"] }
+hyper-util = { git = "https://github.com/hyperium/hyper-util", rev = "63e84bf", features = ["auto"] }
 
 futures-util = "0.3"
 tokio = { version = "1.32", features = ["net"] }

examples/hello-world/src/main.rs

@@ -3,7 +3,7 @@
 
 use std::{net::SocketAddr, sync::Arc};
 use tokio::net::TcpListener;
-use viz::{server::conn::http1, Io, Request, Responder, Result, Router, Tree};
+use viz::{serve, Request, Result, Router, Tree};
 
 async fn index(_: Request) -> Result<&'static str> {
     Ok("Hello, World!")
@@ -13,7 +13,7 @@ async fn index(_: Request) -> Result<&'static str> {
 async fn main() -> Result<()> {
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     let listener = TcpListener::bind(addr).await?;
-    println!("listening on {addr}");
+    println!("listening on http://{addr}");
 
     let app = Router::new().get("/", index);
     let tree = Arc::new(Tree::from(app));
@@ -22,10 +22,7 @@ async fn main() -> Result<()> {
         let (stream, addr) = listener.accept().await?;
         let tree = tree.clone();
         tokio::task::spawn(async move {
-            if let Err(err) = http1::Builder::new()
-                .serve_connection(Io::new(stream), Responder::new(tree, Some(addr)))
-                .await
-            {
+            if let Err(err) = serve(stream, Some(addr), tree).await {
                 eprintln!("Error while serving HTTP connection: {err}");
             }
         });

viz-core/Cargo.toml

@@ -63,6 +63,7 @@ http-body.workspace = true
 http-body-util.workspace = true
 
 hyper.workspace = true
+hyper-util.workspace = true
 
 mime.workspace = true
 thiserror.workspace = true

viz-core/src/lib.rs

@@ -5,7 +5,7 @@
 #![doc(html_logo_url = "https://viz.rs/logo.svg")]
 #![doc(html_favicon_url = "https://viz.rs/logo.svg")]
 #![allow(clippy::module_name_repetitions)]
-// #![forbid(unsafe_code)]
+#![forbid(unsafe_code)]
 #![warn(
     missing_debug_implementations,
     missing_docs,
@@ -43,15 +43,13 @@ mod body;
 mod error;
 mod from_request;
 mod into_response;
-mod io;
 mod request;
 mod response;
 
 pub use body::{IncomingBody, OutgoingBody};
 pub use error::Error;
 pub use from_request::FromRequest;
 pub use into_response::IntoResponse;
-pub use io::Io;
 pub use request::RequestExt;
 pub use response::ResponseExt;
 
@@ -61,6 +59,7 @@ pub use bytes::{Bytes, BytesMut};
 pub use headers;
 pub use http::{header, Method, StatusCode};
 pub use hyper::body::{Body, Incoming};
+pub use hyper_util::rt::TokioIo as Io;
 pub use std::future::Future;
 pub use thiserror::Error as ThisError;
 

viz/Cargo.toml

@@ -72,6 +72,7 @@ viz-handlers = { workspace = true, optional = true }
 viz-macros = { workspace = true, optional = true }
 
 hyper.workspace = true
+hyper-util.workspace = true
 tokio.workspace = true
 
 futures-util = { workspace = true, optional = true }

viz/src/lib.rs

@@ -522,7 +522,7 @@
 
 #![doc(html_logo_url = "https://viz.rs/logo.svg")]
 #![doc(html_favicon_url = "https://viz.rs/logo.svg")]
-// #![forbid(unsafe_code)]
+#![forbid(unsafe_code)]
 #![warn(
     missing_debug_implementations,
     missing_docs,
@@ -543,6 +543,9 @@ mod responder;
 #[cfg(any(feature = "http1", feature = "http2"))]
 pub use responder::Responder;
 
+mod serve;
+pub use serve::serve;
+
 /// TLS
 pub mod tls;
 pub use viz_core::*;
@@ -553,10 +556,10 @@ pub use viz_router::*;
 #[doc(inline)]
 pub use viz_handlers as handlers;
 
+#[cfg(any(feature = "http1", feature = "http2"))]
+pub use hyper::server;
+
 #[cfg(feature = "macros")]
 #[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
 #[doc(inline)]
 pub use viz_macros::handler;
-
-#[cfg(any(feature = "http1", feature = "http2"))]
-pub use hyper::server;

viz/src/serve.rs

@@ -0,0 +1,24 @@
+use std::{net::SocketAddr, sync::Arc};
+
+use hyper_util::{rt::TokioExecutor, server::conn::auto::Builder};
+use tokio::io::{AsyncRead, AsyncWrite};
+
+use viz_core::{Io, Result};
+use viz_router::Tree;
+
+use crate::Responder;
+
+/// Serve the connections.
+///
+/// # Errors
+///
+/// Will return `Err` if the connection does not be served.
+pub async fn serve<I>(stream: I, addr: Option<SocketAddr>, tree: Arc<Tree>) -> Result<()>
+where
+    I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
+{
+    Builder::new(TokioExecutor::new())
+        .serve_connection_with_upgrades(Io::new(stream).into_inner(), Responder::new(tree, addr))
+        .await
+        .map_err(Into::into)
+}