bugfix

Author: ityuany

bootstrap.sh

@@ -2,4 +2,5 @@
 
 cargo install just
 
-cargo install cargo-qtest
+cargo install cargo-watch
+cargo install cargo-qtest

crates/snm_shim/src/ensure_binary_path.rs

@@ -17,33 +17,27 @@ where
         .exists()
         .not()
     {
-        if atom.get_snm_config().get_strict() {
-            return Err(SnmError::UnsupportedNodeVersionError {
-                version: version.to_string(),
-            });
-        } else {
-            let download_url = atom.get_download_url(version);
+        let download_url = atom.get_download_url(version);
 
-            let downloaded_file_path_buf = atom.get_downloaded_file_path_buf(version)?;
+        let downloaded_file_path_buf = atom.get_downloaded_file_path_buf(version)?;
 
-            DownloadBuilder::new()
-                .retries(3)
-                .timeout(atom.get_snm_config().get_download_timeout_secs())
-                .write_strategy(WriteStrategy::WriteAfterDelete)
-                .download(&download_url, &downloaded_file_path_buf)
-                .await?;
+        DownloadBuilder::new()
+            .retries(3)
+            .timeout(atom.get_snm_config().get_download_timeout_secs())
+            .write_strategy(WriteStrategy::WriteAfterDelete)
+            .download(&download_url, &downloaded_file_path_buf)
+            .await?;
 
-            let runtime_dir_path_buf = atom.get_runtime_dir_path_buf(version)?;
+        let runtime_dir_path_buf = atom.get_runtime_dir_path_buf(version)?;
 
-            if is_check {
-                check(version, atom).await?;
-            }
+        if is_check {
+            check(version, atom).await?;
+        }
 
-            atom.decompress_download_file(&downloaded_file_path_buf, &runtime_dir_path_buf)?;
+        atom.decompress_download_file(&downloaded_file_path_buf, &runtime_dir_path_buf)?;
 
-            if let Some(parent) = downloaded_file_path_buf.parent() {
-                fs::remove_dir_all(parent)?;
-            }
+        if let Some(parent) = downloaded_file_path_buf.parent() {
+            fs::remove_dir_all(parent)?;
         }
     }
 

crates/snm_shim/src/get_node_bin_dir.rs

@@ -1,7 +1,8 @@
-use std::env::current_dir;
+use std::{env::current_dir, fs, ops::Not as _};
 
 use snm_atom::{atom::AtomTrait as _, node_atom::NodeAtom};
 use snm_config::parse_snm_config;
+use snm_download_builder::{DownloadBuilder, WriteStrategy};
 use snm_utils::snm_error::SnmError;
 use tracing::{instrument, Level};
 
@@ -14,7 +15,6 @@ pub async fn get_node_bin_dir() -> Result<String, SnmError> {
     let snm_config = parse_snm_config(&dir)?;
 
     let snm_node = NodeAtom::new(snm_config.clone());
-
     let version = if let Some(version) = snm_config.get_runtime_node_version() {
         version
     } else if snm_config.get_strict() {
@@ -24,6 +24,63 @@ pub async fn get_node_bin_dir() -> Result<String, SnmError> {
         version.ok_or(SnmError::NoDefaultNodeBinary)?
     };
 
+    if snm_node
+        .get_anchor_file_path_buf(version.as_str())?
+        .exists()
+        .not()
+    {
+        if snm_node.get_snm_config().get_strict() {
+            return Err(SnmError::UnsupportedNodeVersionError {
+                version: version.to_string(),
+            });
+        } else {
+            let download_url = snm_node.get_download_url(&version);
+
+            let downloaded_file_path_buf = snm_node.get_downloaded_file_path_buf(&version)?;
+
+            DownloadBuilder::new()
+                .retries(3)
+                .timeout(snm_node.get_snm_config().get_download_timeout_secs())
+                .write_strategy(WriteStrategy::WriteAfterDelete)
+                .download(&download_url, &downloaded_file_path_buf)
+                .await?;
+
+            let runtime_dir_path_buf = snm_node.get_runtime_dir_path_buf(&version)?;
+
+            let downloaded_file_path_buf = snm_node.get_downloaded_file_path_buf(&version)?;
+
+            let expect = snm_node.get_expect_shasum(&version).await?;
+
+            let actual = snm_node
+                .get_actual_shasum(&downloaded_file_path_buf)
+                .await?;
+
+            if actual.is_none() || expect.is_none() {
+                fs::remove_file(&downloaded_file_path_buf)?;
+                return Err(SnmError::ShasumError {
+                    file_path: downloaded_file_path_buf.display().to_string(),
+                    expect: "None".to_string(),
+                    actual: "None".to_string(),
+                });
+            }
+
+            if actual.eq(&expect).not() {
+                fs::remove_file(&downloaded_file_path_buf)?;
+                return Err(SnmError::ShasumError {
+                    file_path: downloaded_file_path_buf.display().to_string(),
+                    expect: expect.unwrap_or("None".to_string()),
+                    actual: actual.unwrap_or("None".to_string()),
+                });
+            }
+
+            snm_node.decompress_download_file(&downloaded_file_path_buf, &runtime_dir_path_buf)?;
+
+            if let Some(parent) = downloaded_file_path_buf.parent() {
+                fs::remove_dir_all(parent)?;
+            }
+        }
+    }
+
     let binary_dir_string = ensure_binary_path(&snm_node, &version, true).await?;
 
     Ok(binary_dir_string)

crates/snm_shim/src/lib.rs

@@ -5,10 +5,14 @@ mod get_node_bin_dir;
 use crate::get_default_bin_dir::get_default_bin_dir;
 use crate::get_node_bin_dir::get_node_bin_dir;
 use ensure_binary_path::ensure_binary_path;
-use snm_atom::package_manager_atom::PackageManagerAtom;
+use snm_atom::{atom::AtomTrait, package_manager_atom::PackageManagerAtom};
 use snm_config::parse_snm_config;
+use snm_download_builder::{DownloadBuilder, WriteStrategy};
 use snm_utils::{exec::exec_cli, snm_error::SnmError};
-use std::env::{self, current_dir};
+use std::{
+    env::{self, current_dir},
+    fs,
+};
 use tracing_subscriber::{self};
 
 pub async fn load_package_manage_shim(prefix: &str, bin_name: &str) -> Result<(), SnmError> {
@@ -38,10 +42,35 @@ pub async fn load_package_manage_shim(prefix: &str, bin_name: &str) -> Result<()
         );
         if package_manager.name == prefix {
             let version = package_manager.version;
-            vec![
-                node_dir.clone(),
-                ensure_binary_path(&snm_package_manage, &version, false).await?,
-            ]
+
+            let download_url = snm_package_manage.get_download_url(&version);
+
+            let downloaded_file_path_buf =
+                snm_package_manage.get_downloaded_file_path_buf(&version)?;
+
+            DownloadBuilder::new()
+                .retries(3)
+                .timeout(
+                    snm_package_manage
+                        .get_snm_config()
+                        .get_download_timeout_secs(),
+                )
+                .write_strategy(WriteStrategy::WriteAfterDelete)
+                .download(&download_url, &downloaded_file_path_buf)
+                .await?;
+
+            let runtime_dir_path_buf = snm_package_manage.get_runtime_dir_path_buf(&version)?;
+
+            snm_package_manage
+                .decompress_download_file(&downloaded_file_path_buf, &runtime_dir_path_buf)?;
+
+            if let Some(parent) = downloaded_file_path_buf.parent() {
+                fs::remove_dir_all(parent)?;
+            }
+
+            let binary = snm_package_manage.get_runtime_binary_dir_string(version.as_str())?;
+
+            vec![node_dir.clone(), binary]
         } else if restricted_list.contains(&command.as_str()) {
             return Err(SnmError::NotMatchPackageManagerError {
                 raw_command: args_all.join(" ").to_string(),