feat: cyper support

Author: George-Miao

.gitignore

@@ -4,4 +4,5 @@
 *.env
 output.json
 /.direnv
-/.vscode
+/.vscode
+/.zed

Cargo.toml

@@ -17,17 +17,18 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
-default    = ["builder", "native-tls"]
-rustls-tls = ["reqwest/rustls-tls"]
-native-tls = ["reqwest/default-tls"]
+default    = ["builder", "native-tls", "reqwest"]
+reqwest    = ["dep:reqwest"]
+cyper      = ["dep:cyper"]
+rustls-tls = ["reqwest?/rustls", "cyper?/rustls"]
+native-tls = ["reqwest?/default-tls", "cyper?/native-tls"]
 
 # enables typed-builder on args types
 builder = ["dep:typed-builder"]
 
 [dependencies]
 typed-builder = { version = "0.18.2", optional = true }
 serde         = { version = "1.0.202", features = ["derive"] }
-reqwest       = { version = "0.12.4", default-features = false, features = ["charset", "http2", "macos-system-configuration", "json", "multipart"] }
 url           = { version = "2.5.0", features = ["serde"] }
 
 mod_use     = "0.2.1"
@@ -39,8 +40,28 @@ thiserror   = "1.0.61"
 tracing     = "0.1.40"
 serde_json  = "1.0.117"
 bytes       = "1.6.0"
+cfg-if      = "1.0.4"
+http        = "1.1.0"
+mime        = "0.3.17"
+
+# HTTP Client
+# compio / cyper
+[dependencies.cyper]
+version = "0.8"
+optional = true
+default-features = false
+features = ["json", "multipart"]
+
+# tokio / reqwest
+[dependencies.reqwest]
+version = "0.13"
+optional = true
+default-features = false
+features = ["json", "form", "multipart", "query"]
+
 [dev-dependencies]
 tokio = { version = "1.27.0", features = ["full"] }
+compio = { version = "0.18.0", features = ["all"] }
 
 dotenv             = "0.15.0"
 tracing-subscriber = "0.3.16"

README.md

@@ -22,7 +22,7 @@ or manually add to `Cargo.toml`:
 
 ```toml
 [dependencies]
-qbit-rs = "0.4"
+qbit-rs = "0.5"
 ```
 
 Then use it in your code:
