feat: improve cdn downloads

src-tauri/Cargo.toml

@@ -9,12 +9,12 @@ version = "0.5.46"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = {version = "1.5.5", features = ["isolation"]}
+tauri-build = {version = "1.5.5", features = ["isolation"] }
 
 [dependencies]
 anyhow = "1"
 async-trait = "0.1.81"
-async_zip = {version = "0.0.17", features = ["full"]}
+async_zip = {version = "0.0.17", features = ["full"] }
 auto-launch = "0.5.0"
 blake2 = "0.10"
 chrono = "0.4.38"
@@ -29,26 +29,26 @@ keyring = {version = "3.0.5", features = [
   "windows-native",
   "apple-native",
   "linux-native",
-]}
+] }
 libsqlite3-sys = {version = "0.25.1", features = [
   "bundled",
-]}# Required for tari_wallet
+] }# Required for tari_wallet
 log = "0.4.22"
 log4rs = "1.3.0"
 minotari_node_grpc_client = {git = "https://github.com/tari-project/tari.git", branch = "development"}
 minotari_wallet_grpc_client = {git = "https://github.com/tari-project/tari.git", branch = "development"}
-nix = {version = "0.29.0", features = ["signal"]}
+nix = {version = "0.29.0", features = ["signal"] }
 nvml-wrapper = "0.10.0"
 open = "5"
 phraze = "0.3.15"
 rand = "0.8.5"
 regex = "1.10.5"
-reqwest = {version = "0.12.5", features = ["stream", "json", "multipart"]}
+reqwest = {version = "0.12.5", features = ["stream", "json", "multipart"] }
 sanitize-filename = "0.5"
 semver = "1.0.23"
-sentry = {version = "0.34.0", features = ["anyhow"]}
+sentry = {version = "0.34.0", features = ["anyhow"] }
 sentry-tauri = "0.3.0"
-serde = {version = "1", features = ["derive"]}
+serde = {version = "1", features = ["derive"] }
 serde_json = "1"
 sha2 = "0.10.8"
 sys-locale = "0.3.1"
@@ -58,7 +58,7 @@ tari_common = {git = "https://github.com/tari-project/tari.git", branch = "devel
 tari_common_types = {git = "https://github.com/tari-project/tari.git", branch = "development"}
 tari_core = {git = "https://github.com/tari-project/tari.git", branch = "development", features = [
   "transactions",
-]}
+] }
 tari_crypto = "0.21.0"
 tari_key_manager = {git = "https://github.com/tari-project/tari.git", branch = "development"}
 tari_shutdown = {git = "https://github.com/tari-project/tari.git", branch = "development"}
