Add installation retries

Cargo.toml

@@ -39,6 +39,7 @@ update-informer = "0.6.0"
 tokio = { version = "1.24.1", features = ["full"] }
 async-trait = "0.1.61"
 retry = "2.0.0"
+tokio-retry = "0.3.0"
 
 
 [target.'cfg(target_os = "linux")'.dependencies]

src/error.rs

@@ -44,9 +44,6 @@ pub enum Error {
     #[diagnostic(code(espup::toolchain::rust::failed_to_get_latest_version))]
     #[error("{} Failed To serialize Json from string.", emoji::ERROR)]
     FailedToSerializeJson,
-    #[diagnostic(code(espup::toolchain::rust::xtensa_rust_already_installed))]
-    #[error("{} Previous installation of Rust Toolchain exists in: '{0}'. Please, remove the directory before new installation.", emoji::ERROR)]
-    XtensaToolchainAlreadyInstalled(String),
     #[diagnostic(code(espup::toolchain::rust::invalid_version))]
     #[error(
         "{} Invalid toolchain version '{0}'. Verify that the format is correct: '<major>.<minor>.<patch>.<subpatch>' or '<major>.<minor>.<patch>', and that the release exists in https://github.com/esp-rs/rust-build/releases",
@@ -63,7 +60,7 @@ pub enum Error {
     #[error("{} Failed to add CMake to ESP-IDF tools", emoji::ERROR)]
     FailedToInstantiateCmake,
     #[diagnostic(code(espup::toolchain::espidf::failed_to_create_esp_idf_install_closure))]
-    #[error("{} Failed to create ESP-IDF  install closure", emoji::ERROR)]
+    #[error("{} Failed to create ESP-IDF install closure", emoji::ERROR)]
     FailedToCreateEspIdfInstallClosure,
     #[diagnostic(code(espup::toolchain::espidf::failed_to_install_esp_idf))]
     #[error("{} Failed to install ESP-IDF", emoji::ERROR)]

src/main.rs

@@ -25,6 +25,7 @@ use std::{
     path::PathBuf,
 };
 use tokio::sync::mpsc;
+use tokio_retry::{strategy::FixedInterval, Retry};
 
 #[cfg(windows)]
 const DEFAULT_EXPORT_FILE: &str = "export-esp.ps1";
@@ -243,8 +244,20 @@ async fn install(args: InstallOpts) -> Result<()> {
     let (tx, mut rx) = mpsc::channel::<Result<Vec<String>, Error>>(installable_items);
     for app in to_install {
         let tx = tx.clone();
+        let retry_strategy = FixedInterval::from_millis(50).take(3);
         tokio::spawn(async move {
-            let res = app.install().await;
+            let res = Retry::spawn(retry_strategy, || async {
+                let res = app.install().await;
+                if res.is_err() {
+                    warn!(
+                        "{} Installation for '{}' failed, retriying",
+                        emoji::WARN,
+                        app.name()
+                    );
+                }
+                res
+            })
+            .await;
             tx.send(res).await.unwrap();
         });
     }

src/toolchain/espidf.rs

@@ -206,6 +206,10 @@ impl Installable for EspIdfRepo {
 
         Ok(exports)
     }
+
+    fn name(&self) -> String {
+        "ESP-IDF".to_string()
+    }
 }
 
 /// Gets the esp-idf installation path.

src/toolchain/gcc.rs

@@ -127,6 +127,10 @@ impl Installable for Gcc {
 
         Ok(exports)
     }
+
+    fn name(&self) -> String {
+        format!("GCC ({})", self.toolchain_name)
+    }
 }
 
 /// Gets the name of the GCC arch based on the host triple.

src/toolchain/llvm.rs

@@ -125,4 +125,8 @@ impl Installable for Llvm {
 
         Ok(exports)
     }
+
+    fn name(&self) -> String {
+        "LLVM".to_string()
+    }
 }

src/toolchain/mod.rs

@@ -8,7 +8,7 @@ use reqwest::header;
 use retry::{delay::Fixed, retry};
 use std::{
     env,
-    fs::{create_dir_all, File},
+    fs::{create_dir_all, remove_file, File},
     io::Write,
     path::Path,
 };
@@ -24,6 +24,8 @@ pub mod rust;
 pub trait Installable {
     /// Install some application, returning a vector of any required exports
     async fn install(&self) -> Result<Vec<String>, Error>;
+    /// Returns the name of the toolchain being installeds
+    fn name(&self) -> String;
 }
 
 /// Downloads a file from a URL and uncompresses it, if necesary, to the output directory.
@@ -35,8 +37,12 @@ pub async fn download_file(
 ) -> Result<String, Error> {
     let file_path = format!("{}/{}", output_directory, file_name);
     if Path::new(&file_path).exists() {
-        info!("{} Using cached file: '{}'", emoji::INFO, file_path);
-        return Ok(file_path);
+        warn!(
+            "{} File '{}' already exists, deleting it before download.",
+            emoji::WARN,
+            file_path
+        );
+        remove_file(&file_path)?;
     } else if !Path::new(&output_directory).exists() {
         info!(
             "{} Creating directory: '{}'",
@@ -50,7 +56,7 @@ pub async fn download_file(
     info!(
         "{} Downloading file '{}' from '{}'",
         emoji::DOWNLOAD,
-        file_name,
+        &file_path,
         url
     );
     let resp = reqwest::get(&url).await?;

src/toolchain/rust.rs

@@ -172,9 +172,12 @@ impl Installable for XtensaRust {
         #[cfg(windows)]
         let toolchain_path = self.toolchain_destination.clone().join("esp");
         if toolchain_path.exists() {
-            return Err(Error::XtensaToolchainAlreadyInstalled(
-                toolchain_path.display().to_string(),
-            ));
+            warn!(
+                "{} Previous installation of Xtensa Rust exists in: '{}'. Reusing this installation.",
+                emoji::WARN,
+                &toolchain_path.display()
+            );
+            return Ok(vec![]);
         }
         info!(
             "{} Installing Xtensa Rust {} toolchain",
@@ -237,6 +240,10 @@ impl Installable for XtensaRust {
 
         Ok(vec![]) // No exports
     }
+
+    fn name(&self) -> String {
+        "Xtensa Rust".to_string()
+    }
 }
 
 #[derive(Hash, Eq, PartialEq, Debug, Clone, Serialize, Deserialize, Default)]
@@ -288,6 +295,10 @@ impl Installable for Crate {
 
         Ok(vec![]) // No exports
     }
+
+    fn name(&self) -> String {
+        format!("crate {}", self.name)
+    }
 }
 
 pub struct RiscVTarget {
@@ -352,6 +363,10 @@ impl Installable for RiscVTarget {
 
         Ok(vec![]) // No exports
     }
+
+    fn name(&self) -> String {
+        "RISC-V rust target".to_string()
+    }
 }
 
 /// Gets the artifact extension based on the host architecture.