improve parsing relative uri

jayjamesjay · Aug 15, 2024 · ce69208 · ce69208
1 parent f46dd1c
commit ce69208
Show file tree

Hide file tree

Showing 7 changed files with 199 additions and 84 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/advanced_request_get.rs b/examples/advanced_request_get.rs
@@ -24,7 +24,7 @@ fn main() {
         .parse();
 
     // Connects to a server. Uses information from `addr`.
-    let mut stream = Stream::new(&addr, Some(Duration::from_secs(60))).unwrap();
+    let mut stream = Stream::connect(&addr, Some(Duration::from_secs(60))).unwrap();
     stream = Stream::try_to_https(stream, &addr, None).unwrap();
 
     // Makes a request to server. Sends the prepared message.

diff --git a/src/chunked.rs b/src/chunked.rs
@@ -175,7 +175,7 @@ fn is_ascii_space(b: u8) -> bool {
     }
 }
 
-fn parse_hex_uint(data: Vec<u8>) -> Result<usize, &'static str> {
+fn parse_hex_uint<'a>(data: Vec<u8>) -> Result<usize, &'a str> {
     let mut n = 0usize;
     for (i, v) in data.iter().enumerate() {
         if i == 16 {

diff --git a/src/error.rs b/src/error.rs
@@ -29,13 +29,13 @@ impl fmt::Display for ParseErr {
         use self::ParseErr::*;
 
         let err = match self {
-            Utf8(_) => "invalid character",
-            Int(_) => "cannot parse number",
-            Invalid => "invalid value",
-            Empty => "nothing to parse",
-            StatusErr => "status line contains invalid values",
-            HeadersErr => "headers contain invalid values",
-            UriErr => "uri contains invalid characters",
+            Utf8(_) => "Invalid character",
+            Int(_) => "Cannot parse number",
+            Invalid => "Invalid value",
+            Empty => "Nothing to parse",
+            StatusErr => "Status line contains invalid values",
+            HeadersErr => "Headers contain invalid values",
+            UriErr => "URI contains invalid characters",
         };
         write!(f, "ParseErr: {}", err)
     }
@@ -57,8 +57,9 @@ impl From<str::Utf8Error> for ParseErr {
 pub enum Error {
     IO(io::Error),
     Parse(ParseErr),
-    Timeout(mpsc::RecvTimeoutError),
+    Timeout,
     Tls,
+    Thread,
 }
 
 impl error::Error for Error {
@@ -68,8 +69,7 @@ impl error::Error for Error {
         match self {
             IO(e) => Some(e),
             Parse(e) => Some(e),
-            Timeout(e) => Some(e),
-            Tls => None,
+            Timeout | Tls | Thread => None,
         }
     }
 }
@@ -81,27 +81,14 @@ impl fmt::Display for Error {
         let err = match self {
             IO(_) => "IO error",
             Parse(err) => return err.fmt(f),
-            Timeout(_) => "Timeout error",
+            Timeout => "Timeout error",
             Tls => "TLS error",
+            Thread => "Thread communication error",
         };
         write!(f, "Error: {}", err)
     }
 }
 
-#[cfg(feature = "native-tls")]
-impl From<native_tls::Error> for Error {
-    fn from(_e: native_tls::Error) -> Self {
-        Error::Tls
-    }
-}
-
-#[cfg(feature = "native-tls")]
-impl<T> From<native_tls::HandshakeError<T>> for Error {
-    fn from(_e: native_tls::HandshakeError<T>) -> Self {
-        Error::Tls
-    }
-}
-
 impl From<io::Error> for Error {
     fn from(e: io::Error) -> Self {
         Error::IO(e)
@@ -121,8 +108,8 @@ impl From<str::Utf8Error> for Error {
 }
 
 impl From<mpsc::RecvTimeoutError> for Error {
-    fn from(e: mpsc::RecvTimeoutError) -> Self {
-        Error::Timeout(e)
+    fn from(_e: mpsc::RecvTimeoutError) -> Self {
+        Error::Timeout
     }
 }
 
@@ -132,3 +119,23 @@ impl From<rustls::Error> for Error {
         Error::Tls
     }
 }
+
+#[cfg(feature = "native-tls")]
+impl From<native_tls::Error> for Error {
+    fn from(_e: native_tls::Error) -> Self {
+        Error::Tls
+    }
+}
+
+#[cfg(feature = "native-tls")]
+impl<T> From<native_tls::HandshakeError<T>> for Error {
+    fn from(_e: native_tls::HandshakeError<T>) -> Self {
+        Error::Tls
+    }
+}
+
+impl<T> From<mpsc::SendError<T>> for Error {
+    fn from(_e: mpsc::SendError<T>) -> Self {
+        Error::Thread
+    }
+}
diff --git a/src/request.rs b/src/request.rs
@@ -18,6 +18,7 @@ use std::{
 
 const CR_LF: &str = "\r\n";
 const DEFAULT_REQ_TIMEOUT: u64 = 60 * 60;
+const DEFAULT_CALL_TIMEOUT: u64 = 60;
 
 /// HTTP request methods
 #[derive(Debug, PartialEq, Clone, Copy)]
@@ -308,8 +309,8 @@ impl<'a> RequestMessage<'a> {
 
         let mut request_msg = (request_line + &headers + CR_LF).as_bytes().to_vec();
 
-        if let Some(b) = &self.body {
-            request_msg.extend(*b);
+        if let Some(b) = self.body {
+            request_msg.extend(b);
         }
 
         request_msg
@@ -363,9 +364,9 @@ impl<'a> Request<'a> {
         Request {
             messsage: message,
             redirect_policy: RedirectPolicy::default(),
-            connect_timeout: Some(Duration::from_secs(60)),
-            read_timeout: Some(Duration::from_secs(60)),
-            write_timeout: Some(Duration::from_secs(60)),
+            connect_timeout: Some(Duration::from_secs(DEFAULT_CALL_TIMEOUT)),
+            read_timeout: Some(Duration::from_secs(DEFAULT_CALL_TIMEOUT)),
+            write_timeout: Some(Duration::from_secs(DEFAULT_CALL_TIMEOUT)),
             timeout: Duration::from_secs(DEFAULT_REQ_TIMEOUT),
             root_cert_file_pem: None,
         }
@@ -613,8 +614,11 @@ impl<'a> Request<'a> {
     /// let request = Request::new(&uri)
     ///     .redirect_policy(RedirectPolicy::Limit(5));
     /// ```
-    pub fn redirect_policy(&mut self, policy: RedirectPolicy<fn() -> bool>) -> &mut Self {
-        self.redirect_policy = policy;
+    pub fn redirect_policy<T>(&mut self, policy: T) -> &mut Self
+    where
+        RedirectPolicy<fn() -> bool>: From<T>,
+    {
+        self.redirect_policy = RedirectPolicy::from(policy);
         self
     }
 
@@ -638,7 +642,7 @@ impl<'a> Request<'a> {
         T: Write,
     {
         // Set up a stream.
-        let mut stream = Stream::new(self.messsage.uri, self.connect_timeout)?;
+        let mut stream = Stream::connect(self.messsage.uri, self.connect_timeout)?;
         stream.set_read_timeout(self.read_timeout)?;
         stream.set_write_timeout(self.write_timeout)?;
         stream = Stream::try_to_https(stream, self.messsage.uri, self.root_cert_file_pem)?;
@@ -689,7 +693,7 @@ impl<'a> Request<'a> {
         }
 
         let params = response.basic_info(&self.messsage.method).to_vec();
-        sender_supp.send(params).unwrap();
+        sender_supp.send(params)?;
 
         // Receive and process `body` of the response.
         let content_len = response.content_len().unwrap_or(1);