Refactoring using async-curl v0.2.0

Cargo.toml

@@ -11,7 +11,7 @@ documentation = "https://docs.rs/curl-http-client"
 readme = "README.md"
 
 [dependencies]
-async-curl = "0.1"
+async-curl = "0.2"
 curl = "0.4"
 derive-deref-rs = "0.1"
 http = "0.2"

README.md

@@ -7,14 +7,14 @@ that uses an actor model (Message passing) to achieve a non-blocking I/O.
 
 ## Get Request
 ```rust
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{collector::Collector, http_client::HttpClient, request::HttpRequest};
 use http::{HeaderMap, Method};
 use url::Url;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let collector = Collector::Ram(Vec::new());
 
     let request = HttpRequest {
@@ -36,14 +36,14 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 ## Post Request
 ```rust
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{collector::Collector, http_client::HttpClient, request::HttpRequest};
 use http::{HeaderMap, Method};
 use url::Url;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let collector = Collector::Ram(Vec::new());
 
     let request = HttpRequest {
@@ -67,7 +67,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 ```rust
 use std::path::PathBuf;
 
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{
     collector::{Collector, FileInfo},
     http_client::HttpClient,
@@ -78,7 +78,7 @@ use url::Url;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
 
     let collector = Collector::File(FileInfo::path(PathBuf::from("<FILE PATH TO SAVE>")));
 
@@ -103,7 +103,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 ```rust
 use std::{fs, path::PathBuf};
 
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{
     collector::{Collector, FileInfo},
     http_client::{FileSize, HttpClient},
@@ -117,7 +117,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let file_to_be_uploaded = PathBuf::from("<FILE PATH TO BE UPLOADED>");
     let file_size = fs::metadata(file_to_be_uploaded.as_path()).unwrap().len() as usize;
 
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let collector = Collector::File(FileInfo::path(file_to_be_uploaded));
 
     let request = HttpRequest {
@@ -140,7 +140,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 ## Concurrency
 ```rust
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{collector::Collector, http_client::HttpClient, request::HttpRequest};
 use futures::future;
 use http::{HeaderMap, Method};
@@ -150,7 +150,7 @@ use url::Url;
 async fn main() {
     const NUM_CONCURRENT: usize = 5;
 
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let mut handles = Vec::new();
 
     for _n in 0..NUM_CONCURRENT {
@@ -189,7 +189,7 @@ async fn main() {
 use std::fs;
 use std::path::PathBuf;
 
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{
     collector::{Collector, FileInfo},
     http_client::{BytesOffset, HttpClient},
@@ -200,7 +200,7 @@ use url::Url;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let save_to = PathBuf::from("<FILE PATH TO SAVE>");
     let collector = Collector::File(FileInfo::path(save_to.clone()));
 
@@ -226,7 +226,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 ```rust
 use std::path::PathBuf;
 
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{
     collector::{Collector, FileInfo},
     http_client::HttpClient,
@@ -240,7 +240,7 @@ use url::Url;
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let (tx, mut rx) = channel(1);
 
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let file_info = FileInfo::path(PathBuf::from("<FILE PATH TO SAVE>")).with_transfer_speed_sender(tx);
     let collector = Collector::File(file_info);
 
@@ -273,7 +273,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 ```rust
 use std::{fs, path::PathBuf};
 
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{
     collector::{Collector, FileInfo},
     http_client::{FileSize, HttpClient},
@@ -290,7 +290,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let file_to_be_uploaded = PathBuf::from("<FILE PATH TO BE UPLOADED>");
     let file_size = fs::metadata(file_to_be_uploaded.as_path()).unwrap().len() as usize;
 
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let file_info = FileInfo::path(file_to_be_uploaded).with_transfer_speed_sender(tx);
     let collector = Collector::File(file_info);
 

examples/asynchronous.rs

@@ -1,4 +1,4 @@
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{collector::Collector, http_client::HttpClient, request::HttpRequest};
 use futures::future;
 use http::{HeaderMap, Method};
@@ -8,7 +8,7 @@ use url::Url;
 async fn main() {
     const NUM_CONCURRENT: usize = 5;
 
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let mut handles = Vec::new();
 
     for _n in 0..NUM_CONCURRENT {

examples/download.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{
     collector::{Collector, FileInfo},
     http_client::HttpClient,
@@ -10,23 +10,24 @@ use http::{HeaderMap, Method};
 use url::Url;
 
 #[tokio::main(flavor = "current_thread")]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let curl = AsyncCurl::new();
+async fn main() {
+    let curl = CurlActor::new();
 
     let collector = Collector::File(FileInfo::path(PathBuf::from("<FILE PATH TO SAVE>")));
 
     let request = HttpRequest {
-        url: Url::parse("<SOURCE URL>")?,
+        url: Url::parse("<SOURCE URL>").unwrap(),
         method: Method::GET,
         headers: HeaderMap::new(),
         body: None,
     };
 
     let response = HttpClient::new(curl, collector)
-        .request(request)?
+        .request(request)
+        .unwrap()
         .perform()
-        .await?;
+        .await
+        .unwrap();
 
     println!("Response: {:?}", response);
-    Ok(())
 }

examples/get.rs

@@ -1,25 +1,26 @@
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{collector::Collector, http_client::HttpClient, request::HttpRequest};
 use http::{HeaderMap, Method};
 use url::Url;
 
 #[tokio::main(flavor = "current_thread")]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let curl = AsyncCurl::new();
+async fn main() {
+    let curl = CurlActor::new();
     let collector = Collector::Ram(Vec::new());
 
     let request = HttpRequest {
-        url: Url::parse("<SOURCE URL>")?,
+        url: Url::parse("<SOURCE URL>").unwrap(),
         method: Method::GET,
         headers: HeaderMap::new(),
         body: None,
     };
 
     let response = HttpClient::new(curl, collector)
-        .request(request)?
+        .request(request)
+        .unwrap()
         .perform()
-        .await?;
+        .await
+        .unwrap();
 
     println!("Response: {:?}", response);
-    Ok(())
 }

examples/post.rs

@@ -1,24 +1,26 @@
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{collector::Collector, http_client::HttpClient, request::HttpRequest};
 use http::{HeaderMap, Method};
 use url::Url;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let collector = Collector::Ram(Vec::new());
 
     let request = HttpRequest {
-        url: Url::parse("<TARGET URL>")?,
+        url: Url::parse("<TARGET URL>").unwrap(),
         method: Method::POST,
         headers: HeaderMap::new(),
         body: Some("test body".as_bytes().to_vec()),
     };
 
     let response = HttpClient::new(curl, collector)
-        .request(request)?
+        .request(request)
+        .unwrap()
         .perform()
-        .await?;
+        .await
+        .unwrap();
 
     println!("Response: {:?}", response);
     Ok(())

examples/resume_download.rs

@@ -1,7 +1,7 @@
 use std::fs;
 use std::path::PathBuf;
 
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{
     collector::{Collector, FileInfo},
     http_client::{BytesOffset, HttpClient},
@@ -12,23 +12,26 @@ use url::Url;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let save_to = PathBuf::from("<FILE PATH TO SAVE>");
     let collector = Collector::File(FileInfo::path(save_to.clone()));
 
     let partial_download_file_size = fs::metadata(save_to.as_path())?.len() as usize;
     let request = HttpRequest {
-        url: Url::parse("<SOURCE URL>")?,
+        url: Url::parse("<SOURCE URL>").unwrap(),
         method: Method::GET,
         headers: HeaderMap::new(),
         body: None,
     };
 
     let response = HttpClient::new(curl, collector)
-        .resume_from(BytesOffset::from(partial_download_file_size))?
-        .request(request)?
+        .resume_from(BytesOffset::from(partial_download_file_size))
+        .unwrap()
+        .request(request)
+        .unwrap()
         .perform()
-        .await?;
+        .await
+        .unwrap();
 
     println!("Response: {:?}", response);
     Ok(())

examples/upload.rs

@@ -1,6 +1,6 @@
 use std::{fs, path::PathBuf};
 
-use async_curl::async_curl::AsyncCurl;
+use async_curl::actor::CurlActor;
 use curl_http_client::{
     collector::{Collector, FileInfo},
     http_client::{FileSize, HttpClient},
@@ -14,21 +14,24 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let file_to_be_uploaded = PathBuf::from("<FILE PATH TO BE UPLOADED>");
     let file_size = fs::metadata(file_to_be_uploaded.as_path()).unwrap().len() as usize;
 
-    let curl = AsyncCurl::new();
+    let curl = CurlActor::new();
     let collector = Collector::File(FileInfo::path(file_to_be_uploaded));
 
     let request = HttpRequest {
-        url: Url::parse("<TARGET URL>")?,
+        url: Url::parse("<TARGET URL>").unwrap(),
         method: Method::PUT,
         headers: HeaderMap::new(),
         body: None,
     };
 
     let response = HttpClient::new(curl, collector)
-        .upload_file_size(FileSize::from(file_size))?
-        .request(request)?
+        .upload_file_size(FileSize::from(file_size))
+        .unwrap()
+        .request(request)
+        .unwrap()
         .perform()
-        .await?;
+        .await
+        .unwrap();
 
     println!("Response: {:?}", response);
     Ok(())

src/error.rs

@@ -1,8 +1,12 @@
+use std::fmt::Debug;
+
+use crate::collector::Collector;
+
 /// Error type returned by failed curl HTTP requests.
-#[derive(Debug, thiserror::Error)]
+#[derive(Debug)]
 pub enum Error {
-    #[error("curl request failed")]
-    Curl(String),
-    #[error("Other error: {}", _0)]
+    Curl(curl::Error),
+    Http(String),
+    Perform(async_curl::error::Error<Collector>),
     Other(String),
 }