Adding Client, Response traits for reqwest

src/client/client.rs

@@ -0,0 +1,24 @@
+use std::future::Future;
+use std::pin::Pin;
+
+use serde::de::DeserializeOwned;
+
+pub type BoxFut<T> = Pin<Box<dyn Future<Output = T> + Send>>;
+
+pub trait Client<R, E, E2> where
+    R: Response<E2>,
+{
+    fn new() -> Self;
+    fn get(&self, url_base: String, url_path: String, url_query: Option<String>,
+        headers: Vec<(&'static str, String)>) -> BoxFut<Result<R, E>>;
+}
+
+// TODO: custom/generic HeaderValue trait? And for keys?
+pub trait Response<E> {
+    fn status_code(&self) -> u16;
+    fn verison(&self) -> String;
+    fn header(&self, key: String) -> Option<String>;
+    fn headers_all(&self, key: String) -> Vec<String>;
+    fn into_body(self) -> BoxFut<Result<String, E>>;
+    fn into_json<T: DeserializeOwned + 'static>(self) -> BoxFut<Result<T, E>>;
+}

src/client/client_reqwest.rs

@@ -0,0 +1,63 @@
+use std::iter::FromIterator;
+use std::convert::TryInto;
+
+use serde::de::DeserializeOwned;
+
+use super::{ Client, Response, BoxFut };
+
+impl Client<reqwest::Response, reqwest::Error, reqwest::Error> for reqwest::Client {
+    fn new() -> Self {
+        Self::new()
+    }
+    fn get(&self, url_base: String, url_path: String, url_query: Option<String>,
+        headers: Vec<(&'static str, String)>) -> BoxFut<Result<reqwest::Response, reqwest::Error>>
+    {
+        #[cfg(feature = "nightly")] let url_query = url_query.as_deref();
+        #[cfg(not(feature = "nightly"))] let url_query = url_query.as_ref().map(|s| s.as_ref());
+
+        let mut url = reqwest::Url::parse(&*url_base)
+            .unwrap_or_else(|_| panic!("Failed to parse url_base: \"{}\".", url_base));
+        url.set_path(&*url_path);
+        url.set_query(url_query);
+
+        let header_iter = headers.into_iter()
+            .map(|(key, value)| (
+                key.try_into().unwrap_or_else(|_| panic!("Invalid header key: \"{}\".", &key)),
+                // Makes a copy.
+                (&value).try_into().unwrap_or_else(|_| panic!("Invalid header value: \"{}\".", &value)),
+            ));
+        let header_map = reqwest::header::HeaderMap::from_iter(header_iter);
+
+        let fut = self.get(url)
+            .headers(header_map)
+            .send();
+        return Box::pin(fut);
+    }
+}
+
+impl Response<reqwest::Error> for reqwest::Response {
+    fn status_code(&self) -> u16 {
+        self.status().as_u16()
+    }
+    fn verison(&self) -> String {
+        format!("{:?}", self.version())
+    }
+    fn header(&self, key: String) -> Option<String> {
+        self.headers().get(key)
+            .and_then(|value| value.to_str().ok())
+            .map(|value| value.to_owned())
+    }
+    fn headers_all(&self, key: String) -> Vec<String> {
+        self.headers().get_all(key).iter()
+            .filter_map(|value| value.to_str().ok())
+            .map(|value| value.to_owned())
+            .collect()
+    }
+    fn into_body(self) -> BoxFut<Result<String, reqwest::Error>> {
+        //buf: Vec<u8> = Vec::with_capacity(self.content_length());
+        Box::pin(self.text())
+    }
+    fn into_json<T: DeserializeOwned + 'static>(self) -> BoxFut<Result<T, reqwest::Error>> {
+        Box::pin(self.json())
+    }
+}

src/client/mod.rs

@@ -0,0 +1,7 @@
+///! Contains client support for `reqwest` and `surf`.
+
+mod client;
+pub use client::*;
+
+mod client_reqwest;
+pub use client_reqwest::*;

src/lib.rs

@@ -9,6 +9,8 @@
 /// Re-exported `reqwest` types.
 pub use reqwest;
 
+pub mod client;
+
 mod config;
 pub use config::RiotApiConfig;
 

src/req/mod.rs

@@ -1,4 +1,4 @@
-//! Module containing rate limiting and requesting types.
+//! Contains rate limiting and requesting types.
 
 mod rate_limit;
 pub use rate_limit::*;