Update HttpStream

Author: saulvaldelvira

crates/http/Cargo.toml

@@ -20,6 +20,6 @@ url = { package = "url-utils", version = ">=0.1.0", path = "../url" }
 package = "builders"
 default-features = false
 features = ["builder"]
-version = ">=0.1.0"
+version = ">=0.5.0"
 git = "https://github.com/saulvaldelvira/builders"
 

crates/http/src/request/mod.rs

@@ -5,7 +5,7 @@ use std::{
     collections::HashMap,
     env,
     ffi::OsStr,
-    io::{BufReader, Read, Write},
+    io::{BufRead, BufReader, Read, Write},
     path::Path,
 };
 
@@ -43,20 +43,21 @@ impl HttpRequest {
         let stream = BufReader::new(stream.into());
         parse_request(stream)
     }
+
     #[inline]
     pub fn keep_alive(self) -> Result<Self> {
         let mut req = parse_request(self.stream)?;
         req.set_header("Connection", "keep-alive");
         Ok(req)
     }
+
     #[inline]
-    #[must_use]
     pub fn stream(&self) -> &HttpStream {
         self.stream.get_ref()
     }
+
     /// Url of the request
     #[inline]
-    #[must_use]
     pub fn url(&self) -> &str {
         &self.url
     }
@@ -230,8 +231,8 @@ impl HttpRequest {
     /// [`stream`]'s availability
     ///
     /// [`stream`]: HttpStream
-    pub fn has_body(&self) -> Result<bool> {
-        Ok(self.body.is_some() || self.stream.get_ref().is_ready()?)
+    pub fn has_body(&mut self) -> Result<bool> {
+        Ok(self.body.is_some() || !self.stream.fill_buf()?.is_empty())
     }
 
     /// Reads the request body into [writer](Write)

crates/http/src/response/mod.rs

@@ -1,6 +1,6 @@
 use std::{
     collections::HashMap,
-    io::{self, BufReader, Read, Write},
+    io::{self, BufRead, BufReader, Read, Write},
 };
 
 use builders::Builder;
@@ -115,8 +115,8 @@ impl HttpResponse {
     /// [`stream`]'s availability
     ///
     /// [`stream`]: HttpStream
-    pub fn has_body(&self) -> Result<bool> {
-        Ok(self.stream.get_ref().is_ready()?)
+    pub fn has_body(&mut self) -> Result<bool> {
+        Ok(self.body.is_some() || !self.stream.fill_buf()?.is_empty())
     }
 
     /// Reads the response's body into [writer](Write)

crates/http/src/stream.rs

@@ -1,10 +1,13 @@
+use core::fmt;
 use std::{
-    cmp::min,
     io::{self, Read, Write},
     net::TcpStream,
     time::Duration,
 };
 
+pub trait ReadWrite: Read + Write {}
+impl<T: Read + Write> ReadWrite for T {}
+
 #[derive(Debug)]
 struct StringStream(Vec<u8>, usize);
 
@@ -27,24 +30,31 @@ impl Read for StringStream {
 }
 
 impl StringStream {
-    fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
-        if buf.is_empty() || self.1 >= self.0.len() {
-            return Ok(0);
-        }
-        let src = &self.0[self.1..];
-        let n = min(buf.len(), src.len());
-        buf[..n].copy_from_slice(src);
-        Ok(n)
+    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
+        let min = usize::min(buf.len(), self.0.len() - self.1);
+        buf[..min].copy_from_slice(&self.0[self.1..self.1 + min]);
+        Ok(min)
     }
 }
 
-#[derive(Debug)]
 enum HttpStreamInner {
     Tcp(TcpStream),
     String(StringStream, Vec<u8>),
+    Dyn(Box<dyn ReadWrite>),
     Dummy,
 }
 
+impl fmt::Debug for HttpStreamInner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Tcp(arg0) => f.debug_tuple("Tcp").field(arg0).finish(),
+            Self::String(arg0, arg1) => f.debug_tuple("String").field(arg0).field(arg1).finish(),
+            Self::Dyn(_) => write!(f, "Dyn"),
+            Self::Dummy => write!(f, "Dummy"),
+        }
+    }
+}
+
 /// Holds a "stream" for a [`request`]
 /// This is an object where the http request can read and write to.
 ///
