refactor(api) and cd

Author: lazhenyi

api/src/dist.rs

@@ -1,12 +1,42 @@
 use actix_files::NamedFile;
-use actix_web::{HttpRequest, Responder};
+use actix_web::{HttpRequest, HttpResponse};
+use std::path::{Path, PathBuf};
+use tokio::fs;
 
-pub async fn dist(req: HttpRequest) -> impl Responder {
-    let path = req.path();
-    NamedFile::open_async(format!("/explore/html/{}", path))
-        .await
-        .unwrap_or(NamedFile::open_async("/explore/html/index.html").await.unwrap())
-        .prefer_utf8(true)
-        .use_etag(true)
-        .use_last_modified(true)
+pub async fn dist(req: HttpRequest) -> HttpResponse {
+    let base = Path::new("/explore/html");
+    let request_path = req.path().trim_matches('/');
+    let file_path = resolve_file_path(base, request_path).await;
+    match NamedFile::open_async(&file_path).await {
+        Ok(named_file) => {
+            named_file
+                .prefer_utf8(true)
+                .use_etag(true)
+                .use_last_modified(true)
+                .into_response(&req)
+        }
+        Err(_) => {
+            NamedFile::open_async(base.join("index.html"))
+                .await
+                .map(|f| f.into_response(&req))
+                .unwrap_or_else(|_|
+                    HttpResponse::NotFound()
+                        .content_type("text/html")
+                        .body("<h1>404 Not Found</h1>")
+                )
+        }
+    }
+}
+
+async fn resolve_file_path(base: &Path, request_path: &str) -> PathBuf {
+    if request_path.is_empty() {
+        return base.join("index.html");
+    }
+    let full_path = base.join(request_path);
+    if let Ok(metadata) = fs::metadata(&full_path).await {
+        if metadata.is_dir() {
+            return full_path.join("index.html");
+        }
+    }
+    full_path
 }

docker-compose.yaml

@@ -10,39 +10,32 @@ services:
       - redis_data:/data
     restart: unless-stopped
     networks:
-      - jzfs
+      - traefik_web
   jzfs-git:
     build: .
     image: gitdatateam/jzfs-git:latest
     container_name: jzfs-git
     ports:
       - "22:30322"
-      - "80:80"
     volumes:
       - ./data:/explore/data
       - ./logs:/explore/logs
-    entrypoint:
-      - REDIS_URL=redis://jzfs_redis:6379
-      - PORT=80
-      - ROOT_DATA=/explore/data
     env_file:
       - .env
     restart: unless-stopped
     networks:
-      - jzfs
+      - traefik_web
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.jzfs-git.rule=Host(`git.atom.gitdata.ai`)"
       - "traefik.http.routers.jzfs-git.entrypoints=websecure"
       - "traefik.http.routers.jzfs-git.tls.certresolver=letsencrypt"
-      - "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https"
-      - "traefik.http.middlewares.https-redirect.redirectscheme.permanent=true"
+      - "traefik.docker.network=traefik_web"
     depends_on:
       - jzfs_deps_redis
 
 networks:
-  jzfs:
-    driver: bridge
-
+  traefik_web:
+    external: true
 volumes:
   redis_data: