replace isahc by reqwest

Author: irevoire

Cargo.toml

@@ -23,23 +23,18 @@ yaup = "0.2.0"
 either = { version = "1.8.0", features = ["serde"] }
 thiserror = "1.0.37"
 meilisearch-index-setting-macro = { path = "meilisearch-index-setting-macro", version = "0.25.0" }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-futures = "0.3"
-futures-io = "0.3.26"
-isahc = { version = "1.0", features = ["http2", "text-decoding"], optional = true, default_features = false }
+tokio-util = { version = "0.7.10", default-features = false, features = ["io", "compat"] }
+reqwest = { version = "0.12.3", optional = true, default-features = false, features = ["rustls-tls", "http2", "stream"] }
 uuid = { version = "1.1.2", features = ["v4"] }
+futures-io = "0.3.30"
+futures = "0.3"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = "0.3.47"
-web-sys = { version = "0.3", features = ["RequestInit", "Headers", "Window", "Response", "console"] }
-wasm-bindgen = "0.2"
-wasm-bindgen-futures = "0.4"
+uuid = { version = "1.8.0", default-features = false, features = ["v4", "js"] }
 
 [features]
-default = ["isahc", "isahc", "isahc-static-curl"]
-isahc-static-curl = ["isahc", "isahc", "isahc/static-curl"]
-isahc-static-ssl = ["isahc/static-ssl"]
+default = ["reqwest"]
+reqwest = ["dep:reqwest"]
 
 [dev-dependencies]
 futures-await-test = "0.3"

meilisearch-index-setting-macro/src/lib.rs

