## 分批发布(现场:100 米跑道只有 8 条,不能等所有人跑完才发) - 空成绩从"错误"降级为"提示",不再阻塞发布;真会算错(写法无法识别、秒位 ≥ 60、 手动名次缺名次)仍挡住。发布确认框说明"只发已填的 M 人,其余保持未发布"。 - 服务端核实:publishResults/computeEventScore 本就不会因缺成绩报错 (collectCandidates 直接跳过没有 results 的报名项),根因在前端防呆。 ## 实时赛况(新大屏页 + 定向接口) - 新增 `GET /api/display/live`(guest 可读):返回「当前项目」判定 + 该项目**全量**已发布成绩 (不受快照 latestResults 的 20 行截断)。回退链:manual 指定 > 排期命中 > 最近发布。 设置键 display.live_events / display.live_source。 - 大屏新页 `live`「实时赛况」:1 个项目单栏、2 个自动左右分栏;失败保留上一次画面 (下一场开始前持续显示上一场);30s 轮询(判定依赖当前时间)+ 快照变更触发。 - 管理端「大屏控制」新增「实时赛况」卡;该卡走 PUT /api/settings(admin-only), 故对非管理员整组置灰 + 提示条(不新增角色)。 ## 显式批次层(组别之下) - 迁移 0019 `entries.heat`;批次仅是录入/展示分组,**不参与算分**(有"分批与不分批结果 完全一致"的断言守住)。批量设置接口 + 导入 CSV 可选列 heat + 录入页批次下拉 + 一键均分(按 N 人切片,已有批次号接着往后排)。 ## 成绩输入框实时悬浮提示 - 聚焦格旁的浮动气泡:pointer-events:none、不占布局不改行高、贴底自动上翻; 合法显示解析结果(1:06 → = 66 秒)、可疑/不合法显示原因并带那一格原文; 与发布防呆共用同一套纯函数(entryGuards.ts),口径不会分叉。 ## 窄屏 / 手机端布局 - 真浏览器(Playwright + chromium)在 1440/1024/768/390 四宽度逐页审计 + 溢出探针, 四轮迭代修复;桌面端 1440 前后像素差异 < 0.25%(无回归);修掉如「修改密码」输入框 塌成 22px 这类真问题。 ## 版本号单一真相 - 新增仓库根 `VERSION`:构建时注入二进制(-X main.version)并同步 console/package.json 的版本(产物名跟随)。源码里不再有人工维护的版本号(兜底值改为 `dev`,故意不写数字)。 测试:服务端 13 包全绿;前端 vue-tsc 通过、249 例全过;Console 18 文件。 docs/ 与 devdocs/ 同步(FAQ 到 Q80、新增 devdocs/16 自定义大屏模板设计文档)。
315 lines
13 KiB
Go
315 lines
13 KiB
Go
// Package httpapi 提供 REST 接口、静态资源托管与统一响应结构。
|
||
package httpapi
|
||
|
||
import (
|
||
"database/sql"
|
||
"io/fs"
|
||
"log/slog"
|
||
"net/http"
|
||
"path/filepath"
|
||
"strings"
|
||
"time"
|
||
|
||
"git.yeij.top/AskaEth/Scoreboard/server/internal/auth"
|
||
"git.yeij.top/AskaEth/Scoreboard/server/internal/export"
|
||
"git.yeij.top/AskaEth/Scoreboard/server/internal/middleware"
|
||
"git.yeij.top/AskaEth/Scoreboard/server/internal/webui"
|
||
)
|
||
|
||
// DisplaySender 把大屏控制命令推给实时层;未接入时命令只记审计、不影响接口可用性。
|
||
type DisplaySender interface {
|
||
// SendDisplayCommand 下发一条大屏指令。targets 为空表示广播给所有大屏(公告靠它),
|
||
// 否则只发给这些实例 id(GET /api/display/instances 里的 id),并返回命中的实例数。
|
||
SendDisplayCommand(action string, payload any, targets []string) (matched int, err error)
|
||
}
|
||
|
||
// Options 是构建路由所需的依赖。
|
||
type Options struct {
|
||
Logger *slog.Logger
|
||
Version string
|
||
// System 是系统库连接(users/sessions)。
|
||
System *sql.DB
|
||
// Event 是赛事库连接(teams/events/results/ledger/audit…)。
|
||
Event *sql.DB
|
||
// Auth 可选;为空时用 System 自动构建。
|
||
Auth *auth.Service
|
||
// DataDir 用于备份目录 data/backups。
|
||
DataDir string
|
||
// Backup 可选,手动/发布前备份共用的服务;为空时按 System/Event/DataDir 自动构建。
|
||
Backup *export.Service
|
||
// Shutdown 可选,由 main 注入:触发与 SIGINT/SIGTERM 相同的优雅关闭流程。
|
||
// 为空时 POST /api/shutdown 返回 503,避免把「没接关闭」误报成已受理。
|
||
Shutdown func()
|
||
// Display 可选,实时层接入后传入。
|
||
Display DisplaySender
|
||
// Realtime 可选,实时层接入后传入:写事务提交后推送变更,并提供在线大屏实例。
|
||
Realtime Realtime
|
||
// WS 可选,实时层的 WebSocket 处理器,挂到 /ws。
|
||
WS http.Handler
|
||
// ProjectDir 可选,当前赛事项目目录(含 uploads/),用于赛事包导出。
|
||
ProjectDir string
|
||
// WebFS 可选,默认使用内嵌前端资源。
|
||
WebFS fs.FS
|
||
}
|
||
|
||
type server struct {
|
||
logger *slog.Logger
|
||
version string
|
||
sys *sql.DB
|
||
ev *sql.DB
|
||
auth *auth.Service
|
||
dataDir string
|
||
projectDir string
|
||
backups *export.Service
|
||
shutdown func()
|
||
display DisplaySender
|
||
realtime Realtime
|
||
idem *idempotencyStore
|
||
}
|
||
|
||
// New 组装并返回服务端的 HTTP 处理器。
|
||
func New(opts Options) http.Handler {
|
||
logger := opts.Logger
|
||
if logger == nil {
|
||
logger = slog.Default()
|
||
}
|
||
svc := opts.Auth
|
||
if svc == nil {
|
||
svc = auth.New(opts.System, auth.Options{Logger: logger})
|
||
}
|
||
backups := opts.Backup
|
||
if backups == nil {
|
||
dir := ""
|
||
if strings.TrimSpace(opts.DataDir) != "" {
|
||
dir = filepath.Join(opts.DataDir, "backups")
|
||
}
|
||
backups = export.NewService(opts.System, opts.Event, dir, 0, logger)
|
||
}
|
||
|
||
s := &server{
|
||
logger: logger,
|
||
version: opts.Version,
|
||
sys: opts.System,
|
||
ev: opts.Event,
|
||
auth: svc,
|
||
dataDir: opts.DataDir,
|
||
projectDir: opts.ProjectDir,
|
||
backups: backups,
|
||
shutdown: opts.Shutdown,
|
||
display: opts.Display,
|
||
realtime: opts.Realtime,
|
||
idem: newIdempotencyStore(10 * time.Minute),
|
||
}
|
||
|
||
mux := http.NewServeMux()
|
||
s.routes(mux)
|
||
s.exportRoutes(mux)
|
||
s.projectRoutes(mux)
|
||
s.rulesRoutes(mux)
|
||
s.systemRoutes(mux)
|
||
if opts.WS != nil {
|
||
mux.Handle("/ws", opts.WS)
|
||
}
|
||
|
||
assets := opts.WebFS
|
||
if assets == nil {
|
||
var err error
|
||
assets, err = webui.FS()
|
||
if err != nil {
|
||
logger.Error("前端资源不可用", "err", err)
|
||
}
|
||
}
|
||
if assets != nil {
|
||
mux.Handle("/", staticHandler(assets))
|
||
}
|
||
|
||
var h http.Handler = mux
|
||
h = s.broadcastChanges(h)
|
||
h = middleware.NewAuditor(opts.Event, logger).Middleware(h)
|
||
h = middleware.RateLimitWrite(svc, logger)(h)
|
||
h = middleware.CSRF(logger, h)
|
||
h = middleware.MustChangePassword(logger, h)
|
||
h = middleware.Authenticate(svc, logger)(h)
|
||
h = middleware.Log(logger)(h)
|
||
h = middleware.Recover(logger)(h)
|
||
h = middleware.RequestID(h)
|
||
return h
|
||
}
|
||
|
||
func middlewareUserID(r *http.Request) int64 {
|
||
u := middleware.User(r.Context())
|
||
if u.Role == auth.RoleGuest {
|
||
return 0
|
||
}
|
||
return u.ID
|
||
}
|
||
|
||
// public 注册公开接口(guest 可读)。
|
||
func (s *server) public(fn handler) http.HandlerFunc { return s.handle(fn) }
|
||
|
||
// read 注册「guest 也不可读」的接口,权限不足一律 403。
|
||
func (s *server) read(role auth.Role, fn handler) http.HandlerFunc {
|
||
return middleware.RequireRole(s.logger, role)(s.handle(fn)).ServeHTTP
|
||
}
|
||
|
||
// write 注册写接口:未登录 401,角色不足 403;成功后按 X-Request-Id 支持幂等回放。
|
||
func (s *server) write(role auth.Role, fn handler) http.HandlerFunc {
|
||
return middleware.RequireWrite(s.logger, role)(s.cached(s.handle(fn))).ServeHTTP
|
||
}
|
||
|
||
// writeVoid 注册无返回体的写接口。
|
||
func (s *server) writeVoid(role auth.Role, fn func(w http.ResponseWriter, r *http.Request) error) http.HandlerFunc {
|
||
return middleware.RequireWrite(s.logger, role)(s.cached(s.handleVoid(fn))).ServeHTTP
|
||
}
|
||
|
||
func (s *server) routes(mux *http.ServeMux) {
|
||
// 健康检查不走 {ok,data} 包装(05 第 7 节)。
|
||
mux.HandleFunc("GET /api/health", func(w http.ResponseWriter, r *http.Request) {
|
||
writeJSON(w, http.StatusOK, map[string]any{"ok": true, "version": s.version})
|
||
})
|
||
|
||
// 认证
|
||
mux.HandleFunc("POST /api/auth/login", s.handle(s.login))
|
||
mux.HandleFunc("POST /api/auth/logout", s.handle(s.logout))
|
||
mux.HandleFunc("GET /api/auth/me", s.handle(s.me))
|
||
mux.HandleFunc("POST /api/auth/password", s.handle(s.changePassword))
|
||
|
||
// 系统配置(guest 一律 403)
|
||
mux.HandleFunc("GET /api/settings", s.read(auth.RoleAdmin, s.getSettingsHandler))
|
||
mux.HandleFunc("PUT /api/settings", s.write(auth.RoleAdmin, s.updateSettingsHandler))
|
||
|
||
// 基础配置
|
||
mux.HandleFunc("GET /api/teams", s.public(s.listTeamsHandler))
|
||
mux.HandleFunc("POST /api/teams", s.write(auth.RoleRecorder, s.createTeamHandler))
|
||
mux.HandleFunc("GET /api/teams/{id}", s.public(s.getTeamHandler))
|
||
mux.HandleFunc("PUT /api/teams/{id}", s.write(auth.RoleRecorder, s.updateTeamHandler))
|
||
mux.HandleFunc("DELETE /api/teams/{id}", s.writeVoid(auth.RoleRecorder, s.deleteTeamHandler))
|
||
|
||
mux.HandleFunc("GET /api/sports", s.public(s.listSportsHandler))
|
||
mux.HandleFunc("POST /api/sports", s.write(auth.RoleRecorder, s.createSportHandler))
|
||
mux.HandleFunc("GET /api/sports/{id}", s.public(s.getSportHandler))
|
||
mux.HandleFunc("PUT /api/sports/{id}", s.write(auth.RoleRecorder, s.updateSportHandler))
|
||
mux.HandleFunc("DELETE /api/sports/{id}", s.writeVoid(auth.RoleRecorder, s.deleteSportHandler))
|
||
|
||
mux.HandleFunc("GET /api/events", s.public(s.listEventsHandler))
|
||
mux.HandleFunc("POST /api/events", s.write(auth.RoleRecorder, s.createEventHandler))
|
||
mux.HandleFunc("GET /api/events/{id}", s.public(s.getEventHandler))
|
||
mux.HandleFunc("PUT /api/events/{id}", s.write(auth.RoleRecorder, s.updateEventHandler))
|
||
mux.HandleFunc("DELETE /api/events/{id}", s.writeVoid(auth.RoleRecorder, s.deleteEventHandler))
|
||
mux.HandleFunc("GET /api/events/{id}/entries", s.public(s.listEntriesHandler))
|
||
mux.HandleFunc("GET /api/events/{id}/categories", s.public(s.listCategoriesHandler))
|
||
mux.HandleFunc("PUT /api/events/{id}/categories", s.write(auth.RoleRecorder, s.replaceCategoriesHandler))
|
||
mux.HandleFunc("GET /api/events/{id}/channels", s.public(s.listChannelsHandler))
|
||
mux.HandleFunc("PUT /api/events/{id}/channels", s.write(auth.RoleRecorder, s.replaceChannelsHandler))
|
||
|
||
mux.HandleFunc("GET /api/scoring-profiles", s.public(s.listProfilesHandler))
|
||
mux.HandleFunc("POST /api/scoring-profiles", s.write(auth.RoleRecorder, s.createProfileHandler))
|
||
mux.HandleFunc("GET /api/scoring-profiles/{id}", s.public(s.getProfileHandler))
|
||
mux.HandleFunc("PUT /api/scoring-profiles/{id}", s.write(auth.RoleRecorder, s.updateProfileHandler))
|
||
|
||
mux.HandleFunc("GET /api/athletes", s.public(s.listAthletesHandler))
|
||
mux.HandleFunc("POST /api/athletes", s.write(auth.RoleRecorder, s.createAthleteHandler))
|
||
mux.HandleFunc("GET /api/athletes/{id}", s.public(s.getAthleteHandler))
|
||
mux.HandleFunc("PUT /api/athletes/{id}", s.write(auth.RoleRecorder, s.updateAthleteHandler))
|
||
mux.HandleFunc("DELETE /api/athletes/{id}", s.write(auth.RoleRecorder, s.deleteAthleteHandler))
|
||
|
||
mux.HandleFunc("POST /api/entries/import", s.write(auth.RoleRecorder, s.importEntriesHandler))
|
||
mux.HandleFunc("POST /api/entries/import/resolve", s.write(auth.RoleRecorder, s.resolveImportHandler))
|
||
// 批次(heat)是录入 / 展示分组,不参与算分,所以没有独立的「发布」概念。
|
||
mux.HandleFunc("PUT /api/entries/heat", s.write(auth.RoleRecorder, s.setEntriesHeatHandler))
|
||
|
||
// 成绩
|
||
mux.HandleFunc("GET /api/results", s.public(s.listResultsHandler))
|
||
mux.HandleFunc("PUT /api/results/draft", s.write(auth.RoleRecorder, s.saveDraftHandler))
|
||
mux.HandleFunc("POST /api/results/publish", s.write(auth.RoleRecorder, s.publishHandler))
|
||
mux.HandleFunc("POST /api/results/unpublish", s.write(auth.RoleRecorder, s.unpublishHandler))
|
||
mux.HandleFunc("POST /api/results/{id}/void", s.write(auth.RoleRecorder, s.voidResultHandler))
|
||
|
||
// 积分与排名
|
||
mux.HandleFunc("GET /api/standings", s.public(s.standingsHandler))
|
||
mux.HandleFunc("GET /api/standings/athletes", s.public(s.athleteStandingsHandler))
|
||
mux.HandleFunc("GET /api/standings/teams/{id}/breakdown", s.public(s.breakdownHandler))
|
||
mux.HandleFunc("GET /api/adjustments", s.public(s.listAdjustmentsHandler))
|
||
mux.HandleFunc("POST /api/adjustments", s.write(auth.RoleRecorder, s.createAdjustmentHandler))
|
||
mux.HandleFunc("POST /api/adjustments/{id}/void", s.write(auth.RoleRecorder, s.voidAdjustmentHandler))
|
||
|
||
// 纪录
|
||
mux.HandleFunc("GET /api/records", s.public(s.listRecordsHandler))
|
||
mux.HandleFunc("POST /api/record-breaks", s.write(auth.RoleRecorder, s.createRecordBreakHandler))
|
||
mux.HandleFunc("POST /api/record-breaks/{id}/approve", s.write(auth.RoleRecorder, s.approveRecordBreakHandler))
|
||
|
||
// 大屏控制与运维
|
||
mux.HandleFunc("POST /api/display/command", s.write(auth.RoleRecorder, s.displayCommandHandler))
|
||
mux.HandleFunc("GET /api/display/instances", s.read(auth.RoleRecorder, s.displayInstancesHandler))
|
||
// 「实时赛况」页的当前项目与已发布成绩;大屏(guest)要能直接拉,故对外只读开放。
|
||
mux.HandleFunc("GET /api/display/live", s.public(s.liveEventsHandler))
|
||
mux.HandleFunc("GET /api/audit-logs", s.read(auth.RoleAdmin, s.listAuditLogsHandler))
|
||
mux.HandleFunc("POST /api/backup", s.write(auth.RoleAdmin, s.backupHandler))
|
||
|
||
// 用户管理(系统配置,仅 admin;guest 读 403、写 401)
|
||
mux.HandleFunc("GET /api/users", s.read(auth.RoleAdmin, s.listUsersHandler))
|
||
mux.HandleFunc("POST /api/users", s.write(auth.RoleAdmin, s.createUserHandler))
|
||
mux.HandleFunc("PUT /api/users/{id}", s.write(auth.RoleAdmin, s.updateUserHandler))
|
||
mux.HandleFunc("POST /api/users/{id}/password", s.write(auth.RoleAdmin, s.resetUserPasswordHandler))
|
||
|
||
// 变更历史(recorder 及以上可读)
|
||
mux.HandleFunc("GET /api/revisions", s.read(auth.RoleRecorder, s.listRevisionsHandler))
|
||
mux.HandleFunc("GET /api/revisions/{id}", s.read(auth.RoleRecorder, s.getRevisionDetailHandler))
|
||
|
||
// 图片上传与静态访问(会标/背景/单位图标)。上传落 <ProjectDir>/uploads/,随赛事包导出;
|
||
// 静态访问要匿名放行,大屏的 <img> 才能不带会话直接取图。
|
||
mux.HandleFunc("POST /api/uploads", s.write(auth.RoleRecorder, s.uploadHandler))
|
||
mux.HandleFunc("GET /uploads/{name}", s.serveUpload)
|
||
|
||
// 字体:4 款内置字体(前端 @font-face)由 GET /api/fonts 列出,上传的落
|
||
// <项目目录>/uploads/fonts/,随赛事包导出;静态访问同样是匿名放行——大屏的
|
||
// @font-face 不带会话。字体目录比图片多一层,静态路由必须单独注册。
|
||
mux.HandleFunc("GET /api/fonts", s.read(auth.RoleRecorder, s.listFontsHandler))
|
||
mux.HandleFunc("POST /api/fonts", s.write(auth.RoleAdmin, s.uploadFontHandler))
|
||
mux.HandleFunc("DELETE /api/fonts/{name}", s.writeVoid(auth.RoleAdmin, s.deleteFontHandler))
|
||
mux.HandleFunc("GET /uploads/fonts/{name}", s.serveFont)
|
||
|
||
// 由其他模块负责的接口:先占位,避免落到静态资源处理器。
|
||
mux.HandleFunc("/api/export/", s.notWired("导出"))
|
||
mux.HandleFunc("/api/rules/", s.notWired("规则导入导出"))
|
||
mux.HandleFunc("/api/", func(w http.ResponseWriter, r *http.Request) {
|
||
s.writeAPIError(w, r, notFound("接口不存在"))
|
||
})
|
||
}
|
||
|
||
// notWired 为待接线的接口返回 501,避免请求被静态资源兜底成 HTML。
|
||
func (s *server) notWired(name string) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
s.writeAPIError(w, r, notImplemented(name+"接口尚未接入"))
|
||
}
|
||
}
|
||
|
||
// staticHandler 把 URL 映射到多页面前端产物。
|
||
//
|
||
// / → index.html
|
||
// /display → display.html
|
||
// /admin → admin.html
|
||
// /其他 → 按文件路径查找
|
||
func staticHandler(assets fs.FS) http.Handler {
|
||
files := http.FileServerFS(assets)
|
||
|
||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||
p := strings.TrimPrefix(r.URL.Path, "/")
|
||
|
||
switch p {
|
||
case "", "index.html":
|
||
http.ServeFileFS(w, r, assets, "index.html")
|
||
case "display", "display/":
|
||
http.ServeFileFS(w, r, assets, "display.html")
|
||
case "admin", "admin/":
|
||
http.ServeFileFS(w, r, assets, "admin.html")
|
||
default:
|
||
if _, err := fs.Stat(assets, p); err != nil {
|
||
http.NotFound(w, r)
|
||
return
|
||
}
|
||
files.ServeHTTP(w, r)
|
||
}
|
||
})
|
||
}
|