Abstract HTTP and add support for wasm through Reqwest

examples/http-get-message.rs

@@ -9,15 +9,13 @@ async fn main() -> anyhow::Result<()> {
     tracing_subscriber::fmt::init();
 
     let client = Client::new(env::var("DISCORD_TOKEN")?);
-    let channel_id = Id::new(381_926_291_785_383_946);
+    let channel_id = Id::new(745811002771374151);
 
-    future::join_all((1u8..=10).map(|x| {
-        client
-            .create_message(channel_id)
-            .content(&format!("Ping #{x}"))
-            .into_future()
-    }))
-    .await;
+    client
+        .create_message(channel_id)
+        .content(&format!("Ping #{{x}}"))
+        .expect("content not a valid length")
+        .await.unwrap();
 
     let me = client.current_user().await?.model().await?;
     println!("Current user: {}#{}", me.name, me.discriminator);

twilight-http-ratelimiting/Cargo.toml

@@ -15,12 +15,12 @@ version = "0.15.1"
 
 [dependencies]
 futures-util = { version = "0.3", default-features = false }
-tokio = { version = "1", default-features = false, features = ["rt", "sync", "time"] }
+http = { version = "0.2", default-features = false }
+tokio = { version = "1.26", default-features = false, features = ["rt", "sync", "time"] }
 tracing = { default-features = false, features = ["std", "attributes"], version = "0.1.23" }
 
-[dev-dependencies]
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 criterion = { default-features = false, version = "0.4" }
-http = { version = "0.2", default-features = false }
 static_assertions = { default-features = false, version = "1.1.0" }
 tokio = { default-features = false, features = ["macros", "rt-multi-thread"], version = "1.0" }
 

twilight-http-ratelimiting/src/request.rs

@@ -43,6 +43,16 @@ impl Method {
             Method::Put => "PUT",
         }
     }
+
+    pub const fn to_http(self) -> ::http::Method {
+        match self {
+            Method::Delete => ::http::Method::DELETE,
+            Method::Get => ::http::Method::GET,
+            Method::Patch => ::http::Method::PATCH,
+            Method::Post => ::http::Method::POST,
+            Method::Put => ::http::Method::PUT,
+        }
+    }
 }
 
 /// Error returned when a [`Path`] could not be parsed from a string.

twilight-http/Cargo.toml

@@ -14,10 +14,8 @@ rust-version.workspace = true
 version = "0.15.2"
 
 [dependencies]
-hyper = { default-features = false, features = ["client", "http1", "http2", "runtime"], version = "0.14" }
-hyper-rustls = { default-features = false, optional = true, features = ["http1", "http2"], version = "0.24" }
-hyper-tls = { default-features = false, optional = true, version = "0.5" }
-hyper-trust-dns = { default-features = false, optional = true, version = "0.5" }
+bytes = "1.4.0"
+http = { version = "0.2.9", default-features = false }
 percent-encoding = { default-features = false, version = "2" }
 rand = { default-features = false, features = ["std_rng", "std"], version = "0.8" }
 serde = { default-features = false, features = ["derive"], version = "1" }
