+
(null)
const versionChecked = ref(false)
diff --git a/web/src/admin/pages/AdjustmentsPage.vue b/web/src/admin/pages/AdjustmentsPage.vue
index 0a5e4a1..d74605b 100644
--- a/web/src/admin/pages/AdjustmentsPage.vue
+++ b/web/src/admin/pages/AdjustmentsPage.vue
@@ -56,6 +56,7 @@ const localItems = ref([])
let nextLocalId = -1
const canWrite = computed(() => !auth.readOnly && data.canWrite)
+const isAdmin = computed(() => auth.user?.role === 'admin')
/**
* 人工调整开关：true / false / null（未知）。
*
@@ -77,12 +78,15 @@ const filteredItems = computed(() => {
})
})
+// 分页只作用于服务端记录；本地降级条目固定显示在当前页，不能混进 total 的页码计算。
const pageCount = computed(() => Math.max(1, Math.ceil(total.value / size)))
const rangeText = computed(() => {
- if (total.value === 0) return '共 0 条'
+ const local = localItems.value.length
+ const suffix = local > 0 ? `，另有 ${local} 条本地示例记录` : ''
+ if (total.value === 0) return local > 0 ? `共 ${local} 条本地示例记录` : '共 0 条'
const from = (page.value - 1) * size + 1
const to = Math.min(page.value * size, total.value)
- return `第 ${from}–${to} 条，共 ${total.value} 条`
+ return `第 ${from}–${to} 条，共 ${total.value} 条${suffix}`
})
function teamLabel(teamId: number): string {
@@ -109,20 +113,33 @@ function isLocal(item: PointAdjustment): boolean {
return item.id < 0
}
+/** 只有真的连不上服务端才做本地降级；业务 404 / 解析失败必须原样呈现。 */
function isFallback(error: unknown): boolean {
- return (
- error instanceof ApiError &&
- (['NETWORK', 'TIMEOUT', 'PARSE_FAILED'].includes(error.code) || error.status === 404)
- )
+ return error instanceof ApiError && ['NETWORK', 'TIMEOUT'].includes(error.code)
+}
+
+function isForbidden(error: unknown): boolean {
+ return error instanceof ApiError && (error.status === 403 || error.code === 'FORBIDDEN')
}
async function loadRules(): Promise {
try {
- rulePack.value = await adminApi.client.rules.get()
- ruleError.value = null
+ // /api/rules/export 是 admin-only：录入员跳过它，改用下面的只读开关端点，
+ // 否则页面会常驻一条红色「读取规则包失败：无权访问该资源」。
+ if (isAdmin.value) {
+ rulePack.value = await adminApi.client.rules.get()
+ ruleError.value = null
+ } else {
+ rulePack.value = null
+ ruleError.value = null
+ }
} catch (caught) {
rulePack.value = null
- ruleError.value = caught instanceof Error ? caught.message : '无法读取规则包'
+ ruleError.value = isForbidden(caught)
+ ? null
+ : caught instanceof Error
+ ? caught.message
+ : '无法读取规则包'
}
// 规则包只有 admin 能读；录入员改用只读开关端点，避免把已启用功能误报成关闭。
try {
diff --git a/web/src/admin/pages/EntryPage.vue b/web/src/admin/pages/EntryPage.vue
index 26cb88e..cbabc79 100644
--- a/web/src/admin/pages/EntryPage.vue
+++ b/web/src/admin/pages/EntryPage.vue
@@ -1,5 +1,5 @@
-
-
-
-
-
- 规划中
-
-
-
-
-
-
-
-
-
{{ title }}页面将在后续里程碑实现
-
M4 只交付占位路由与骨架，核心链路（成绩录入 → 积分榜 → 大屏）已可用。
-
-
-
-
-
-
-
-
-
数据加载失败：{{ data.error }}
-
-
+
+
diff --git a/web/src/admin/router.ts b/web/src/admin/router.ts
index 3134a89..ffd3560 100644
--- a/web/src/admin/router.ts
+++ b/web/src/admin/router.ts
@@ -1,8 +1,12 @@
import { createRouter, createWebHashHistory, type RouteRecordRaw } from 'vue-router'
import AdminLayout from './layouts/AdminLayout.vue'
+import { useAuthStore } from './stores/auth'
/**
- * 路由表。页面已全部落地，不再使用 PlaceholderPage。
+ * 路由表。
+ *
+ * 系统设置与日志的接口是 admin-only，这里用 meta.requiresAdmin 兜底：
+ * 直接改 hash 深链也进不去，避免 recorder/guest 触发一串 403 请求。
*/
const routes: RouteRecordRaw[] = [
{
@@ -80,13 +84,13 @@ const routes: RouteRecordRaw[] = [
path: 'logs',
name: 'logs',
component: () => import('./pages/LogsPage.vue'),
- meta: { title: '日志' },
+ meta: { title: '日志', requiresAdmin: true },
},
{
path: 'system',
name: 'system',
component: () => import('./pages/SystemPage.vue'),
- meta: { title: '系统设置' },
+ meta: { title: '系统设置', requiresAdmin: true },
},
{
path: 'password',
@@ -112,6 +116,15 @@ export const router = createRouter({
routes,
})
+router.beforeEach(async (to) => {
+ if (to.meta.requiresAdmin !== true) return true
+ const auth = useAuthStore()
+ // 刷新页面时深链先于布局层挂载，这里补一次会话探测，避免把管理员误判成访客。
+ if (!auth.initialized) await auth.load()
+ if (auth.user?.role === 'admin') return true
+ return { name: 'dashboard' }
+})
+
router.afterEach((to) => {
const title = typeof to.meta.title === 'string' ? to.meta.title : ''
document.title = title === '' ? '管理面板' : `${title} · 管理面板`
diff --git a/web/src/admin/stores/auth.ts b/web/src/admin/stores/auth.ts
index 1ca2fb5..d902963 100644
--- a/web/src/admin/stores/auth.ts
+++ b/web/src/admin/stores/auth.ts
@@ -73,6 +73,7 @@ export const useAuthStore = defineStore('admin-auth', () => {
user,
loading,
error,
+ initialized,
isGuest,
readOnly,
displayName,
diff --git a/web/src/admin/stores/event.ts b/web/src/admin/stores/event.ts
index a0b7e99..31e7894 100644
--- a/web/src/admin/stores/event.ts
+++ b/web/src/admin/stores/event.ts
@@ -34,7 +34,6 @@ export const useEventStore = defineStore('admin-event', () => {
const realtimeStatus = ref
('idle')
const serverVersion = ref(null)
- const serverTime = ref(null)
const serverHealth = ref(null)
let realtime: RealtimeClient | null = null
@@ -111,12 +110,6 @@ export const useEventStore = defineStore('admin-event', () => {
realtime.connect()
}
- function stopRealtime(): void {
- realtime?.close()
- realtime = null
- realtimeStatus.value = 'idle'
- }
-
async function refreshStandings(): Promise {
try {
const [next, athletes] = await Promise.all([
@@ -161,7 +154,6 @@ export const useEventStore = defineStore('admin-event', () => {
lastRefreshAt,
realtimeStatus,
serverVersion,
- serverTime,
serverHealth,
isMock,
mockLabel,
@@ -173,6 +165,5 @@ export const useEventStore = defineStore('admin-event', () => {
refreshEvents,
eventById,
teamById,
- stopRealtime,
}
})
diff --git a/web/src/admin/styles/miuix.css b/web/src/admin/styles/miuix.css
index 54e6a49..7a9bb2e 100644
--- a/web/src/admin/styles/miuix.css
+++ b/web/src/admin/styles/miuix.css
@@ -96,10 +96,3 @@ body {
.mx-table-entry tbody tr.is-focus {
background: var(--mx-primary-glow);
}
-
-/* 只读访客态：禁用写操作控件。 */
-.is-readonly .mx-btn-primary,
-.is-readonly .mx-btn-danger {
- opacity: 0.45;
- pointer-events: none;
-}
diff --git a/web/src/admin/tests/scoring.test.ts b/web/src/admin/tests/scoring.test.ts
new file mode 100644
index 0000000..08dd5cf
--- /dev/null
+++ b/web/src/admin/tests/scoring.test.ts
@@ -0,0 +1,230 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import type { Event, EventCategory, ScoreChannel, ScoringProfile } from '@/shared'
+import { computeEventScore, type ScorableRow, type ScoreContext } from '../api/scoring'
+
+// 逐条对齐服务端 internal/domain/scoring.go 的 ScoreEvent 口径。
+// 运行：node --test --import ./src/shared/tests/register.mjs src/admin/tests/
+
+function makeEvent(overrides: Partial = {}): Event {
+ return {
+ id: 1,
+ sportId: 1,
+ code: 'M100',
+ name: '100 米',
+ eventType: 'individual',
+ resultMode: 'auto',
+ resultType: 'time',
+ compare: 'asc',
+ recordEligible: false,
+ scored: true,
+ multiplier: 1,
+ status: 'pending',
+ scheduledAt: null,
+ venue: null,
+ sortOrder: 1,
+ remark: null,
+ ...overrides,
+ }
+}
+
+function makeProfile(overrides: Partial = {}): ScoringProfile {
+ return { id: 1, code: 'p', name: 'p', tieMode: 'skip', recordBonusMode: 'max', rules: [], ...overrides }
+}
+
+function makeChannel(overrides: Partial = {}): ScoreChannel {
+ return { id: 1, eventId: 1, scope: 'athlete', basis: 'result', profileId: 1, sortOrder: 1, ...overrides }
+}
+
+function makeRow(entryId: number, resultValue: number | null, teamId: number, rank: number | null = null): ScorableRow {
+ return { entryId, teamId, athleteId: entryId, resultValue, rank, status: 'ok', isTie: false }
+}
+
+function makeContext(overrides: Partial = {}): ScoreContext {
+ return { event: makeEvent(), category: null, channels: [], profiles: [], weight: 1, ...overrides }
+}
+
+function close(actual: number, expected: number): void {
+ assert.ok(Math.abs(actual - expected) < 1e-9, `${actual} != ${expected}`)
+}
+
+test('awardRanks 之外的名次一律 0 分', () => {
+ const profile = makeProfile({
+ awardRanks: 2,
+ rules: [
+ { rank: 1, points: 9 },
+ { rank: 2, points: 6 },
+ { rank: 3, points: 3 },
+ ],
+ })
+ const result = computeEventScore(
+ [makeRow(1, 10, 100), makeRow(2, 11, 101), makeRow(3, 12, 102)],
+ makeContext({ channels: [makeChannel()], profiles: [profile] }),
+ )
+ close(result.rowPoints.get(1) ?? 0, 9)
+ close(result.rowPoints.get(2) ?? 0, 6)
+ close(result.rowPoints.get(3) ?? 0, 0)
+ close(result.teamPoints.get(102) ?? 0, 0)
+})
+
+test('lastPlaceZero 让末位整组 0 分', () => {
+ const profile = makeProfile({
+ lastPlaceZero: true,
+ rules: [
+ { rank: 1, points: 9 },
+ { rank: 2, points: 6 },
+ { rank: 3, points: 3 },
+ ],
+ })
+ const result = computeEventScore(
+ [makeRow(1, 10, 100), makeRow(2, 11, 101), makeRow(3, 12, 102)],
+ makeContext({ channels: [makeChannel()], profiles: [profile] }),
+ )
+ close(result.rowPoints.get(1) ?? 0, 9)
+ close(result.rowPoints.get(2) ?? 0, 6)
+ close(result.rowPoints.get(3) ?? 0, 0)
+})
+
+test('末位并列整组都按最后一名处理', () => {
+ const profile = makeProfile({
+ lastPlaceZero: true,
+ rules: [
+ { rank: 1, points: 9 },
+ { rank: 2, points: 6 },
+ { rank: 3, points: 3 },
+ ],
+ })
+ const result = computeEventScore(
+ [makeRow(1, 10, 100), makeRow(2, 11, 101), makeRow(3, 11, 102)],
+ makeContext({ channels: [makeChannel()], profiles: [profile] }),
+ )
+ close(result.rowPoints.get(1) ?? 0, 9)
+ close(result.rowPoints.get(2) ?? 0, 0)
+ close(result.rowPoints.get(3) ?? 0, 0)
+})
+
+test('scored=false 只排名不计分', () => {
+ const profile = makeProfile({
+ rules: [
+ { rank: 1, points: 9 },
+ { rank: 2, points: 6 },
+ ],
+ })
+ const result = computeEventScore(
+ [makeRow(1, 10, 100), makeRow(2, 11, 101)],
+ makeContext({ event: makeEvent({ scored: false }), channels: [makeChannel()], profiles: [profile] }),
+ )
+ assert.equal(result.ranks.get(1), 1)
+ assert.equal(result.ranks.get(2), 2)
+ close(result.rowPoints.get(1) ?? 0, 0)
+ close(result.teamPoints.get(100) ?? 0, 0)
+})
+
+test('多通道叠加，个人通道分按权重折算进单位总分', () => {
+ const athleteProfile = makeProfile({ id: 1, rules: [{ rank: 1, points: 10 }] })
+ const teamProfile = makeProfile({ id: 2, rules: [{ rank: 1, points: 4 }] })
+ const result = computeEventScore(
+ [makeRow(1, 10, 100)],
+ makeContext({
+ channels: [
+ makeChannel({ id: 1, scope: 'athlete', profileId: 1 }),
+ makeChannel({ id: 2, scope: 'team', profileId: 2 }),
+ ],
+ profiles: [athleteProfile, teamProfile],
+ weight: 2,
+ }),
+ )
+ // 行分是两条通道的原始分之和；折算到单位时只有个人通道乘系数。
+ close(result.rowPoints.get(1) ?? 0, 14)
+ close(result.rowTeamPoints.get(1) ?? 0, 24)
+ close(result.teamPoints.get(100) ?? 0, 24)
+})
+
+test('并列 average 取占用名次区间的均值', () => {
+ const profile = makeProfile({
+ tieMode: 'average',
+ rules: [
+ { rank: 1, points: 10 },
+ { rank: 2, points: 6 },
+ { rank: 3, points: 3 },
+ { rank: 4, points: 1 },
+ ],
+ })
+ const result = computeEventScore(
+ [makeRow(1, 10, 100), makeRow(2, 10, 101), makeRow(3, 10, 102)],
+ makeContext({ channels: [makeChannel()], profiles: [profile] }),
+ )
+ close(result.rowPoints.get(1) ?? 0, (10 + 6 + 3) / 3)
+ close(result.rowPoints.get(2) ?? 0, (10 + 6 + 3) / 3)
+ close(result.rowPoints.get(3) ?? 0, (10 + 6 + 3) / 3)
+ assert.equal(result.ranks.get(1), 1)
+})
+
+test('并列 higher 取区间最高档', () => {
+ const profile = makeProfile({
+ tieMode: 'higher',
+ rules: [
+ { rank: 1, points: 10 },
+ { rank: 2, points: 6 },
+ { rank: 3, points: 3 },
+ ],
+ })
+ const result = computeEventScore(
+ [makeRow(1, 10, 100), makeRow(2, 10, 101), makeRow(3, 10, 102)],
+ makeContext({ channels: [makeChannel()], profiles: [profile] }),
+ )
+ close(result.rowPoints.get(1) ?? 0, 10)
+ close(result.rowPoints.get(2) ?? 0, 10)
+ close(result.rowPoints.get(3) ?? 0, 10)
+})
+
+test('没有计分通道时算出名次但一律 0 分', () => {
+ const result = computeEventScore(
+ [makeRow(1, 10, 100), makeRow(2, 11, 101)],
+ makeContext({ channels: [], profiles: [] }),
+ )
+ assert.equal(result.ranks.get(1), 1)
+ assert.equal(result.ranks.get(2), 2)
+ close(result.rowPoints.get(1) ?? 0, 0)
+ close(result.teamPoints.get(100) ?? 0, 0)
+})
+
+test('manual 通道使用录入名次，不做顺推改写', () => {
+ const profile = makeProfile({
+ rules: [
+ { rank: 1, points: 10 },
+ { rank: 2, points: 6 },
+ ],
+ })
+ const result = computeEventScore(
+ [makeRow(1, null, 100, 2), makeRow(2, null, 101, 1)],
+ makeContext({
+ event: makeEvent({ resultMode: 'manual', compare: 'none' }),
+ channels: [makeChannel({ basis: 'manual' })],
+ profiles: [profile],
+ }),
+ )
+ close(result.rowPoints.get(1) ?? 0, 6)
+ close(result.rowPoints.get(2) ?? 0, 10)
+ assert.equal(result.ranks.get(1), 2)
+ assert.equal(result.ranks.get(2), 1)
+})
+
+test('项目与组别权重相乘', () => {
+ const profile = makeProfile({ rules: [{ rank: 1, points: 10 }] })
+ const category: EventCategory = {
+ id: 7,
+ eventId: 1,
+ name: '甲组',
+ multiplier: 3,
+ gender: null,
+ ageMin: null,
+ ageMax: null,
+ sortOrder: 1,
+ }
+ const result = computeEventScore(
+ [makeRow(1, 10, 100)],
+ makeContext({ event: makeEvent({ multiplier: 2 }), category, channels: [makeChannel()], profiles: [profile] }),
+ )
+ close(result.rowPoints.get(1) ?? 0, 60)
+})
diff --git a/web/src/display/App.vue b/web/src/display/App.vue
index 159a19a..144911d 100644
--- a/web/src/display/App.vue
+++ b/web/src/display/App.vue
@@ -1,5 +1,5 @@
示例数据
+ 登录已失效 · 请重新登录
⚠ 连接中断 · 数据可能不是最新
v{{ version }}
@@ -43,6 +45,11 @@ const mock = computed(() => source.value === 'mock')
border-color: rgba(255, 215, 94, 0.5);
color: var(--gold);
}
+.auth {
+ background: rgba(255, 160, 64, 0.16);
+ border-color: rgba(255, 160, 64, 0.55);
+ color: #ffd0a0;
+}
.version {
background: rgba(255, 255, 255, 0.06);
color: var(--text-dim);
diff --git a/web/src/display/components/TickerBar.vue b/web/src/display/components/TickerBar.vue
index c19bef4..8552a21 100644
--- a/web/src/display/components/TickerBar.vue
+++ b/web/src/display/components/TickerBar.vue
@@ -11,11 +11,8 @@ interface TickerItem {
const { standings, latestResults, announcement, detail, settings } = useScoreboard()
-const topMedals = computed(() =>
- [...standings.value]
- .sort((a, b) => b.gold - a.gold || b.silver - a.silver || b.bronze - a.bronze)
- .slice(0, 3),
-)
+// 与团体奖牌榜页同一口径：按服务端名次（总分优先）取前 3，不在前端按金→银→铜重排。
+const topMedals = computed(() => standings.value.slice(0, 3))
const latestGroup = computed(() => latestResults.value[0] ?? null)
@@ -60,8 +57,8 @@ onUnmounted(() => window.clearInterval(timer))
-
-
{{ i + 1 }}
+
+ {{ row.rank }}
{{ row.shortName ?? row.teamName }}
金 {{ row.gold }}
银 {{ row.silver }}
diff --git a/web/src/display/components/pages/AthleteStandingsPage.vue b/web/src/display/components/pages/AthleteStandingsPage.vue
index c3480be..775f96b 100644
--- a/web/src/display/components/pages/AthleteStandingsPage.vue
+++ b/web/src/display/components/pages/AthleteStandingsPage.vue
@@ -1,17 +1,23 @@
@@ -28,7 +34,7 @@ const rowFont = computed(() => fitRowFont(rows.value.length, 560))
铜
-
+
{{ row.rank }}
{{ row.athleteName }}
{{ row.shortName ?? row.teamName }}
@@ -39,7 +45,8 @@ const rowFont = computed(() => fitRowFont(rows.value.length, 560))
{{ row.bronze }}
-
暂无个人积分数据
+
其余 {{ hiddenCount }} 人略
+
暂无个人积分数据
@@ -62,6 +69,7 @@ const rowFont = computed(() => fitRowFont(rows.value.length, 560))
padding: 0 18px;
font-size: var(--row-font, 42px);
line-height: 1.1;
+ overflow: hidden;
border-bottom: 1px solid rgba(255, 255, 255, 0.07);
}
.row:last-child {
@@ -122,6 +130,14 @@ const rowFont = computed(() => fitRowFont(rows.value.length, 560))
.bronze {
color: #e0995e;
}
+.more {
+ flex: none;
+ padding: 6px 18px 0;
+ font-size: 20px;
+ letter-spacing: 2px;
+ color: var(--text-dim);
+ text-align: right;
+}
.empty {
flex: 1;
display: grid;
diff --git a/web/src/display/components/pages/EventResultsPage.vue b/web/src/display/components/pages/EventResultsPage.vue
index b26689a..ad935ae 100644
--- a/web/src/display/components/pages/EventResultsPage.vue
+++ b/web/src/display/components/pages/EventResultsPage.vue
@@ -7,7 +7,7 @@ import PageFrame from '../PageFrame.vue'
const { latestResults, options } = useScoreboard()
-// 数据口径：state='published' 且 status='finished'，按发布时间倒序取前 N 个（06 第 5 节）。
+// 数据口径：服务端只过滤 state='published'（不看项目 status），按发布时间倒序取前 N 个（06 第 5 节）。
const groups = computed(() => latestResults.value.slice(0, options.value.resultsCount))
const STATUS_LABELS: Record
= {
diff --git a/web/src/display/components/pages/StandingsPage.vue b/web/src/display/components/pages/StandingsPage.vue
index 88a3c05..0b22418 100644
--- a/web/src/display/components/pages/StandingsPage.vue
+++ b/web/src/display/components/pages/StandingsPage.vue
@@ -1,7 +1,7 @@
diff --git a/web/src/display/components/pages/TeamMedalsPage.vue b/web/src/display/components/pages/TeamMedalsPage.vue
index 33677b6..46b2a02 100644
--- a/web/src/display/components/pages/TeamMedalsPage.vue
+++ b/web/src/display/components/pages/TeamMedalsPage.vue
@@ -1,6 +1,6 @@
diff --git a/web/src/display/fitFont.ts b/web/src/display/fitFont.ts
index 582eb44..cd39022 100644
--- a/web/src/display/fitFont.ts
+++ b/web/src/display/fitFont.ts
@@ -1,3 +1,9 @@
+/**
+ * 榜单主体可用高度：1920×1080 舞台扣掉顶栏 / 页框标题 / 底栏后的经验值。
+ * 三张榜单页共用，避免各写一个 560 导致布局一改就错位。
+ */
+export const BOARD_AVAILABLE_PX = 560
+
/**
* 行数不可控，字号必须跟着算，否则单位一多就会把最后一行顶到轮播条下面。
*
diff --git a/web/src/display/guards.ts b/web/src/display/guards.ts
index 2bd44fc..e13cb5f 100644
--- a/web/src/display/guards.ts
+++ b/web/src/display/guards.ts
@@ -304,8 +304,8 @@ export type DisplaySettings = EventSettings
/**
* 嵌套路径取值。
*
- * REST 的 `/api/settings` 是嵌套对象，WS 快照却是 `display.rotate_seconds`
- * 这类点号扁平键；同一份配置两种形态都要认，故先走嵌套路径再退回扁平键。
+ * 当前 REST 与 WS 快照都是嵌套对象；`display.rotate_seconds` 这类点号扁平键是
+ * 旧版本地缓存 / settings 表的遗留形态，先走嵌套路径再退回扁平键，升级后首屏仍能读到配置。
*/
function settingValue(
source: Record,
diff --git a/web/src/display/mock.ts b/web/src/display/mock.ts
index 1a32342..3c5cab7 100644
--- a/web/src/display/mock.ts
+++ b/web/src/display/mock.ts
@@ -22,7 +22,6 @@ const TEAM_NAMES: readonly string[] = [
'第四分公司',
'第五分公司',
'第六分公司',
- '技术研究院',
]
function team(index: number, code: string): Team {
@@ -47,7 +46,6 @@ const MOCK_TEAMS: Team[] = [
team(4, 'T05'),
team(5, 'T06'),
team(6, 'T07'),
- team(7, 'T08'),
]
interface StandingSeed {
@@ -67,7 +65,6 @@ const STANDING_SEEDS: readonly StandingSeed[] = [
{ rank: 5, totalPoints: 127, gold: 3, silver: 4, bronze: 5, rankChange: null },
{ rank: 6, totalPoints: 103, gold: 2, silver: 3, bronze: 4, rankChange: 0 },
{ rank: 7, totalPoints: 95, gold: 2, silver: 2, bronze: 2, rankChange: -2 },
- { rank: 8, totalPoints: 78, gold: 1, silver: 1, bronze: 3, rankChange: 0 },
]
function buildStandings(): StandingRow[] {
@@ -185,7 +182,7 @@ function buildLatestResults(): EventResultGroup[] {
{ rank: 3, teamIndex: 3, athlete: '周敏', resultText: '13.36', resultValue: 13.36 },
{ rank: 4, teamIndex: 6, athlete: '吴倩', resultText: '13.48', resultValue: 13.48 },
{ rank: 5, teamIndex: 2, athlete: '郑爽', resultText: '13.55', resultValue: 13.55 },
- { rank: 6, teamIndex: 7, athlete: '冯雪', resultText: '13.62', resultValue: 13.62 },
+ { rank: 6, teamIndex: 6, athlete: '冯雪', resultText: '13.62', resultValue: 13.62 },
],
's',
),
@@ -202,7 +199,7 @@ function buildLatestResults(): EventResultGroup[] {
{ rank: 1, teamIndex: 2, athlete: '黄涛', resultText: '6.42', resultValue: 6.42 },
{ rank: 2, teamIndex: 5, athlete: '徐斌', resultText: '6.18', resultValue: 6.18 },
{ rank: 3, teamIndex: 0, athlete: '马超', resultText: '6.05', resultValue: 6.05 },
- { rank: 4, teamIndex: 7, athlete: '朱峰', resultText: '5.96', resultValue: 5.96 },
+ { rank: 4, teamIndex: 3, athlete: '朱峰', resultText: '5.96', resultValue: 5.96 },
{ rank: 5, teamIndex: 1, athlete: '胡军', resultText: '5.88', resultValue: 5.88 },
{ rank: 6, teamIndex: 4, athlete: '林凯', resultText: '5.71', resultValue: 5.71 },
],
diff --git a/web/src/display/storage.ts b/web/src/display/storage.ts
index 96f3fcf..6ad9292 100644
--- a/web/src/display/storage.ts
+++ b/web/src/display/storage.ts
@@ -10,6 +10,9 @@ import { isRecord, num, parseSnapshot } from './guards'
const SNAPSHOT_KEY = 'scoreboard:display:snapshot'
+/** 缓存时效：一届赛事一天办完，隔夜快照只会在开屏瞬间显示上一场的错数据。 */
+const SNAPSHOT_TTL_MS = 12 * 60 * 60 * 1000
+
export interface CachedSnapshot {
version: number
savedAt: number
@@ -24,7 +27,10 @@ export function readCachedSnapshot(): CachedSnapshot | null {
if (!isRecord(parsed)) return null
const snapshot = parseSnapshot(parsed.snapshot)
if (snapshot === null) return null
- return { version: snapshot.version, savedAt: num(parsed.savedAt), snapshot }
+ const savedAt = num(parsed.savedAt)
+ // savedAt 缺失或过期都按无缓存处理；过期的版本号也不再作为 hello 的基准。
+ if (savedAt <= 0 || Date.now() - savedAt > SNAPSHOT_TTL_MS) return null
+ return { version: snapshot.version, savedAt, snapshot }
} catch {
// 隐私模式或配额异常时静默降级：缓存只是兜底，不能因此不出屏。
return null
diff --git a/web/src/display/tests/fitFont.test.ts b/web/src/display/tests/fitFont.test.ts
new file mode 100644
index 0000000..b8eb0ff
--- /dev/null
+++ b/web/src/display/tests/fitFont.test.ts
@@ -0,0 +1,15 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { BOARD_AVAILABLE_PX, fitRowFont } from '../fitFont'
+
+test('fitRowFont 空列表用固定字号', () => {
+ assert.equal(fitRowFont(0, BOARD_AVAILABLE_PX), '48px')
+})
+
+test('fitRowFont 行数少时封顶 56px', () => {
+ assert.equal(fitRowFont(1, BOARD_AVAILABLE_PX), '56px')
+})
+
+test('fitRowFont 行数多时守住 16px 下限', () => {
+ assert.equal(fitRowFont(100, BOARD_AVAILABLE_PX), '16px')
+})
diff --git a/web/src/display/types.ts b/web/src/display/types.ts
index 2ce490d..80ffb98 100644
--- a/web/src/display/types.ts
+++ b/web/src/display/types.ts
@@ -13,14 +13,6 @@ export const DISPLAY_PAGES = [
export type DisplayPageKey = (typeof DISPLAY_PAGES)[number]['key']
-export const PAGE_TITLES: Record = {
- standings: '总积分榜',
- 'team-medals': '团体奖牌榜',
- 'athlete-standings': '个人积分奖牌榜',
- 'event-results': '分项成绩',
- announcement: '公告',
-}
-
/** 管理端 `goto` 下发的页名不保证与内部 key 一致，这里统一归一化。 */
const PAGE_ALIASES: Record = {
standings: 'standings',
diff --git a/web/src/display/useScoreboard.ts b/web/src/display/useScoreboard.ts
index 07514f9..197cd1e 100644
--- a/web/src/display/useScoreboard.ts
+++ b/web/src/display/useScoreboard.ts
@@ -1,29 +1,19 @@
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
import { RealtimeClient, createApiClient } from '@/shared'
import type {
AthleteStanding,
Change,
DisplayCommand,
- Event,
EventResultGroup,
RealtimeStatus,
- RecordEntry,
SnapshotMessage,
StandingRow,
- Team,
} from '@/shared'
import {
- isRecord,
- list,
- numOrNull,
- parseAthleteStandings,
- parseEvent,
- parseEventResultGroups,
parseSettings,
parseSnapshot,
parseStandingRow,
parseStandingRows,
- parseTeam,
parseTeamBreakdown,
} from './guards'
import type { DisplaySettings } from './guards'
@@ -51,15 +41,13 @@ const source = ref('live')
const status = ref('idle')
const version = ref(null)
const settings = ref(null)
-const teams = ref([])
-const events = ref([])
const standings = ref([])
const athletes = ref([])
const latestResults = ref([])
-const records = ref([])
const rankDelta = ref>({})
const page = ref('standings')
const locked = ref(true)
+const authRequired = ref(false)
const options = ref({
page: null,
locked: true,
@@ -76,6 +64,8 @@ let rankTimer: ReturnType | null = null
let detailTimer: ReturnType | null = null
let announceTimer: ReturnType | null = null
let pageTimer: ReturnType | null = null
+let announceReturnPage: DisplayPageKey | null = null
+let athletesLoading = false
const showAthleteBoard = computed(() => settings.value?.standings.showIndividualBoard ?? true)
@@ -95,6 +85,12 @@ function clearTimer(timer: ReturnType | null): null {
return null
}
+// 翻页（含整页轮播）后把当前页同步给服务端，管理端实例看板才不会一直显示旧页。
+// 模块级单例与页面同生命周期，不需要随组件卸载停表。
+watch(page, (next) => {
+ client?.setPage(next)
+})
+
// ---------------------------------------------------------------------------
// 数据落地
// ---------------------------------------------------------------------------
@@ -129,31 +125,12 @@ function applyStandings(rows: StandingRow[]): void {
function applySnapshot(snapshot: SnapshotMessage, kind: DisplaySource): void {
settings.value = snapshot.settings
- teams.value = snapshot.teams
- events.value = snapshot.events
latestResults.value = snapshot.latestResults
- records.value = snapshot.records
version.value = snapshot.version
applyStandings(snapshot.standings)
source.value = kind
}
-function mergeById(
- current: T[],
- change: Change,
- parse: (value: unknown) => T,
-): T[] {
- if (change.action === 'replace') return list(change.data).map(parse)
-
- if (change.action === 'void') {
- const id = change.id ?? (isRecord(change.data) ? numOrNull(change.data.id) : null)
- return id === null ? current : current.filter((item) => item.id !== id)
- }
-
- const item = parse(change.data)
- return [...current.filter((entry) => entry.id !== item.id), item]
-}
-
function mergeStanding(row: StandingRow): void {
applyStandings([...standings.value.filter((item) => item.teamId !== row.teamId), row])
}
@@ -161,54 +138,51 @@ function mergeStanding(row: StandingRow): void {
/**
* 应用增量变更。
*
- * 只有榜单类实体能在客户端可靠合并；其余实体（如逐条成绩）合并规则在服务端，
+ * 只有总积分榜能在客户端可靠合并；其余实体（逐条成绩、分项成绩等）的合并规则在服务端，
* 这里直接 resync 拉全量——宁可多拉一次，也不允许大屏上出现算错的分数。
+ * 个人榜不在快照 / 增量里，总榜一变就单独重拉一次，否则它会停在开屏那一刻。
*/
function applyChanges(changes: Change[]): void {
let resyncNeeded = false
+ let standingsTouched = false
for (const change of changes) {
- switch (change.entity) {
- case 'standings':
- if (change.action === 'replace') {
- // 服务端当前下发的是 {eventId:N} 这类定位信息而不是榜单数组；
- // 直接当空数组用会把大屏清空，所以忽略并拉全量。
- if (!Array.isArray(change.data)) {
- resyncNeeded = true
- break
- }
- applyStandings(parseStandingRows(change.data))
- } else if (change.action === 'upsert') {
- mergeStanding(parseStandingRow(change.data))
- }
- break
- case 'athleteStandings':
- case 'athlete_standings':
- if (change.action === 'replace') athletes.value = parseAthleteStandings(change.data)
- break
- case 'latestResults':
- case 'eventResults':
- if (change.action === 'replace') {
- latestResults.value = parseEventResultGroups(change.data, teams.value)
- }
- break
- case 'settings':
- if (change.action !== 'void') settings.value = parseSettings(change.data)
- break
- case 'teams':
- teams.value = mergeById(teams.value, change, parseTeam)
- break
- case 'events':
- events.value = mergeById(events.value, change, parseEvent)
- break
- default:
- resyncNeeded = true
+ if (change.entity !== 'standings') {
+ resyncNeeded = true
+ continue
+ }
+ if (change.action === 'replace' && Array.isArray(change.data)) {
+ applyStandings(parseStandingRows(change.data))
+ standingsTouched = true
+ } else if (change.action === 'upsert') {
+ mergeStanding(parseStandingRow(change.data))
+ standingsTouched = true
+ } else {
+ // replace 载荷不是榜单数组时不能当空数组用（会把大屏清空），回退全量。
+ resyncNeeded = true
}
}
+ if (standingsTouched) void refreshAthletes()
if (resyncNeeded) client?.requestResync()
}
+/**
+ * 个人榜单独走 REST：服务端快照不含 athletes，增量也不写这个 entity。
+ * 拉取失败时保留上一份，不能因为附属榜单把实时主数据挡住。
+ */
+async function refreshAthletes(): Promise {
+ if (athletesLoading) return
+ athletesLoading = true
+ try {
+ athletes.value = await api.standings.athletes()
+ } catch {
+ // 静默保留旧数据，下一次榜单变更会再试。
+ } finally {
+ athletesLoading = false
+ }
+}
+
// ---------------------------------------------------------------------------
// 断线兜底与启动
// ---------------------------------------------------------------------------
@@ -220,23 +194,20 @@ function hydrateFromCache(): void {
}
/**
- * REST 兜底：快照不含个人榜，所以个人榜必须单独取；
- * 但快照比 REST 权威（REST 没有 version），已收到快照时不用 REST 覆盖。
+ * REST 兜底。
+ *
+ * 大屏不请求 /api/settings（admin-only，guest 必然 403），配置只认 WS 快照与本地缓存；
+ * 快照比 REST 权威（REST 没有 version），且请求飞行途中可能已有快照到达，
+ * 所以是否套用 REST 必须在 await 之后重新判断，不能沿用发请求前的结论。
*/
async function loadRest(): Promise {
- const hasSnapshot = version.value !== null
- const [settingsResult, standingsResult, athletesResult] = await Promise.allSettled([
- api.settings.get(),
+ const [standingsResult, athletesResult] = await Promise.allSettled([
api.standings.teams(),
api.standings.athletes(),
])
+ const hasSnapshot = version.value !== null
let ok = false
- if (settingsResult.status === 'fulfilled' && !hasSnapshot) {
- // REST 载荷同样过解析层，保证嵌套结构与默认值和大屏其余入口一致。
- settings.value = parseSettings(settingsResult.value)
- ok = true
- }
if (standingsResult.status === 'fulfilled' && !hasSnapshot) {
applyStandings(standingsResult.value)
ok = true
@@ -251,10 +222,7 @@ async function loadRest(): Promise {
function activateMock(): void {
const snapshot = createMockSnapshot()
settings.value = parseSettings(snapshot.settings)
- teams.value = snapshot.teams
- events.value = snapshot.events
latestResults.value = snapshot.latestResults
- records.value = snapshot.records
athletes.value = createMockAthletes()
standings.value = snapshot.standings
source.value = 'mock'
@@ -281,7 +249,8 @@ function readUrlOptions(): DisplayUrlOptions {
locked: lockParam !== '0' && lockParam !== 'false',
screen: params.get('screen'),
instance: params.get('instance'),
- resultsCount: clampInt(params.get('n'), 1, 6, 3),
+ // 分项成绩每组最小宽度约 450px，5 组起就超出 1920 舞台，上限压到 4。
+ resultsCount: clampInt(params.get('n'), 1, 4, 3),
}
}
@@ -305,7 +274,8 @@ function stopPageRotation(): void {
function startPageRotation(): void {
stopPageRotation()
- if (locked.value || reducedMotion.value) return
+ // 公告不在轮播页清单里，轮播会把公告切走；公告期间一律不启动。
+ if (locked.value || reducedMotion.value || page.value === 'announcement') return
const order = rotationPages.value
if (order.length < 2) return
@@ -316,10 +286,6 @@ function startPageRotation(): void {
}, PAGE_ROTATE_MS)
}
-function setPage(next: DisplayPageKey): void {
- page.value = next
-}
-
function setLocked(value: boolean): void {
locked.value = value
if (value) stopPageRotation()
@@ -377,15 +343,23 @@ function announce(text: string, seconds: number): void {
const trimmed = text.trim()
if (trimmed === '') return
+ // 第二条公告到来时 page 已经是 announcement，必须复用「进入公告前的真实页」，
+ // 否则返回页会被记成公告页自身，计时结束后永远停在公告页。
+ if (page.value !== 'announcement') announceReturnPage = page.value
+ const returnPage = announceReturnPage ?? 'standings'
+
announcement.value = { text: trimmed, seconds, startedAt: Date.now() }
- const previous = page.value
page.value = 'announcement'
+ // 公告不在轮播页清单里，20s 整页轮播会把它切走；公告期间必须停轮播。
+ stopPageRotation()
announceTimer = clearTimer(announceTimer)
if (seconds > 0) {
announceTimer = setTimeout(() => {
announceTimer = null
- if (page.value === 'announcement') page.value = previous
+ if (page.value === 'announcement') page.value = returnPage
+ announceReturnPage = null
+ if (!locked.value) startPageRotation()
}, seconds * 1000)
}
}
@@ -397,6 +371,8 @@ function handleCommand(command: DisplayCommand): void {
if (target !== null) {
closeDetail()
page.value = target
+ // 公告期间轮播是停着的，goto 抢回控制权后按锁定状态恢复。
+ if (!locked.value) startPageRotation()
}
break
}
@@ -430,14 +406,17 @@ function connect(): void {
client = new RealtimeClient({
role: 'display',
displayKey: options.value.instance ?? options.value.screen ?? undefined,
+ instanceId: options.value.instance ?? undefined,
+ page: page.value,
initialVersion: version.value,
onSnapshot: (message) => {
- // 服务端快照的 settings 是点号扁平 map，原始载荷直写 ref 会让 display 变 undefined；
- // 必须过解析层归一，解析失败则整包丢弃（心跳/重连会再给一次）。
+ // 快照载荷一律过解析层逐字段兜底，解析失败则整包丢弃（心跳/重连会再给一次）。
const snapshot = parseSnapshot(message)
if (snapshot === null) return
applySnapshot(snapshot, 'live')
writeCachedSnapshot(snapshot)
+ // 个人榜不在快照里，每次拿到快照（含 resync 结果）都单独补拉一次。
+ void refreshAthletes()
},
onCatchup: (message) => {
applyChanges(message.changes)
@@ -448,10 +427,18 @@ function connect(): void {
onCommand: handleCommand,
onStatusChange: (next) => {
status.value = next
+ if (next === 'online') authRequired.value = false
},
onVersionChange: (next) => {
version.value = next
},
+ onAuthRequired: () => {
+ authRequired.value = true
+ },
+ onError: (error) => {
+ // 心跳超时 / 非 JSON / 握手失败都只在这里可见，现场排障要靠它。
+ console.warn('[大屏实时]', error.message)
+ },
})
client.connect()
}
@@ -498,27 +485,17 @@ export function useScoreboard() {
status,
version,
settings,
- teams,
- events,
standings,
athletes,
latestResults,
- records,
- rankDelta,
page,
- locked,
+ authRequired,
options,
detail,
announcement,
booted,
- rotationPages,
bootstrap,
dispose,
- setPage,
- setLocked,
- startPageRotation,
- stopPageRotation,
- closeDetail,
rankDeltaFor,
}
}
diff --git a/web/src/shared/api.ts b/web/src/shared/api.ts
index bc2ee36..2a00d1c 100644
--- a/web/src/shared/api.ts
+++ b/web/src/shared/api.ts
@@ -1,6 +1,5 @@
import { isRawBody, isRecord, readString } from './internal'
import { normalizeRulePack } from './rules'
-import { isGuestRole } from './session'
import { parseYaml } from './yaml'
import type {
AdjustmentInput,
@@ -30,8 +29,6 @@ import type {
Result,
ResultQuery,
RulePack,
- RulePackImportPreview,
- RulePackImportResult,
RuleSwitches,
SaveDraftPayload,
ScoreChannel,
@@ -113,7 +110,9 @@ export interface CrudApi {
list(): Promise
get(id: number): Promise
create(input: Input): Promise
- update(id: number, input: Partial): Promise
+ // 服务端 PUT 是整行覆盖（repo.go 的 UPDATE 写全部列），局部更新会把未传字段清空，
+ // 所以这里要求完整 input，不能声明成 Partial。
+ update(id: number, input: Input): Promise
remove(id: number): Promise
}
@@ -180,11 +179,7 @@ export interface ExportQuery {
export interface ExportApi {
/** 返回可直接放进 的地址，省掉一次内存中的 Blob。 */
standingsUrl(query?: ExportQuery): string
- breakdownUrl(query: ExportQuery): string
- resultsUrl(query?: ExportQuery): string
standings(query?: ExportQuery): Promise
- breakdown(query: ExportQuery): Promise
- results(query?: ExportQuery): Promise
save(blob: Blob, filename: string): void
}
@@ -197,9 +192,6 @@ export interface RulesApi {
get(): Promise
/** GET /api/rules/switches，recorder 可读的布尔开关（不含规则内容）。 */
switches(): Promise
- /** 先预览差异，再决定是否落地（02 第 7.3 节硬性要求）。 */
- preview(pack: RulePack): Promise
- apply(pack: RulePack): Promise
}
export interface SystemApi {
@@ -256,18 +248,12 @@ function createResultsApi(http: Http): ResultsApi {
}
function createExportApi(http: Http): ExportApi {
- const path = {
- standings: '/export/standings.xlsx',
- breakdown: '/export/breakdown.xlsx',
- results: '/export/results.xlsx',
- }
+ // 服务端只注册了 /export/standings.xlsx 与 /export/all.xlsx 等；
+ // 单位明细 / 分项成绩导出分别是 /export/teams/{id}、/export/events/{id}，由各自页面拼地址。
+ const standingsPath = '/export/standings.xlsx'
return {
- standingsUrl: (query) => http.url(path.standings, query),
- breakdownUrl: (query) => http.url(path.breakdown, query),
- resultsUrl: (query) => http.url(path.results, query),
- standings: (query) => http.blob(path.standings, { query }),
- breakdown: (query) => http.blob(path.breakdown, { query }),
- results: (query) => http.blob(path.results, { query }),
+ standingsUrl: (query) => http.url(standingsPath, query),
+ standings: (query) => http.blob(standingsPath, { query }),
save: (blob, filename) => {
const url = URL.createObjectURL(blob)
const anchor = document.createElement('a')
@@ -299,14 +285,6 @@ function createRulesApi(http: Http): RulesApi {
return pack
},
switches: () => http.request('/rules/switches'),
- preview: (pack) =>
- http.request('/rules/import', {
- method: 'POST',
- query: { preview: 1 },
- body: pack,
- }),
- apply: (pack) =>
- http.request('/rules/import', { method: 'POST', body: pack }),
}
}
@@ -371,21 +349,19 @@ export class ApiClient {
}
this.auth = {
- login: async (username, password) =>
- markGuest(
- await http.request('/auth/login', {
- method: 'POST',
- body: { username, password },
- }),
- ),
+ login: (username, password) =>
+ http.request('/auth/login', {
+ method: 'POST',
+ body: { username, password },
+ }),
changePassword: (currentPassword, newPassword) =>
http.request<{ relogin: boolean }>('/auth/password', {
method: 'POST',
body: { currentPassword, newPassword },
}),
logout: () => http.requestVoid('/auth/logout', { method: 'POST' }),
- // 未登录时服务端回 200 + guest DTO，这里补出 guest 标记供 isGuestUser 判定。
- me: async () => markGuest(await http.request('/auth/me')),
+ // 未登录时服务端回 200 + guest DTO，调用方用 isGuestUser(user) 判定，不能只看 null。
+ me: () => http.request('/auth/me'),
}
this.settings = {
@@ -469,12 +445,20 @@ export class ApiClient {
this.unwrap(body)
}
+ /**
+ * 401 也用于「原密码不正确」等业务失败（服务端回 AUTH_FAILED）。
+ * 只有会话缺失 / 过期（AUTH_REQUIRED）才需要通知调用方清空登录态。
+ */
+ private notifyUnauthorized(error: ApiError): void {
+ if (error.code === 'AUTH_REQUIRED') this.onUnauthorized?.(error)
+ }
+
private async requestJson(path: string, options: RequestOptions = {}): Promise {
const response = await this.send(path, options)
const body = await readBody(response)
if (response.status === 401) {
const error = this.toApiError(body, response.status)
- this.onUnauthorized?.(error)
+ this.notifyUnauthorized(error)
throw error
}
if (!response.ok) throw this.toApiError(body, response.status)
@@ -488,7 +472,7 @@ export class ApiClient {
const body = await readBody(response)
if (response.status === 401) {
const error = this.toApiError(body, response.status)
- this.onUnauthorized?.(error)
+ this.notifyUnauthorized(error)
throw error
}
throw this.toApiError(body, response.status)
@@ -502,7 +486,7 @@ export class ApiClient {
const body = await readBody(response)
if (response.status === 401) {
const error = this.toApiError(body, response.status)
- this.onUnauthorized?.(error)
+ this.notifyUnauthorized(error)
throw error
}
throw this.toApiError(body, response.status)
@@ -536,9 +520,14 @@ export class ApiClient {
const controller = new AbortController()
const timer = setTimeout(() => controller.abort(), this.timeoutMs)
const external = options.signal
+ let abortedByCaller = false
if (external !== undefined) {
- if (external.aborted) controller.abort()
- else external.addEventListener('abort', () => controller.abort(), { once: true })
+ const abortFromCaller = (): void => {
+ abortedByCaller = true
+ controller.abort()
+ }
+ if (external.aborted) abortFromCaller()
+ else external.addEventListener('abort', abortFromCaller, { once: true })
}
try {
@@ -555,6 +544,8 @@ export class ApiClient {
signal: controller.signal,
})
} catch (error) {
+ // 外部取消与服务端超时共用同一个 signal，必须分开归类，调用方才能决定要不要提示。
+ if (abortedByCaller) throw new ApiError('ABORTED', '请求已取消', 0, error)
if (controller.signal.aborted) {
throw new ApiError('TIMEOUT', `请求超时（${this.timeoutMs}ms）`, 0, error)
}
@@ -620,14 +611,6 @@ function isScalar(value: unknown): value is string | number | boolean {
return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean'
}
-/**
- * 服务端未登录时 /auth/me 也回 200 + guest DTO，
- * 这里把 role 结论固化成 guest 字段，调用方用 isGuestUser(user) 判定即可。
- */
-function markGuest(user: CurrentUser): CurrentUser {
- return { ...user, guest: isGuestRole(user.role) }
-}
-
async function readBody(response: Response): Promise {
if (response.status === 204) return null
const text = await response.text()
diff --git a/web/src/shared/format.ts b/web/src/shared/format.ts
index 24bc137..63859e7 100644
--- a/web/src/shared/format.ts
+++ b/web/src/shared/format.ts
@@ -24,7 +24,9 @@ export function formatSeconds(seconds: number, fractionDigits = 2): string {
rest = (0).toFixed(fractionDigits)
}
- const body = minutes > 0 ? `${minutes}:${rest.padStart(3 + fractionDigits, '0')}` : rest
+ // 秒数要补足两位；fractionDigits=0 时没有小数点，补位宽度是 2 而不是 3。
+ const secondsWidth = fractionDigits > 0 ? 3 + fractionDigits : 2
+ const body = minutes > 0 ? `${minutes}:${rest.padStart(secondsWidth, '0')}` : rest
return `${sign}${body}`
}
@@ -104,8 +106,15 @@ export function formatClock(iso: string | null): string {
return `${DATE_PAD(date.getHours())}:${DATE_PAD(date.getMinutes())}`
}
+/** 带时区后缀（Z 或 ±HH:MM）的时间串按原样解析。 */
+const HAS_TIMEZONE = /(Z|[+-]\d{2}:?\d{2})$/i
+
function toDate(iso: string | null): Date | null {
if (iso === null || iso === '') return null
- const date = new Date(iso)
+ // SQLite 的 datetime('now') 是 UTC 但不带时区，new Date() 会按本地时区解析，
+ // 东八区会整体早 8 小时；先把空格分隔符换成 T，无时区的串再补 Z 按 UTC 解析。
+ const normalized = iso.replace(' ', 'T')
+ const text = HAS_TIMEZONE.test(normalized) ? normalized : `${normalized}Z`
+ const date = new Date(text)
return Number.isNaN(date.getTime()) ? null : date
}
diff --git a/web/src/shared/index.ts b/web/src/shared/index.ts
index a5716b0..b9c00af 100644
--- a/web/src/shared/index.ts
+++ b/web/src/shared/index.ts
@@ -8,7 +8,6 @@
export * from './types'
export { ApiClient, ApiError, createApiClient } from './api'
export type { ApiClientOptions, QueryParams, QueryValue } from './api'
-export { normalizeSettings, normalizeStandingRows } from './normalize'
export { GUEST_ROLE, isGuestRole, isGuestUser } from './session'
export { RealtimeClient } from './realtime'
export type {
diff --git a/web/src/shared/normalize.ts b/web/src/shared/normalize.ts
deleted file mode 100644
index e8585d3..0000000
--- a/web/src/shared/normalize.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * 服务端两类载荷的归一化。
- *
- * REST 与 WebSocket 快照对同一份数据用了两套字段名（快照直接序列化 domain 类型），
- * 归一化放在 shared 层，display 与 admin 各自只认归一后的契约类型。
- */
-
-import {
- asRecord,
- emptyToNull,
- firstBool,
- firstNumber,
- firstNumberOrNull,
- firstString,
- isRecord,
-} from './internal'
-import type { EventSettings, StandingRow } from './types'
-
-/**
- * 赛事配置归一化。
- *
- * `GET /api/settings` 是嵌套对象，而 WebSocket 快照的 `settings` 是
- * settings 表的点号扁平 map（`display.rotate_seconds`、`standings.mode`…）。
- * 两种形状都接受，缺省值对齐服务端 `getSettings`，避免大屏首包读不到字段。
- */
-export function normalizeSettings(raw: unknown): EventSettings {
- const source = asRecord(raw)
- const nestedEvent = isRecord(source.event) ? source.event : null
- const nestedDisplay = isRecord(source.display) ? source.display : null
- const nestedStandings = isRecord(source.standings) ? source.standings : null
- const isFlat = nestedEvent === null && nestedDisplay === null && nestedStandings === null
-
- const name =
- emptyToNull(firstString(isFlat ? source['event.name'] : undefined, nestedEvent?.name)) ??
- '未命名赛事'
- const subtitle = emptyToNull(
- firstString(isFlat ? source['event.subtitle'] : undefined, nestedEvent?.subtitle),
- )
- const host = emptyToNull(firstString(isFlat ? source['event.organizer'] : undefined, nestedEvent?.host))
- const logoPath = emptyToNull(
- firstString(isFlat ? source['event.logo_path'] : undefined, nestedEvent?.logoPath),
- )
- const primaryColor = emptyToNull(
- firstString(isFlat ? source['display.theme_color'] : undefined, nestedEvent?.primaryColor),
- )
- const displayLogo = emptyToNull(
- firstString(isFlat ? source['display.logo'] : undefined, nestedDisplay?.logo),
- )
-
- return {
- event: { name, subtitle, host, logoPath, primaryColor },
- display: {
- background: emptyToNull(
- firstString(isFlat ? source['display.background'] : undefined, nestedDisplay?.background),
- ),
- logo: displayLogo ?? logoPath,
- title:
- emptyToNull(firstString(isFlat ? source['display.title'] : undefined, nestedDisplay?.title)) ??
- name,
- subtitle:
- emptyToNull(
- firstString(isFlat ? source['display.subtitle'] : undefined, nestedDisplay?.subtitle),
- ) ?? subtitle,
- primaryColor,
- rotateSeconds: firstNumber(
- 15,
- isFlat ? source['display.rotate_seconds'] : undefined,
- nestedDisplay?.rotateSeconds,
- ),
- },
- standings: {
- individualToTeamWeight: firstNumber(
- 1,
- isFlat ? source['standings.individual_to_team_weight'] : undefined,
- nestedStandings?.individualToTeamWeight,
- ),
- rankingMode:
- emptyToNull(
- firstString(isFlat ? source['standings.mode'] : undefined, nestedStandings?.rankingMode),
- ) ?? 'points',
- showIndividualBoard: firstBool(
- true,
- isFlat ? source['standings.show_individual_board'] : undefined,
- isFlat ? source['standings.show_individual_medals'] : undefined,
- nestedStandings?.showIndividualBoard,
- ),
- showIndividualMedals: firstBool(
- true,
- isFlat ? source['standings.show_individual_medals'] : undefined,
- nestedStandings?.showIndividualMedals,
- ),
- },
- // 扁平 map 里只有模板编码（scoring.default_profile），解析不出数据库 id，只能置空。
- defaultProfileId: isFlat ? null : firstNumberOrNull(source.defaultProfileId),
- requireApproval: firstBool(
- false,
- isFlat ? source['results.review_required'] : undefined,
- source.requireApproval,
- ),
- }
-}
-
-/**
- * 总积分榜归一化。
- *
- * 快照用 domain.StandingsRow（`code/name/points/medals`），
- * REST 用 standingRowDTO（`teamCode/teamName/totalPoints/medalTotal`），两种都接受。
- */
-export function normalizeStandingRows(raw: unknown): StandingRow[] {
- if (!Array.isArray(raw)) return []
- return raw.map(normalizeStandingRow)
-}
-
-function normalizeStandingRow(raw: unknown): StandingRow {
- const rec = asRecord(raw)
- const gold = firstNumber(0, rec.gold)
- const silver = firstNumber(0, rec.silver)
- const bronze = firstNumber(0, rec.bronze)
- const rankChange = rec.rankChange
- return {
- rank: firstNumber(0, rec.rank),
- teamId: firstNumber(0, rec.teamId),
- teamCode: firstString(rec.teamCode, rec.code) ?? '',
- teamName: firstString(rec.teamName, rec.name) ?? '',
- shortName: emptyToNull(firstString(rec.shortName)),
- color: emptyToNull(firstString(rec.color)),
- logoPath: emptyToNull(firstString(rec.logoPath)),
- gold,
- silver,
- bronze,
- medalTotal: firstNumber(gold + silver + bronze, rec.medalTotal, rec.medals),
- totalPoints: firstNumber(0, rec.totalPoints, rec.points),
- rankChange: typeof rankChange === 'number' && Number.isFinite(rankChange) ? rankChange : null,
- }
-}
diff --git a/web/src/shared/realtime.ts b/web/src/shared/realtime.ts
index d4456ed..505d7f5 100644
--- a/web/src/shared/realtime.ts
+++ b/web/src/shared/realtime.ts
@@ -35,11 +35,17 @@ export interface RealtimeOptions {
url?: string
role: ClientRole
displayKey?: string
+ /** 大屏实例 id，hello 时上报，供管理端「已连接的大屏实例」定位。 */
+ instanceId?: string
+ /** 当前页名，hello 时上报；翻页后调用 setPage 再补一次。 */
+ page?: string
/** 大屏从 localStorage 恢复快照后传入，可让服务端只补增量。 */
initialVersion?: number | null
reconnect?: ReconnectOptions
/** 超过该时间没有任何服务端消息即判定半开连接，主动断开重连。 */
watchdogMs?: number
+ /** 握手超时：半开握手不触发 onopen/onclose，必须自己判死后重连。 */
+ handshakeMs?: number
/** resync 最小间隔，避免版本持续落后时反复打断服务端。 */
resyncCooldownMs?: number
onSnapshot?: (snapshot: SnapshotMessage) => void
@@ -48,6 +54,8 @@ export interface RealtimeOptions {
onCommand?: (command: DisplayCommand) => void
onStatusChange?: (status: RealtimeStatus, info: RealtimeInfo) => void
onVersionChange?: (version: number) => void
+ /** 策略性断开（如未登录申请管理端房间）：重连也会被同样拒绝，调用方应引导登录。 */
+ onAuthRequired?: () => void
onError?: (error: Error) => void
}
@@ -81,8 +89,10 @@ export class RealtimeClient {
private readonly url: string
private readonly role: ClientRole
private readonly displayKey: string | undefined
+ private readonly instanceId: string | undefined
private readonly reconnect: Required
private readonly watchdogMs: number
+ private readonly handshakeMs: number
private readonly resyncCooldownMs: number
private readonly handlers: Pick<
RealtimeOptions,
@@ -92,25 +102,31 @@ export class RealtimeClient {
| 'onCommand'
| 'onStatusChange'
| 'onVersionChange'
+ | 'onAuthRequired'
| 'onError'
>
private socket: WebSocket | null = null
private currentStatus: RealtimeStatus = 'idle'
private currentVersion: number | null
+ private currentPage: string | undefined
private attempt = 0
private serverTime: string | null = null
private closedByUser = false
private reconnectTimer: ReturnType | null = null
private watchdogTimer: ReturnType | null = null
+ private handshakeTimer: ReturnType | null = null
private lastResyncAt = 0
constructor(options: RealtimeOptions) {
this.url = options.url ?? defaultUrl()
this.role = options.role
this.displayKey = options.displayKey
+ this.instanceId = options.instanceId
+ this.currentPage = options.page
this.currentVersion = options.initialVersion ?? null
this.watchdogMs = options.watchdogMs ?? 25_000
+ this.handshakeMs = options.handshakeMs ?? 10_000
this.resyncCooldownMs = options.resyncCooldownMs ?? 3_000
this.reconnect = {
baseDelayMs: options.reconnect?.baseDelayMs ?? 1_000,
@@ -125,6 +141,7 @@ export class RealtimeClient {
onCommand: options.onCommand,
onStatusChange: options.onStatusChange,
onVersionChange: options.onVersionChange,
+ onAuthRequired: options.onAuthRequired,
onError: options.onError,
}
}
@@ -163,7 +180,11 @@ export class RealtimeClient {
}
this.socket = socket
+ // 握手超时从「发起连接」就开始算：半开握手不会触发 onopen 也不会触发 onclose，
+ // 只在 onopen 武装 watchdog 会让状态永远停在 connecting。
+ this.armHandshakeTimeout(socket)
socket.onopen = () => {
+ this.clearHandshakeTimer()
this.attempt = 0
this.setStatus('online')
this.sendHello()
@@ -176,17 +197,34 @@ export class RealtimeClient {
// 错误之后必然跟一次 close，重连交给 onclose 统一处理。
this.handlers.onError?.(new Error('WebSocket 连接出错'))
}
- socket.onclose = () => {
+ socket.onclose = (event: CloseEvent) => {
this.socket = null
this.clearWatchdog()
- if (!this.closedByUser) this.scheduleReconnect()
+ this.clearHandshakeTimer()
+ if (this.closedByUser) return
+ // 1008 = 服务端策略性拒绝（如未登录却申请管理端房间）。重连也会被同样拒绝，
+ // 停止重试并交给调用方引导登录，避免无限重连把服务端刷满。
+ if (event.code === 1008) {
+ this.setStatus('offline')
+ this.handlers.onAuthRequired?.()
+ return
+ }
+ this.scheduleReconnect()
}
}
+ /** 翻页后补一条 hello，让服务端注册表里的「当前页」跟上（协议只定义了 hello）。 */
+ setPage(page: string): void {
+ if (this.currentPage === page) return
+ this.currentPage = page
+ if (this.currentStatus === 'online') this.sendHello()
+ }
+
close(): void {
this.closedByUser = true
this.clearReconnectTimer()
this.clearWatchdog()
+ this.clearHandshakeTimer()
const socket = this.socket
this.socket = null
@@ -251,14 +289,21 @@ export class RealtimeClient {
}
private applySnapshot(data: SnapshotMessage): void {
- if (this.currentVersion !== null && data.version < this.currentVersion) return
+ // 快照是权威状态，必须无条件接受：服务端在「客户端版本超前」时也会下发全量快照
+ // （换赛事库 / 还原备份后 change_log 归零）。若按版本号丢弃，大屏会永久冻结在旧库数据上。
+ // 版本回退即视为服务端已重置，直接接受并把本地版本对齐到快照。
this.setVersion(data.version)
this.handlers.onSnapshot?.(data)
this.sendAck()
}
private applyCatchup(data: CatchupMessage): void {
- if (this.currentVersion !== null && data.version <= this.currentVersion) return
+ // 没有快照基准时不能直接合并增量，与 applyChange 保持一致，先要全量。
+ if (this.currentVersion === null) {
+ this.requestResync()
+ return
+ }
+ if (data.version <= this.currentVersion) return
this.setVersion(data.version)
this.handlers.onCatchup?.(data)
this.sendAck()
@@ -295,6 +340,8 @@ export class RealtimeClient {
const hello: HelloMessage = { role: this.role }
if (this.currentVersion !== null) hello.lastVersion = this.currentVersion
if (this.displayKey !== undefined) hello.displayKey = this.displayKey
+ if (this.instanceId !== undefined) hello.instanceId = this.instanceId
+ if (this.currentPage !== undefined) hello.page = this.currentPage
this.send('hello', hello)
}
@@ -325,6 +372,23 @@ export class RealtimeClient {
}
}
+ private armHandshakeTimeout(socket: WebSocket): void {
+ this.clearHandshakeTimer()
+ this.handshakeTimer = setTimeout(() => {
+ this.handshakeTimer = null
+ if (this.socket !== socket) return
+ this.handlers.onError?.(new Error('WebSocket 握手超时'))
+ socket.close()
+ }, this.handshakeMs)
+ }
+
+ private clearHandshakeTimer(): void {
+ if (this.handshakeTimer !== null) {
+ clearTimeout(this.handshakeTimer)
+ this.handshakeTimer = null
+ }
+ }
+
private scheduleReconnect(): void {
if (this.closedByUser || this.reconnectTimer !== null) return
this.setStatus('offline')
diff --git a/web/src/shared/rules.ts b/web/src/shared/rules.ts
index 06b2c16..bab0d90 100644
--- a/web/src/shared/rules.ts
+++ b/web/src/shared/rules.ts
@@ -215,14 +215,11 @@ function normalizeChannels(raw: unknown): RuleChannel[] {
const rec = asRecord(item)
const profile = firstString(rec.profile)
if (profile === null || profile === '') continue
- const channel: RuleChannel = {
+ out.push({
scope: oneOf(rec.scope, SCOPES, 'athlete'),
basis: oneOf(rec.basis, BASES, 'result'),
profile,
- }
- const aggregate = firstString(rec.aggregate)
- if (aggregate !== null && aggregate !== '') channel.aggregate = aggregate
- out.push(channel)
+ })
}
return out
}
diff --git a/web/src/shared/tests/api.test.ts b/web/src/shared/tests/api.test.ts
new file mode 100644
index 0000000..b9696d8
--- /dev/null
+++ b/web/src/shared/tests/api.test.ts
@@ -0,0 +1,41 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { ApiClient, ApiError } from '../api'
+
+function errorResponse(status: number, code: string): Response {
+ return new Response(JSON.stringify({ ok: false, error: { code, message: 'boom' } }), {
+ status,
+ headers: { 'Content-Type': 'application/json' },
+ })
+}
+
+// P1-32：401 也用于「原密码不正确」（AUTH_FAILED），不能借它清空登录态。
+test('401 AUTH_FAILED 不触发 onUnauthorized', async () => {
+ let called = 0
+ const client = new ApiClient({
+ fetchImpl: async () => errorResponse(401, 'AUTH_FAILED'),
+ onUnauthorized: () => {
+ called += 1
+ },
+ })
+
+ await assert.rejects(client.auth.changePassword('old', 'new'), (error: unknown) => {
+ return error instanceof ApiError && error.code === 'AUTH_FAILED'
+ })
+ assert.equal(called, 0)
+})
+
+test('401 AUTH_REQUIRED 触发 onUnauthorized', async () => {
+ let called = 0
+ const client = new ApiClient({
+ fetchImpl: async () => errorResponse(401, 'AUTH_REQUIRED'),
+ onUnauthorized: () => {
+ called += 1
+ },
+ })
+
+ await assert.rejects(client.auth.me(), (error: unknown) => {
+ return error instanceof ApiError && error.code === 'AUTH_REQUIRED'
+ })
+ assert.equal(called, 1)
+})
diff --git a/web/src/shared/tests/format.test.ts b/web/src/shared/tests/format.test.ts
new file mode 100644
index 0000000..81bccf1
--- /dev/null
+++ b/web/src/shared/tests/format.test.ts
@@ -0,0 +1,28 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { formatClock, formatDateTime, formatSeconds } from '../format'
+
+// 服务端 datetime('now') 存的是 UTC 且不带时区，必须按 UTC 解析，否则东八区整体早 8 小时。
+test('formatDateTime 把无时区时间串按 UTC 解析', () => {
+ assert.equal(formatDateTime('2026-09-09 12:34:56'), formatDateTime('2026-09-09T12:34:56Z'))
+ assert.equal(formatClock('2026-09-09 12:34:56'), formatClock('2026-09-09T12:34:56Z'))
+})
+
+test('formatDateTime 保留带时区时间串的原始时刻', () => {
+ const withOffset = new Date('2026-09-09T12:34:56+08:00')
+ assert.equal(formatDateTime('2026-09-09T12:34:56+08:00'), formatDateTime(withOffset.toISOString()))
+ assert.equal(formatClock('2026-09-09T12:34:56+08:00'), formatClock(withOffset.toISOString()))
+})
+
+test('formatSeconds 在 fractionDigits=0 时秒数仍补足两位', () => {
+ assert.equal(formatSeconds(66, 0), '1:06')
+ assert.equal(formatSeconds(66.33, 1), '1:06.3')
+ assert.equal(formatSeconds(66), '1:06.00')
+ assert.equal(formatSeconds(6.33), '6.33')
+ assert.equal(formatSeconds(60, 0), '1:00')
+})
+
+test('formatDateTime 对空值返回占位', () => {
+ assert.equal(formatDateTime(null), '—')
+ assert.equal(formatClock(null), '--:--')
+})
diff --git a/web/src/shared/tests/realtime.test.ts b/web/src/shared/tests/realtime.test.ts
new file mode 100644
index 0000000..0ae0136
--- /dev/null
+++ b/web/src/shared/tests/realtime.test.ts
@@ -0,0 +1,164 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { RealtimeClient } from '../realtime'
+
+class FakeSocket {
+ static readonly CONNECTING = 0
+ static readonly OPEN = 1
+ static readonly CLOSED = 3
+ static instances: FakeSocket[] = []
+
+ readyState = FakeSocket.CONNECTING
+ onopen: (() => void) | null = null
+ onmessage: ((event: { data: unknown }) => void) | null = null
+ onerror: (() => void) | null = null
+ onclose: ((event: { code: number }) => void) | null = null
+ readonly url: string
+ readonly sent: string[] = []
+
+ constructor(url: string) {
+ this.url = url
+ FakeSocket.instances.push(this)
+ }
+
+ send(data: string): void {
+ this.sent.push(data)
+ }
+
+ close(): void {
+ this.readyState = FakeSocket.CLOSED
+ this.onclose?.({ code: 1006 })
+ }
+
+ open(): void {
+ this.readyState = FakeSocket.OPEN
+ this.onopen?.()
+ }
+
+ emit(event: string, data: unknown): void {
+ this.onmessage?.({ data: JSON.stringify({ event, data }) })
+ }
+
+ drop(code: number): void {
+ this.readyState = FakeSocket.CLOSED
+ this.onclose?.({ code })
+ }
+}
+
+function installFakeWebSocket(): void {
+ FakeSocket.instances = []
+ ;(globalThis as { WebSocket?: unknown }).WebSocket = FakeSocket
+}
+
+function firstSocket(): FakeSocket {
+ const socket = FakeSocket.instances[0]
+ assert.ok(socket)
+ return socket
+}
+
+// P0-1：服务端在客户端版本超前（换库 / 还原备份后 change_log 归零）时也会发快照，
+// 若按版本号丢弃，大屏会永久冻结在旧数据上。
+test('快照版本低于本地缓存也接受，并把版本重置到快照', () => {
+ installFakeWebSocket()
+ const seen: number[] = []
+ const client = new RealtimeClient({
+ role: 'display',
+ url: 'ws://test/ws',
+ initialVersion: 500,
+ onSnapshot: (snapshot) => seen.push(snapshot.version),
+ })
+ client.connect()
+ firstSocket().open()
+ firstSocket().emit('snapshot', { version: 3 })
+
+ assert.deepEqual(seen, [3])
+ assert.equal(client.version, 3)
+ client.close()
+})
+
+// P1-22：Console 的「已连接大屏实例」靠 hello 里的 page / instanceId 定位。
+test('hello 上报 page 与 instanceId，翻页后补发', () => {
+ installFakeWebSocket()
+ const client = new RealtimeClient({
+ role: 'display',
+ url: 'ws://test/ws',
+ instanceId: 'screen-1',
+ page: 'standings',
+ })
+ client.connect()
+ const socket = firstSocket()
+ socket.open()
+
+ assert.deepEqual(JSON.parse(socket.sent[0] ?? '{}'), {
+ event: 'hello',
+ data: { role: 'display', instanceId: 'screen-1', page: 'standings' },
+ })
+
+ socket.sent.length = 0
+ client.setPage('team-medals')
+ assert.equal(JSON.parse(socket.sent[0] ?? '{}').data.page, 'team-medals')
+ client.close()
+})
+
+// P1-17：策略性拒绝（1008）重连也会被同样拒绝，必须停重连并提示登录。
+test('close 1008 停止重连并回调 onAuthRequired', async () => {
+ installFakeWebSocket()
+ let authRequired = 0
+ const client = new RealtimeClient({
+ role: 'admin',
+ url: 'ws://test/ws',
+ reconnect: { baseDelayMs: 5, maxDelayMs: 5, jitterRatio: 0 },
+ onAuthRequired: () => {
+ authRequired += 1
+ },
+ })
+ client.connect()
+ const socket = firstSocket()
+ socket.open()
+ socket.drop(1008)
+
+ assert.equal(authRequired, 1)
+ assert.equal(client.status, 'offline')
+ await new Promise((resolve) => setTimeout(resolve, 30))
+ assert.equal(FakeSocket.instances.length, 1)
+ client.close()
+})
+
+// P1-34：半开握手不触发 onopen/onclose，必须靠握手超时判死。
+test('握手超时主动断开并重连', async () => {
+ installFakeWebSocket()
+ const errors: string[] = []
+ const client = new RealtimeClient({
+ role: 'display',
+ url: 'ws://test/ws',
+ handshakeMs: 10,
+ reconnect: { baseDelayMs: 5, maxDelayMs: 5, jitterRatio: 0 },
+ onError: (error) => errors.push(error.message),
+ })
+ client.connect()
+ await new Promise((resolve) => setTimeout(resolve, 40))
+
+ assert.ok(errors.some((message) => message.includes('握手超时')))
+ assert.ok(FakeSocket.instances.length >= 2)
+ client.close()
+})
+
+// P2-13：没有快照基准时不能直接合并 catchup。
+test('没有快照基准时收到 catchup 先请求全量', () => {
+ installFakeWebSocket()
+ const catchups: unknown[] = []
+ const client = new RealtimeClient({
+ role: 'display',
+ url: 'ws://test/ws',
+ onCatchup: (message) => catchups.push(message),
+ })
+ client.connect()
+ const socket = firstSocket()
+ socket.open()
+ socket.sent.length = 0
+ socket.emit('catchup', { fromVersion: 0, version: 5, changes: [] })
+
+ assert.equal(catchups.length, 0)
+ assert.ok(socket.sent.some((raw) => raw.includes('"resync"')))
+ client.close()
+})
diff --git a/web/src/shared/tests/register.mjs b/web/src/shared/tests/register.mjs
new file mode 100644
index 0000000..e49785d
--- /dev/null
+++ b/web/src/shared/tests/register.mjs
@@ -0,0 +1,3 @@
+import { register } from 'node:module'
+
+register('./resolve.mjs', import.meta.url)
diff --git a/web/src/shared/tests/resolve.mjs b/web/src/shared/tests/resolve.mjs
new file mode 100644
index 0000000..3f24d48
--- /dev/null
+++ b/web/src/shared/tests/resolve.mjs
@@ -0,0 +1,16 @@
+/**
+ * `node --test` 专用的解析钩子：把 TS 源码里的无扩展名相对导入补成 .ts。
+ * 只服务于测试，不参与 Vite 构建。
+ */
+import { existsSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+export async function resolve(specifier, context, next) {
+ if (specifier.startsWith('.') && !/\.[cm]?[jt]s$/.test(specifier)) {
+ for (const ext of ['.ts', '.mjs', '.js']) {
+ const candidate = new URL(specifier + ext, context.parentURL)
+ if (existsSync(fileURLToPath(candidate))) return next(specifier + ext, context)
+ }
+ }
+ return next(specifier, context)
+}
diff --git a/web/src/shared/types.ts b/web/src/shared/types.ts
index 7c5b51a..0825585 100644
--- a/web/src/shared/types.ts
+++ b/web/src/shared/types.ts
@@ -385,11 +385,6 @@ export interface CurrentUser {
username: string
displayName: string
role: string
- /**
- * 由客户端按 role 补出：true 表示这是未登录时 /auth/me 返回的 guest DTO。
- * 服务端未登录也回 200，不能用「对象是否为 null」判访客，见 shared/session.ts。
- */
- guest?: boolean
/** 首次登录或管理员重置密码后为 true，前端应强制引导改密 */
mustChangePassword: boolean
lastLoginAt: string | null
@@ -488,8 +483,6 @@ export interface RuleChannel {
scope: ChannelScope
basis: ChannelBasis
profile: string
- /** basis 为 aggregate 时的汇总口径（avg/max/min/count），服务端缺省 sum。 */
- aggregate?: string
}
export interface ChannelTemplateMatch {
@@ -524,31 +517,6 @@ export interface RulePack {
eventOverrides: EventOverride[]
}
-export type RulePackDiffKind = 'profile' | 'channelTemplate' | 'eventOverride' | 'standings'
-export type RulePackDiffChange = 'added' | 'removed' | 'modified' | 'unchanged'
-
-export interface RulePackDiffEntry {
- kind: RulePackDiffKind
- target: string
- change: RulePackDiffChange
- detail: string
-}
-
-/** 导入必须先预览再落地（02 第 7.3 节），所以预览结果是独立类型。 */
-export interface RulePackImportPreview {
- formatVersion: number
- /** false 表示 formatVersion 不兼容，此时不允许落地。 */
- compatible: boolean
- diffs: RulePackDiffEntry[]
- affectedEventCount: number
-}
-
-export interface RulePackImportResult extends RulePackImportPreview {
- applied: boolean
- /** 导入后服务端全量重算的积分流水条数，用于确认重算确实发生。 */
- recalculatedLedgerRows: number
-}
-
// ---------------------------------------------------------------------------
// REST 统一响应
// ---------------------------------------------------------------------------
@@ -562,9 +530,10 @@ export type ApiErrorCode =
| 'STATE_INVALID'
| 'RATE_LIMITED'
| 'INTERNAL'
- // 以下三个由客户端产生，服务端不会返回，但前端要能统一处理
+ // 以下四个由客户端产生，服务端不会返回，但前端要能统一处理
| 'NETWORK'
| 'TIMEOUT'
+ | 'ABORTED'
| 'PARSE_FAILED'
export interface ApiErrorBody {
@@ -598,6 +567,10 @@ export interface HelloMessage {
/** 上一次已应用的版本，服务端据此决定发增量还是整包快照。 */
lastVersion?: number
displayKey?: string
+ /** 大屏实例 id；缺省时服务端退回 displayKey 或自行生成。 */
+ instanceId?: string
+ /** 当前页名，写入服务端大屏实例注册表供管理端查看。 */
+ page?: string
}
export interface AckMessage {