fix: 修掉十路审查发现的 9 个 P0 与一批 P1(数据正确性 / 越权 / 现场可用性)
P0(9 条全修): - 多通道项目奖牌重复计数:domain 层按 (EventID,CategoryID,EntryID/Subject) 去重, 通道优先级 athlete→team→id - 「只排名不计分」项目(scored:false)不再进奖牌榜,REST/WS/导出口径统一 - aggregate 流水 entry_id 恒 NULL 导致重算后分数翻倍:作废范围改按 event+category 定位 - 已发布成绩仍可被「存草稿」覆盖并清空 rank:服务端 409 STATE_INVALID + 前端禁编辑 - voidResult / 规则导入重算后名次不回写:接住 Ranked 调 applyComputedRanks - 赛事包覆盖导入可能「旧项目已删、新项目没成」:先改名成功再清理,失败回滚 - 导入赛事包可覆盖正在运行的赛事目录:name==当前项目直接 400 - Console spawn 失败后守护器永久卡死:清 child/pid + 调度重启 + stop 超时兜底 - /ws 快照向非 admin 下发 admin-only 配置:按角色裁剪 settings P1(计分口径 / 契约 / 现场): - standings.tieBreak 三处接线;profiles[].recordBonusMode 生效;破纪录校验 RecordEligible 与 entry 归属;破纪录登记校验已发布成绩 - export.loadRanked 与主路径对齐;ListBackups reason 解析;CLI backup 前缀修正 (原来只增不减会撑爆磁盘);单位积分明细/导出统一权重折算;停用单位展示 - 规则导入原子化(重算并入同一事务)+ 返回 compatible/affectedEventCount/ recalculatedLedgerRows;登录审计 user_id 修正 - WS 策略性断开用 Close(code,reason);HelloMessage 补 page/instanceId; 实例注册表清理;settings/单位/项目写操作补 change_log 触发大屏刷新 - 大屏:全量快照不再被版本守卫丢弃;个人积分榜刷新;公告返回页/轮播;行数截断; REST 竞态;1008 停止重连;握手超时;时区补 Z;401 仅 AUTH_REQUIRED 才登出 - 管理端:published 行禁编辑;saveDraft 补 unit(1:06.33 显示);前端预览改用服务端 points;空成绩行不再恒「已修改」;修订详情按 id 拉取;切项目请求序号与 dirty 保护; 发布后刷新项目状态;NAV/路由按角色过滤;recorder 不再打 admin-only 接口 - Console:大屏窗口销毁后重建;大屏 URL 复用 host 归一化;backup.bat 改纯 ASCII (已在 Meowhome 实跑验证) 自检:服务端 gofmt/build/vet 通过、12 包测试全绿;前端 vue-tsc + build 通过、 node --test 24/24;console check-syntax 12 文件通过。
This commit is contained in:
1 parent
96cf181ae3
commit
13f1f03cd0
124 files changed
+5658
-1820
No files matched your search
+57
-8
@@ -28,6 +28,12 @@ const FALLBACK_FORCE_KILL_MS = 1500
|
||||
// 连续健康这么久才认为崩溃计数可以清零
|
||||
const HEALTHY_RESET_MS = 60000
|
||||
|
||||
// 服务端可能监听 0.0.0.0/::,本机访问(健康检查、关闭握手、大屏、管理面板)统一走回环地址
|
||||
function healthHost(server) {
|
||||
const host = (server && server.host) || '127.0.0.1'
|
||||
return host === '0.0.0.0' || host === '::' ? '127.0.0.1' : host
|
||||
}
|
||||
|
||||
// 服务端守护:拉起 scoreboard.exe、转发日志、健康探测、崩溃自动重启。
|
||||
// 现场无人值守,所以「崩了自动拉起」比「暴露复杂控制」更重要。
|
||||
class ServiceSupervisor extends EventEmitter {
|
||||
@@ -51,6 +57,7 @@ class ServiceSupervisor extends EventEmitter {
|
||||
this.healthTimer = null
|
||||
this.restartTimer = null
|
||||
this.forceKillTimer = null
|
||||
this.stopTimer = null
|
||||
// 本次进程的关闭握手 token 与握手结果,仅用于日志区分「优雅退出 / 被强杀」
|
||||
this.shutdownToken = null
|
||||
this.gracefulAccepted = false
|
||||
@@ -75,8 +82,7 @@ class ServiceSupervisor extends EventEmitter {
|
||||
|
||||
// 服务端可能监听 0.0.0.0,本机探测要走回环地址
|
||||
healthHost() {
|
||||
const host = this.server.host || '127.0.0.1'
|
||||
return host === '0.0.0.0' || host === '::' ? '127.0.0.1' : host
|
||||
return healthHost(this.server)
|
||||
}
|
||||
|
||||
emitStatus() {
|
||||
@@ -148,17 +154,33 @@ class ServiceSupervisor extends EventEmitter {
|
||||
|
||||
child.on('error', (err) => {
|
||||
this.log.push('console', `服务端进程错误:${err.message}`)
|
||||
this.setState('crashed', { lastError: err.message })
|
||||
this.handleSpawnError(child, err)
|
||||
})
|
||||
|
||||
child.on('exit', (code, signal) => this.handleExit(code, signal))
|
||||
child.on('exit', (code, signal) => this.handleExit(child, code, signal))
|
||||
|
||||
this.setState('running')
|
||||
this.startHealthCheck()
|
||||
return this.status
|
||||
}
|
||||
|
||||
handleExit(code, signal) {
|
||||
// spawn 失败(ENOENT/EACCES 等)时 Node 只发 error、不发 exit:
|
||||
// 必须在这里清掉 child/pid 并调度重启,否则 start() 因 child 非空直接返回、
|
||||
// stop() 永远等不到 exit,守护器彻底卡死。
|
||||
handleSpawnError(child, err) {
|
||||
if (this.child !== child) return
|
||||
this.stopHealthCheck()
|
||||
this.child = null
|
||||
this.pid = null
|
||||
this.healthy = false
|
||||
this.healthySince = null
|
||||
this.setState('crashed', { lastError: `服务端进程错误:${err.message}` })
|
||||
if (!this.stopRequested) this.scheduleRestart()
|
||||
}
|
||||
|
||||
handleExit(child, code, signal) {
|
||||
// 迟到的 exit(error 分支已收尾或已换进程)不能动当前状态
|
||||
if (this.child !== child) return
|
||||
if (this.forceKillTimer) {
|
||||
clearTimeout(this.forceKillTimer)
|
||||
this.forceKillTimer = null
|
||||
@@ -217,9 +239,35 @@ class ServiceSupervisor extends EventEmitter {
|
||||
this.setState('stopping')
|
||||
this.log.push('console', '正在优雅关闭服务端…')
|
||||
|
||||
child.once('exit', () => resolve())
|
||||
|
||||
const graceMs = Number(this.server.shutdownTimeoutMs) || DEFAULT_SHUTDOWN_TIMEOUT_MS
|
||||
let settled = false
|
||||
const finish = () => {
|
||||
if (settled) return
|
||||
settled = true
|
||||
if (this.stopTimer) {
|
||||
clearTimeout(this.stopTimer)
|
||||
this.stopTimer = null
|
||||
}
|
||||
resolve()
|
||||
}
|
||||
|
||||
// 兜底:握手与强杀链路都可能因进程状态异常收不到 exit,
|
||||
// 退出流程不能永远挂住,超时后无条件放行并补一刀强杀。
|
||||
this.stopTimer = setTimeout(() => {
|
||||
this.stopTimer = null
|
||||
this.log.push('console', '等待服务端退出超时,停止流程强制返回')
|
||||
if (this.child === child) {
|
||||
this.forcedKill = true
|
||||
try {
|
||||
child.kill('SIGKILL')
|
||||
} catch {
|
||||
// 进程可能已经没了
|
||||
}
|
||||
}
|
||||
finish()
|
||||
}, SHUTDOWN_REQUEST_TIMEOUT_MS + graceMs + FALLBACK_FORCE_KILL_MS + 2000)
|
||||
|
||||
child.once('exit', () => finish())
|
||||
|
||||
this.requestShutdown().then((accepted) => {
|
||||
// 请求期间进程可能已经退了,handleExit 会清掉兜底定时器
|
||||
@@ -365,9 +413,10 @@ class ServiceSupervisor extends EventEmitter {
|
||||
dispose() {
|
||||
if (this.restartTimer) clearTimeout(this.restartTimer)
|
||||
if (this.forceKillTimer) clearTimeout(this.forceKillTimer)
|
||||
if (this.stopTimer) clearTimeout(this.stopTimer)
|
||||
this.stopHealthCheck()
|
||||
this.removeAllListeners()
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { ServiceSupervisor, STATE_LABEL }
|
||||
module.exports = { ServiceSupervisor, healthHost }
|
||||
Reference in new issue
Block a user