diff options
| author | MatthieuCoder <matthieu@matthieu-dev.xyz> | 2023-01-13 22:23:19 +0400 |
|---|---|---|
| committer | MatthieuCoder <matthieu@matthieu-dev.xyz> | 2023-01-13 22:23:19 +0400 |
| commit | b1e17001e3fce2874e4bb1354196c90a5fd7acd0 (patch) | |
| tree | 95aa49d203c37afda042befcfc8c0fd679a7e1e8 /exes/rest/src/handler.rs | |
| parent | bca576c35e54d5505c62e42e8be416c797e84b6b (diff) | |
better ratelimit, new go structure and better build system
Diffstat (limited to 'exes/rest/src/handler.rs')
| -rw-r--r-- | exes/rest/src/handler.rs | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/exes/rest/src/handler.rs b/exes/rest/src/handler.rs index 6d58dce..f59583d 100644 --- a/exes/rest/src/handler.rs +++ b/exes/rest/src/handler.rs @@ -10,8 +10,9 @@ use std::{ convert::TryFrom, hash::{Hash, Hasher}, str::FromStr, + sync::Arc, }; -use tracing::{debug_span, error, instrument, Instrument}; +use tracing::{debug_span, error, info_span, instrument, Instrument}; use twilight_http_ratelimiting::{Method, Path}; use crate::ratelimit_client::RemoteRatelimiter; @@ -37,8 +38,8 @@ fn normalize_path(request_path: &str) -> (&str, &str) { #[instrument] pub async fn handle_request( client: Client<HttpsConnector<HttpConnector>, Body>, - ratelimiter: RemoteRatelimiter, - token: &str, + ratelimiter: Arc<RemoteRatelimiter>, + token: String, mut request: Request<Body>, ) -> Result<Response<Body>, anyhow::Error> { let (hash, uri_string) = { @@ -78,19 +79,12 @@ pub async fn handle_request( (hash.finish().to_string(), uri_string) }; + // waits for the request to be authorized + ratelimiter + .ticket(hash.clone()) + .instrument(debug_span!("ticket validation request")) + .await?; - let span = debug_span!("ticket validation request"); - let header_sender = match span - .in_scope(|| ratelimiter.ticket(hash)) - .await - { - Ok(sender) => sender, - Err(e) => { - error!("Failed to receive ticket for ratelimiting: {:?}", e); - bail!("failed to reteive ticket"); - } - }; - request .headers_mut() .insert(HOST, HeaderValue::from_static("discord.com")); @@ -135,15 +129,18 @@ pub async fn handle_request( } }; - let ratelimit_headers = resp + let headers = resp .headers() .into_iter() - .map(|(k, v)| (k.to_string(), v.to_str().unwrap().to_string())) + .map(|(k, v)| (k.to_string(), v.to_str().map(|f| f.to_string()))) + .filter(|f| f.1.is_ok()) + .map(|f| (f.0, f.1.expect("errors should be filtered"))) .collect(); - if header_sender.send(ratelimit_headers).is_err() { - error!("Error when sending ratelimit headers to ratelimiter"); - }; + let _ = ratelimiter + .submit_headers(hash, headers) + .instrument(info_span!("submitting headers")) + .await; Ok(resp) } |