@@ -128,7 +128,7 @@ fn get_index_config_implementation(
 
     quote! {
         #[::meilisearch_sdk::macro_helper::async_trait(?Send)]
-        impl ::meilisearch_sdk::documents::IndexConfig<::meilisearch_sdk::request::IsahcClient> for #struct_ident {
+        impl ::meilisearch_sdk::documents::IndexConfig<::meilisearch_sdk::request::ReqwestClient> for #struct_ident {
             const INDEX_STR: &'static str = #index_name;
 
             fn generate_settings() -> ::meilisearch_sdk::settings::Settings {
@@ -140,7 +140,7 @@ fn get_index_config_implementation(
             #distinct_attr_token
         }
 
-         async fn generate_index(client: &::meilisearch_sdk::client::Client<::meilisearch_sdk::request::IsahcClient>) -> std::result::Result<::meilisearch_sdk::indexes::Index<::meilisearch_sdk::request::IsahcClient>, ::meilisearch_sdk::tasks::Task> {
+         async fn generate_index(client: &::meilisearch_sdk::client::Client<::meilisearch_sdk::request::ReqwestClient>) -> std::result::Result<::meilisearch_sdk::indexes::Index<::meilisearch_sdk::request::ReqwestClient>, ::meilisearch_sdk::tasks::Task> {
             return client.create_index(#index_name, #primary_key_token)
                 .await.unwrap()
                 .wait_for_completion(&client, ::std::option::Option::None, ::std::option::Option::None)

src/client.rs

@@ -129,7 +129,7 @@ impl<'a, Http: HttpClient> DocumentQuery<'a, Http> {
     /// # let MEILISEARCH_API_KEY = option_env!("MEILISEARCH_API_KEY").unwrap_or("masterKey");
     /// #
     /// # let client = Client::new(MEILISEARCH_URL, Some(MEILISEARCH_API_KEY));
-    /// # futures::executor::block_on(async move {
+    /// # tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
     /// #[derive(Debug, Serialize, Deserialize, PartialEq)]
     /// struct MyObject {
     ///     id: String,
@@ -294,7 +294,7 @@ impl<'a, Http: HttpClient> DocumentsQuery<'a, Http> {
     /// # let MEILISEARCH_API_KEY = option_env!("MEILISEARCH_API_KEY").unwrap_or("masterKey");
     /// #
     /// # let client = Client::new(MEILISEARCH_URL, Some(MEILISEARCH_API_KEY));
-    /// # futures::executor::block_on(async move {
+    /// # tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
     /// # let index = client.create_index("documents_query_execute", None).await.unwrap().wait_for_completion(&client, None, None).await.unwrap().try_make_index(&client).unwrap();
     /// #[derive(Debug, Serialize, Deserialize, PartialEq)]
     /// struct MyObject {
@@ -355,7 +355,7 @@ impl<'a, Http: HttpClient> DocumentDeletionQuery<'a, Http> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{client::Client, errors::*, indexes::*, request::IsahcClient};
+    use crate::{client::Client, errors::*, indexes::*};
     use meilisearch_test_macro::meilisearch_test;
     use serde::{Deserialize, Serialize};
 
@@ -367,10 +367,7 @@ mod tests {
 
     #[allow(unused)]
     #[derive(IndexConfig)]
-    struct MovieClips
-    where
-        IsahcClient: HttpClient,
-    {
+    struct MovieClips {
         #[index_config(primary_key)]
         movie_id: u64,
         #[index_config(distinct)]
@@ -387,10 +384,7 @@ mod tests {
 
     #[allow(unused)]
     #[derive(IndexConfig)]
-    struct VideoClips
-    where
-        IsahcClient: HttpClient,
-    {
+    struct VideoClips {
         video_id: u64,
     }
 

src/documents.rs

@@ -19,7 +19,7 @@
 //! # use meilisearch_sdk::{client::*, errors::*, dumps::*, dumps::*, task_info::*, tasks::*};
 //! # use futures_await_test::async_test;
 //! # use std::{thread::sleep, time::Duration};
-//! # futures::executor::block_on(async move {
+//! # tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
 //! #
 //! # let MEILISEARCH_URL = option_env!("MEILISEARCH_URL").unwrap_or("http://localhost:7700");
 //! # let MEILISEARCH_API_KEY = option_env!("MEILISEARCH_API_KEY").unwrap_or("masterKey");
@@ -54,7 +54,7 @@ impl<Http: HttpClient> Client<Http> {
     /// # use meilisearch_sdk::{client::*, errors::*, dumps::*, dumps::*, task_info::*, tasks::*};
     /// # use futures_await_test::async_test;
     /// # use std::{thread::sleep, time::Duration};
-    /// # futures::executor::block_on(async move {
+    /// # tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
     /// #
     /// # let MEILISEARCH_URL = option_env!("MEILISEARCH_URL").unwrap_or("http://localhost:7700");
     /// # let MEILISEARCH_API_KEY = option_env!("MEILISEARCH_API_KEY").unwrap_or("masterKey");

src/dumps.rs

@@ -13,10 +13,6 @@ pub enum Error {
     Meilisearch(#[from] MeilisearchError),
     #[error(transparent)]
     MeilisearchCommunication(#[from] MeilisearchCommunicationError),
-    /// There is no Meilisearch server listening on the [specified host]
-    /// (../client/struct.Client.html#method.new).
-    #[error("The Meilisearch server can't be reached.")]
-    UnreachableServer,
     /// The Meilisearch server returned an invalid JSON for a request.
     #[error("Error parsing response JSON: {}", .0)]
     ParseError(#[from] serde_json::Error),
@@ -46,15 +42,9 @@ pub enum Error {
     InvalidTenantToken(#[from] jsonwebtoken::errors::Error),
 
     /// The http client encountered an error.
-    #[cfg(feature = "isahc")]
-    #[cfg(not(target_arch = "wasm32"))]
-    #[error("HTTP request failed: {}", .0)]
-    HttpError(isahc::Error),
-
-    /// The http client encountered an error.
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(feature = "reqwest")]
     #[error("HTTP request failed: {}", .0)]
-    HttpError(String),
+    HttpError(#[from] reqwest::Error),
 
     // The library formatting the query parameters encountered an error.
     #[error("Internal Error: could not parse the query parameters: {}", .0)]
@@ -277,27 +267,16 @@ impl std::fmt::Display for ErrorCode {
     }
 }
 
-#[cfg(feature = "isahc")]
-#[cfg(not(target_arch = "wasm32"))]
-impl From<isahc::Error> for Error {
-    fn from(error: isahc::Error) -> Error {
-        if error.kind() == isahc::error::ErrorKind::ConnectionFailed {
-            Error::UnreachableServer
-        } else {
-            Error::HttpError(error)
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
 
     use jsonwebtoken::errors::ErrorKind::InvalidToken;
+    use meilisearch_test_macro::meilisearch_test;
     use uuid::Uuid;
 
-    #[test]
-    fn test_meilisearch_error() {
+    #[meilisearch_test]
+    async fn test_meilisearch_error() {
         let error: MeilisearchError = serde_json::from_str(
             r#"
 {
@@ -329,8 +308,8 @@ mod test {
         assert_eq!(error.error_type, ErrorType::Unknown);
     }
 
-    #[test]
-    fn test_error_message_parsing() {
+    #[meilisearch_test]
+    async fn test_error_message_parsing() {
         let error: MeilisearchError = serde_json::from_str(
             r#"
 {
@@ -366,12 +345,6 @@ mod test {
             "MeilisearchCommunicationError: The server responded with a 404.\nurl: http://localhost:7700/something"
         );
 
-        let error = Error::UnreachableServer;
-        assert_eq!(
-            error.to_string(),
-            "The Meilisearch server can't be reached."
-        );
-
         let error = Error::Timeout;
         assert_eq!(error.to_string(), "A task did not succeed in time.");
 
@@ -411,10 +384,19 @@ mod test {
             "Error parsing response JSON: invalid type: map, expected a string at line 2 column 8"
         );
 
-        let error = Error::HttpError(isahc::post("test_url", "test_body").unwrap_err());
+        let error = Error::HttpError(
+            reqwest::Client::new()
+                .execute(reqwest::Request::new(
+                    reqwest::Method::POST,
+                    // there will never be a `meilisearch.gouv.fr` addr since these domain name are controlled by the state of france
+                    reqwest::Url::parse("https://meilisearch.gouv.fr").unwrap(),
+                ))
+                .await
+                .unwrap_err(),
+        );
         assert_eq!(
             error.to_string(),
-            "HTTP request failed: failed to resolve host name"
+            "HTTP request failed: error sending request for url (https://meilisearch.gouv.fr/)"
         );
 
         let error = Error::InvalidTenantToken(jsonwebtoken::errors::Error::from(InvalidToken));

src/errors.rs

@@ -58,7 +58,7 @@ impl<'a, Http: HttpClient> ExperimentalFeatures<'a, Http> {
     /// # let MEILISEARCH_URL = option_env!("MEILISEARCH_URL").unwrap_or("http://localhost:7700");
     /// # let MEILISEARCH_API_KEY = option_env!("MEILISEARCH_API_KEY").unwrap_or("masterKey");
     /// # let client = Client::new(MEILISEARCH_URL, Some(MEILISEARCH_API_KEY));
-    /// futures::executor::block_on(async move {
+    /// tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
     ///     let features = ExperimentalFeatures::new(&client);
     ///     features.get().await.unwrap();
     /// });
@@ -85,7 +85,7 @@ impl<'a, Http: HttpClient> ExperimentalFeatures<'a, Http> {
     /// # let MEILISEARCH_URL = option_env!("MEILISEARCH_URL").unwrap_or("http://localhost:7700");
     /// # let MEILISEARCH_API_KEY = option_env!("MEILISEARCH_API_KEY").unwrap_or("masterKey");
     /// # let client = Client::new(MEILISEARCH_URL, Some(MEILISEARCH_API_KEY));
-    /// futures::executor::block_on(async move {
+    /// tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
     ///     let mut features = ExperimentalFeatures::new(&client);
     ///     features.set_vector_store(true);
     ///     features.update().await.unwrap();