remove codes again

Author: timzaak

Cargo.lock

@@ -16,12 +16,11 @@ version = "2.4.1"
 anyhow = { version = "1.0" }
 bytes = "1"
 chrono = { version = "0.4" }
-clap = { version = "4.5.7"}
+clap = { version = "4.5"}
 console = "0.16"
 dashmap = "6.1"
 delay_timer = "0.11.6"
 duration-str = "0.17"
-flate2 = "1.0"
 futures = "0.3"
 futures-util = { version = "0.3", default-features = false }
 headers = "0.4"
@@ -30,8 +29,6 @@ if_chain = "1.0"
 indicatif = "0.18"
 lazy_static = "1.4"
 md-5 = "0.10"
-mime = "0.3"
-mime_guess = "2.0.0"
 percent-encoding = "2.1"
 regex = "1.10"
 reqwest = { version = "0.12", default-features = false }
@@ -46,4 +43,4 @@ tracing-core = "0.1.32"
 tracing-subscriber = { version = "0.3"}
 walkdir = "2.5"
 warp = "0.4.2"
-salvo = "0.84"
+salvo = "0.85.0"

Cargo.toml

@@ -19,51 +19,11 @@ addr = "0.0.0.0"
 ## it would the port would be https.external_port(https.external_port should be defined), otherwise is false
 # redirect_https = true
 
-# [https]
-# port = 443 # https bind address
-# addr = "0.0.0.0"
-## port when serving public network,default is https port. external_port should not be 0.
-# external_port = 443
 
-## if set true, http server(80) will send client
-## status code:301(Moved Permanently) to tell client redirect to https
-
-## default value for https ssl
-# [https.ssl]
-# private = "private.key path" # private ssl key
-# public = "public.cert path" # public ssl cert
-
-## acme config, it doest not support run with https.ssl config.
-# [https.acme]
-## emails to Let's Encrypt needs to interact.
-# emails = ["mailto:[email protected]"]
-
-## directory to store account and certificate
-## optional, default is ${file_dir}/acme
-# dir = "/data/acme"
 
 ## ci / stage / prod, default is prod, ci is just for CI test with Pebble, don't use it.
 # type = prod
 
-## default cache config
-[cache]
-## if file size > max_size, it will not be cached. default is (10MB).
-# max_size = 10_000_000
-## gzip compression for js/json/icon/json, default is false,
-## only support gzip algo, and only compress cached files,
-## be careful to set it true
-# compression = false
-
-## http header Cache-Control config,
-## optional, if not set, won't sender this header to client
-# [[cache.client_cache]]
-## 30day
-# expire = '30d'
-# extension_names = ['icon', 'gif', 'jpg', 'jpeg', 'png', 'js']
-# [[cache.client_cache]]
-# expire = '0'
-# extension_names = ['html']
-
 ## admin server config
 ## admin server don't support hot reload. the config should not change.
 ## optional, and it's disabled by default.
@@ -95,18 +55,3 @@ addr = "0.0.0.0"
 ## optional, when https enabled, redirect_https default value true
 ## it would the port would be https.external_port(https.external_port should be defined), otherwise is false
 # redirect_https = 443
-
-## this would be usefully when set https.acme
-# disable_acme = false
-# [domains.https.ssl]
-
-# [domains.cache]
-# max_size = 10_000_000
-# compression = false
-# [[domains.cache.client_cache]]
-# expire = '30d' # 30day
-# extension_names = ['icon', 'gif', 'jpg', 'jpeg', 'png', 'js']
-
-
-# [openTelemetry]
-# endpoint = "http://localhost:4317"

config.toml

@@ -29,11 +29,9 @@ warp = { workspace = true, features = ["multipart", "server"] }
 # warp inner
 percent-encoding = { workspace = true }
 headers = { workspace = true }
-mime = { workspace = true }
-mime_guess = { workspace = true }
+
 futures-util = { workspace = true }
-# gzip
-flate2 = { workspace = true }
+
 
 # tokio trace and log
 tracing = { workspace = true }

rustfmt.toml

