update README

felipenoris · Mar 12, 2022 · eb2acee · eb2acee
1 parent 6e9aa45
commit eb2acee
Showing 1 changed file with 39 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -33,52 +33,58 @@ The following example will set up a reverse proxy listening on `127.0.0.1:13900`
 and will proxy these calls:
 
 * `"/target/first"` will be proxied to `http://127.0.0.1:13901`
+
 * `"/target/second"` will be proxied to `http://127.0.0.1:13902`
+
 * All other URLs will be handled by `debug_request` function, that will display request information.
 
 ```rust,no_run
 use hyper::server::conn::AddrStream;
-use hyper::{Body, Request, Response, Server};
+use hyper::{Body, Request, Response, Server, StatusCode};
 use hyper::service::{service_fn, make_service_fn};
-use futures::future::{self, Future};
-
-type BoxFut = Box<Future<Item=Response<Body>, Error=hyper::Error> + Send>;
+use std::{convert::Infallible, net::SocketAddr};
+use hyper::http::uri::InvalidUri;
+use std::net::IpAddr;
 
-fn debug_request(req: Request<Body>) -> BoxFut {
+fn debug_request(req: Request<Body>) -> Result<Response<Body>, Infallible>  {
     let body_str = format!("{:?}", req);
-    let response = Response::new(Body::from(body_str));
-    Box::new(future::ok(response))
+    Ok(Response::new(Body::from(body_str)))
 }
 
+async fn handle(client_ip: IpAddr, req: Request<Body>) -> Result<Response<Body>, Infallible> {
+    if req.uri().path().starts_with("/target/first") {
+        // will forward requests to port 13901
+        match hyper_reverse_proxy::call(client_ip, "http://127.0.0.1:13901", req).await {
+            Ok(response) => {Ok(response)}
+            Err(error) => {Ok(Response::builder()
+                                  .status(StatusCode::INTERNAL_SERVER_ERROR)
+                                  .body(Body::empty())
+                                  .unwrap())}
+        }
+    } else if req.uri().path().starts_with("/target/second") {
+        // will forward requests to port 13902
+        match hyper_reverse_proxy::call(client_ip, "http://127.0.0.1:13902", req).await {
+            Ok(response) => {Ok(response)}
+            Err(_error) => {Ok(Response::builder()
+                                  .status(StatusCode::INTERNAL_SERVER_ERROR)
+                                  .body(Body::empty())
+                                  .unwrap())}
+        }
+    } else {
+        debug_request(req)
+    }
+}
 #[tokio::main]
-fn main() {
-    // This is our socket address...
-    let addr = ([127, 0, 0, 1], 13900).into();
-
-    // A `Service` is needed for every connection.
-    let make_svc = make_service_fn(|socket: &AddrStream| {
-        let remote_addr = socket.remote_addr();
-        service_fn(move |req: Request<Body>| { // returns BoxFut
-
-            if req.uri().path().starts_with("/target/first") {
-
-                // will forward requests to port 13901
-                return hyper_reverse_proxy::call(remote_addr.ip(), "http://127.0.0.1:13901", req)
-
-            } else if req.uri().path().starts_with("/target/second") {
-
-                // will forward requests to port 13902
-                return hyper_reverse_proxy::call(remote_addr.ip(), "http://127.0.0.1:13902", req)
-
-            } else {
-                debug_request(req)
-            }
-        })
+async fn main() {
+    let bind_addr = "127.0.0.1:8000";
+    let addr:SocketAddr = bind_addr.parse().expect("Could not parse ip:port.");
+    let make_svc = make_service_fn(|conn: &AddrStream| {
+        let remote_addr = conn.remote_addr().ip();
+        async move {
+            Ok::<_, Infallible>(service_fn(move |req| handle(remote_addr, req)))
+        }
     });
-
     let server = Server::bind(&addr).serve(make_svc);
-    
-    // Run this server for... forever!    
     println!("Running server on {:?}", addr);
     if let Err(e) = server.await {
         eprintln!("server error: {}", e);