Proper keep-alive

Author: rylev

examples/server.rs

@@ -1,6 +1,6 @@
 use async_h1::{server, Body};
-use async_std::prelude::*;
 use async_std::net;
+use async_std::prelude::*;
 use async_std::task;
 
 fn main() -> Result<(), async_h1::Exception> {
@@ -10,12 +10,15 @@ fn main() -> Result<(), async_h1::Exception> {
         let mut incoming = listener.incoming();
 
         while let Some(stream) = incoming.next().await {
+            println!("new TCP stream...");
             task::spawn(async {
                 let stream = stream?;
                 let (reader, writer) = &mut (&stream, &stream);
-                server::connect(reader, writer, |_| async {
-                    let body = Body::from_string("hello chashu".to_owned());
-                    Ok(http::Response::new(body))
+                server::connect(reader, writer, |_| {
+                    async {
+                        let body = Body::from_string("hello chashu".to_owned());
+                        Ok(http::Response::new(body))
+                    }
                 })
                 .await
             });

src/server.rs

@@ -1,13 +1,13 @@
 //! Process HTTP connections on the server.
 
-use async_std::future::Future;
+use async_std::future::{timeout, Future, TimeoutError};
 use async_std::io::{self, BufReader};
 use async_std::io::{Read, Write};
 use async_std::prelude::*;
 use async_std::task::{Context, Poll};
 use futures_core::ready;
 use http::{Request, Response, Version};
-use std::time::{Duration, Instant};
+use std::time::Duration;
 
 use std::pin::Pin;
 
@@ -26,35 +26,27 @@ where
     O: Read + Unpin + Send,
 {
     let req = decode(reader).await?;
-    if let RequestOrReader::Request(mut req) = req {
+    if let Some(mut req) = req {
         let headers = req.headers();
-        let timeout = match (headers.get("Connection"), headers.get("Keep-Alive")) {
+        let timeout_duration = match (headers.get("Connection"), headers.get("Keep-Alive")) {
             (Some(connection), Some(_v))
                 if connection == http::header::HeaderValue::from_static("Keep-Alive") =>
             {
                 // TODO: parse timeout
-                Duration::from_secs(5)
+                Duration::from_secs(10)
             }
-            _ => Duration::from_secs(5),
+            _ => Duration::from_secs(10),
         };
 
-        let beginning = Instant::now();
         loop {
             // TODO: what to do when the callback returns Err
             let mut res = encode(callback(&mut req).await?).await?;
             io::copy(&mut res, writer).await?;
-            let mut stream = req.into_body().into_reader().into_inner();
-            req = loop {
-                match decode(stream).await? {
-                    RequestOrReader::Request(r) => break r,
-                    RequestOrReader::Reader(r) => {
-                        let now = Instant::now();
-                        if now - beginning > timeout {
-                            return Ok(());
-                        }
-                        stream = r;
-                    }
-                }
+            let stream = req.into_body().into_reader().into_inner();
+            req = match timeout(timeout_duration, decode(stream)).await {
+                Ok(Ok(Some(r))) => r,
+                Ok(Ok(None)) | Err(TimeoutError { .. }) => break, /* EOF or timeout */
+                Ok(Err(e)) => return Err(e),
             };
         }
     }
@@ -165,14 +157,8 @@ where
     Ok(Encoder::new(buf, res.into_body()))
 }
 
-#[derive(Debug)]
-pub enum RequestOrReader<R: Read> {
-    Request(Request<Body<BufReader<R>>>),
-    Reader(R),
-}
-
 /// Decode an HTTP request on the server.
-pub async fn decode<R>(reader: R) -> Result<RequestOrReader<R>, Exception>
+pub async fn decode<R>(reader: R) -> Result<Option<Request<Body<BufReader<R>>>>, Exception>
 where
     R: Read + Unpin + Send,
 {
@@ -186,7 +172,7 @@ where
         let bytes_read = reader.read_until(b'\n', &mut buf).await?;
         // No more bytes are yielded from the stream.
         if bytes_read == 0 {
-            return Ok(RequestOrReader::Reader(reader.into_inner()));
+            return Ok(None);
         }
 
         // We've hit the end delimiter of the stream.
@@ -232,5 +218,5 @@ where
     };
 
     // Return the request.
-    Ok(RequestOrReader::Request(req.body(body)?))
+    Ok(Some(req.body(body)?))
 }