ci: 更新清理旧包的工作流配置

feat: 备份文件恢复

.github/workflows/cleanup-packages.yml

@@ -20,23 +20,41 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const { data: packages } = await github.rest.packages.getAllPackageVersionsForPackageOwnedByAuthenticatedUser({
-              package_type: 'container',
-              package_name: process.env.GITHUB_REPOSITORY.split('/')[1]
-            });
+            // 分页获取所有包版本
+            const allVersions = [];
+            let page = 1;
+            let fetched;
+            const packageName = process.env.GITHUB_REPOSITORY.split('/')[1];
+            do {
+              const { data: packages } = await github.rest.packages.getAllPackageVersionsForPackageOwnedByAuthenticatedUser({
+                package_type: 'container',
+                package_name: packageName,
+                page,
+                per_page: 100
+              });
+              fetched = packages.length;
+              allVersions.push(...packages);
+              page++;
+            } while (fetched === 100);
 
-            // Identify versions with only a single SHA tag (format: sha-<7 hexadecimal characters>)
-            const shaOnlyVersions = packages.filter(pkg => {
+            // 筛选仅有 SHA/sha256 标签或无标签的版本
+            const shaOrNoTagVersions = allVersions.filter(pkg => {
               const tags = pkg.metadata.container.tags;
-              return tags.length === 1 && tags[0].match(/^sha-[0-9a-f]{7}$/);
+              return (
+                (tags.length === 1 && (
+                  tags[0].match(/^sha-[0-9a-f]{7}$/) ||
+                  tags[0].match(/^sha256:[0-9a-f]{64}$/)
+                )) ||
+                tags.length === 0
+              );
             });
 
-            // Delete the SHA-only versions
-            for (const version of shaOnlyVersions) {
+            // 删除这些版本
+            for (const version of shaOrNoTagVersions) {
               await github.rest.packages.deletePackageVersionForAuthenticatedUser({
                 package_type: 'container',
-                package_name: process.env.GITHUB_REPOSITORY.split('/')[1],
+                package_name: packageName,
                 package_version_id: version.id
               });
-              console.log(`Deleted package version ${version.id} with SHA tag ${version.metadata.container.tags[0]}`);
+              console.log(`Deleted package version ${version.id} with tags: ${version.metadata.container.tags.join(', ') || 'none'}`);
             }

.github/workflows/docker-publish.yml

@@ -1,4 +1,4 @@
-name: Publish Docker Image
+name: Publish Docker Image on Main
 
 on:
   push:

README.md

@@ -17,6 +17,12 @@ Komari 是一款轻量级的自托管服务器监控工具，旨在提供简单
 
 ### 0. 容器云一键部署
 
+- 雨云云应用 - CNY 4.5/月 
+
+[![](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/6780/NzYxNzAz_) 
+
+- Claw Run - USD 1.5/月
+
 [![](https://raw.githubusercontent.com/ClawCloud/Run-Template/refs/heads/main/Run-on-ClawCloud.svg)](https://template.run.claw.cloud/?openapp=system-fastdeploy%3FtemplateName%3Dkomari)
 
 ### 1. 使用一键安装脚本
@@ -91,10 +97,12 @@ sudo ./install-komari.sh
    默认监听 `25774` 端口，访问 `http://localhost:25774`。
 
 ## 前端开发指南
-[Komari 主题开发指南 | Komari](https://komari-monitor.github.io/komari-document/dev/theme.html)
+[Komari 主题开发指南 | Komari](https://komari-document.pages.dev/dev/theme.html)
+
+[在 Crowdin 上翻译 Komari](https://crowdin.com/project/komari/invite?h=cd051bf172c9a9f7f1360e87ffb521692507706)
 
 ## 客户端 Agent 开发指南
-[Komari Agent 信息上报与事件处理文档](https://komari-monitor.github.io/komari-document/dev/agent.html)
+[Komari Agent 信息上报与事件处理文档](https://komari-document.pages.dev/dev/agent.html)
 
 ## 贡献
 欢迎提交 Issue 或 Pull Request！

api/admin/download.go

@@ -135,5 +135,23 @@ func DownloadBackup(c *gin.Context) {
 		log.Printf("Database file '%s' is within './data', skipping explicit addition.\n", dbFilePath)
 	}
 
+	// 添加备份标记文件
+	markupContent := "此文件为 Komari 备份标记文件，请勿删除。\nThis is a Komari backup markup file, please do not delete.\n\n备份时间 / Backup Time: " + time.Now().Format("2006-01-02 15:04:05")
+	markupWriter, err := zipWriter.CreateHeader(&zip.FileHeader{
+		Name:     "komari-backup-markup",
+		Method:   zip.Deflate,
+		Modified: time.Now(),
+	})
+	if err != nil {
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating backup markup file: %v", err))
+		return
+	}
+
+	_, err = markupWriter.Write([]byte(markupContent))
+	if err != nil {
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error writing backup markup file: %v", err))
+		return
+	}
+
 	// zipWriter.Close() 由 defer 自动调用
 }

api/admin/upload.go

@@ -0,0 +1,166 @@
+package admin
+
+import (
+	"archive/zip"
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+
+	"github.com/gin-gonic/gin"
+	"github.com/komari-monitor/komari/api"
+	"github.com/komari-monitor/komari/cmd/flags"
+)
+
+// 只有一个备份恢复操作在进行
+var restoreMutex sync.Mutex
+
+// UploadBackup 用于接收上传的备份文件并将其内容恢复到原始位置
+func UploadBackup(c *gin.Context) {
+	// 尝试获取锁，如果已有恢复操作在进行，则立即返回错误
+	if !restoreMutex.TryLock() {
+		api.RespondError(c, http.StatusConflict, "Another restore operation is already in progress")
+		return
+	}
+	defer restoreMutex.Unlock()
+
+	// 获取上传的文件
+	file, header, err := c.Request.FormFile("backup")
+	if err != nil {
+		api.RespondError(c, http.StatusBadRequest, fmt.Sprintf("Error getting uploaded file: %v", err))
+		return
+	}
+	defer file.Close()
+
+	// 检查文件是否为zip格式
+	if !strings.HasSuffix(strings.ToLower(header.Filename), ".zip") {
+		api.RespondError(c, http.StatusBadRequest, "Uploaded file must be a ZIP archive")
+		return
+	}
+
+	// 创建临时文件保存上传的zip
+	tempFile, err := os.CreateTemp("", "backup-*.zip")
+	if err != nil {
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating temporary file: %v", err))
+		return
+	}
+	tempFilePath := tempFile.Name()
+	defer os.Remove(tempFilePath) // 确保临时文件最终被删除
+
+	// 将上传的文件内容复制到临时文件
+	_, err = io.Copy(tempFile, file)
+	if err != nil {
+		tempFile.Close()
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error saving uploaded file: %v", err))
+		return
+	}
+	tempFile.Close() // 关闭文件以便后续操作
+
+	// 打开zip文件准备解压
+	zipReader, err := zip.OpenReader(tempFilePath)
+	if err != nil {
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error opening zip file: %v", err))
+		return
+	}
+	defer zipReader.Close()
+
+	// 检查是否包含备份标记文件
+	hasMarkupFile := false
+	for _, zipFile := range zipReader.File {
+		if zipFile.Name == "komari-backup-markup" {
+			hasMarkupFile = true
+			break
+		}
+	}
+	if !hasMarkupFile {
+		api.RespondError(c, http.StatusBadRequest, "Invalid backup file: missing komari-backup-markup file")
+		return
+	}
+
+	// 确保data目录存在
+	if err := os.MkdirAll("./data", 0755); err != nil {
+		api.RespondError(c, http.StatusInternalServerError, fmt.Sprintf("Error creating data directory: %v", err))
+		return
+	}
+
+	// 获取数据库文件名
+	dbFileName := filepath.Base(flags.DatabaseFile)
+
+	// 解压文件
+	for _, zipFile := range zipReader.File {
+		// 检查文件路径是否安全（防止路径遍历攻击）
+		filePath := zipFile.Name
+		if strings.Contains(filePath, "..") {
+			log.Printf("Potentially unsafe path in zip: %s, skipping", filePath)
+			continue
+		}
+
+		// 跳过备份标记文件
+		if filePath == "komari-backup-markup" {
+			continue
+		}
+
+		// 确定目标路径
+		var destPath string
+		if filePath == dbFileName {
+			// 如果是数据库文件，恢复到数据库文件路径
+			destPath = flags.DatabaseFile
+		} else {
+			// 其他文件恢复到data目录
+			destPath = filepath.Join("./data", filePath)
+		}
+
+		// 如果是目录，创建目录
+		if zipFile.FileInfo().IsDir() {
+			if err := os.MkdirAll(destPath, 0755); err != nil {
+				log.Printf("Error creating directory %s: %v", destPath, err)
+			}
+			continue
+		}
+
+		// 确保目标文件的目录存在
+		destDir := filepath.Dir(destPath)
+		if err := os.MkdirAll(destDir, 0755); err != nil {
+			log.Printf("Error creating directory %s: %v", destDir, err)
+			continue
+		}
+
+		// 打开zip中的文件
+		srcFile, err := zipFile.Open()
+		if err != nil {
+			log.Printf("Error opening file from zip %s: %v", filePath, err)
+			continue
+		}
+
+		// 创建目标文件
+		destFile, err := os.Create(destPath)
+		if err != nil {
+			srcFile.Close()
+			log.Printf("Error creating file %s: %v", destPath, err)
+			continue
+		}
+
+		// 复制内容
+		_, err = io.Copy(destFile, srcFile)
+		srcFile.Close()
+		destFile.Close()
+		if err != nil {
+			log.Printf("Error extracting file %s: %v", destPath, err)
+			continue
+		}
+
+		// 保持原始文件的修改时间
+		if err := os.Chtimes(destPath, zipFile.Modified, zipFile.Modified); err != nil {
+			log.Printf("Error setting file time for %s: %v", destPath, err)
+		}
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"status":  "success",
+		"message": "Backup restored successfully",
+	})
+}

api/record/record.go

@@ -42,6 +42,16 @@ func GetRecordsByUUID(c *gin.Context) {
 func GetPingRecords(c *gin.Context) {
 	uuid := c.Query("uuid")
 	hours := c.Query("hours")
+	type RecordsResp struct {
+		TaskId uint   `json:"task_id"`
+		Time   string `json:"time"`
+		Value  int    `json:"value"`
+	}
+	type Resp struct {
+		Count   int           `json:"count"`
+		Records []RecordsResp `json:"records"`
+		Tasks   []gin.H       `json:"tasks,omitempty"` // 任务列表
+	}
 
 	if uuid == "" {
 		api.RespondError(c, 400, "UUID is required")
@@ -63,9 +73,16 @@ func GetPingRecords(c *gin.Context) {
 		return
 	}
 
-	response := gin.H{
-		"records": records,
-		"count":   len(records),
+	response := &Resp{
+		Count:   len(records),
+		Records: []RecordsResp{},
+	}
+	for _, r := range records {
+		response.Records = append(response.Records, RecordsResp{
+			TaskId: r.TaskId,
+			Time:   r.Time.ToTime().Format(time.RFC3339),
+			Value:  r.Value,
+		})
 	}
 
 	if len(records) > 0 {
@@ -103,7 +120,7 @@ func GetPingRecords(c *gin.Context) {
 				})
 			}
 		}
-		response["tasks"] = tasksList
+		response.Tasks = tasksList
 	}
 
 	api.RespondSuccess(c, response)

cmd/server.go

@@ -153,6 +153,7 @@ func RunServer() {
 	adminAuthrized := r.Group("/api/admin", api.AdminAuthMiddleware())
 	{
 		adminAuthrized.GET("/download/backup", admin.DownloadBackup)
+		adminAuthrized.POST("/upload/backup", admin.UploadBackup)
 		// test
 		testGroup := adminAuthrized.Group("/test")
 		{