细节调整
This commit is contained in:
1 parent
bccd21fde5
commit
79bded1cd2
25 files changed
+2655
-494
No files matched your search
@@ -235,7 +235,12 @@ impl DownloadEngine {
|
||||
|
||||
let use_proxy = self.inner.use_proxy.load(Ordering::SeqCst);
|
||||
self.ensure_mihomo_proxy().await;
|
||||
let probe = self.inner.http.probe(url, headers, use_proxy).await;
|
||||
// 交互式校验(「添加下载」对话框):用户在等结果,保留探测超时避免界面卡死
|
||||
let probe = self
|
||||
.inner
|
||||
.http
|
||||
.probe(url, headers, use_proxy, Some(super::http_dl::PROBE_TIMEOUT))
|
||||
.await;
|
||||
let settings = self.inner.settings.lock().unwrap_or_else(|e| e.into_inner()).clone();
|
||||
let task_dir = dir.map(|d| d.to_string()).unwrap_or_else(|| settings.download_dir.clone());
|
||||
|
||||
@@ -390,13 +395,17 @@ impl DownloadEngine {
|
||||
/// 生成不冲突的文件名(同名时追加 (1)、(2)...)
|
||||
/// 冲突来源:磁盘已有同名最终文件、已存在同名临时文件(其他任务正在下载该名)、
|
||||
/// 以及任务列表中已有任务占用同名(即使最终文件尚未落盘,避免共用同一 .thingdl 临时文件)
|
||||
fn generate_unique_filename(&self, dir: &str, filename: &str) -> String {
|
||||
///
|
||||
/// `exclude_id`:把某个任务排除在「已占用」之外。探测完成后用真实文件名重命名时
|
||||
/// 必须传自己的 id —— 否则会与**自己**的占位文件名相撞,把每一个下载都改名成
|
||||
/// `xxx (1).ext`(探测文件名与 URL 推导名一致时必现)。
|
||||
fn generate_unique_filename(&self, dir: &str, filename: &str, exclude_id: Option<&str>) -> String {
|
||||
// 任务列表中已占用的文件名(同一目录下)
|
||||
let taken: std::collections::HashSet<String> = {
|
||||
let tasks = self.inner.tasks.lock().unwrap_or_else(|e| e.into_inner());
|
||||
tasks
|
||||
.values()
|
||||
.filter(|t| t.dir == dir)
|
||||
.filter(|t| t.dir == dir && Some(t.id.as_str()) != exclude_id)
|
||||
.map(|t| t.filename.clone())
|
||||
.collect()
|
||||
};
|
||||
@@ -487,7 +496,7 @@ impl DownloadEngine {
|
||||
.unwrap_or_else(|| format!("download_{}", chrono::Utc::now().timestamp()))
|
||||
});
|
||||
if auto_rename {
|
||||
task_filename = self.generate_unique_filename(&task_dir, &task_filename);
|
||||
task_filename = self.generate_unique_filename(&task_dir, &task_filename, None);
|
||||
}
|
||||
|
||||
// 3) 立即插入占位任务:Queued(未探测完成前 schedule 会跳过),未知大小单段
|
||||
@@ -536,7 +545,13 @@ impl DownloadEngine {
|
||||
let use_proxy = self.inner.use_proxy.load(Ordering::SeqCst);
|
||||
tauri::async_runtime::spawn(async move {
|
||||
engine.ensure_mihomo_proxy().await;
|
||||
let probe = engine.inner.http.probe(&raw_url, &raw_headers, use_proxy).await;
|
||||
// 后台探测不设超时:服务器慢就继续等(与下载路径一致),
|
||||
// 只有真正失败才置 Error;用户暂停/取消走任务的取消标志。
|
||||
let probe = engine
|
||||
.inner
|
||||
.http
|
||||
.probe(&raw_url, &raw_headers, use_proxy, None)
|
||||
.await;
|
||||
|
||||
// 探测结束,解除 pending 门控
|
||||
engine
|
||||
@@ -591,10 +606,11 @@ impl DownloadEngine {
|
||||
}
|
||||
};
|
||||
|
||||
// 释放 tasks 锁后,若探测返回了真实文件名,重新做唯一化并写回
|
||||
// 释放 tasks 锁后,若探测返回了真实文件名,重新做唯一化并写回。
|
||||
// 必须排除自己(`&rid`):占位名往往与探测名相同,不排除就会和自己相撞而改名成 (1)
|
||||
if let Some((dir_owned, Some(real_name))) = rename_from {
|
||||
let final_name = if auto_rename {
|
||||
engine.generate_unique_filename(&dir_owned, &real_name)
|
||||
engine.generate_unique_filename(&dir_owned, &real_name, Some(&rid))
|
||||
} else {
|
||||
real_name
|
||||
};
|
||||
|
||||
@@ -13,11 +13,49 @@ use tokio::task::JoinSet;
|
||||
use super::rate_limit::RateLimiter;
|
||||
use super::task::{ProbeResult, Segment};
|
||||
|
||||
/// 请求超时:连接 + 响应头必须在 30s 内就绪(分段请求若无超时,
|
||||
/// 服务器挂死时任务将永久卡在 Active,pause→resume 会出现新旧任务并发写同一临时文件)
|
||||
const REQUEST_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
|
||||
/// 分块读取停滞超时:30s 内无任何数据视为连接挂死,主动中断(配合取消标志及时退出)
|
||||
const READ_STALL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
|
||||
/// 取消轮询间隔。
|
||||
///
|
||||
/// **这不是下载超时**:下载路径不再因「长时间无数据/无响应头」中断,服务器慢就继续等,
|
||||
/// 只有用户暂停/取消或真正报错才结束。这个 200ms 轮询的唯一作用是让暂停/取消在
|
||||
/// 「连接挂死、`stream.next()` 一直 pending」时也能及时被感知——
|
||||
/// 否则等待 future 永不返回,取消标志就永远读不到。
|
||||
const CANCEL_POLL_INTERVAL: std::time::Duration = std::time::Duration::from_millis(200);
|
||||
|
||||
/// 交互式探测超时(仅用于「添加下载」校验等用户正盯着界面等结果的场景:
|
||||
/// 无限等待等于界面卡死)。真正的下载/后台探测路径不设超时。
|
||||
pub const PROBE_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30);
|
||||
|
||||
/// 等待一个 future 完成,期间每 200ms 检查一次取消标志;**不设超时**。
|
||||
///
|
||||
/// 返回 `Err("已取消")` 表示用户暂停/取消(调用方据此把任务置为 Paused 而非 Error)。
|
||||
async fn wait_cancellable<F>(fut: F, cancel: &AtomicBool) -> Result<F::Output, String>
|
||||
where
|
||||
F: std::future::Future,
|
||||
{
|
||||
tokio::pin!(fut);
|
||||
loop {
|
||||
if cancel.load(Ordering::SeqCst) {
|
||||
return Err("已取消".to_string());
|
||||
}
|
||||
tokio::select! {
|
||||
biased;
|
||||
_ = tokio::time::sleep(CANCEL_POLL_INTERVAL) => continue,
|
||||
out = &mut fut => return Ok(out),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 按需给「发送请求」加超时:`None` 表示不设超时(服务器慢就继续等)。
|
||||
/// `Err(())` 只表示超时,这样调用方能把它与「请求失败」区分开(后者要回退 HEAD)。
|
||||
async fn send_with_optional_timeout(
|
||||
req: reqwest::RequestBuilder,
|
||||
timeout: Option<std::time::Duration>,
|
||||
) -> Result<reqwest::Result<reqwest::Response>, ()> {
|
||||
match timeout {
|
||||
Some(d) => tokio::time::timeout(d, req.send()).await.map_err(|_| ()),
|
||||
None => Ok(req.send().await),
|
||||
}
|
||||
}
|
||||
|
||||
/// HTTP/HTTPS 下载器
|
||||
#[derive(Clone)]
|
||||
@@ -97,19 +135,23 @@ impl HttpDownloader {
|
||||
|
||||
/// 探测下载资源信息(大小、是否支持 Range、文件名)
|
||||
/// 优先用 GET + Range: bytes=0-0(返回 206 + Content-Range),回退到 HEAD。
|
||||
/// 代理降级:use_proxy=true 时先走系统代理,失败则回退 no_proxy 直连重试一次
|
||||
/// 代理降级:use_proxy=true 时先走系统代理,失败则回退 no_proxy 直连重试一次。
|
||||
///
|
||||
/// `timeout`:`Some` 用于交互式探测(用户正等界面结果);`None` 表示不设超时
|
||||
/// (后台探测,如更新包下载,服务器慢就继续等)。
|
||||
pub async fn probe(
|
||||
&self,
|
||||
url: &str,
|
||||
headers: &HashMap<String, String>,
|
||||
use_proxy: bool,
|
||||
timeout: Option<std::time::Duration>,
|
||||
) -> Result<ProbeResult, String> {
|
||||
let first = self.client(use_proxy);
|
||||
match self.probe_with_client(&first, url, headers).await {
|
||||
match self.probe_with_client(&first, url, headers, timeout).await {
|
||||
Ok(r) => return Ok(r),
|
||||
Err(e) if use_proxy => {
|
||||
let direct = self.client(false);
|
||||
self.probe_with_client(&direct, url, headers)
|
||||
self.probe_with_client(&direct, url, headers, timeout)
|
||||
.await
|
||||
.map_err(|e2| format!("代理探测失败({}),直连重试也失败({})", e, e2))
|
||||
}
|
||||
@@ -123,6 +165,7 @@ impl HttpDownloader {
|
||||
client: &Client,
|
||||
url: &str,
|
||||
headers: &HashMap<String, String>,
|
||||
timeout: Option<std::time::Duration>,
|
||||
) -> Result<ProbeResult, String> {
|
||||
// 先尝试 Range 请求(能同时判断 Accept-Ranges 和获取大小)
|
||||
let mut req = client
|
||||
@@ -133,10 +176,14 @@ impl HttpDownloader {
|
||||
req = req.header(k, v);
|
||||
}
|
||||
|
||||
match tokio::time::timeout(REQUEST_TIMEOUT, req.send())
|
||||
.await
|
||||
.map_err(|_| "探测超时(30s 内未收到响应头)".to_string())?
|
||||
{
|
||||
// 先拿到「发送结果」:超时(仅交互式探测会有)直接上抛,
|
||||
// 发送失败则回退 HEAD。注意不能把发送失败也上抛——那会让 HEAD 回退失效。
|
||||
let first = match send_with_optional_timeout(req, timeout).await {
|
||||
Err(()) => return Err("探测超时(未收到响应头)".to_string()),
|
||||
Ok(r) => r,
|
||||
};
|
||||
|
||||
match first {
|
||||
Ok(resp) => {
|
||||
let status = resp.status();
|
||||
let headers_map = resp.headers().clone();
|
||||
@@ -185,9 +232,9 @@ impl HttpDownloader {
|
||||
for (k, v) in headers {
|
||||
head_req = head_req.header(k, v);
|
||||
}
|
||||
let resp = tokio::time::timeout(REQUEST_TIMEOUT, head_req.send())
|
||||
let resp = send_with_optional_timeout(head_req, timeout)
|
||||
.await
|
||||
.map_err(|_| "探测超时(HEAD 30s 内未收到响应头)".to_string())?
|
||||
.map_err(|_| "探测超时(HEAD 未收到响应头)".to_string())?
|
||||
.map_err(|e| format!("探测失败(GET 和 HEAD 均失败): {}", e))?;
|
||||
let headers_map = resp.headers().clone();
|
||||
let total_size = headers_map
|
||||
@@ -421,9 +468,10 @@ async fn download_segment_with_client(
|
||||
req = req.header(k, v);
|
||||
}
|
||||
|
||||
let resp = tokio::time::timeout(REQUEST_TIMEOUT, req.send())
|
||||
.await
|
||||
.map_err(|_| "请求超时(30s 内未收到响应头)".to_string())?
|
||||
// 等响应头:不设超时(服务器慢就继续等),但期间轮询取消标志,
|
||||
// 保证用户暂停/取消时能立刻中断这次请求。
|
||||
let resp = wait_cancellable(req.send(), &cancel)
|
||||
.await?
|
||||
.map_err(|e| format!("请求失败: {}", e))?;
|
||||
|
||||
let status = resp.status();
|
||||
@@ -453,50 +501,53 @@ async fn download_segment_with_client(
|
||||
return Err("已取消".to_string());
|
||||
}
|
||||
|
||||
// 停滞超时:30s 无数据即中断,确保 cancel 标志能及时被感知(配合代际句柄防并发写)
|
||||
match tokio::time::timeout(READ_STALL_TIMEOUT, stream.next()).await {
|
||||
Ok(Some(Ok(chunk))) => {
|
||||
buf.extend_from_slice(&chunk);
|
||||
// 接收到数据立即更新进度(避免监控周期内进度无变化导致速度显示为 0)
|
||||
local_completed += chunk.len() as u64;
|
||||
progress.store(local_completed, Ordering::Relaxed);
|
||||
// 积累到 64KB 再写入(减少 I/O 次数)
|
||||
if buf.len() >= 64 * 1024 {
|
||||
file.write_all(&buf)
|
||||
.await
|
||||
.map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
// 限速
|
||||
limiter.consume(buf.len() as u64).await;
|
||||
buf.clear();
|
||||
// 读数据:**不做停滞超时**——30s 无数据不代表失败(慢速源、网络抖动很常见),
|
||||
// 只要用户没暂停就继续等。select 里那个 200ms 计时器只负责周期性回到循环头
|
||||
// 读一次取消标志:否则 `stream.next()` 一直 pending 时暂停/取消永远感知不到。
|
||||
tokio::select! {
|
||||
biased;
|
||||
_ = tokio::time::sleep(CANCEL_POLL_INTERVAL) => continue,
|
||||
next = stream.next() => match next {
|
||||
Some(Ok(chunk)) => {
|
||||
buf.extend_from_slice(&chunk);
|
||||
// 接收到数据立即更新进度(避免监控周期内进度无变化导致速度显示为 0)
|
||||
local_completed += chunk.len() as u64;
|
||||
progress.store(local_completed, Ordering::Relaxed);
|
||||
// 积累到 64KB 再写入(减少 I/O 次数)
|
||||
if buf.len() >= 64 * 1024 {
|
||||
file.write_all(&buf)
|
||||
.await
|
||||
.map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
// 限速
|
||||
limiter.consume(buf.len() as u64).await;
|
||||
buf.clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(Some(Err(e))) => {
|
||||
return Err(format!("读取数据失败: {}", e));
|
||||
}
|
||||
Ok(None) => {
|
||||
// 流结束,写入剩余数据
|
||||
if !buf.is_empty() {
|
||||
file.write_all(&buf)
|
||||
.await
|
||||
.map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
// local_completed 和 progress 已在接收 chunk 时更新
|
||||
limiter.consume(buf.len() as u64).await;
|
||||
buf.clear();
|
||||
Some(Err(e)) => {
|
||||
return Err(format!("读取数据失败: {}", e));
|
||||
}
|
||||
// 校验:已知大小的分段若流提前结束(收到的字节数不足分段长度),
|
||||
// 说明服务器提前断开或返回不完整内容,不能标记为完成,否则文件会被截断
|
||||
if !unknown_size && local_completed < seg.len() {
|
||||
return Err(format!(
|
||||
"文件不完整:已接收 {} / {} 字节,服务器提前结束连接",
|
||||
local_completed,
|
||||
seg.len()
|
||||
));
|
||||
None => {
|
||||
// 流结束,写入剩余数据
|
||||
if !buf.is_empty() {
|
||||
file.write_all(&buf)
|
||||
.await
|
||||
.map_err(|e| format!("写入文件失败: {}", e))?;
|
||||
// local_completed 和 progress 已在接收 chunk 时更新
|
||||
limiter.consume(buf.len() as u64).await;
|
||||
buf.clear();
|
||||
}
|
||||
// 校验:已知大小的分段若流提前结束(收到的字节数不足分段长度),
|
||||
// 说明服务器提前断开或返回不完整内容,不能标记为完成,否则文件会被截断
|
||||
if !unknown_size && local_completed < seg.len() {
|
||||
return Err(format!(
|
||||
"文件不完整:已接收 {} / {} 字节,服务器提前结束连接",
|
||||
local_completed,
|
||||
seg.len()
|
||||
));
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
Err(_) => {
|
||||
return Err("读取超时(30s 无数据,已中断下载)".to_string());
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user