feat: 提交0.4加速版二维码直传与自动配网优化
This commit is contained in:
+46
-12
@@ -46,6 +46,13 @@ struct UploadSession {
|
||||
}
|
||||
|
||||
type SessionMap = Arc<Mutex<HashMap<String, Arc<Mutex<UploadSession>>>>>;
|
||||
type CompletedMap = Arc<Mutex<HashMap<String, CompletedUpload>>>;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
struct CompletedUpload {
|
||||
sha256: String,
|
||||
size: u64,
|
||||
}
|
||||
|
||||
pub struct ReceiverServer {
|
||||
pub port: u16,
|
||||
@@ -65,23 +72,31 @@ impl ReceiverServer {
|
||||
|
||||
let stop = Arc::new(AtomicBool::new(false));
|
||||
let sessions: SessionMap = Arc::new(Mutex::new(HashMap::new()));
|
||||
let completed: CompletedMap = Arc::new(Mutex::new(HashMap::new()));
|
||||
|
||||
let stop_tcp = stop.clone();
|
||||
let sessions_tcp = sessions.clone();
|
||||
let completed_tcp = completed.clone();
|
||||
let token_tcp = session_token.clone();
|
||||
let dir_tcp = save_dir.clone();
|
||||
let events_tcp = events.clone();
|
||||
let tcp_thread = thread::spawn(move || {
|
||||
while !stop_tcp.load(Ordering::Relaxed) {
|
||||
match listener.accept() {
|
||||
Ok((stream, _)) => {
|
||||
Ok((mut stream, _)) => {
|
||||
let dir = dir_tcp.clone();
|
||||
let token = token_tcp.clone();
|
||||
let tx = events_tcp.clone();
|
||||
let sessions = sessions_tcp.clone();
|
||||
let completed = completed_tcp.clone();
|
||||
thread::spawn(move || {
|
||||
if let Err(e) = handle_client(stream, &dir, &token, &tx, &sessions) {
|
||||
let _ = tx.send(ReceiverEvent::Error(format!("接收失败:{e:#}")));
|
||||
if let Err(e) = handle_client(&mut stream, &dir, &token, &tx, &sessions, &completed) {
|
||||
// Never turn a parse/write race into an opaque Android
|
||||
// `unexpected end of stream`: make a best effort to
|
||||
// return an HTTP status before closing the socket.
|
||||
let message = format!("接收失败:{e:#}");
|
||||
let _ = write_response(&mut stream, 500, "text/plain", message.as_bytes());
|
||||
let _ = tx.send(ReceiverEvent::Error(message));
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -147,11 +162,12 @@ impl Drop for ReceiverServer {
|
||||
}
|
||||
|
||||
fn handle_client(
|
||||
mut stream: TcpStream,
|
||||
stream: &mut TcpStream,
|
||||
save_dir: &Path,
|
||||
token: &str,
|
||||
events: &Sender<ReceiverEvent>,
|
||||
sessions: &SessionMap,
|
||||
completed: &CompletedMap,
|
||||
) -> Result<()> {
|
||||
stream.set_nodelay(true).ok();
|
||||
stream.set_read_timeout(Some(Duration::from_secs(120)))?;
|
||||
@@ -180,7 +196,7 @@ fn handle_client(
|
||||
|
||||
let supplied = headers.get("x-qft-token").map(String::as_str).unwrap_or("");
|
||||
if supplied != token {
|
||||
return write_response(&mut stream, 403, "text/plain", b"invalid session");
|
||||
return write_response(stream, 403, "text/plain", b"invalid session");
|
||||
}
|
||||
|
||||
let device = decode_header(headers.get("x-qft-device")).unwrap_or_else(|| "Android".to_owned());
|
||||
@@ -188,27 +204,27 @@ fn handle_client(
|
||||
|
||||
if method == "GET" && path == "/qft/ping" {
|
||||
let body = json!({"ok": true, "protocol": 2, "parallel": true}).to_string();
|
||||
return write_response(&mut stream, 200, "application/json", body.as_bytes());
|
||||
return write_response(stream, 200, "application/json", body.as_bytes());
|
||||
}
|
||||
|
||||
if method == "POST" && path == "/qft/upload/init" {
|
||||
return init_parallel_upload(&mut stream, save_dir, &headers, &device, events, sessions);
|
||||
return init_parallel_upload(stream, save_dir, &headers, &device, events, sessions);
|
||||
}
|
||||
|
||||
if method == "POST" && path.starts_with("/qft/upload/chunk/") {
|
||||
return receive_parallel_chunk(&mut stream, &mut reader, path, &headers, events, sessions);
|
||||
return receive_parallel_chunk(stream, &mut reader, path, &headers, events, sessions);
|
||||
}
|
||||
|
||||
if method == "POST" && path.starts_with("/qft/upload/finish/") {
|
||||
return finish_parallel_upload(&mut stream, path, events, sessions);
|
||||
return finish_parallel_upload(stream, path, events, sessions, completed);
|
||||
}
|
||||
|
||||
// Compatibility path for old clients and content providers that cannot seek.
|
||||
if method == "POST" && path == "/qft/upload" {
|
||||
return receive_legacy_stream(&mut stream, &mut reader, save_dir, &headers, &device, events);
|
||||
return receive_legacy_stream(stream, &mut reader, save_dir, &headers, &device, events);
|
||||
}
|
||||
|
||||
write_response(&mut stream, 404, "text/plain", b"not found")
|
||||
write_response(stream, 404, "text/plain", b"not found")
|
||||
}
|
||||
|
||||
fn init_parallel_upload(
|
||||
@@ -336,12 +352,24 @@ fn finish_parallel_upload(
|
||||
path: &str,
|
||||
events: &Sender<ReceiverEvent>,
|
||||
sessions: &SessionMap,
|
||||
completed: &CompletedMap,
|
||||
) -> Result<()> {
|
||||
let upload_id = path.trim_start_matches("/qft/upload/finish/");
|
||||
let session_arc = {
|
||||
let map = sessions.lock().map_err(|_| anyhow::anyhow!("上传会话锁损坏"))?;
|
||||
map.get(upload_id).cloned().context("上传会话不存在或已完成")?
|
||||
map.get(upload_id).cloned()
|
||||
};
|
||||
if session_arc.is_none() {
|
||||
// The client may lose the TCP response after the file was safely
|
||||
// renamed. Finish is idempotent so its retry reports that committed
|
||||
// result instead of surfacing an opaque connection/404 failure.
|
||||
if let Some(done) = completed.lock().ok().and_then(|v| v.get(upload_id).cloned()) {
|
||||
let body = json!({"ok": true, "sha256": done.sha256, "size": done.size, "duplicate": true}).to_string();
|
||||
return write_response(stream, 200, "application/json", body.as_bytes());
|
||||
}
|
||||
bail!("上传会话不存在或已完成")
|
||||
}
|
||||
let session_arc = session_arc.expect("checked above");
|
||||
|
||||
let (device, file_name, size, part_path, final_path) = {
|
||||
let session = session_arc.lock().map_err(|_| anyhow::anyhow!("上传会话损坏"))?;
|
||||
@@ -363,6 +391,12 @@ fn finish_parallel_upload(
|
||||
let mut map = sessions.lock().map_err(|_| anyhow::anyhow!("上传会话锁损坏"))?;
|
||||
map.remove(upload_id);
|
||||
}
|
||||
if let Ok(mut finished) = completed.lock() {
|
||||
// A QFT receive session is short-lived. Keep a bounded completion cache
|
||||
// only for retrying a lost finish response.
|
||||
if finished.len() >= 64 { finished.clear(); }
|
||||
finished.insert(upload_id.to_owned(), CompletedUpload { sha256: sha.clone(), size });
|
||||
}
|
||||
let _ = events.send(ReceiverEvent::UploadCompleted {
|
||||
device, file_name, saved_path: final_path, sha256: sha.clone(),
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user