tests for stream

Author: jayjamesjay

Cargo.lock

@@ -1,6 +1,6 @@
 # http_req
 > [!CAUTION]
-> V0.11.0 introduces major changes to design of `RequestBuilder` and `Request`. Please review [documentation](https://docs.rs/http_req/0.11.0/http_req/) before migrating from previous versions.
+> v0.11.0 introduces major changes to design of `RequestBuilder` and `Request`. Please review [documentation](https://docs.rs/http_req/0.11.0/http_req/) before migrating from previous versions.
 
 [![Rust](https://github.com/jayjamesjay/http_req/actions/workflows/rust.yml/badge.svg)](https://github.com/jayjamesjay/http_req/actions/workflows/rust.yml)
 [![Crates.io](https://img.shields.io/badge/crates.io-v0.11.0-orange.svg?longCache=true)](https://crates.io/crates/http_req)

README.md

@@ -1,14 +1,13 @@
-//! implements the wire protocol for HTTP's "chunked" Transfer-Encoding.
+//! support for Transfer-Encoding: chunked
 use crate::CR_LF;
-///
-/// It's a Rust version of the reference implementation in [Go][1].
-///
-/// [1]: https://golang.google.cn/src/net/http/internal/chunked.go
-///
 use std::io::{self, BufRead, BufReader, Error, ErrorKind, Read};
 
 const MAX_LINE_LENGTH: usize = 4096;
 
+/// Implements the wire protocol for HTTP's Transfer-Encoding: chunked.
+///
+/// It's a Rust version of the [reference implementation in Go](https://golang.google.cn/src/net/http/internal/chunked.go)
+///
 pub struct ChunkReader<R> {
     check_end: bool,
     eof: bool,
@@ -103,7 +102,10 @@ impl<R: Read> BufRead for ChunkReader<R> {
     }
 }
 
-impl<R: Read> From<BufReader<R>> for ChunkReader<R> {
+impl<R> From<BufReader<R>> for ChunkReader<R>
+where
+    R: Read,
+{
     fn from(value: BufReader<R>) -> Self {
         ChunkReader {
             check_end: false,
@@ -119,6 +121,7 @@ impl<R> ChunkReader<R>
 where
     R: Read,
 {
+    /// Creates a new `ChunkReader` from `reader`
     pub fn new(reader: R) -> Self
     where
         R: Read,

src/chunked.rs

@@ -10,8 +10,6 @@ pub enum ParseErr {
     UriErr,
     Invalid,
     Empty,
-    #[cfg(feature = "rust-tls")]
-    Rustls(rustls::Error),
 }
 
 impl error::Error for ParseErr {
@@ -22,8 +20,6 @@ impl error::Error for ParseErr {
             Utf8(e) => Some(e),
             Int(e) => Some(e),
             StatusErr | HeadersErr | UriErr | Invalid | Empty => None,
-            #[cfg(feature = "rust-tls")]
-            Rustls(e) => Some(e),
         }
     }
 }
@@ -40,20 +36,11 @@ impl fmt::Display for ParseErr {
             StatusErr => "status line contains invalid values",
             HeadersErr => "headers contain invalid values",
             UriErr => "uri contains invalid characters",
-            #[cfg(feature = "rust-tls")]
-            Rustls(_) => "rustls error",
         };
         write!(f, "ParseErr: {}", err)
     }
 }
 
-#[cfg(feature = "rust-tls")]
-impl From<rustls::Error> for ParseErr {
-    fn from(e: rustls::Error) -> Self {
-        ParseErr::Rustls(e)
-    }
-}
-
 impl From<num::ParseIntError> for ParseErr {
     fn from(e: num::ParseIntError) -> Self {
         ParseErr::Int(e)
@@ -93,9 +80,9 @@ impl fmt::Display for Error {
 
         let err = match self {
             IO(_) => "IO error",
-            Tls => "TLS error",
-            Timeout(_) => "Timeout error",
             Parse(err) => return err.fmt(f),
+            Timeout(_) => "Timeout error",
+            Tls => "TLS error",
         };
         write!(f, "Error: {}", err)
     }
@@ -138,3 +125,10 @@ impl From<mpsc::RecvTimeoutError> for Error {
         Error::Timeout(e)
     }
 }
+
+#[cfg(feature = "rust-tls")]
+impl From<rustls::Error> for Error {
+    fn from(_e: rustls::Error) -> Self {
+        Error::Tls
+    }
+}

src/error.rs

@@ -16,7 +16,7 @@ use std::{
 };
 
 const CR_LF: &str = "\r\n";
-const DEFAULT_REQ_TIMEOUT: u64 = 12 * 60 * 60;
+const DEFAULT_REQ_TIMEOUT: u64 = 60 * 60;
 
 /// HTTP request methods
 #[derive(Debug, PartialEq, Clone, Copy)]
@@ -601,7 +601,7 @@ impl<'a> Request<'a> {
         });
 
         //Receive and process `head` of the response.
-        raw_response_head.receive(&receiver, deadline);
+        raw_response_head.receive(&receiver, deadline)?;
 
         let response = Response::from_head(&raw_response_head)?;
         let content_len = response.content_len().unwrap_or(1);
@@ -622,7 +622,7 @@ impl<'a> Request<'a> {
 
         //Receive and process `body`` of the response.
         if content_len > 0 {
-            writer.receive_all(&receiver, deadline);
+            writer.receive_all(&receiver, deadline)?;
         }
 
         Ok(response)
@@ -874,6 +874,16 @@ mod tests {
         assert_eq!(request.write_timeout, Some(Duration::from_nanos(100)));
     }
 
+    #[test]
+    fn request_timeout() {
+        let uri = Uri::try_from(URI).unwrap();
+        let mut request = Request::new(&uri);
+        let timeout = Duration::from_secs(360);
+
+        request.timeout(timeout);
+        assert_eq!(request.timeout, timeout);
+    }
+
     #[test]
     fn request_send() {
         let mut writer = Vec::new();
@@ -885,7 +895,7 @@ mod tests {
 
     #[ignore]
     #[test]
-    fn request_get() {
+    fn fn_get() {
         let mut writer = Vec::new();
         let res = get(URI, &mut writer).unwrap();
 
@@ -899,7 +909,7 @@ mod tests {
 
     #[ignore]
     #[test]
-    fn request_head() {
+    fn fn_head() {
         let res = head(URI).unwrap();
         assert_ne!(res.status_code(), UNSUCCESS_CODE);
 
@@ -909,7 +919,7 @@ mod tests {
 
     #[ignore]
     #[test]
-    fn request_post() {
+    fn fn_post() {
         let mut writer = Vec::new();
         let res = post(URI, &BODY, &mut writer).unwrap();