Skip to content

use BoxCloneSyncService in hyper example #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibraheemdev merged 1 commit into from
Jan 17, 2025
Merged

use BoxCloneSyncService in hyper example #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ routefinder = "0.5"
wayfind = "0.7"

# Examples
tower = { version = "0.4", features = ["make", "util"] }
tower = { version = "0.5.2", features = ["make", "util"] }
tokio = { version = "1", features = ["full"] }
http-body-util = "0.1"
hyper = { version = "1", features = ["http1", "server"] }
Expand Down
17 changes: 6 additions & 11 deletions examples/hyper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use std::sync::Arc;

use http_body_util::Full;
use hyper::body::{Bytes, Incoming};
Expand All @@ -8,7 +8,6 @@ use hyper::{Method, Request, Response, StatusCode};
use hyper_util::rt::TokioIo;
use tokio::net::TcpListener;
use tower::service_fn;
use tower::util::BoxCloneService;
use tower::Service as _;

type Body = Full<Bytes>;
Expand All @@ -31,11 +30,8 @@ async fn not_found(_req: Request<Incoming>) -> hyper::Result<Response<Body>> {
.unwrap())
}

// We can use `BoxCloneService` to erase the type of each handler service.
//
// We still need a `Mutex` around each service because `BoxCloneService` doesn't
// require the service to implement `Sync`.
type Service = Mutex<BoxCloneService<Request<Incoming>, Response<Body>, hyper::Error>>;
// We can use `BoxCloneSyncService` to erase the type of each handler service.
type Service = tower::util::BoxCloneSyncService<Request<Incoming>, Response<Body>, hyper::Error>;

// We use a `HashMap` to hold a `Router` for each HTTP method. This allows us
// to register the same route for multiple methods.
Expand All @@ -57,8 +53,7 @@ async fn route(router: Arc<Router>, req: Request<Incoming>) -> hyper::Result<Res
return not_found(req).await;
};

// lock the service for a very short time, just to clone the service
let mut service = found.value.lock().unwrap().clone();
let mut service = found.value.clone();
service.call(req).await
}

Expand All @@ -71,14 +66,14 @@ async fn main() {
router
.entry(Method::GET)
.or_default()
.insert("/", BoxCloneService::new(service_fn(index)).into())
.insert("/", Service::new(service_fn(index)))
.unwrap();

// GET /blog => `blog`
router
.entry(Method::GET)
.or_default()
.insert("/blog", BoxCloneService::new(service_fn(blog)).into())
.insert("/blog", Service::new(service_fn(blog)))
.unwrap();

let listener = TcpListener::bind(("127.0.0.1", 3000)).await.unwrap();
Expand Down
Loading