@@ -80,12 +80,12 @@ tauri = {version = "1.8.0", features = [
   "icon-ico",
   "icon-png",
   "process-command-api",
-]}
+] }
 tauri-plugin-single-instance = {git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1"}
 thiserror = "1.0.26"
-tokio = {version = "1", features = ["full"]}
-tokio-util = {version = "0.7.11", features = ["compat"]}
-xz2 = {version = "0.1.7", features = ["static"]}# static bind lzma
+tokio = {version = "1", features = ["full"] }
+tokio-util = {version = "0.7.11", features = ["compat"] }
+xz2 = {version = "0.1.7", features = ["static"] }# static bind lzma
 zip = "2.2.0"
 
 [target.'cfg(windows)'.dependencies]
@@ -94,7 +94,7 @@ winreg = "0.52.0"
 # needed for keymanager. TODO: Find a way of creating a keymanager without bundling sqlite
 chrono = "0.4.38"
 device_query = "2.1.0"
-libsqlite3-sys = {version = "0.25.1", features = ["bundled"]}
+libsqlite3-sys = {version = "0.25.1", features = ["bundled"] }
 log = "0.4.22"
 nvml-wrapper = "0.10.0"
 rand = "0.8.5"

src-tauri/src/binaries/adapter_github.rs

@@ -8,7 +8,9 @@ use tari_common::configuration::Network;
 use tauri::api::path::cache_dir;
 
 use crate::{
-    download_utils::download_file_with_retries, github, progress_tracker::ProgressTracker,
+    download_utils::download_file_with_retries,
+    github::{self, request_client::RequestClient},
+    progress_tracker::ProgressTracker,
     APPLICATION_FOLDER_ID,
 };
 
@@ -41,6 +43,12 @@ impl LatestVersionApiAdapter for GithubReleasesAdapter {
             .join(format!("{}.sha256", asset.name));
         let checksum_url = format!("{}.sha256", asset.url);
 
+        if asset.source.is_mirror() {
+            RequestClient::current()
+                .check_if_cache_hits(checksum_url.as_str())
+                .await?;
+        }
+
         match download_file_with_retries(&checksum_url, &checksum_path, progress_tracker).await {
             Ok(_) => Ok(checksum_path),
             Err(e) => {

src-tauri/src/binaries/adapter_tor.rs

@@ -2,6 +2,8 @@ use crate::binaries::binaries_resolver::{
     LatestVersionApiAdapter, VersionAsset, VersionDownloadInfo,
 };
 use crate::download_utils::download_file_with_retries;
+use crate::github::request_client::RequestClient;
+use crate::github::ReleaseSource;
 use crate::progress_tracker::ProgressTracker;
 use crate::APPLICATION_FOLDER_ID;
 use anyhow::Error;
@@ -22,27 +24,18 @@ impl LatestVersionApiAdapter for TorReleaseAdapter {
             "https://cdn-universe.tari.com/torbrowser/13.5.7/tor-expert-bundle-{}-13.5.7.tar.gz",
             platform
         );
-        let mut cdn_responded = false;
-
-        let client = reqwest::Client::new();
-        for _ in 0..3 {
-            let cloned_cdn_tor_bundle_url = cdn_tor_bundle_url.clone();
-            let response = client.head(cloned_cdn_tor_bundle_url).send().await;
-
-            if let Ok(resp) = response {
-                if resp.status().is_success() {
-                    cdn_responded = true;
-                    break;
-                }
-            }
-        }
+
+        let cdn_responded = RequestClient::current()
+            .check_if_cache_hits(cdn_tor_bundle_url.as_str())
+            .await?;
 
         if cdn_responded {
             let version = VersionDownloadInfo {
                 version: "13.5.7".parse().expect("Bad tor version"),
                 assets: vec![VersionAsset {
                     url: cdn_tor_bundle_url.to_string(),
                     name: format!("tor-expert-bundle-{}-13.5.7.tar.gz", platform),
+                    source: ReleaseSource::Mirror,
                 }],
             };
             return Ok(vec![version]);
@@ -54,6 +47,7 @@ impl LatestVersionApiAdapter for TorReleaseAdapter {
             assets: vec![VersionAsset {
                 url: format!("https://dist.torproject.org/torbrowser/13.5.7/tor-expert-bundle-{}-13.5.7.tar.gz", platform),
                 name: format!("tor-expert-bundle-{}-13.5.7.tar.gz", platform),
+                source: ReleaseSource::Github
             }]
         };
         Ok(vec![version])

src-tauri/src/binaries/binaries_manager.rs

@@ -6,6 +6,7 @@ use tari_common::configuration::Network;
 
 use crate::{
     download_utils::{download_file_with_retries, extract, validate_checksum},
+    github::request_client::RequestClient,
     progress_tracker::ProgressTracker,
 };
 
@@ -426,6 +427,12 @@ impl BinaryManager {
             .map_err(|e| anyhow!("Error creating in progress folder. Error: {:?}", e))?;
         let in_progress_file_zip = in_progress_dir.join(asset.name.clone());
 
+        if asset.source.is_mirror() {
+            RequestClient::current()
+                .check_if_cache_hits(asset.url.as_str())
+                .await?;
+        }
+
         download_file_with_retries(
             asset.url.as_str(),
             &in_progress_file_zip,

src-tauri/src/binaries/binaries_resolver.rs

@@ -1,8 +1,11 @@
+use crate::github::ReleaseSource;
 use crate::ProgressTracker;
 use anyhow::{anyhow, Error};
 use async_trait::async_trait;
+use log::info;
 use regex::Regex;
 use semver::Version;
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::LazyLock;
@@ -15,19 +18,22 @@ use super::adapter_xmrig::XmrigVersionApiAdapter;
 use super::binaries_manager::BinaryManager;
 use super::Binaries;
 
+pub const LOG_TARGET: &str = "tari::universe::binary_resolver";
+
 static INSTANCE: LazyLock<RwLock<BinaryResolver>> =
     LazyLock::new(|| RwLock::new(BinaryResolver::new()));
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct VersionDownloadInfo {
     pub(crate) version: Version,
     pub(crate) assets: Vec<VersionAsset>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct VersionAsset {
     pub(crate) url: String,
     pub(crate) name: String,
+    pub(crate) source: ReleaseSource,
 }
 
 #[async_trait]
@@ -208,14 +214,16 @@ impl BinaryResolver {
         progress_tracker: ProgressTracker,
         should_check_for_update: bool,
     ) -> Result<(), Error> {
+        info!(target: LOG_TARGET, "Initializing binary: {} | should check for update: {}", binary.name(), should_check_for_update);
+
         let manager = self
             .managers
             .get_mut(&binary)
             .ok_or_else(|| anyhow!("Couldn't find manager for binary: {}", binary.name()))?;
 
         manager.read_local_versions().await;
 
-        if should_check_for_update {
+        if true {
             // Will populate Vec of downloaded versions that meet the requirements
             manager.check_for_updates().await;
         }

src-tauri/src/download_utils.rs

@@ -1,3 +1,4 @@
+use crate::github::request_client::RequestClient;
 use crate::ProgressTracker;
 use anyhow::{anyhow, Error};
 use async_zip::base::read::seek::ZipFileReader;
@@ -39,12 +40,12 @@ pub async fn download_file_with_retries(
     }
 }
 
-async fn download_file(
+pub async fn download_file(
     url: &str,
     destination: &Path,
     progress_tracker: ProgressTracker,
 ) -> Result<(), anyhow::Error> {
-    let response = reqwest::get(url).await?;
+    let response = RequestClient::current().send_get_request(url).await?;
 
     // Ensure the directory exists
     if let Some(parent) = destination.parent() {
@@ -57,9 +58,9 @@ async fn download_file(
     // Stream the response body directly to the file
     let mut stream = response.bytes_stream();
     while let Some(item) = stream.next().await {
-        let _ = progress_tracker
-            .update("downloading".to_string(), None, 10)
-            .await;
+        // let _ = progress_tracker
+        //     .update("downloading".to_string(), None, 10)
+        //     .await;
         dest.write_all(&item?).await?;
     }