Switch to native-tls
This commit is contained in:
2 files changed
+44
-12
No files matched your search
@@ -17,7 +17,7 @@ tauri-plugin-opener = "2.5.3"
|
|||||||
serde = { version = "1.0.228", features = ["derive"] }
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
serde_json = "1.0.149"
|
serde_json = "1.0.149"
|
||||||
tauri-plugin-os = "2.3.2"
|
tauri-plugin-os = "2.3.2"
|
||||||
reqwest = { version = "0.13.2", default-features = false, features = ["stream", "rustls"] }
|
reqwest = { version = "0.13.2", default-features = false, features = ["stream", "native-tls"] }
|
||||||
tokio = "1.49.0"
|
tokio = "1.49.0"
|
||||||
futures-util = { version = "0.3.32", features = ["io"] }
|
futures-util = { version = "0.3.32", features = ["io"] }
|
||||||
tauri-plugin-decorum = "1.1.1"
|
tauri-plugin-decorum = "1.1.1"
|
||||||
|
|||||||
+43
-11
@@ -143,13 +143,17 @@ async fn download(
|
|||||||
r
|
r
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("[download] ERROR: HTTP request failed: {}", e);
|
println!("[download] ERROR: HTTP request failed: {:?}", e);
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let total_size = resp.content_length().unwrap_or(0);
|
let total_size = resp.content_length().unwrap_or(0);
|
||||||
println!("[download] Content-Length: {} bytes ({:.2} MB)", total_size, total_size as f64 / 1_048_576.0);
|
println!(
|
||||||
|
"[download] Content-Length: {} bytes ({:.2} MB)",
|
||||||
|
total_size,
|
||||||
|
total_size as f64 / 1_048_576.0
|
||||||
|
);
|
||||||
let _ = app.emit("download-size", format!("{}:{}", &name, &total_size));
|
let _ = app.emit("download-size", format!("{}:{}", &name, &total_size));
|
||||||
|
|
||||||
let mut downloaded: u64 = 0;
|
let mut downloaded: u64 = 0;
|
||||||
@@ -162,7 +166,10 @@ async fn download(
|
|||||||
path
|
path
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("[download] ERROR: Failed to resolve app_local_data_dir: {}", e);
|
println!(
|
||||||
|
"[download] ERROR: Failed to resolve app_local_data_dir: {}",
|
||||||
|
e
|
||||||
|
);
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -188,11 +195,17 @@ async fn download(
|
|||||||
let _ = tokio::fs::remove_file(&download_part_path).await;
|
let _ = tokio::fs::remove_file(&download_part_path).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("[download] Creating downloads dir (if needed): {:?}", downloads_path);
|
println!(
|
||||||
|
"[download] Creating downloads dir (if needed): {:?}",
|
||||||
|
downloads_path
|
||||||
|
);
|
||||||
let _ = tokio::fs::create_dir_all(&downloads_path).await;
|
let _ = tokio::fs::create_dir_all(&downloads_path).await;
|
||||||
|
|
||||||
if let Ok(true) = tokio::fs::try_exists(&game_path.join(name.clone())).await {
|
if let Ok(true) = tokio::fs::try_exists(&game_path.join(name.clone())).await {
|
||||||
println!("[download] Existing game dir found, removing: {:?}", game_path.join(&name));
|
println!(
|
||||||
|
"[download] Existing game dir found, removing: {:?}",
|
||||||
|
game_path.join(&name)
|
||||||
|
);
|
||||||
let _ = tokio::fs::remove_dir_all(&game_path.join(name.clone())).await;
|
let _ = tokio::fs::remove_dir_all(&game_path.join(name.clone())).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -217,7 +230,10 @@ async fn download(
|
|||||||
let chunk = match chunk_result {
|
let chunk = match chunk_result {
|
||||||
Ok(c) => c,
|
Ok(c) => c,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("[download] ERROR: Failed to read chunk #{}: {}", chunk_count, e);
|
println!(
|
||||||
|
"[download] ERROR: Failed to read chunk #{}: {}",
|
||||||
|
chunk_count, e
|
||||||
|
);
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -225,7 +241,10 @@ async fn download(
|
|||||||
chunk_count += 1;
|
chunk_count += 1;
|
||||||
|
|
||||||
if let Err(e) = file.write_all(&chunk).await {
|
if let Err(e) = file.write_all(&chunk).await {
|
||||||
println!("[download] ERROR: Failed to write chunk #{} to disk: {}", chunk_count, e);
|
println!(
|
||||||
|
"[download] ERROR: Failed to write chunk #{} to disk: {}",
|
||||||
|
chunk_count, e
|
||||||
|
);
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -276,7 +295,11 @@ async fn download(
|
|||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("[download] Download complete: {} bytes in {:.2}s", downloaded, start.elapsed().as_secs_f64());
|
println!(
|
||||||
|
"[download] Download complete: {} bytes in {:.2}s",
|
||||||
|
downloaded,
|
||||||
|
start.elapsed().as_secs_f64()
|
||||||
|
);
|
||||||
println!("[download] Verifying SHA-512 hash...");
|
println!("[download] Verifying SHA-512 hash...");
|
||||||
let _ = app.emit("download-hash-checking", format!("{}", &name));
|
let _ = app.emit("download-hash-checking", format!("{}", &name));
|
||||||
|
|
||||||
@@ -284,7 +307,10 @@ async fn download(
|
|||||||
let mut file = match tokio::fs::File::open(download_part_path.clone()).await {
|
let mut file = match tokio::fs::File::open(download_part_path.clone()).await {
|
||||||
Ok(f) => f,
|
Ok(f) => f,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("[download] ERROR: Failed to open .part file for hashing: {}", e);
|
println!(
|
||||||
|
"[download] ERROR: Failed to open .part file for hashing: {}",
|
||||||
|
e
|
||||||
|
);
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -296,7 +322,10 @@ async fn download(
|
|||||||
let bytes_read = match file.read(&mut buffer).await {
|
let bytes_read = match file.read(&mut buffer).await {
|
||||||
Ok(n) => n,
|
Ok(n) => n,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("[download] ERROR: Failed to read file during hashing: {}", e);
|
println!(
|
||||||
|
"[download] ERROR: Failed to read file during hashing: {}",
|
||||||
|
e
|
||||||
|
);
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -341,7 +370,10 @@ async fn download(
|
|||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("[download] SUCCESS: '{}' downloaded, verified, and extracted", name);
|
println!(
|
||||||
|
"[download] SUCCESS: '{}' downloaded, verified, and extracted",
|
||||||
|
name
|
||||||
|
);
|
||||||
return "1".to_string();
|
return "1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user