add console static files

rustfs/Cargo.toml

@@ -70,6 +70,8 @@ iam = { path = "../iam" }
 jsonwebtoken = "9.3.0"
 tower-http = { version = "0.6.2", features = ["cors"] }
 include_dir = "0.7.4"
+pnet = "0.35.0"
+mime_guess = "2.0.5"
 
 [build-dependencies]
 prost-build.workspace = true

rustfs/src/console.rs

@@ -7,15 +7,30 @@ use axum::{
 };
 
 use include_dir::{include_dir, Dir};
+use mime_guess::from_path;
+use pnet::datalink::interfaces;
 use serde::Serialize;
+use std::net::SocketAddr;
 
 static STATIC_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/static");
 
 async fn static_handler(uri: axum::http::Uri) -> impl IntoResponse {
-    let path = uri.path().trim_start_matches('/');
+    let mut path = uri.path().trim_start_matches('/');
+    if path.is_empty() {
+        path = "index.html"
+    }
     if let Some(file) = STATIC_DIR.get_file(path) {
+        let mime_type = from_path(file.path().as_os_str()).first_or_octet_stream();
         Response::builder()
             .status(StatusCode::OK)
+            .header("Content-Type", mime_type.to_string())
+            .body(Body::from(file.contents()))
+            .unwrap()
+    } else if let Some(file) = STATIC_DIR.get_file("index.html") {
+        let mime_type = from_path(file.path().as_os_str()).first_or_octet_stream();
+        Response::builder()
+            .status(StatusCode::OK)
+            .header("Content-Type", mime_type.to_string())
             .body(Body::from(file.contents()))
             .unwrap()
     } else {
@@ -26,13 +41,66 @@ async fn static_handler(uri: axum::http::Uri) -> impl IntoResponse {
     }
 }
 
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Serialize)]
 struct Config {
-    fs_addr: String,
+    api: Api,
+    s3: S3,
+    release: Release,
+    license: License,
+}
+
+impl Config {
+    fn new(url: &str, version: &str, date: &str) -> Self {
+        Config {
+            api: Api {
+                base_url: format!("{}/rustfs/admin/v3", url),
+            },
+            s3: S3 {
+                endpoint: url.to_owned(),
+                region: "cn-east-1".to_owned(),
+            },
+            release: Release {
+                version: version.to_string(),
+                date: date.to_string(),
+            },
+            license: License {
+                name: "Apache-2.0".to_string(),
+                url: "https://www.apache.org/licenses/LICENSE-2.0".to_string(),
+            },
+        }
+    }
+
+    fn to_json(&self) -> String {
+        serde_json::to_string(self).unwrap_or_default()
+    }
+}
+
+#[derive(Debug, Serialize)]
+struct Api {
+    #[serde(rename = "baseURL")]
+    base_url: String,
+}
+
+#[derive(Debug, Serialize)]
+struct S3 {
+    endpoint: String,
+    region: String,
+}
+
+#[derive(Debug, Serialize)]
+struct Release {
+    version: String,
+    date: String,
+}
+
+#[derive(Debug, Serialize)]
+struct License {
+    name: String,
+    url: String,
 }
 
 async fn config_handler(axum::extract::Extension(fs_addr): axum::extract::Extension<String>) -> impl IntoResponse {
-    let cfg = serde_json::to_string(&Config { fs_addr }).unwrap_or_default();
+    let cfg = Config::new(&fs_addr, "v0.0.1", "2025-01-01").to_json();
 
     Response::builder()
         .header("content-type", "application/json")
@@ -42,14 +110,37 @@ async fn config_handler(axum::extract::Extension(fs_addr): axum::extract::Extens
 }
 
 pub async fn start_static_file_server(addrs: &str, fs_addr: &str) {
+    // 将字符串解析为 SocketAddr
+    let socket_addr: SocketAddr = fs_addr.parse().unwrap();
+
+    // 提取 IP 地址和端口号
+    let mut src_ip = socket_addr.ip();
+    let port = socket_addr.port();
+
+    if src_ip.to_string() == "0.0.0.0" {
+        for iface in interfaces() {
+            if iface.is_loopback() || !iface.is_up() {
+                continue;
+            }
+            for ip in iface.ips {
+                if ip.is_ipv4() {
+                    src_ip = ip.ip();
+                }
+            }
+        }
+    }
+
+    // FIXME: TODO: protocol from config
+    let s3_url = format!("http://{}:{}", src_ip, port);
+
     // 创建路由
     let app = Router::new()
-        .route("/config.json", get(config_handler).layer(axum::extract::Extension(fs_addr.to_string())))
-        .route("/*file", get(static_handler));
+        .route("/config.json", get(config_handler).layer(axum::extract::Extension(s3_url.clone())))
+        .nest_service("/", get(static_handler));
 
     let listener = tokio::net::TcpListener::bind(addrs).await.unwrap();
 
-    println!("console listening on: {}", listener.local_addr().unwrap());
+    println!("console running on: http://{} with s3 api {}", listener.local_addr().unwrap(), s3_url);
 
     axum::serve(listener, app).await.unwrap();
 }

rustfs/src/main.rs

@@ -234,7 +234,7 @@ async fn run(opt: config::Opt) -> Result<()> {
     if opt.console_enable {
         info!("console is enabled");
         tokio::spawn(async move {
-            console::start_static_file_server(&opt.console_address, &opt.address).await;
+            console::start_static_file_server(&opt.console_address, server_address.as_str()).await;
         });
     }
 

rustfs/static/index.html

@@ -1 +0,0 @@
-static index