feat: 补齐第一批已知缺口(关闭握手 / 定时备份 / Origin 白名单 / DTO 收敛)
- httpapi:新增 POST /api/shutdown(admin 会话或 X-Shutdown-Token 常量时间比对) 与 GET /api/rules/switches(recorder 可读,只回布尔开关);settings/standings 的 重复 DTO 收敛到 internal/dto;standings.showIndividualMedals 贯通到设置读写与前端 - export:抽出 export.Service,新增自动备份定时任务(backup.intervalMinutes/keep), 自动、手动、发布前三类备份共用同一把互斥锁与滚动清理 - realtime:/ws 去掉 InsecureSkipVerify,改用 OriginPatterns(同源与无 Origin 放行, 跨站需命中 server.allowedOrigins) - console:停止服务改走 POST /api/shutdown 优雅关闭(5 秒宽限后回退强杀), 服务管理器新增「已连接的大屏实例」卡片 - deploy:build.bat 改用 for /f 读内部署名——set /p 在 chcp 65001 下返回空, 导致最近这次构建的 exe 里根本没注入署名 - docs:备份策略、关闭超时、Origin 配置的说明与实现对齐
This commit is contained in:
1 parent
4d56c73ae6
commit
2c9ff65fc4
42 files changed
+1271
-275
No files matched your search
@@ -1,6 +1,9 @@
|
||||
package export
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
@@ -121,3 +124,133 @@ func TestListBackupsMissingDir(t *testing.T) {
|
||||
t.Errorf("空目录的最近备份: ok=%v err=%v", ok, err)
|
||||
}
|
||||
}
|
||||
|
||||
// 间隔 <=0 关闭任务;未配置备份目录时安全跳过(不 panic、不生成文件)。
|
||||
func TestStartAutoDisabled(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
svc := NewService(nil, nil, dir, 20, testLogger())
|
||||
ctx := context.Background()
|
||||
|
||||
svc.StartAuto(ctx, 0)
|
||||
svc.StartAuto(ctx, -time.Minute)
|
||||
|
||||
entries, err := os.ReadDir(dir)
|
||||
if err != nil {
|
||||
t.Fatalf("读取备份目录: %v", err)
|
||||
}
|
||||
if len(entries) != 0 {
|
||||
t.Fatalf("间隔 <=0 不应生成备份,实际 %d 个文件", len(entries))
|
||||
}
|
||||
|
||||
// 未配置备份目录:只记日志并跳过,不能 panic。
|
||||
NewService(nil, nil, "", 20, testLogger()).StartAuto(ctx, time.Minute)
|
||||
}
|
||||
|
||||
// 定时任务按间隔生成 auto 备份。
|
||||
func TestStartAutoBacksUp(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
dir := t.TempDir()
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
NewService(nil, db, dir, 20, testLogger()).StartAuto(ctx, 10*time.Millisecond)
|
||||
|
||||
deadline := time.Now().Add(10 * time.Second)
|
||||
for {
|
||||
list, err := ListBackups(dir, "event")
|
||||
if err != nil {
|
||||
t.Fatalf("列出备份: %v", err)
|
||||
}
|
||||
if len(list) > 0 {
|
||||
if list[0].Reason != "auto" {
|
||||
t.Fatalf("定时备份原因 = %q,期望 auto", list[0].Reason)
|
||||
}
|
||||
return
|
||||
}
|
||||
if time.Now().After(deadline) {
|
||||
t.Fatal("10 秒内未生成定时备份")
|
||||
}
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
}
|
||||
}
|
||||
|
||||
// 超过保留份数时删除最旧的备份。
|
||||
func TestServiceRunPrunesOldBackups(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
dir := t.TempDir()
|
||||
base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.Local)
|
||||
for i := 0; i < 3; i++ {
|
||||
if _, err := Backup(db, BackupOptions{
|
||||
Dir: dir, Prefix: "event", Reason: "auto", SkipPrune: true,
|
||||
Now: base.Add(time.Duration(i) * time.Minute),
|
||||
}); err != nil {
|
||||
t.Fatalf("预置第 %d 份备份: %v", i, err)
|
||||
}
|
||||
}
|
||||
|
||||
svc := NewService(nil, db, dir, 2, testLogger())
|
||||
if _, err := svc.RunEvent("auto"); err != nil {
|
||||
t.Fatalf("RunEvent: %v", err)
|
||||
}
|
||||
|
||||
list, err := ListBackups(dir, "event")
|
||||
if err != nil {
|
||||
t.Fatalf("列出备份: %v", err)
|
||||
}
|
||||
if len(list) != 2 {
|
||||
t.Fatalf("保留份数 = %d,期望 2", len(list))
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(dir, "event-auto-20260101-000000.db")); !os.IsNotExist(err) {
|
||||
t.Errorf("最旧的备份应被删除,err=%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// 并发触发时必须等待同一把锁,保证同一时刻只有一个 VACUUM INTO 在跑。
|
||||
func TestServiceRunMutualExclusion(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
svc := NewService(nil, db, t.TempDir(), 20, testLogger())
|
||||
|
||||
svc.mu.Lock()
|
||||
done := make(chan error, 1)
|
||||
go func() {
|
||||
_, err := svc.RunEvent("auto")
|
||||
done <- err
|
||||
}()
|
||||
select {
|
||||
case err := <-done:
|
||||
t.Fatalf("RunEvent 未等待互斥锁就返回: %v", err)
|
||||
case <-time.After(100 * time.Millisecond):
|
||||
}
|
||||
svc.mu.Unlock()
|
||||
|
||||
select {
|
||||
case err := <-done:
|
||||
if err != nil {
|
||||
t.Fatalf("RunEvent: %v", err)
|
||||
}
|
||||
case <-time.After(10 * time.Second):
|
||||
t.Fatal("RunEvent 超时未完成")
|
||||
}
|
||||
}
|
||||
|
||||
// 同一秒重复备份会带 -2 之类的序号,原因解析不能把它当成时间的一部分。
|
||||
func TestReasonFromNameWithSequence(t *testing.T) {
|
||||
cases := []struct{ name, prefix, want string }{
|
||||
{"event-auto-20260909-213614.db", "event", "auto"},
|
||||
{"event-auto-20260909-213614-2.db", "event", "auto"},
|
||||
{"event-publish-20260909-213614-10.db", "event", "publish"},
|
||||
{"system-manual-20260909-213614.db", "system", "manual"},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := reasonFromName(c.name, c.prefix); got != c.want {
|
||||
t.Errorf("reasonFromName(%q) = %q,期望 %q", c.name, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func testLogger() *slog.Logger {
|
||||
return slog.New(slog.NewTextHandler(io.Discard, nil))
|
||||
}
|
||||
Reference in new issue
Block a user