@@ -48,10 +48,20 @@ let api = Qbit::builder()
 let torrents = api.get_version().await;
 ```
 
-For more methods, see [`Qbit`](https://docs.rs/qbit-rs/latest/qbit_rs/struct.Qbit.html).
+## HTTP Client
+
+The crate by default uses `reqwest` as the HTTP client. It also supports [`cyper`](https://github.com/compio-rs/cyper) (HTTP client for [`compio`](https://github.com/compio-rs/compio) based on hyper) under the `cyper` feature flag. To uses it, disable default features and enable `cyper`:
+
+```bash
+cargo add qbit-rs --no-default-features --features cyper
+```
+
+Notice that this will also disable tls and `typed-builder` support for args. Make sure to enable `builder`, `native-tls` or `rustls-tls` if you need them.
 
 ## API Coverage
 
+For all methods, see [`Qbit`](https://docs.rs/qbit-rs/latest/qbit_rs/struct.Qbit.html).
+
 Most of the API is covered, except `RSS` and `Search`. PR is welcomed if you need that part of the API. The following is a list of the implementation status:
 
 1. [x] Authentication
@@ -154,4 +164,4 @@ Most of the API is covered, except `RSS` and `Search`. PR is welcomed if you nee
 1. Undocumented
    1. [x] [Export torrent](https://docs.rs/qbit-rs/latest/qbit_rs/struct.Qbit.html#method.export_torrent)[^1]
 
-[^1]: The endpoint is added in [this PR](https://github.com/qbittorrent/qBittorrent/pull/16968)
+[^1]: The endpoint is added in [this PR](https://github.com/qbittorrent/qBittorrent/pull/16968)

flake.nix

@@ -43,6 +43,7 @@
             llvm.libstdcxxClang
             openssl
             pkg-config
+            cargo-nextest
           ]
           ++ (
             if

src/builder.rs

@@ -2,11 +2,10 @@
 
 use std::{fmt::Debug, sync::Mutex};
 
-use reqwest::Client;
 use tap::Pipe;
 use url::Url;
 
-use crate::{LoginState, Qbit, ext::Cookie, model::Credential};
+use crate::{Client, LoginState, Qbit, ext::Cookie, model::Credential};
 
 pub struct QbitBuilder<C = (), R = (), E = ()> {
     credential: C,
@@ -84,7 +83,7 @@ impl<C, R, E> QbitBuilder<C, R, E> {
     }
 }
 
-impl<C, U> QbitBuilder<C, reqwest::Client, U>
+impl<C, U> QbitBuilder<C, Client, U>
 where
     C: IntoLoginState,
     U: TryInto<Url>,
@@ -109,14 +108,14 @@ where
     U::Error: Debug,
 {
     pub fn build(self) -> Qbit {
-        self.client(reqwest::Client::new()).build()
+        self.client(Client::new()).build()
     }
 }
 
 #[test]
 fn test_builder() {
     QbitBuilder::new()
-        .client(reqwest::Client::new())
+        .client(Client::new())
         .endpoint("http://localhost:8080")
         .credential(Credential::new("admin", "adminadmin"))
         .build();
@@ -127,7 +126,7 @@ fn test_builder() {
         .build();
 
     QbitBuilder::new()
-        .client(reqwest::Client::new())
+        .client(Client::new())
         .endpoint("http://localhost:8080")
         .cookie("SID=1234567890")
         .build();

src/client.rs

@@ -0,0 +1,67 @@
+#![allow(unused_imports)]
+
+cfg_if::cfg_if! {
+    if #[cfg(all(feature = "reqwest", feature = "cyper"))] {
+        compile_error!("The 'reqwest' and 'cyper' features cannot be enabled at the same time. To use `cyper`, disable default feature first.");
+    } else if #[cfg(feature = "reqwest")] {
+        pub(crate) use reqwest::{Client, Error, Method, Response, StatusCode, Url, get, header, multipart};
+    } else if #[cfg(feature = "cyper")] {
+        pub(crate) use cyper::{Client, Response, Error, multipart};
+        pub(crate) use url::Url;
+        pub(crate) use http::{Method, StatusCode, header};
+        pub(crate) use cyper_ext::*;
+    } else {
+        compile_error!("Either the 'reqwest' or 'compio' feature must be enabled");
+    }
+}
+
+pub(crate) trait CheckError: Sized {
+    type Ok;
+    type Error;
+    fn check(self) -> Result<Self::Ok, Self::Error>;
+}
+
+#[cfg(feature = "reqwest")]
+impl CheckError for reqwest::RequestBuilder {
+    type Error = reqwest::Error;
+    type Ok = reqwest::RequestBuilder;
+
+    #[inline(always)]
+    fn check(self) -> Result<Self, Self::Error> {
+        Ok(self)
+    }
+}
+
+#[cfg(feature = "cyper")]
+mod cyper_ext {
+    use cyper::multipart::Part;
+    use mime::FromStrError;
+
+    use super::*;
+
+    pub(crate) trait PartExt: Sized {
+        fn mime_str(self, mime: &str) -> Result<Part, FromStrError>;
+    }
+
+    impl PartExt for multipart::Part {
+        fn mime_str(self, mime: &str) -> Result<Part, FromStrError> {
+            let mime = mime.parse()?;
+            Ok(self.mime(mime))
+        }
+    }
+
+    #[cfg(test)]
+    pub(crate) async fn get<T: cyper::IntoUrl>(url: T) -> Result<Response, cyper::Error> {
+        Client::new().get(url)?.send().await
+    }
+
+    impl<T> CheckError for cyper::Result<T> {
+        type Error = cyper::Error;
+        type Ok = T;
+
+        #[inline(always)]
+        fn check(self) -> Result<T, Self::Error> {
+            self
+        }
+    }
+}

src/ext.rs

@@ -1,7 +1,6 @@
-use reqwest::{Response, StatusCode, header::SET_COOKIE};
 use tap::Pipe;
 
-use crate::{ApiError, Error, Result};
+use crate::{ApiError, Error, Response, Result, StatusCode, header::SET_COOKIE};
 
 pub trait FromResponse {
     fn from_response(response: &Response) -> Result<Self>