feat: async_trait support

Author: joseluisq

Cargo.toml

@@ -25,9 +25,11 @@ keywords = [
 ]
 
 [dependencies]
-hyper = { version = "0.14", default-features = false, features = ["server", "tcp"] }
-anyhow = "1.0"
-thiserror = "1.0"
+hyper = { version = "0.14.25", default-features = false, features = ["server", "tcp"] }
+anyhow = "1.0.70"
+thiserror = "1.0.40"
+async-trait = "0.1.68"
+async-recursion = "1.0.4"
 
 [dev-dependencies]
 hyper = { version = "0.14", features = ["tcp", "server", "http1"] }

Makefile

@@ -0,0 +1,10 @@
+docs:
+	@cargo doc --no-deps
+.PHONY: docs
+
+docs-dev:
+	@cargo doc --no-deps
+	@echo "Crate documentation: http://localhost:8787/hyper_middleware"
+	@static-web-server -p 8787 -d target/doc/ \
+		& watchman-make -p 'src/**/*.rs' --run 'cargo doc'
+.PHONY: docs-dev

README.md

@@ -22,10 +22,9 @@
 
 use hyper::{header, Server, StatusCode};
 use std::{net::SocketAddr, path::PathBuf};
-
 use hyper_middleware::{
-    AfterMiddleware, BeforeMiddleware, Body, Chain, Error, Handler, Request, Response, Result,
-    Service,
+    async_trait, AfterMiddleware, BeforeMiddleware, Body, Chain, Error, Handler, Request, Response,
+    Result, Service,
 };
 
 struct Config {
@@ -36,8 +35,9 @@ struct Application {
     opts: Config,
 }
 
+#[async_trait]
 impl Handler for Application {
-    fn handle(&self, req: &mut Request) -> Result<Response> {
+    async fn handle(&self, req: &mut Request) -> Result<Response> {
         // Access the Hyper incoming Request
         println!("Handler - URI Path: {}", req.uri().path());
 
@@ -57,8 +57,9 @@ impl Handler for Application {
 
 struct FirstMiddleware {}
 
+#[async_trait]
 impl BeforeMiddleware for FirstMiddleware {
-    fn before(&self, req: &mut Request) -> Result {
+    async fn before(&self, req: &mut Request) -> Result {
         println!("First Middleware called!");
 
         // Access the Hyper incoming Request
@@ -67,15 +68,16 @@ impl BeforeMiddleware for FirstMiddleware {
         Ok(())
     }
 
-    fn catch(&self, _: &mut Request, err: Error) -> Result {
+    async fn catch(&self, _: &mut Request, err: Error) -> Result {
         Err(err)
     }
 }
 
 struct SecondMiddleware {}
 
+#[async_trait]
 impl AfterMiddleware for SecondMiddleware {
-    fn after(&self, _: &mut Request, mut res: Response) -> Result<Response> {
+    async fn after(&self, _: &mut Request, mut res: Response) -> Result<Response> {
         println!("Second Middleware called!");
 
         // Mutate the Hyper Response at convenience
@@ -88,7 +90,7 @@ impl AfterMiddleware for SecondMiddleware {
         Ok(res)
     }
 
-    fn catch(&self, _: &mut Request, err: Error) -> Result<Response> {
+    async fn catch(&self, _: &mut Request, err: Error) -> Result<Response> {
         Ok(Response::builder()
             .status(StatusCode::NOT_FOUND)
             .body(Body::from(err.to_string()))

examples/server.rs

@@ -7,8 +7,8 @@ use hyper::{header, Server, StatusCode};
 use std::{net::SocketAddr, path::PathBuf};
 
 use hyper_middleware::{
-    AfterMiddleware, BeforeMiddleware, Body, Chain, Error, Handler, Request, Response, Result,
-    Service,
+    async_trait, AfterMiddleware, BeforeMiddleware, Body, Chain, Error, Handler, Request, Response,
+    Result, Service,
 };
 
 struct Config {
@@ -19,8 +19,9 @@ struct Application {
     opts: Config,
 }
 
+#[async_trait]
 impl Handler for Application {
-    fn handle(&self, req: &mut Request) -> Result<Response> {
+    async fn handle(&self, req: &mut Request) -> Result<Response> {
         // Access the Hyper incoming Request
         println!("Handler - URI Path: {}", req.uri().path());
 
@@ -40,8 +41,9 @@ impl Handler for Application {
 
 struct FirstMiddleware {}
 
+#[async_trait]
 impl BeforeMiddleware for FirstMiddleware {
-    fn before(&self, req: &mut Request) -> Result {
+    async fn before(&self, req: &mut Request) -> Result {
         println!("First Middleware called!");
 
         // Access the Hyper incoming Request
@@ -50,15 +52,16 @@ impl BeforeMiddleware for FirstMiddleware {
         Ok(())
     }
 
-    fn catch(&self, _: &mut Request, err: Error) -> Result {
+    async fn catch(&self, _: &mut Request, err: Error) -> Result {
         Err(err)
     }
 }
 
 struct SecondMiddleware {}
 
+#[async_trait]
 impl AfterMiddleware for SecondMiddleware {
-    fn after(&self, _: &mut Request, mut res: Response) -> Result<Response> {
+    async fn after(&self, _: &mut Request, mut res: Response) -> Result<Response> {
         println!("Second Middleware called!");
 
         // Mutate the Hyper Response at convenience
@@ -71,7 +74,7 @@ impl AfterMiddleware for SecondMiddleware {
         Ok(res)
     }
 
-    fn catch(&self, _: &mut Request, err: Error) -> Result<Response> {
+    async fn catch(&self, _: &mut Request, err: Error) -> Result<Response> {
         Ok(Response::builder()
             .status(StatusCode::NOT_FOUND)
             .body(Body::from(err.to_string()))

src/lib.rs

@@ -18,6 +18,8 @@ pub mod middleware;
 pub mod remote_addr;
 pub mod service;
 
+pub use async_recursion::*;
+pub use async_trait::*;
 pub use error::{Context, Error, Result};
 pub use http::*;
 pub use middleware::*;