@@ -32,15 +30,27 @@ twilight-validate = { default-features = false, path = "../twilight-validate", v
 brotli = { default-features = false, features = ["std"], optional = true, version = "3.0.0" }
 simd-json = { default-features = false, features = ["serde_impl", "swar-number-parsing"], optional = true, version = ">=0.4, <0.11" }
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+hyper = { default-features = false, features = ["client", "http1", "http2", "runtime"], version = "0.14" }
+hyper-rustls = { default-features = false, optional = true, features = ["http1", "http2"], version = "0.24" }
+hyper-tls = { default-features = false, optional = true, version = "0.5" }
+hyper-trust-dns = { default-features = false, optional = true, version = "0.5" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+reqwest = { default-features = false, features = [] }
+#reqwest = { git = "https://github.com/flisky/reqwest", default-features = false, features = [] }
+getrandom = { version = "0.2", features = ["js"] }
+
 [features]
-default = ["decompression", "rustls-native-roots"]
+default = ["rustls-native-roots"]
+# default = ["decompression", "rustls-native-roots"]
 decompression = ["dep:brotli"]
 native = ["dep:hyper-tls"]
 rustls-native-roots = ["dep:hyper-rustls", "hyper-rustls?/native-tokio"]
 rustls-webpki-roots = ["dep:hyper-rustls", "hyper-rustls?/webpki-tokio"]
 trust-dns = ["dep:hyper-trust-dns"]
 
-[dev-dependencies]
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 serde_test = { default-features = false, version = "1" }
 static_assertions = { default-features = false, version = "1.1.0" }
 twilight-util = { default-features = false, features = ["builder"], path = "../twilight-util", version = "0.15.2" }

twilight-http/src/client/builder.rs

@@ -1,6 +1,6 @@
 use super::Token;
-use crate::{client::connector, Client};
-use hyper::header::HeaderMap;
+use crate::{Client, http::HttpClient};
+use http::header::HeaderMap;
 use std::{
     sync::{atomic::AtomicBool, Arc},
     time::Duration,
@@ -30,9 +30,7 @@ impl ClientBuilder {
 
     /// Build the [`Client`].
     pub fn build(self) -> Client {
-        let connector = connector::create();
-
-        let http = hyper::Client::builder().build(connector);
+        let http = HttpClient::new();
 
         let token_invalidated = if self.remember_invalid_token {
             Some(Arc::new(AtomicBool::new(false)))
@@ -155,7 +153,8 @@ impl Default for ClientBuilder {
             default_allowed_mentions: None,
             default_headers: None,
             proxy: None,
-            ratelimiter: Some(Box::new(InMemoryRatelimiter::default())),
+            ratelimiter: None,
+            //ratelimiter: Some(Box::new(InMemoryRatelimiter::default())),
             remember_invalid_token: true,
             timeout: Duration::from_secs(10),
             token: None,

twilight-http/src/client/mod.rs

@@ -1,11 +1,9 @@
 mod builder;
-mod connector;
 mod interaction;
 
 pub use self::{builder::ClientBuilder, interaction::InteractionClient};
 
 use crate::{
-    client::connector::Connector,
     error::{Error, ErrorType},
     request::{
         channel::{
@@ -79,13 +77,9 @@ use crate::{
         Method, Request,
     },
     response::ResponseFuture,
-    API_VERSION,
-};
-use hyper::{
-    client::Client as HyperClient,
-    header::{HeaderMap, HeaderValue, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT},
-    Body,
+    API_VERSION, http::{RawRequestBuilder, HttpClient},
 };
+use http::header::{HeaderMap, HeaderValue, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT};
 use std::{
     fmt::{Debug, Formatter, Result as FmtResult},
     ops::Deref,
@@ -223,7 +217,7 @@ impl Deref for Token {
 pub struct Client {
     pub(crate) default_allowed_mentions: Option<AllowedMentions>,
     default_headers: Option<HeaderMap>,
-    http: HyperClient<Connector>,
+    http: HttpClient,
     proxy: Option<Box<str>>,
     ratelimiter: Option<Box<dyn Ratelimiter>>,
     timeout: Duration,
@@ -2578,7 +2572,7 @@ impl Client {
         let url = format!("{protocol}://{host}/api/v{API_VERSION}/{path}");
         tracing::debug!(?url);
 
-        let mut builder = hyper::Request::builder().method(method.name()).uri(&url);
+        let mut builder = RawRequestBuilder::new().method(method.to_http()).uri(&url)?;
 
         if use_authorization_token {
             if let Some(token) = self.token.as_deref() {
@@ -2612,7 +2606,7 @@ impl Client {
 
             #[cfg(feature = "decompression")]
             headers.insert(
-                hyper::header::ACCEPT_ENCODING,
+                http::header::ACCEPT_ENCODING,
                 HeaderValue::from_static("br"),
             );
 
@@ -2634,18 +2628,23 @@ impl Client {
         }
 
         let try_req = if let Some(form) = form {
-            builder.body(Body::from(form.build()))
+            builder.body(form.build())
         } else if let Some(bytes) = body {
-            builder.body(Body::from(bytes))
+            builder.body(bytes)
         } else {
-            builder.body(Body::empty())
+            builder.body(Vec::new())
         };
 
-        let inner = self.http.request(try_req.map_err(|source| Error {
+        let inner = self.http.request(try_req.build().map_err(|source| Error {
             kind: ErrorType::BuildingRequest,
-            source: Some(Box::new(source)),
+            source: None,
         })?);
 
+        // let inner = self.http.request(try_req.build().map_err(|source| Error {
+        //     kind: ErrorType::BuildingRequest,
+        //     source: Some(Box::new(source)),
+        // })?);
+
         // For requests that don't use an authorization token we don't need to
         // remember whether the token is invalid. This may be for requests such
         // as webhooks and interactions.
@@ -2658,7 +2657,7 @@ impl Client {
 
             ResponseFuture::ratelimit(invalid_token, inner, self.timeout, tx_future)
         } else {
-            ResponseFuture::new(Box::pin(time::timeout(self.timeout, inner)), invalid_token)
+            ResponseFuture::new(Box::pin(inner), invalid_token)
         })
     }
 }

twilight-http/src/error.rs

@@ -1,5 +1,4 @@
-use crate::{api_error::ApiError, json::JsonError, response::StatusCode};
-use hyper::{Body, Response};
+use crate::{api_error::ApiError, json::JsonError, response::StatusCode, http::RawResponse};
 use std::{
     error::Error as StdError,
     fmt::{Debug, Display, Formatter, Result as FmtResult},
@@ -125,7 +124,7 @@ pub enum ErrorType {
     ///
     /// This may occur during Discord API stability incidents.
     ServiceUnavailable {
-        response: Response<Body>,
+        response: RawResponse,
     },
     /// Token in use has become revoked or is otherwise invalid.
     ///

twilight-http/src/http/hyper/client.rs

@@ -0,0 +1,23 @@
+use super::{response::RawResponseFuture, request::RawRequest, connector};
+
+#[derive(Debug)]
+pub struct HttpClient {
+    pub(crate) hyper: hyper::Client<connector::Connector>
+}
+
+impl HttpClient {
+    pub fn new() -> Self {
+        let connector = connector::create();
+
+        let hyper = hyper::Client::builder().build(connector);
+
+        HttpClient { hyper }
+    }
+
+    pub fn request(&self, req: RawRequest) -> RawResponseFuture {
+        let inner = self.hyper.request(req.hyper);
+        RawResponseFuture {
+            inner
+        }
+    }
+}

twilight-http/src/http/hyper/mod.rs

@@ -0,0 +1,9 @@
+mod connector;
+mod response;
+mod request;
+mod client;
+
+pub use connector::{create, Connector};
+pub use response::{RawResponseFuture, RawResponse};
+pub use request::RawRequest;
+pub use client::HttpClient;

twilight-http/src/http/hyper/request.rs

@@ -0,0 +1,8 @@
+use http::{Method, Uri, HeaderMap, HeaderValue};
+use hyper::Body;
+
+use crate::{Error, error::ErrorType};
+
+pub struct RawRequest {
+    pub(crate) hyper: hyper::Request<Body>
+}

twilight-http/src/http/hyper/response.rs

@@ -0,0 +1,49 @@
+use std::{future::Future, pin::Pin};
+
+use http::{HeaderValue, header::HeaderMap};
+use hyper::Body;
+
+use crate::response::{BytesFuture, StatusCode};
+
+#[derive(Debug)]
+pub struct RawResponse {
+    pub inner: hyper::Response<Body>,
+}
+
+impl RawResponse {
+    fn new(inner: hyper::Response<Body>) -> Self {
+        RawResponse { inner }
+    }
+
+    pub fn headers(&self) -> &HeaderMap<HeaderValue> {
+        self.inner.headers()
+    }
+
+    pub fn headers_mut(&mut self) -> &mut HeaderMap<HeaderValue> {
+        self.inner.headers_mut()
+    }
+
+    pub fn bytes(self, compressed: bool) -> BytesFuture {
+        BytesFuture::from_hyper(self.inner.into_body(), compressed)
+    }
+
+    pub fn status(&self) -> StatusCode {
+        // Convert the `hyper` status code into its raw form in order to return
+        // our own.
+        let raw = self.inner.status().as_u16();
+
+        StatusCode::new(raw)
+    }
+}
+
+pub struct RawResponseFuture {
+    pub inner: hyper::client::ResponseFuture,
+}
+
+impl Future for RawResponseFuture {
+    type Output = hyper::Result<RawResponse>;
+
+    fn poll(mut self: std::pin::Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> std::task::Poll<Self::Output> {
+        Pin::new(&mut self.inner).poll(cx).map_ok(RawResponse::new)
+    }
+}