remve unneeded deps

Author: timzaak

Cargo.lock

@@ -14,7 +14,6 @@ version = "3.0.0"
 
 [workspace.dependencies]
 anyhow = { version = "1.0" }
-bytes = "1"
 chrono = { version = "0.4" }
 clap = { version = "4.5" }
 console = "0.16"
@@ -23,8 +22,6 @@ delay_timer = "0.11.6"
 duration-str = "0.17"
 futures = "0.3"
 futures-util = { version = "0.3", default-features = false }
-headers = "0.4"
-hyper = { version = "1" }
 if_chain = "1.0"
 indicatif = "0.18"
 lazy_static = "1.4"
@@ -39,8 +36,6 @@ tokio = { version = "1.0" }
 toml = { version = "0.9.8" }
 toml_edit = "0.23.7"
 tracing = "0.1.21"
-tracing-core = "0.1.32"
 tracing-subscriber = { version = "0.3" }
 walkdir = "2.5"
-salvo = "0.85.0"
-dunce = "1"
+salvo = "0.85.0"

Cargo.toml

@@ -35,7 +35,6 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 #config
-toml = { workspace = true }
 toml_edit = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
@@ -48,5 +47,4 @@ md-5 = { workspace = true }
 # util
 anyhow = { workspace = true, features = ["backtrace"] }
 walkdir = { workspace = true }
-if_chain = { workspace = true }
-dunce = { workspace = true }
+if_chain = { workspace = true }

client/Cargo.toml

@@ -23,7 +23,7 @@ users to release SPA.
 
 ## Feature
 
-- Built with Hyper and Salvo, fast and small!
+- Built with Salvo, fast and small!
 - Static web version control, you can regress or release a new version easily.
 - Docker support(compressed size: 32M).
 - Provide command line/npm package to deploy spa.

docs/index.md

@@ -20,14 +20,13 @@ path = "src/main.rs"
 [dependencies]
 entity = { path = "../entity" }
 # web
-hyper = { workspace = true }
-bytes = { workspace = true }
+#hyper = { workspace = true }
 
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "io-std", "sync", "time", "tokio-macros"] }
 
 # warp inner
 percent-encoding = { workspace = true }
-headers = { workspace = true }
+#headers = { workspace = true }
 
 futures-util = { workspace = true }
 
@@ -63,7 +62,5 @@ anyhow = { workspace = true, features = ["backtrace"] }
 walkdir = { workspace = true }
 # time
 chrono = { workspace = true, features = ["serde"] }
-#make if let more easy
-tracing-core = { workspace = true }
 
 salvo = { workspace = true, features = ["serve-static", "size-limiter", "trailing-slash", "affix-state", "basic-auth"] }

server/Cargo.toml

@@ -1,6 +1,6 @@
 use anyhow::{Context, bail};
 use duration_str::deserialize_duration;
-use headers::{HeaderValue, Origin};
+use salvo::http::HeaderValue;
 use serde::{Deserialize, Deserializer};
 use std::collections::HashSet;
 use std::time::Duration;
@@ -134,7 +134,8 @@ impl<'de> Deserialize<'de> for OriginWrapper {
         let mut parts = data.splitn(2, "://");
         let scheme = parts.next().expect("missing scheme");
         let rest = parts.next().expect("missing scheme");
-        let origin = Origin::try_from_parts(scheme, rest, None).expect("invalid Origin");
+        let origin = salvo::http::headers::Origin::try_from_parts(scheme, rest, None)
+            .expect("invalid Origin");
 
         Ok(OriginWrapper(
             origin

server/src/config.rs

@@ -758,8 +758,8 @@ 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 salvo::http::uri::Uri;
     use std::env;
     use std::fs::OpenOptions;
     use std::io::Read;

server/src/domain_storage.rs

@@ -1,6 +1,5 @@
 use anyhow::anyhow;
 use dashmap::DashMap;
-use hyper::body::Bytes;
 use lazy_static::lazy_static;
 use std::collections::HashMap;
 use std::collections::HashSet;
@@ -196,17 +195,6 @@ impl FileCache {
 #[derive(Clone, Debug)]
 pub struct ArcPath(pub Arc<PathBuf>);
 
-#[derive(Debug)]
-pub enum DataBlock {
-    CacheBlock {
-        bytes: Bytes,
-        compressed: bool,
-        path: ArcPath,
-    },
-    // for use warp
-    FileBlock(ArcPath),
-}
-
 pub struct CacheItem {
     pub data: PathBuf,
     pub version: u32,

server/src/file_cache.rs

@@ -1,5 +1,5 @@
 use spa_server::config::Config;
-use tracing_core::Level;
+use tracing::Level;
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]

server/src/main.rs

@@ -1,7 +1,6 @@
 use crate::config::{Config, extract_origin};
-use headers::HeaderValue;
-use hyper::StatusCode;
 use salvo::Response;
+use salvo::http::{HeaderValue, StatusCode};
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;