feat: basic features support completed and style improving

Author: debugdoctor

server/Cargo.lock

@@ -10,15 +10,17 @@ rust-embed = "8.7.2"
 tokio = { version = "1.47.1", features = ["full"] }
 tracing = "0.1.41"
 tracing-subscriber = "0.3.20"
-tower-http = { version = "0.6.6", features = ["fs"] }
+tower-http = { version = "0.6.6", features = ["fs", "timeout"] }
 lazy_static = "1.5.0"
 serde_json = "1.0.143"
 serde = { version = "1.0.219", features = ["derive"] }
 tokio-stream = "0.1.17"
 futures = "0.3.31"
 async-stream = "0.3.6"
+mime_guess = "2.0.5"
 
 [profile.release]
-opt-level = 2
+opt-level = "z"
 lto = true
-strip = true
+strip = true
+panic = "abort"

server/Cargo.toml

@@ -27,7 +27,6 @@ impl AccessCode {
 #[derive(Clone)]
 pub struct FileBlock {
     pub data: Bytes,
-    pub is_final: bool,
     pub filename: String,
     pub start: u64,
     pub end: u64,
@@ -39,10 +38,9 @@ impl FileBlock {
         FILE_BLOCK_DB.clone()
     }
 
-    pub fn new(data: &Bytes, is_final: bool, filename: String, start: u64, end: u64, total: u64) -> Self {
+    pub fn new(data: &Bytes, filename: String, start: u64, end: u64, total: u64) -> Self {
         FileBlock {
             data: data.clone(),
-            is_final,
             filename,
             start,
             end,

server/src/db.rs

@@ -1,22 +1,19 @@
-use tracing::event;
-use tracing_subscriber;
-use anyhow::Result;
+use tracing::{event, Level};
 
+mod db;
+mod router;
 mod service;
 mod utils;
-mod router;
-mod db;
 
 #[tokio::main]
-async fn main() -> Result<()> {
-	tracing_subscriber::fmt()
+async fn main() {
+    tracing_subscriber::fmt()
         .with_thread_ids(false)
         .with_target(false)
         .with_line_number(false)
         .init();
-
-    event!(tracing::Level::INFO, "server started");
-    router::start_server("0.0.0.0", "5000").await;
 
-    Ok(())
+    event!(Level::INFO, "server started");
+    
+    router::start_server("0.0.0.0", "5000").await;
 }

server/src/main.rs

@@ -1,16 +1,28 @@
 use axum::{routing::{get, post}, serve, Router};
 use tokio::net::{TcpListener};
+use tower_http::timeout::TimeoutLayer;
 use tracing::{event, instrument};
+use std::time::Duration;
 
-use crate::service::handler::{download, get_file, get_id, get_status, upload, upload_file};
+use crate::service::handler::{download, get_assets, get_file, get_id, get_status, upload, upload_file};
+use tower_http::services::ServeDir;
 
 fn api_router() -> Router {
     Router::new()
         .route("/hello", get(|| async { "Hi!" }))
         .route("/get_id", get(get_id))
         .route("/{id}/status", get(get_status))
+        // Add timeout layer specifically for upload api
         .route("/{id}/upload", post(upload_file))
+        .layer(TimeoutLayer::new(Duration::from_secs(20))) 
+        // Add timeout layer specifically for download api
         .route("/{id}/file", get(get_file))
+        .layer(TimeoutLayer::new(Duration::from_secs(20))) 
+}
+
+fn assets_router() -> Router {
+    Router::new()
+        .route("/{path}", get(get_assets))
 }
 
 fn view_router() -> Router {
@@ -24,9 +36,9 @@ pub async fn start_server(ip: &str, port: &str) {
     let app = Router::new()
         .merge(view_router())
         .nest("/api", api_router())
-        .nest_service("/assets", axum::routing::get_service(
-            tower_http::services::ServeDir::new("../web/dist/assets")
-        ));
+        .nest("/assets", assets_router())
+        // 添加静态文件服务，用于提供web/dist目录中的文件
+        .fallback_service(ServeDir::new("../web/dist"));
 
     let addr = format!("{}:{}", ip, port);
     let listener = match TcpListener::bind(&addr).await {
@@ -40,8 +52,6 @@ pub async fn start_server(ip: &str, port: &str) {
     event!(tracing::Level::INFO, "Server listening on {}", addr);
     match serve(listener, app).await {
         Ok(_) => {}
-        Err(e) => {
-            event!(tracing::Level::ERROR, "Server error: {}", e);
-        }
-    };
-}
+        Err(e) => event!(tracing::Level::ERROR, "Server error: {}", e),
+    }
+}