@@ -44,7 +44,7 @@ impl AdminServer {
                 .and(
                     self.get_domain_info()
                         .or(self.get_domain_upload_path())
-                        .or(self.get_files_metadata())
+                        .or(self.get_files_metadata()),
                 )
                 .or(warp::post().and(
                     self.update_domain_version()
@@ -108,7 +108,6 @@ impl AdminServer {
             .and_then(service::update_domain_version)
     }
 
-
     fn change_upload_status(
         &self,
     ) -> impl Filter<Extract = (impl warp::Reply,), Error = Rejection> + Clone {
@@ -282,7 +281,6 @@ pub mod service {
         }
     }
 
-
     pub(super) async fn change_upload_status(
         storage: Arc<DomainStorage>,
         param: UpdateUploadingStatusOption,
@@ -314,7 +312,6 @@ pub mod service {
             let mut resp = e.to_string().into_response();
             *resp.status_mut() = StatusCode::BAD_REQUEST;
 
-
             return Ok(resp);
         }
         let mut parts = form.into_stream();
@@ -371,8 +368,7 @@ pub mod service {
         for info in domains_info {
             let delete_versions = if let Some(max_reserve) = query.max_reserve {
                 if let Some(mut max_version) =
-                    info.current_version
-                        .or(info.versions.iter().max().copied())
+                    info.current_version.or(info.versions.iter().max().copied())
                 {
                     //TODO: fix it, get reserve versions by array index compare, rather than -.
                     max_version -= max_reserve;
@@ -418,7 +414,7 @@ pub mod service {
                         Ok(_) => Response::default(),
                         Err(e) => {
                             let mut resp = e.to_string().into_response();
-                            * resp.status_mut() = StatusCode::BAD_REQUEST;
+                            *resp.status_mut() = StatusCode::BAD_REQUEST;
                             resp
                         }
                     }

server/Cargo.toml

@@ -16,15 +16,7 @@ pub struct Config {
     pub admin_config: Option<AdminConfig>,
     pub http: HttpConfig,
     #[serde(default)]
-    pub cache: CacheConfig,
-    #[serde(default)]
     pub domains: Vec<DomainConfig>,
-    pub open_telemetry: Option<OpenTelemetry>,
-}
-
-#[derive(Deserialize, Debug, Clone, PartialEq)]
-pub struct OpenTelemetry {
-    pub endpoint: String,
 }
 
 //TODO: create config with lots of default value
@@ -69,7 +61,6 @@ fn default_max_upload_size() -> u64 {
 pub struct DomainConfig {
     pub domain: String,
     pub cors: Option<HashSet<OriginWrapper>>,
-    pub cache: Option<DomainCacheConfig>,
     pub https: Option<DomainHttpsConfig>,
     pub alias: Option<Vec<String>>,
     pub redirect_https: Option<bool>,
@@ -97,8 +88,6 @@ pub enum ACMEType {
     Stage,
 }
 
-
-
 #[derive(Deserialize, Debug, Clone, PartialEq)]
 pub struct HttpConfig {
     pub addr: String,
@@ -107,43 +96,13 @@ pub struct HttpConfig {
     pub redirect_https: Option<bool>,
 }
 
-// should write Deserialize by hand.
-#[derive(Deserialize, Debug, Clone, PartialEq)]
-pub struct CacheConfig {
-    #[serde(default = "default_max_size")]
-    pub max_size: u64,
-    #[serde(default)]
-    pub compression: bool,
-    #[serde(default)]
-    pub client_cache: Vec<ClientCacheItem>,
-}
-#[derive(Deserialize, Debug, Clone, PartialEq)]
-pub struct DomainCacheConfig {
-    pub max_size: Option<u64>,
-    pub compression: Option<bool>,
-    pub client_cache: Option<Vec<ClientCacheItem>>,
-}
-
-fn default_max_size() -> u64 {
-    10 * 1000 * 1000
-}
-
 #[derive(Deserialize, Debug, Clone, PartialEq)]
 pub struct ClientCacheItem {
     #[serde(deserialize_with = "deserialize_duration")]
     pub expire: Duration,
     pub extension_names: Vec<String>,
 }
 
-impl Default for CacheConfig {
-    fn default() -> Self {
-        CacheConfig {
-            max_size: default_max_size(),
-            client_cache: Vec::new(),
-            compression: false,
-        }
-    }
-}
 #[derive(Deserialize, Debug, Clone, Eq, PartialEq)]
 pub struct DeprecatedVersionRemove {
     #[serde(default = "default_cron")]

server/src/admin_server.rs

@@ -629,10 +629,7 @@ impl DomainStorage {
                 if !multiple.exists() {
                     let parent = self.prefix.join(host);
                     if !parent.exists() && fs::create_dir_all(&parent).is_err() {
-                        bail!(
-                            "create host directory {} failure",
-                            parent.display().to_string()
-                        )
+                        bail!("create host directory {} failure", parent.display())
                     }
                     if File::create_new(multiple).is_err() {
                         bail!("files in same domain should not create at same time")
@@ -761,7 +758,6 @@ pub fn sanitize_path(base: impl AsRef<Path>, tail: &str) -> Result<PathBuf, Reje
     Ok(buf)
 }
 
-
 #[cfg(test)]
 mod test {
     use crate::config::Config;
@@ -848,7 +844,7 @@ mod test {
             .join("../tests/web/data")
             .display()
             .to_string();
-        let file_cache = FileCache::new(&config);
+        let file_cache = FileCache::new();
         let storage = DomainStorage::init(&config.file_dir, file_cache).unwrap();
         let result = storage.get_domain_info().unwrap();
 
@@ -862,7 +858,6 @@ mod test {
             .read(true)
             .create(true)
             .append(true)
-            
             .open("/tmp/cde.txt")
             .unwrap();
         let mut text = String::new();