fix client command info bug and .SPA-Multiple incorrectly write

Author: timzaak

client/src/api.rs

@@ -3,7 +3,8 @@ use anyhow::anyhow;
 use reqwest::{header, multipart, StatusCode};
 use serde_json::Value;
 use spa_server::admin_server::request::{
-    DeleteDomainVersionOption, DomainWithOptVersionOption, UpdateUploadingStatusOption,
+    DeleteDomainVersionOption, DomainWithOptVersionOption, GetDomainOption,
+    UpdateUploadingStatusOption,
 };
 use spa_server::domain_storage::{ShortMetaData, UploadDomainPosition};
 use std::borrow::Cow;
@@ -74,10 +75,8 @@ impl API {
     }
 
     pub async fn get_domain_info(&self, domain: Option<String>) -> anyhow::Result<Value> {
-        let mut q = self.async_client.get(self.url("status"));
-        if let Some(domain) = domain {
-            q = q.query(&["domain", &domain])
-        }
+        let param = GetDomainOption { domain };
+        let mut q = self.async_client.get(self.url("status")).query(&param);
         let resp = q.send().await?;
         json_resp!(resp)
     }

client/src/commands.rs

@@ -12,13 +12,19 @@ pub struct CliCommand {
 
 #[derive(Subcommand, Debug)]
 pub enum Commands {
-    Info { domain: Option<String> },
+    Info {
+        domain: Option<String>,
+    },
     Upload(UploadArg),
     Release {
         domain: String,
-        version: Option<u32> },
+        version: Option<u32>,
+    },
     Reload,
-    Delete {domain: Option<String>, max_reserve:Option<u32>}
+    Delete {
+        domain: Option<String>,
+        max_reserve: Option<u32>,
+    },
 }
 
 #[derive(Args, Debug)]
@@ -55,6 +61,12 @@ mod test {
         let c = CliCommand::parse_from(&["spa-client", "--config-dir=abc.conf", "info"]);
         //println!("{:?}", &c);
         assert_eq!(c.config_dir, Some(PathBuf::from("abc.conf")));
+        let c = CliCommand::parse_from(&["spa-client", "info", "www.example.com"]);
+        if let Commands::Info { domain } = c.commands {
+            assert_eq!(domain.unwrap(), "www.example.com")
+        } else {
+            unreachable!()
+        }
     }
 
     #[test]

docs/develop/change-log.md

@@ -4,7 +4,9 @@
 
 - [x] fix: command client upload interrupt, get error file key.
 - [x] fix: admin server report os:9 error when upload existed file.
-- [x] ci: add ci for spa-server
+- [x] ci: add ci for spa-server, and GitHub action could run it
+- [x] fix: command client info incorrect handle domain query string
+- [x] fix: fix .SPA-Multiple would write sub dir more than once
 
 ### Version 2.2.0
 

server/src/domain_storage.rs

@@ -215,7 +215,7 @@ impl DomainStorage {
             }
         }
         if max_version > 0 {
-            tracing::info!("serve: {},version: {}", domain_dir_name, max_version);
+            info!("serve: {},version: {}", domain_dir_name, max_version);
             return Ok((uploading_version, Some(max_version)));
         }
         return Ok((uploading_version, None));
@@ -283,17 +283,23 @@ impl DomainStorage {
                             let multiple_file =
                                 self.prefix.join(&host).join(MULTIPLE_WEB_FILE_NAME);
                             if multiple_file.exists() {
-                                let mut file =
-                                    OpenOptions::new().append(true).open(multiple_file)?;
-                                writeln!(file, "{}", path.to_string())?;
+                                let mut file = OpenOptions::new()
+                                    .append(true)
+                                    .read(true)
+                                    .open(multiple_file)?;
+                                let mut multiple_path = String::new();
+                                file.read_to_string(&mut multiple_path)?;
+                                if !multiple_path.lines().any(|x| x == path) {
+                                    writeln!(file, "{}", path)?;
+                                }
                             }
                             map.insert(path.to_string(), (new_path.clone(), version));
                         }
                     };
                 }
                 None => {
                     //TODO: check if MULTIPLE_WEB_FILE_NAME exists
-                    if path == "" {
+                    if path.is_empty() {
                         self.meta.insert(
                             host.to_string(),
                             DomainMeta::OneWeb(new_path.clone(), version),
@@ -303,10 +309,16 @@ impl DomainStorage {
                         let mut file = OpenOptions::new()
                             .create(true)
                             .append(true)
+                            .read(true)
                             .open(&multiple_file)?;
 
+                        let mut multiple_path = String::new();
+                        file.read_to_string(&mut multiple_path)?;
+                        if !multiple_path.lines().any(|x| x == path) {
+                            writeln!(file, "{}", path)?;
+                        }
                         let map = DashMap::new();
-                        writeln!(file, "{}", path.to_string())?;
+
                         info!("create multiple_file {multiple_file:?}, append {path}");
                         map.insert(path.to_string(), (new_path.clone(), version));
 
@@ -597,7 +609,7 @@ impl DomainStorage {
                 None => (domain.as_str(), ""),
             };
             let multiple = self.prefix.join(host).join(MULTIPLE_WEB_FILE_NAME);
-            if path != "" {
+            if !path.is_empty() {
                 if !multiple.exists() {
                     let parent = self.prefix.join(host);
                     if !parent.exists() && fs::create_dir_all(&parent).is_err() {
@@ -721,9 +733,15 @@ pub struct UploadDomainPosition {
 
 #[cfg(test)]
 mod test {
+    use crate::config::Config;
     use crate::domain_storage::{DomainStorage, URI_REGEX_STR};
+    use crate::file_cache::FileCache;
     use hyper::Uri;
     use regex::Regex;
+    use std::env;
+    use std::fs::OpenOptions;
+    use std::io::Read;
+    use std::io::Write;
     use std::ops::RangeInclusive;
     use std::path::PathBuf;
     use std::str::FromStr;
@@ -789,9 +807,33 @@ mod test {
     //     println!("{:?}", path.join("usr/lib/pam/").to_str());
     // }
 
-    // would crea
-    // #[test]
-    // fn test_create_file() {
-    //     File::create_new(PathBuf::from("/tmp/bccskwef")).unwrap();
-    // }
+    #[test]
+    fn test_domain_storage_get_domain_info() {
+        let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../test/config.test.conf");
+        env::set_var("SPA_CONFIG", path.display().to_string());
+        let mut config = Config::load().unwrap();
+        config.file_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+            .join("../test/data")
+            .display()
+            .to_string();
+        let file_cache = FileCache::new(&config);
+        let storage = DomainStorage::init(&config.file_dir, file_cache).unwrap();
+        let result = storage.get_domain_info().unwrap();
+
+        println!("{:?}", result);
+    }
+    #[test]
+    fn test_file_read() {
+        let mut file = OpenOptions::new()
+            .read(true)
+            .create(true)
+            .append(true)
+            .write(true)
+            .open("/tmp/cde.txt")
+            .unwrap();
+        let mut text = String::new();
+        file.read_to_string(&mut text).unwrap();
+        assert_eq!(&text, "");
+        //writeln!(file, "{}", "abc").unwrap();
+    }
 }