@@ -86,32 +96,27 @@ impl HttpStream {
     pub fn set_read_timeout(&self, d: Option<Duration>) -> io::Result<()> {
         match &self.inner {
             HttpStreamInner::Tcp(tcp_stream) => tcp_stream.set_read_timeout(d),
-            HttpStreamInner::Dummy | HttpStreamInner::String(..) => Ok(()),
+            HttpStreamInner::Dyn(_) | HttpStreamInner::Dummy | HttpStreamInner::String(..) => {
+                Ok(())
+            }
         }
     }
-    pub fn peek(&self, buf: &mut [u8]) -> std::io::Result<usize> {
+
+    pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
         match &self.inner {
-            HttpStreamInner::Tcp(tcp_stream) => tcp_stream.peek(buf),
-            HttpStreamInner::Dummy => Ok(0),
-            HttpStreamInner::String(read, _) => read.peek(buf),
+            HttpStreamInner::Tcp(tcp) => tcp.peek(buf),
+            HttpStreamInner::String(input, _) => input.peek(buf),
+            HttpStreamInner::Dyn(_) | HttpStreamInner::Dummy => Ok(0),
         }
     }
-    pub fn is_ready(&self) -> std::io::Result<bool> {
-        let mut buf = [0_u8; 1];
-        let n = match &self.inner {
-            HttpStreamInner::Tcp(tcp_stream) => tcp_stream.peek(&mut buf)?,
-            HttpStreamInner::String(string_stream, _) => string_stream.peek(&mut buf)?,
-            HttpStreamInner::Dummy => 0,
-        };
-        Ok(n > 0)
-    }
 }
 
 impl Read for HttpStream {
     fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
         match &mut self.inner {
             HttpStreamInner::Tcp(tcp_stream) => tcp_stream.read(buf),
             HttpStreamInner::Dummy => Ok(0),
+            HttpStreamInner::Dyn(d) => d.read(buf),
             HttpStreamInner::String(buf_reader, _) => buf_reader.read(buf),
         }
     }
@@ -122,13 +127,15 @@ impl Write for HttpStream {
         match &mut self.inner {
             HttpStreamInner::Tcp(tcp_stream) => tcp_stream.write(buf),
             HttpStreamInner::Dummy => Ok(0),
+            HttpStreamInner::Dyn(d) => d.write(buf),
             HttpStreamInner::String(_, w) => w.write(buf),
         }
     }
 
     fn flush(&mut self) -> std::io::Result<()> {
         match &mut self.inner {
             HttpStreamInner::Tcp(tcp_stream) => tcp_stream.flush(),
+            HttpStreamInner::Dyn(d) => d.flush(),
             HttpStreamInner::Dummy | HttpStreamInner::String(..) => Ok(()),
         }
     }
@@ -165,4 +172,11 @@ impl HttpStream {
             inner: HttpStreamInner::Dummy,
         }
     }
+
+    #[must_use]
+    pub fn from_boxed_dyn(d: Box<dyn ReadWrite>) -> Self {
+        Self {
+            inner: HttpStreamInner::Dyn(d),
+        }
+    }
 }

crates/server/Cargo.toml

@@ -2,7 +2,7 @@
 name = "http-srv"
 description = "Http Server"
 authors = ["Saúl Valdelvira <saul@saulv.es>"]
-version = "0.7.0"
+version = "0.8.0"
 edition = "2024"
 license = "GPL-3.0-only"
 readme = "README"
@@ -12,7 +12,7 @@ repository = "https://github.com/saulvaldelvira/http-server"
 http.workspace = true
 mime = { package = "rmime", version = ">=0.1.0", path = "../mime" }
 regexpr = { version = ">=0.3.3", git = "https://github.com/saulvaldelvira/regexpr", optional = true }
-pool = { package = "job-pool", version = ">=0.1.0", git = "https://github.com/saulvaldelvira/job-pool" }
+pool = { package = "job-pool", version = ">=0.4.0", git = "https://github.com/saulvaldelvira/job-pool" }
 jsonrs = { package = "jsonrs", version = ">=0.1.4", git = "https://github.com/saulvaldelvira/json.rs" }
 delay_init = { package = "delay_init" , version = ">=0.2.0", git = "https://github.com/saulvaldelvira/delay-init" }
 base64 = { package = "rb64", version = ">=0.1.0", git = "https://github.com/saulvaldelvira/rb64" }

crates/server/src/config.rs

@@ -60,7 +60,7 @@ fn get_default_conf_file() -> Option<PathBuf> {
 ///
 /// let pool_conf = PoolConfig::builder()
 ///                 .n_workers(120_u16)
-///                 .build().unwrap();
+///                 .build();
 /// let conf =
 /// ServerConfig::default()
 ///     .port(8080)
@@ -117,7 +117,7 @@ impl ServerConfig {
             match arg.as_ref() {
                 "-p" | "--port" => conf.port = parse_next!(),
                 "-n" | "-n-workers" => {
-                    pool_conf_builder.n_workers(parse_next!(as u16));
+                    pool_conf_builder.set_n_workers(parse_next!(as u16));
                 }
                 "-d" | "--dir" => {
                     let path: String = parse_next!();
@@ -140,6 +140,8 @@ impl ServerConfig {
                 "-h" | "--help" => help(),
                 unknown => return Err(format!("Unknow argument: {unknown}").into()),
             }
+
+            conf.pool_conf = pool_conf_builder.build();
         }
 
         log_info!("{conf:#?}");