Merge pull request #7 from DullJZ/add-api

Fix: dist.tar.gz unzip error

.github/workflows/build.yml

@@ -19,6 +19,21 @@ jobs:
       run: |
         echo "VERSION=$(cat VERSION | tr -d '\n')" >> $GITHUB_ENV
 
+    - name: Download frontend assets
+      run: |
+        echo "Downloading latest frontend build from s3-balance-web..."
+        LATEST_RELEASE=$(curl -s https://api.github.com/repos/DullJZ/s3-balance-web/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+        echo "Latest frontend release: $LATEST_RELEASE"
+
+        curl -L -o dist.tar.gz "https://github.com/DullJZ/s3-balance-web/releases/download/$LATEST_RELEASE/dist.tar.gz"
+
+        mkdir -p internal/webui/dist
+        tar -xzf dist.tar.gz -C internal/webui/dist/
+        rm dist.tar.gz
+
+        echo "Frontend assets downloaded and extracted to internal/webui/dist"
+        ls -la internal/webui/dist/
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
       with:
@@ -62,6 +77,21 @@ jobs:
       run: |
         echo "VERSION=$(cat VERSION | tr -d '\n')" >> $GITHUB_ENV
 
+    - name: Download frontend assets
+      run: |
+        echo "Downloading latest frontend build from s3-balance-web..."
+        LATEST_RELEASE=$(curl -s https://api.github.com/repos/DullJZ/s3-balance-web/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+        echo "Latest frontend release: $LATEST_RELEASE"
+
+        curl -L -o dist.tar.gz "https://github.com/DullJZ/s3-balance-web/releases/download/$LATEST_RELEASE/dist.tar.gz"
+
+        mkdir -p internal/webui/dist
+        tar -xzf dist.tar.gz -C internal/webui/dist/
+        rm dist.tar.gz
+
+        echo "Frontend assets downloaded and extracted to internal/webui/dist"
+        ls -la internal/webui/dist/
+
     - name: Setup Go
       uses: actions/setup-go@v2
       with:

.gitignore

@@ -53,4 +53,6 @@ CLAUDE.md
 docs/
 
 # Generated files
-s3-balance
+s3-balance
+
+dist/

VERSION

@@ -1 +1 @@
-v0.1.2
+v0.2.0

cmd/s3-balance/main.go

@@ -20,6 +20,8 @@ import (
 	"github.com/DullJZ/s3-balance/internal/middleware"
 	"github.com/DullJZ/s3-balance/internal/scheduler"
 	"github.com/DullJZ/s3-balance/internal/storage"
+	"github.com/DullJZ/s3-balance/internal/web"
+	"github.com/DullJZ/s3-balance/internal/webui"
 	"github.com/DullJZ/s3-balance/pkg/presigner"
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -28,9 +30,17 @@ import (
 func main() {
 	// 解析命令行参数
 	var configFile string
+	var onlyWeb bool
 	flag.StringVar(&configFile, "config", "config/config.yaml", "Path to configuration file")
+	flag.BoolVar(&onlyWeb, "only-web", false, "Only serve web UI, no backend services")
 	flag.Parse()
 
+	// 如果是只提供Web前端模式
+	if onlyWeb {
+		startWebOnlyMode(configFile)
+		return
+	}
+
 	// 创建配置管理器
 	configManager, err := config.NewManager(configFile)
 	if err != nil {
@@ -148,6 +158,15 @@ func main() {
 		log.Printf("Management API endpoints available at /api/*")
 	}
 
+	// 注册Web管理界面
+	distSubFS, err := webui.GetDistFS()
+	if err != nil {
+		log.Fatalf("Failed to load embedded web UI: %v", err)
+	}
+	webHandler := web.NewHandler(distSubFS)
+	router.PathPrefix("/web").Handler(http.StripPrefix("/web", webHandler))
+	log.Println("Web UI available at /web")
+
 	// 运行在S3兼容模式
 	log.Println("Running in S3-compatible mode")
 	s3Handler.RegisterS3Routes(router)
@@ -298,3 +317,77 @@ func cleanupS3MultipartUploads(_ context.Context, storageService *storage.Servic
 		}
 	}
 }
+
+// startWebOnlyMode 只启动Web前端服务，不启动后端服务
+func startWebOnlyMode(configFile string) {
+	log.Println("Starting in web-only mode (no backend services)")
+
+	// 加载配置文件以获取端口等信息
+	configManager, err := config.NewManager(configFile)
+	if err != nil {
+		log.Fatalf("Failed to load config: %v", err)
+	}
+	defer configManager.Close()
+
+	cfg := configManager.GetConfig()
+
+	// 创建路由器
+	router := mux.NewRouter()
+
+	// 加载嵌入的前端资源
+	distSubFS, err := webui.GetDistFS()
+	if err != nil {
+		log.Fatalf("Failed to load embedded web UI: %v", err)
+	}
+
+	// 注册Web前端路由
+	webHandler := web.NewHandler(distSubFS)
+
+	// 根路径重定向到 /web
+	router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		http.Redirect(w, r, "/web/", http.StatusMovedPermanently)
+	})
+
+	// Web UI 路由
+	router.PathPrefix("/web").Handler(http.StripPrefix("/web", webHandler))
+
+	// 添加 CORS 和日志中间件
+	router.Use(corsMiddleware)
+	router.Use(loggingMiddleware)
+
+	// 使用配置文件中的端口
+	addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)
+	srv := &http.Server{
+		Addr:         addr,
+		Handler:      router,
+		ReadTimeout:  cfg.Server.ReadTimeout,
+		WriteTimeout: cfg.Server.WriteTimeout,
+		IdleTimeout:  cfg.Server.IdleTimeout,
+	}
+
+	log.Println("Web UI available at /web")
+	log.Printf("Starting web server on %s", srv.Addr)
+
+	// 启动服务器
+	go func() {
+		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			log.Fatalf("Failed to start server: %v", err)
+		}
+	}()
+
+	// 等待中断信号
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
+	<-sigChan
+
+	// 优雅关闭
+	log.Println("Shutting down web server...")
+	shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer shutdownCancel()
+
+	if err := srv.Shutdown(shutdownCtx); err != nil {
+		log.Printf("Server shutdown error: %v", err)
+	}
+
+	log.Println("Web server stopped")
+}

