gsadmin/Firelink
1
0
Fork 0
mirror of https://github.com/nimbold/Firelink.git synced 2026-07-26 12:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(download): handle dynamic server rate-limits and metadata

Browse Source 
Fallback to GET Range for metadata when HEAD fails or misses Content-Length. Fetch aria2 WS error payload via tellStatus. Escalate 429 retries with specific 60/120/300s backoff. Persist download fraction for paused tasks.
This commit is contained in:
NimBold
2026-06-29 21:26:21 +03:30
parent 0a77e15f86
commit cf0af00887
3 changed files with 80 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/lib.rs
+54 -17
View File
@@ -952,8 +952,15 @@ async fn fetch_metadata(
}
let mut current_res = head_req.send().await.map_err(|e| e.to_string())?;
let mut needs_fallback = false;
if !current_res.status().is_success() && !current_res.status().is_redirection() {
let mut get_req = client.get(&current_url);
needs_fallback = true;
} else if current_res.status().is_success() && current_res.headers().get(reqwest::header::CONTENT_LENGTH).is_none() {
needs_fallback = true;
}
if needs_fallback {
let mut get_req = client.get(&current_url).header(reqwest::header::RANGE, "bytes=0-0");
if should_send_auth {
if let Some(ref user) = username {
if !user.is_empty() {
@@ -1015,30 +1022,51 @@ async fn fetch_metadata(
if filename.is_empty() {
filename = "download".to_string();
}
let mut size_str = "Unknown".to_string();
let mut size_bytes = 0;
if let Some(len) = res.headers().get(reqwest::header::CONTENT_LENGTH) {
if let Ok(len_str) = len.to_str() {
if let Ok(bytes) = len_str.parse::<u64>() {
size_bytes = bytes;
if bytes < 1024 {
size_str = format!("{} B", bytes);
} else if bytes < 1024 * 1024 {
size_str = format!("{:.1} KB", bytes as f64 / 1024.0);
} else if bytes < 1024 * 1024 * 1024 {
size_str = format!("{:.1} MB", bytes as f64 / 1024.0 / 1024.0);
} else {
size_str = format!("{:.2} GB", bytes as f64 / 1024.0 / 1024.0 / 1024.0);
if res.status() == reqwest::StatusCode::PARTIAL_CONTENT {
if let Some(content_range) = res.headers().get(reqwest::header::CONTENT_RANGE) {
if let Ok(cr_str) = content_range.to_str() {
if let Some(idx) = cr_str.find('/') {
if let Ok(bytes) = cr_str[idx + 1..].parse::<u64>() {
size_bytes = bytes;
}
}
}
}
}
if size_bytes == 0 {
if let Some(len) = res.headers().get(reqwest::header::CONTENT_LENGTH) {
if let Ok(len_str) = len.to_str() {
if let Ok(bytes) = len_str.parse::<u64>() {
size_bytes = bytes;
}
}
}
}
if size_bytes > 0 {
let bytes = size_bytes;
if bytes < 1024 {
size_str = format!("{} B", bytes);
} else if bytes < 1024 * 1024 {
size_str = format!("{:.1} KB", bytes as f64 / 1024.0);
} else if bytes < 1024 * 1024 * 1024 {
size_str = format!("{:.1} MB", bytes as f64 / 1024.0 / 1024.0);
} else {
size_str = format!("{:.2} GB", bytes as f64 / 1024.0 / 1024.0 / 1024.0);
}
}
let mut resumable = false;
if let Some(accept_ranges) = res.headers().get(reqwest::header::ACCEPT_RANGES) {
if res.status() == reqwest::StatusCode::PARTIAL_CONTENT {
resumable = true;
} else if let Some(accept_ranges) = res.headers().get(reqwest::header::ACCEPT_RANGES) {
if let Ok(accept_ranges_str) = accept_ranges.to_str() {
if accept_ranges_str.to_lowercase().contains("bytes") {
if accept_ranges_str.contains("bytes") {
resumable = true;
}
}
@@ -4804,7 +4832,16 @@ pub fn run() {
let outcome = match method {
"aria2.onDownloadComplete" => Some(crate::queue::PendingOutcome::Complete),
"aria2.onDownloadError" => {
let msg = event.get("error_message").and_then(|m| m.as_str()).unwrap_or("aria2 download error").to_string();
let mut msg = event.get("error_message").and_then(|m| m.as_str()).unwrap_or("aria2 download error").to_string();
let aria2_port = state.aria2_port.load(std::sync::atomic::Ordering::Relaxed);
let aria2_secret = state.aria2_secret.clone();
if let Ok(status) = rpc_call(aria2_port, &aria2_secret, "aria2.tellStatus", serde_json::json!([gid, ["errorCode", "errorMessage"]])).await {
if let Some(err_msg) = status.get("errorMessage").and_then(|m| m.as_str()) {
if !err_msg.is_empty() {
msg = err_msg.to_string();
}
}
}
Some(crate::queue::PendingOutcome::Error(msg))
}
_ => None,
src-tauri/src/retry.rs
+26 -2
View File
@@ -42,6 +42,13 @@ pub const BACKOFF_SCHEDULE: [Duration; 3] = [
Duration::from_secs(10),
];
/// The 429-specific 3-strike escalating backoff schedule: 60s, 120s, 300s.
pub const BACKOFF_SCHEDULE_429: [Duration; 3] = [
Duration::from_secs(60),
Duration::from_secs(120),
Duration::from_secs(300),
];
/// Maximum number of transient-error retries before the download is allowed to
/// fall through to a hard `Failed`. Three strikes matches the schedule length.
pub const MAX_RETRIES: usize = BACKOFF_SCHEDULE.len();
@@ -95,7 +102,7 @@ pub fn is_transient_network_error(message: &str) -> bool {
let m = message.to_ascii_lowercase();
const TRANSIENT: [&str; 20] = [
const TRANSIENT: [&str; 23] = [
// reqwest / hyper / OS socket-layer
"timed out",
"timeout",
@@ -116,6 +123,9 @@ pub fn is_transient_network_error(message: &str) -> bool {
"request timeout",
"http 503",
"503 service unavailable",
"http 429",
"http error 429",
"429 too many requests",
// aria2c log phrasing
"connection was closed",
"timeout.",
@@ -143,7 +153,14 @@ pub async fn backoff_and_emit(
) -> BackoffOutcome {
let attempt = strike + 1;
emit(format!("Network drop — retry #{attempt}: {reason}"));
let delay = backoff_for(strike);
let delay = if reason.to_ascii_lowercase().contains("429") {
BACKOFF_SCHEDULE_429
.get(strike)
.copied()
.unwrap_or_else(|| *BACKOFF_SCHEDULE_429.last().unwrap())
} else {
backoff_for(strike)
};
tokio::select! {
_ = tokio::time::sleep(delay) => BackoffOutcome::Continue,
_ = interrupt => BackoffOutcome::Aborted,
@@ -229,6 +246,13 @@ mod tests {
));
}
#[test]
fn classifies_http_429_as_transient() {
assert!(is_transient_network_error("HTTP 429 Too Many Requests"));
assert!(is_transient_network_error("HTTP Error 429: Too Many Requests"));
assert!(is_transient_network_error("429 too many requests"));
}
#[test]
fn classifies_ytdlp_and_aria2_phrasing_as_transient() {
assert!(is_transient_network_error(
src/utils/downloads.ts
-1
View File
@@ -124,7 +124,6 @@ const DOWNLOAD_SECRET_FIELDS = ['password', 'cookies', 'headers'] as const;
*/
export const redactDownloadForPersistence = (item: DownloadItem): DownloadItem => {
const copy: DownloadItem = { ...item };
delete copy.fraction;
delete copy.speed;
delete copy.eta;
for (const field of DOWNLOAD_SECRET_FIELDS) {