lisone/ds2api
1
0
Fork 0
mirror of https://github.com/CJackHwang/ds2api.git synced 2026-05-21 16:37:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update web UI asset serving and embedding mechanism.

Browse Source
This commit is contained in:
CJACK
2026-02-16 19:58:33 +08:00
parent 190881f13a
commit 888a0e6bff
17 changed files with 150 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
internal/webui/handler.go
View File

@@ -1,10 +1,8 @@
package webui
import (
"io/fs"
"net/http"
"os"
"path"
"path/filepath"
"strings"
@@ -19,18 +17,11 @@ const welcomeHTML = `<!DOCTYPE html>
</head><body><main><h1>DS2API</h1><p>DeepSeek to OpenAI & Claude Compatible API</p><div class="links"><a href="/admin">管理面板</a><a href="/v1/models">API 状态</a><a href="https://github.com/CJackHwang/ds2api" target="_blank">GitHub</a></div></main></body></html>`
type Handler struct {
StaticDir string
embeddedAdmin fs.FS
hasEmbeddedUI bool
StaticDir string
}
func NewHandler() *Handler {
h := &Handler{StaticDir: resolveStaticAdminDir(config.StaticAdminDir())}
if sub, err := fs.Sub(embeddedAdminFS, "assets/admin"); err == nil {
h.embeddedAdmin = sub
h.hasEmbeddedUI = true
}
return h
return &Handler{StaticDir: resolveStaticAdminDir(config.StaticAdminDir())}
}
func RegisterRoutes(r chi.Router, h *Handler) {
@@ -61,11 +52,6 @@ func (h *Handler) admin(w http.ResponseWriter, r *http.Request) {
h.serveFromDisk(w, r, staticDir)
return
}
if h.hasEmbeddedUI {
if h.serveFromFS(w, r, h.embeddedAdmin) {
return
}
}
http.Error(w, "WebUI not built. Run `cd webui && npm run build` first.", http.StatusNotFound)
}
@@ -100,6 +86,9 @@ func (h *Handler) serveFromDisk(w http.ResponseWriter, r *http.Request, staticDi
}
func resolveStaticAdminDir(preferred string) string {
if strings.TrimSpace(os.Getenv("DS2API_STATIC_ADMIN_DIR")) != "" {
return filepath.Clean(preferred)
}
candidates := []string{preferred}
if wd, err := os.Getwd(); err == nil {
candidates = append(candidates, filepath.Join(wd, "static/admin"))
@@ -130,34 +119,3 @@ func resolveStaticAdminDir(preferred string) string {
}
return filepath.Clean(preferred)
}
func (h *Handler) serveFromFS(w http.ResponseWriter, r *http.Request, rootFS fs.FS) bool {
rel := strings.TrimPrefix(r.URL.Path, "/admin")
rel = strings.TrimPrefix(rel, "/")
safe := strings.TrimPrefix(path.Clean("/"+rel), "/")
if strings.HasPrefix(safe, "../") {
http.NotFound(w, r)
return true
}
if safe != "" && strings.Contains(safe, ".") {
if _, err := fs.Stat(rootFS, safe); err != nil {
http.NotFound(w, r)
return true
}
if strings.HasPrefix(safe, "assets/") {
w.Header().Set("Cache-Control", "public, max-age=31536000, immutable")
} else {
w.Header().Set("Cache-Control", "no-store, must-revalidate")
}
http.ServeFileFS(w, r, rootFS, safe)
return true
}
if _, err := fs.Stat(rootFS, "index.html"); err != nil {
return false
}
w.Header().Set("Cache-Control", "no-store, must-revalidate")
http.ServeFileFS(w, r, rootFS, "index.html")
return true
}