cleanup default routing

This commit is contained in:
Brandon Thomas
2020-06-29 20:12:07 -04:00
parent 8238977553
commit 96e900457e
+5 -15
View File
@@ -97,7 +97,6 @@ fn debug_request(req: Request<Body>) -> BoxFut {
Box::new(future::ok(response)) Box::new(future::ok(response))
} }
#[derive(Default)]
struct RequestDetails { struct RequestDetails {
pub request_bytes: Vec<u8>, pub request_bytes: Vec<u8>,
pub speaker: String, pub speaker: String,
@@ -168,24 +167,15 @@ fn main() -> AnyhowResult<()> {
info!("Got a request from: {:?}", remote_addr); info!("Got a request from: {:?}", remote_addr);
let route_a = route_one.clone(); let route_a = route_one.clone();
let route_b = route_two.clone();
service_fn(move |req: Request<Body>| { // returns BoxFut service_fn(move |req: Request<Body>| {
match req.method() { match (req.method(), req.uri().path()) {
&Method::OPTIONS => { (&Method::POST, "/speak") =>
// TODO: CORS should be hardcoded here, not wastefully proxied.
return hyper_reverse_proxy::call(remote_addr.ip(), &route_a, req); // Return BoxFut
},
_ => {},
}
match req.uri().path() {
"/speak" =>
speak_proxy(req, remote_addr.clone(), "/speak"), speak_proxy(req, remote_addr.clone(), "/speak"),
"/speak_spectrogram" => (&Method::POST, "/speak_spectrogram") =>
speak_proxy(req, remote_addr.clone(), "/speak_spectrogram"), speak_proxy(req, remote_addr.clone(), "/speak_spectrogram"),
_ => _ =>
debug_request(req), hyper_reverse_proxy::call(remote_addr.ip(), &route_a, req),
} }
}) })
}); });