internal/config/manager.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"bytes"
 	"fmt"
 	"log"
 	"os"
@@ -128,7 +129,7 @@ func (m *Manager) watchConfig() {
 
 			// 只处理修改和重命名事件
 			if event.Op&fsnotify.Write == fsnotify.Write ||
-			   event.Op&fsnotify.Rename == fsnotify.Rename {
+				event.Op&fsnotify.Rename == fsnotify.Rename {
 				log.Printf("Config file %s modified (detected by fsnotify), reloading...", m.configFile)
 
 				// 更新最后修改时间以避免轮询重复触发
@@ -366,39 +367,36 @@ func (m *Manager) backupConfigFile() error {
 
 // writeConfigFile 将配置写入 YAML 文件
 func (m *Manager) writeConfigFile(cfg *Config) error {
-	// 临时文件，确保原子性
-	tmpFile := m.configFile + ".tmp"
-
-	file, err := os.OpenFile(tmpFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return fmt.Errorf("failed to create temp config file: %w", err)
-	}
-	defer file.Close()
-
-	encoder := yaml.NewEncoder(file)
+	// 先编码到缓冲区，避免在写入过程中损坏原文件
+	var buf bytes.Buffer
+	encoder := yaml.NewEncoder(&buf)
 	encoder.SetIndent(2)
 
 	if err := encoder.Encode(cfg); err != nil {
-		file.Close()
-		os.Remove(tmpFile)
 		return fmt.Errorf("failed to encode config: %w", err)
 	}
 
 	if err := encoder.Close(); err != nil {
-		file.Close()
-		os.Remove(tmpFile)
 		return fmt.Errorf("failed to close encoder: %w", err)
 	}
 
-	if err := file.Close(); err != nil {
-		os.Remove(tmpFile)
-		return fmt.Errorf("failed to close temp file: %w", err)
+	file, err := os.OpenFile(m.configFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	if err != nil {
+		return fmt.Errorf("failed to open config file: %w", err)
 	}
 
-	// 原子性替换原文件
-	if err := os.Rename(tmpFile, m.configFile); err != nil {
-		os.Remove(tmpFile)
-		return fmt.Errorf("failed to replace config file: %w", err)
+	if _, err := file.Write(buf.Bytes()); err != nil {
+		file.Close()
+		return fmt.Errorf("failed to write config file: %w", err)
+	}
+
+	if err := file.Sync(); err != nil {
+		file.Close()
+		return fmt.Errorf("failed to sync config file: %w", err)
+	}
+
+	if err := file.Close(); err != nil {
+		return fmt.Errorf("failed to close config file: %w", err)
 	}
 
 	return nil
@@ -420,4 +418,4 @@ func (m *Manager) Close() error {
 	}
 
 	return nil
-}
+}

internal/web/handler.go

@@ -0,0 +1,87 @@
+package web
+
+import (
+	"io"
+	"io/fs"
+	"net/http"
+	"path"
+	"strings"
+)
+
+// Handler Web管理界面处理器
+type Handler struct {
+	fileSystem http.FileSystem
+}
+
+// NewHandler 创建Web处理器
+// distFS 应该是通过 embed.FS 嵌入的 dist 目录
+func NewHandler(distFS fs.FS) *Handler {
+	return &Handler{
+		fileSystem: http.FS(distFS),
+	}
+}
+
+// ServeHTTP 实现 http.Handler 接口
+// 处理单页应用的路由，将所有未找到的路径重定向到 index.html
+func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	// 清理路径
+	p := r.URL.Path
+	if !strings.HasPrefix(p, "/") {
+		p = "/" + p
+	}
+
+	// 尝试打开文件
+	f, err := h.fileSystem.Open(path.Clean(p))
+	if err != nil {
+		// 文件不存在，返回 index.html (用于支持前端路由)
+		indexFile, err := h.fileSystem.Open("index.html")
+		if err != nil {
+			http.Error(w, "File not found", http.StatusNotFound)
+			return
+		}
+		defer indexFile.Close()
+
+		// 读取 index.html 内容
+		stat, err := indexFile.Stat()
+		if err != nil {
+			http.Error(w, "Internal server error", http.StatusInternalServerError)
+			return
+		}
+
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		http.ServeContent(w, r, "index.html", stat.ModTime(), indexFile.(io.ReadSeeker))
+		return
+	}
+	defer f.Close()
+
+	// 文件存在，检查是否为目录
+	stat, err := f.Stat()
+	if err != nil {
+		http.Error(w, "Internal server error", http.StatusInternalServerError)
+		return
+	}
+
+	if stat.IsDir() {
+		// 如果是目录，尝试返回 index.html
+		indexPath := path.Join(p, "index.html")
+		indexFile, err := h.fileSystem.Open(indexPath)
+		if err != nil {
+			http.Error(w, "Forbidden", http.StatusForbidden)
+			return
+		}
+		defer indexFile.Close()
+
+		indexStat, err := indexFile.Stat()
+		if err != nil {
+			http.Error(w, "Internal server error", http.StatusInternalServerError)
+			return
+		}
+
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		http.ServeContent(w, r, "index.html", indexStat.ModTime(), indexFile.(io.ReadSeeker))
+		return
+	}
+
+	// 返回文件内容
+	http.ServeContent(w, r, stat.Name(), stat.ModTime(), f.(io.ReadSeeker))
+}

internal/webui/embed.go

@@ -0,0 +1,14 @@
+package webui
+
+import (
+	"embed"
+	"io/fs"
+)
+
+//go:embed dist
+var distFS embed.FS
+
+// GetDistFS 获取嵌入的前端静态文件系统
+func GetDistFS() (fs.FS, error) {
+	return fs.Sub(distFS, "dist")
+}