actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-17 08:06:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize GhApiClient::do_fetch: Avoid unnecessary restful API call

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2024-05-28 23:09:22 +10:00
parent 962a7d057c
commit fc0222881c
No known key found for this signature in database
GPG key ID: 76D1E687CA3C4928
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/binstalk-git-repo-api/src/gh_api_client.rs
View file

@ -150,6 +150,14 @@ impl GhApiClient {
Ok(())
}
fn get_auth_token(&self) -> Option<&str> {
if self.0.is_auth_token_valid.load(Relaxed) {
self.0.auth_token.as_deref()
} else {
None
}
}
async fn do_fetch<T, U, GraphQLFn, RestfulFn, GraphQLFut, RestfulFut>(
&self,
graphql_func: GraphQLFn,
@ -164,25 +172,18 @@ impl GhApiClient {
{
self.check_retry_after()?;
if self.0.is_auth_token_valid.load(Relaxed) {
if let Some(auth_token) = self.0.auth_token.as_deref() {
match graphql_func(&self.0.client, data, auth_token).await {
Err(GhApiError::Unauthorized) => {
self.0.is_auth_token_valid.store(false, Relaxed);
}
res => return res.map_err(|err| err.context("GraphQL API")),
if let Some(auth_token) = self.get_auth_token() {
match graphql_func(&self.0.client, data, auth_token).await {
Err(GhApiError::Unauthorized) => {
self.0.is_auth_token_valid.store(false, Relaxed);
}
res => return res.map_err(|err| err.context("GraphQL API")),
}
}
match restful_func(&self.0.client, data, self.0.auth_token.as_deref()).await {
Err(GhApiError::Unauthorized) => {
self.0.is_auth_token_valid.store(false, Relaxed);
restful_func(&self.0.client, data, None).await
}
res => res,
}
.map_err(|err| err.context("Restful API"))
restful_func(&self.0.client, data, None)
.await
.map_err(|err| err.context("Restful API"))
}
/// Return `Ok(Some(api_artifact_url))` if exists.