fix: implementation of std::marker::Send is not general enough for ws client

Author: Mettwasser

src/worldstate/client.rs

@@ -13,7 +13,6 @@ use std::{
 };
 
 use moka::future::Cache;
-use reqwest::StatusCode;
 
 use super::{
     Queryable,
@@ -81,8 +80,8 @@ type ItemCache = Cache<(Language, Box<str>), Option<Item>>;
 #[derive(Debug, Clone)]
 pub struct Client {
     pub(crate) http: reqwest::Client,
-    pub(crate) base_url: String,
-    pub(crate) config: ClientConfig,
+    pub(crate) base_url: Arc<str>,
+    pub(crate) config: Arc<ClientConfig>,
     type_cache: TypeCache,
     items_cache: ItemCache,
 }
@@ -94,8 +93,8 @@ impl Default for Client {
     fn default() -> Self {
         Self {
             http: reqwest::Client::new(),
-            base_url: "https://api.warframestat.us".to_owned(),
-            config: ClientConfig::default(),
+            base_url: "https://api.warframestat.us".into(),
+            config: Arc::new(ClientConfig::default()),
             type_cache: Cache::builder()
                 .time_to_live(Duration::from_mins(5))
                 .build(),
@@ -111,15 +110,15 @@ impl Client {
     #[must_use]
     pub fn new(
         reqwest_client: reqwest::Client,
-        base_url: String,
+        base_url: &str,
         config: ClientConfig,
         type_cache: TypeCache,
         items_cache: ItemCache,
     ) -> Self {
         Self {
             http: reqwest_client,
-            base_url,
-            config,
+            base_url: base_url.into(),
+            config: Arc::new(config),
             type_cache,
             items_cache,
         }
@@ -128,7 +127,7 @@ impl Client {
     async fn type_cached<T, F>(&self, language: Language, fallback: F) -> Result<T::Return, Error>
     where
         T: Queryable,
-        F: AsyncFn() -> Result<T::Return, Error>,
+        F: AsyncFnOnce() -> Result<T::Return, Error>,
     {
         let type_id = TypeId::of::<T::Return>();
 
@@ -178,8 +177,7 @@ impl Client {
     where
         T: Queryable,
     {
-        self.type_cached::<T, _>(Language::EN, || T::query(&self.base_url, &self.http))
-            .await
+        self.fetch_using_lang::<T>(Language::EN).await
     }
 
     /// Fetches an instance of a specified model in a supplied Language.
@@ -211,8 +209,8 @@ impl Client {
     where
         T: Queryable,
     {
-        self.type_cached::<T, _>(language, || {
-            T::query_with_language(&self.base_url, &self.http, language)
+        self.type_cached::<T, _>(language, async || {
+            T::query(&self.base_url.clone(), &self.http.clone(), language).await
         })
         .await
     }
@@ -224,7 +222,7 @@ impl Client {
         fallback: F,
     ) -> Result<Option<Item>, Error>
     where
-        F: AsyncFn() -> Result<Option<Item>, Error>,
+        F: AsyncFnOnce() -> Result<Option<Item>, Error>,
     {
         let key = (language, Box::from(query));
         if let Some(item) = self.items_cache.get(&key).await {
@@ -270,14 +268,7 @@ impl Client {
     /// }
     /// ```
     pub async fn query_item(&self, query: &str) -> Result<Option<Item>, Error> {
-        self.cached_item(Language::EN, query, || {
-            self.query_by_url(format!(
-                "{}/items/{}/?language=en",
-                self.base_url,
-                urlencoding::encode(query),
-            ))
-        })
-        .await
+        self.query_item_using_lang(query, Language::EN).await
     }
 
     /// Queries an item by its name and returns the closest matching item.
@@ -310,28 +301,18 @@ impl Client {
         query: &str,
         language: Language,
     ) -> Result<Option<Item>, Error> {
-        self.cached_item(language, query, || {
-            self.query_by_url(format!(
-                "{}/items/{}/?language={}",
-                self.base_url,
-                urlencoding::encode(query),
-                language
-            ))
+        self.cached_item(language, query, async move || {
+            Item::query(
+                self.http.clone(),
+                format!(
+                    "{}/items/{}/?language={}",
+                    self.base_url,
+                    urlencoding::encode(query),
+                    language
+                ),
+            )
+            .await
         })
         .await
     }
-
-    async fn query_by_url(&self, url: String) -> Result<Option<Item>, Error> {
-        let response = self.http.get(url).send().await?;
-
-        if response.status() == StatusCode::NOT_FOUND {
-            return Ok(None);
-        }
-
-        let json = response.text().await?;
-
-        let item = serde_json::from_str::<Item>(&json)?;
-
-        Ok(Some(item))
-    }
 }

src/worldstate/models/base.rs

@@ -22,11 +22,6 @@ use crate::worldstate::language::Language;
 
 /// Types implementing this have an actual endpoint on the API.
 pub trait Endpoint {
-    /// Returns the URL to the english endpoint.
-    ///
-    /// Getting the english endpoint is free, as concatenating is done at compile time.
-    fn endpoint_en(base_url: &str) -> String;
-
     /// Returns the URL to the endpoint of the specified language.
     ///
     /// Getting this endpoint is __NOT__ free, as concatenating is done at runtime.
@@ -80,23 +75,6 @@ pub trait Queryable: Endpoint + Clone + 'static {
     fn query(
         base_url: &str,
         request_executor: &reqwest::Client,
-    ) -> impl std::future::Future<Output = Result<Self::Return, Error>> + Send {
-        async {
-            Ok(request_executor
-                .get(Self::endpoint_en(base_url))
-                .send()
-                .await?
-                .json::<Self::Return>()
-                .await?)
-        }
-    }
-
-    /// Queries a model with the specified language and returns an instance of
-    /// [`itself`](Queryable::Return).
-    #[must_use]
-    fn query_with_language(
-        base_url: &str,
-        request_executor: &reqwest::Client,
         language: Language,
     ) -> impl std::future::Future<Output = Result<Self::Return, Error>> + Send {
         async move {

src/worldstate/models/items/mod.rs

@@ -10,6 +10,7 @@ pub use modification::Mod;
 pub use node::Node;
 pub use pet::Pet;
 pub use relic::Relic;
+use reqwest::StatusCode;
 pub use resource::Resource;
 pub use sentinel::Sentinel;
 pub use serde::Deserialize;
@@ -20,6 +21,8 @@ pub use warframe::{
 };
 use weapon::Weapon;
 
+use crate::worldstate::Error;
+
 mod arcane;
 mod archwing;
 mod gear;
@@ -225,6 +228,23 @@ pub enum Item {
     )]
     Weapon(Box<Weapon>),
 }
+
+impl Item {
+    pub(crate) async fn query(http: reqwest::Client, url: String) -> Result<Option<Item>, Error> {
+        let response = http.get(url).send().await?;
+
+        if response.status() == StatusCode::NOT_FOUND {
+            return Ok(None);
+        }
+
+        let json = response.text().await?;
+
+        let item = serde_json::from_str::<Item>(&json)?;
+
+        Ok(Some(item))
+    }
+}
+
 #[cfg(test)]
 mod test {
     use rstest::rstest;

src/worldstate/models/mod.rs

@@ -14,6 +14,7 @@
 //! use warframe::worldstate::{
 //!     Client,
 //!     Error,
+//!     Language,
 //!     Queryable,
 //!     queryable::{
 //!         Cetus,
@@ -24,9 +25,18 @@
 //! async fn main() -> Result<(), Error> {
 //!     let reqwest_client = reqwest::Client::new();
 //!
-//!     let cetus: Cetus = Cetus::query("https://api.warframestat.us/", &reqwest_client).await?;
-//!     let fissures: Vec<Fissure> =
-//!         Fissure::query("https://api.warframestat.us/", &reqwest_client).await?;
+//!     let cetus: Cetus = Cetus::query(
+//!         "https://api.warframestat.us/",
+//!         &reqwest_client,
+//!         Language::EN,
+//!     )
+//!     .await?;
+//!     let fissures: Vec<Fissure> = Fissure::query(
+//!         "https://api.warframestat.us/",
+//!         &reqwest_client,
+//!         Language::EN,
+//!     )
+//!     .await?;
 //!
 //!     Ok(())
 //! }

warframe-macros/src/model/struct_impl/args.rs

@@ -35,13 +35,8 @@ pub struct QueryableImpl {
 fn get_endpoint_impl(struct_name: &Ident, endpoint: &LitStr) -> syn::Result<TokenStream> {
     let endpoint_value = endpoint.value();
 
-    let endpoint_en = format!("/pc{endpoint_value}/?language=en");
-
     Ok(quote! {
         impl crate::worldstate::models::base::Endpoint for #struct_name {
-            fn endpoint_en(base_url: &str) -> String {
-                format!("{}{}", base_url, #endpoint_en)
-            }
             fn endpoint(base_url: &str, language: crate::worldstate::language::Language) -> String {
                 format!(
                     "{}/pc{}/?language={}",