mirror/Riven
1
0
Fork 1
mirror of https://github.com/MingweiSamuel/Riven.git synced 2024-12-26 10:56:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

style: cleanups for clippy

Browse source
This commit is contained in:
Mingwei Samuel 2024-11-03 22:46:47 -08:00
parent 78c88a0a3f
commit a7f72cd21a
3 changed files with 102 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
riven/src/req/mod.rs
View file

@ -13,6 +13,5 @@ pub use token_bucket::*;
mod regional_requester; mod regional_requester;
pub use regional_requester::*; pub use regional_requester::*;
#[cfg(test)]
#[path = "token_bucket.test.rs"] #[path = "token_bucket.test.rs"]
mod token_bucket_test; mod token_bucket_test;

203
riven/src/req/regional_requester.rs
View file

@ -1,4 +1,3 @@
use std::future::Future;
use memo_map::MemoMap; use memo_map::MemoMap;
use reqwest::{RequestBuilder, StatusCode}; use reqwest::{RequestBuilder, StatusCode};
@ -30,118 +29,116 @@ impl RegionalRequester {
} }
} }
pub fn execute<'a>( pub async fn execute<'a>(
&'a self, &'a self,
config: &'a RiotApiConfig, config: &'a RiotApiConfig,
method_id: &'static str, method_id: &'static str,
request: RequestBuilder, request: RequestBuilder,
) -> impl Future<Output = Result<ResponseInfo>> + 'a { ) -> Result<ResponseInfo> {
async move { let mut retries: u8 = 0;
let mut retries: u8 = 0; loop {
loop { let method_rate_limit = self
let method_rate_limit = self .method_rate_limits
.method_rate_limits .get_or_insert(&method_id, || RateLimit::new(RateLimitType::Method));
.get_or_insert(&method_id, || RateLimit::new(RateLimitType::Method));
// Rate limit. // Rate limit.
let rate_limit = RateLimit::acquire_both(&self.app_rate_limit, method_rate_limit); let rate_limit = RateLimit::acquire_both(&self.app_rate_limit, method_rate_limit);
#[cfg(feature = "tracing")] #[cfg(feature = "tracing")]
let rate_limit = rate_limit.instrument(tracing::info_span!("rate_limit")); let rate_limit = rate_limit.instrument(tracing::info_span!("rate_limit"));
rate_limit.await; rate_limit.await;
// Send request. // Send request.
let request_clone = request let request_clone = request
.try_clone() .try_clone()
.expect("Failed to clone request.") .expect("Failed to clone request.")
.send(); .send();
#[cfg(feature = "tracing")] #[cfg(feature = "tracing")]
let request_clone = request_clone.instrument(tracing::info_span!("request")); let request_clone = request_clone.instrument(tracing::info_span!("request"));
let response = request_clone.await; let response = request_clone.await;
let response = match response { let response = match response {
Ok(response) => response, Ok(response) => response,
// Check for lower level errors, like connection errors. // Check for lower level errors, like connection errors.
Err(e) => { Err(e) => {
if retries >= config.retries { if retries >= config.retries {
log::debug!( log::debug!(
"Request failed (retried {} times), failure, returning error.", "Request failed (retried {} times), failure, returning error.",
retries retries
); );
break Err(RiotApiError::new(e, retries, None, None)); break Err(RiotApiError::new(e, retries, None, None));
}
let delay = Duration::from_secs(2_u64.pow(retries as u32));
log::debug!("Request failed with cause \"{}\", (retried {} times), using exponential backoff, retrying after {:?}.", e.to_string(), retries, delay);
let backoff = sleep(delay);
#[cfg(feature = "tracing")]
let backoff = backoff.instrument(tracing::info_span!("backoff"));
backoff.await;
retries += 1;
continue;
} }
}; let delay = Duration::from_secs(2_u64.pow(retries as u32));
// Maybe update rate limits (based on response headers). log::debug!("Request failed with cause \"{}\", (retried {} times), using exponential backoff, retrying after {:?}.", e.to_string(), retries, delay);
// Use single bar for no short circuiting. let backoff = sleep(delay);
let retry_after_app = self.app_rate_limit.on_response(config, &response); #[cfg(feature = "tracing")]
let retry_after_method = method_rate_limit.on_response(config, &response); let backoff = backoff.instrument(tracing::info_span!("backoff"));
let retry_after = retry_after_app.or(retry_after_method); // Note: Edge case if both are Some(_) not handled. backoff.await;
retries += 1;
let status = response.status(); continue;
// Handle normal success / failure cases.
let status_none = Self::NONE_STATUS_CODES.contains(&status);
// Success case.
if status.is_success() || status_none {
log::trace!(
"Response {} (retried {} times), success, returning result.",
status,
retries
);
break Ok(ResponseInfo {
response,
retries,
status_none,
});
} }
let err = response.error_for_status_ref().err().unwrap_or_else(|| { };
panic!( // Maybe update rate limits (based on response headers).
"Unhandlable response status code, neither success nor failure: {}.", // Use single bar for no short circuiting.
status let retry_after_app = self.app_rate_limit.on_response(config, &response);
) let retry_after_method = method_rate_limit.on_response(config, &response);
let retry_after = retry_after_app.or(retry_after_method); // Note: Edge case if both are Some(_) not handled.
let status = response.status();
// Handle normal success / failure cases.
let status_none = Self::NONE_STATUS_CODES.contains(&status);
// Success case.
if status.is_success() || status_none {
log::trace!(
"Response {} (retried {} times), success, returning result.",
status,
retries
);
break Ok(ResponseInfo {
response,
retries,
status_none,
}); });
// Failure, may or may not be retryable.
// Not-retryable: no more retries or 4xx or ? (3xx, redirects exceeded).
// Retryable: retries remaining, and 429 or 5xx.
if retries >= config.retries
|| (StatusCode::TOO_MANY_REQUESTS != status && !status.is_server_error())
{
log::debug!(
"Response {} (retried {} times), failure, returning error.",
status,
retries
);
break Err(RiotApiError::new(
err,
retries,
Some(response),
Some(status),
));
}
// Is retryable, do exponential backoff if retry-after wasn't specified.
// 1 sec, 2 sec, 4 sec, 8 sec.
match retry_after {
None => {
let delay = Duration::from_secs(2_u64.pow(retries as u32));
log::debug!("Response {} (retried {} times), NO `retry-after`, using exponential backoff, retrying after {:?}.", status, retries, delay);
let backoff = sleep(delay);
#[cfg(feature = "tracing")]
let backoff = backoff.instrument(tracing::info_span!("backoff"));
backoff.await;
}
Some(delay) => {
log::debug!("Response {} (retried {} times), `retry-after` set, retrying after {:?}.", status, retries, delay);
}
}
retries += 1;
} }
let err = response.error_for_status_ref().err().unwrap_or_else(|| {
panic!(
"Unhandlable response status code, neither success nor failure: {}.",
status
)
});
// Failure, may or may not be retryable.
// Not-retryable: no more retries or 4xx or ? (3xx, redirects exceeded).
// Retryable: retries remaining, and 429 or 5xx.
if retries >= config.retries
|| (StatusCode::TOO_MANY_REQUESTS != status && !status.is_server_error())
{
log::debug!(
"Response {} (retried {} times), failure, returning error.",
status,
retries
);
break Err(RiotApiError::new(
err,
retries,
Some(response),
Some(status),
));
}
// Is retryable, do exponential backoff if retry-after wasn't specified.
// 1 sec, 2 sec, 4 sec, 8 sec.
match retry_after {
None => {
let delay = Duration::from_secs(2_u64.pow(retries as u32));
log::debug!("Response {} (retried {} times), NO `retry-after`, using exponential backoff, retrying after {:?}.", status, retries, delay);
let backoff = sleep(delay);
#[cfg(feature = "tracing")]
let backoff = backoff.instrument(tracing::info_span!("backoff"));
backoff.await;
}
Some(delay) => {
log::debug!("Response {} (retried {} times), `retry-after` set, retrying after {:?}.", status, retries, delay);
}
}
retries += 1;
} }
} }
} }

4
riven/tests/testutils.rs
View file

@ -318,7 +318,7 @@ pub async fn spectator_v5_combo(route: PlatformRoute) -> Result<(), String> {
let livegame_p = riot_api() let livegame_p = riot_api()
.spectator_v5() .spectator_v5()
.get_current_game_info_by_puuid(route, &puuid); .get_current_game_info_by_puuid(route, puuid);
let livegame_o = livegame_p.await.map_err(|e| { let livegame_o = livegame_p.await.map_err(|e| {
format!( format!(
"Failed to get live game {} for summoner PUUID {}: {}", "Failed to get live game {} for summoner PUUID {}: {}",
@ -360,7 +360,7 @@ pub async fn spectator_tft_v5_combo(route: PlatformRoute) -> Result<(), String>
let livegame_p = riot_api() let livegame_p = riot_api()
.spectator_tft_v5() .spectator_tft_v5()
.get_current_game_info_by_puuid(route, &puuid); .get_current_game_info_by_puuid(route, puuid);
let livegame_o = livegame_p.await.map_err(|e| { let livegame_o = livegame_p.await.map_err(|e| {
format!( format!(
"Failed to get live game {} for summoner PUUID {}: {}", "Failed to get live game {} for summoner PUUID {}: {}",