sugoidogo/modrinth
1
0
Fork 0
mirror of https://github.com/modrinth/code.git synced 2026-08-31 12:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(app-lib): remove timeout for shared instance uploads (#7304)

Browse Source 
* fix(app-lib): remove timeout for shared instance uploads

* style(app-lib): cargo fmt

* style(app-lib): remove unused import
This commit is contained in:
Sychic
2026-08-25 18:28:47 +00:00
committed by GitHub
parent e33ef5f252
commit 7420560784
3 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app-lib/src/util/fetch.rs
+28 -10
View File
@@ -19,7 +19,7 @@ use std::num::NonZeroU32;
use std::path::Path;
use std::pin::Pin;
use std::sync::{Arc, LazyLock};
use std::time::{self, Duration, Instant, SystemTime};
use std::time::{Duration, Instant, SystemTime};
use tokio::sync::Semaphore;
use tokio::{fs::File, io::AsyncReadExt, io::AsyncWriteExt};
use tracing::{debug, info};
@@ -330,27 +330,45 @@ fn duration_seconds_ceil(duration: Duration) -> u64 {
.saturating_add(u64::from(duration.subsec_nanos() > 0))
}
fn reqwest_client_builder_with_timeout() -> reqwest::ClientBuilder {
reqwest_client_builder().read_timeout(Duration::from_secs(30))
}
fn reqwest_client_builder() -> reqwest::ClientBuilder {
reqwest::Client::builder()
.connect_timeout(time::Duration::from_secs(15))
.read_timeout(time::Duration::from_secs(30))
.tcp_keepalive(Some(time::Duration::from_secs(10)))
.connect_timeout(Duration::from_secs(15))
.tcp_keepalive(Some(Duration::from_secs(10)))
.user_agent(crate::launcher_user_agent())
}
pub static INSECURE_REQWEST_CLIENT: LazyLock<reqwest::Client> =
LazyLock::new(|| {
reqwest_client_builder_with_timeout()
.build()
.expect("client configuration should be valid")
});
pub static REQWEST_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
reqwest_client_builder_with_timeout()
.https_only(true)
.build()
.expect("client configuration should be valid")
});
pub static INSECURE_NO_TIMEOUT_REQWEST_CLIENT: LazyLock<reqwest::Client> =
LazyLock::new(|| {
reqwest_client_builder()
.build()
.expect("client configuration should be valid")
});
pub static REQWEST_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
reqwest_client_builder()
.https_only(true)
.build()
.expect("client configuration should be valid")
});
pub static NO_TIMEOUT_REQWEST_CLIENT: LazyLock<reqwest::Client> =
LazyLock::new(|| {
reqwest_client_builder()
.https_only(true)
.build()
.expect("client configuration should be valid")
});
const FETCH_ATTEMPTS: usize = 2;