fix(meeting): Task 16 修复 code-reviewer 审计 P2 七项 + Nit 七项
覆盖 Phase 2e-2 代码审查报告(docs/reviews/2026-04-23-phase2e-2-code-review.md) P2/Nit 收尾批次,均在本仓库完成闭环;剩余 5 项登记推迟至 Phase 2f/3。 ===== P2 七项 ===== - P2-1 cleanupUserResources 补 transport 清理 · media-server 新增 DELETE /internal/v1/transports/:id + transport.service.closeTransport · Go MediaOrchestrator 接口新增 CloseTransport;HTTP 实现按 doCloseRequest 走 4xx 幂等 + 指数退避 · meeting_signal_service.cleanupUserResources 新增 "transport:<id>" 分支 - P2-2 preview.vue 快速切设备竞态 · previewSeq 序号 + nextTick 后 stale 判断,丢弃过期结果 · onVideoChange/onAudioChange 走 scheduleRestartPreview 200ms 防抖 · onBeforeUnmount 清理 changeDebounceTimer - P2-3 room.vue onLoad redirectTo 后补 return · 引入 redirectingToJoin 守卫,跳转页不再执行 onMounted 初始化 - P2-6 generateUniqueRoomCode 重试上限监控 · 重试后成功:Warn 日志(码空间健康度告警) · 重试耗尽:Error 日志 + ErrRoomCodeConflict · 修正 logs.Error 调用签名(去掉多余的 nil) - P2-7 SendChatMessage 服务端长度 + 频率限制 · 新增 ErrChatContentEmpty / ErrChatContentTooLong / ErrChatRateLimited · utf8.RuneCountInString 校验 500 字符上限 · Redis INCR + EXPIRE 滑动窗口(30 条/60s,首次写入 EXPIRE 兜底) · controller.handleError 映射为 HTTP 400 - P2-8 MEETING_ENDED_REASON_LABEL 覆盖复核 · 新增前端专属常量 MEETING_ENDED_REASON_KICKED + 文案 · store/meeting.js _onMemberKicked 使用常量 · 同步修复后端 OnWSDisconnect 硬编码 "ws_disconnect" → constants.MeetingLeftReasonDisconnect - P2 已修 P2-1/2/3/6/7/8;P2-4(WS token 迁出 URL query)与 P2-5(Chat 服务拆分)登记推迟 ===== Nit 七项 ===== - Nit: kind:id 解析改用 strings.SplitN · cleanupUserResources / pushExistingRoomState 两处同步 - Nit: resourceTTL 中央化 · 新增 constants.MeetingResourceTrackTTLSeconds(3600) · meeting_signal_service.go resourceTTL 由 const 改 var 并引用常量 - Nit: ws/handler.go CheckOrigin 白名单 · NewHandler 新增 serverCfg 依赖;checkOrigin 支持同源放行 / dev 模式放行 / release 模式白名单严格匹配 · config.ServerConfig 新增 WSAllowedOrigins(逗号分隔)+ AllowedOrigins() / IsRelease() 辅助方法 · provider.go 新增 provideServerConfig,wire_gen.go 同步 - Nit: http_media_orchestrator.go 超时 + CreateRouter 重试 · 默认 TimeoutMS 5000→10000ms 兼容 Worker 冷启动 · 新增 CreateRouterRetry(默认 1 次,300ms 退避),仅对非 404 错误重试 · config.dev.yaml / config.docker.yaml 同步写入显式配置 - Nit: deploy-public.sh REDIS_PASSWORD × redis.conf 联动校验 · 检测 REDIS_PASSWORD 与 redis.conf 的 requirepass 配对一致性 · redis.conf 增加公网部署 requirepass 使用说明 - Nit: media-server internal-auth isPrivatePath 按 path 匹配 · 剔除 query/hash 后再与白名单 startsWith,避免 "?" 语义混淆 - Nit: mediasoup-client.js in-flight 锁走读确认 · finally 分支已覆盖 resolve/reject 两路,追加注释强化语义 - Nit 走读复核:_onMemberLeft 整槽关闭 vs _onProducerNew(closed=true) 精确匹配 producerId · 粒度正确,无需改动(登记结论) ===== 构建验证 ===== - go vet ./... / go build ./... 通过 - frontend npm run build:h5 通过(仅 uni-app legacy warning,无 error) - media-server npx tsc --noEmit 通过 ===== 审查追踪小节 ===== docs/reviews/2026-04-23-phase2e-2-code-review.md 追加 "Task 16 修复追踪(2026-04-24 更新)": - 已修复一览(本批次 14 处 + 历次 commitcdaa39d/ea2bf96/f5ae095/ 5ed14c2) - 推迟登记表(P2-4 / P2-5 / 端口收敛 / appData 校验 / RFC3339 时间格式,共 5 项) Made-with: Cursor
This commit is contained in:
@@ -120,6 +120,12 @@ let audioContext = null
|
||||
let analyser = null
|
||||
let volumeRafId = null
|
||||
|
||||
// P2-2 修复:快速切换摄像头/麦克风时 getUserMedia 并发竞态保护
|
||||
// - previewSeq 每调用一次 startPreview 递增,保证只有"最后一次"请求结果被挂载
|
||||
// - changeDebounceTimer 合并 200ms 内的连续切换(防止 picker 快速滚动触发多次拉流)
|
||||
let previewSeq = 0
|
||||
let changeDebounceTimer = null
|
||||
|
||||
const hasPermission = ref(false)
|
||||
const permissionError = ref('')
|
||||
const joining = ref(false)
|
||||
@@ -197,6 +203,7 @@ const startPreview = async () => {
|
||||
}
|
||||
return
|
||||
}
|
||||
const mySeq = ++previewSeq
|
||||
stopPreviewStream()
|
||||
stopAudioMeter()
|
||||
try {
|
||||
@@ -206,13 +213,21 @@ const startPreview = async () => {
|
||||
? { deviceId: { exact: selectedVideoId.value }, width: { ideal: 1280 }, height: { ideal: 720 }, frameRate: { ideal: 24, max: 30 } }
|
||||
: { width: { ideal: 1280 }, height: { ideal: 720 }, frameRate: { ideal: 24, max: 30 } }
|
||||
}
|
||||
previewStream = await navigator.mediaDevices.getUserMedia(constraints)
|
||||
const stream = await navigator.mediaDevices.getUserMedia(constraints)
|
||||
if (mySeq !== previewSeq) {
|
||||
// 期间又触发了新的 startPreview,本次结果已过期,立即关闭 track 丢弃
|
||||
stream.getTracks().forEach(t => { try { t.stop() } catch {} })
|
||||
return
|
||||
}
|
||||
previewStream = stream
|
||||
hasPermission.value = true
|
||||
permissionError.value = ''
|
||||
await nextTick()
|
||||
if (mySeq !== previewSeq) return
|
||||
mountPreviewVideo()
|
||||
startAudioMeter(previewStream)
|
||||
} catch (err) {
|
||||
if (mySeq !== previewSeq) return
|
||||
hasPermission.value = false
|
||||
permissionError.value = err?.name === 'NotAllowedError'
|
||||
? '已拒绝摄像头/麦克风权限,请在浏览器地址栏左侧恢复权限后重试'
|
||||
@@ -222,6 +237,17 @@ const startPreview = async () => {
|
||||
// #endif
|
||||
}
|
||||
|
||||
// P2-2 修复:设备切换防抖,避免 picker 快速滚动触发多次 getUserMedia 并发
|
||||
const scheduleRestartPreview = () => {
|
||||
if (changeDebounceTimer) {
|
||||
clearTimeout(changeDebounceTimer)
|
||||
}
|
||||
changeDebounceTimer = setTimeout(() => {
|
||||
changeDebounceTimer = null
|
||||
startPreview()
|
||||
}, 200)
|
||||
}
|
||||
|
||||
const mountPreviewVideo = () => {
|
||||
// #ifdef H5
|
||||
const parent = resolveDom(videoBox.value)
|
||||
@@ -309,14 +335,14 @@ const onVideoChange = (e) => {
|
||||
const d = videoDevices.value[idx]
|
||||
if (!d) return
|
||||
selectedVideoId.value = d.deviceId
|
||||
startPreview()
|
||||
scheduleRestartPreview()
|
||||
}
|
||||
const onAudioChange = (e) => {
|
||||
const idx = Number(e.detail.value)
|
||||
const d = audioDevices.value[idx]
|
||||
if (!d) return
|
||||
selectedAudioId.value = d.deviceId
|
||||
startPreview()
|
||||
scheduleRestartPreview()
|
||||
}
|
||||
const onSpeakerChange = (e) => {
|
||||
const idx = Number(e.detail.value)
|
||||
@@ -427,6 +453,10 @@ onLoad(async (query) => {
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
if (changeDebounceTimer) {
|
||||
clearTimeout(changeDebounceTimer)
|
||||
changeDebounceTimer = null
|
||||
}
|
||||
stopPreviewStream()
|
||||
stopAudioMeter()
|
||||
})
|
||||
|
||||
@@ -565,15 +565,24 @@ const redirectHome = () => {
|
||||
|
||||
let stateStopWatch = null
|
||||
|
||||
// P2-3 修复:redirectTo 后必须 return,避免 onMounted 继续执行闪默认 UI
|
||||
// 使用 module-scoped 标记,onMounted 读取后判断是否提前退出
|
||||
let redirectingToJoin = false
|
||||
|
||||
onLoad((query) => {
|
||||
// 刷新页面 / 直链访问 room 时 store 为空,回跳 join 避免白屏
|
||||
if (!meetingStore.isInMeeting) {
|
||||
const paramCode = (query?.code || '').replace(/\D/g, '')
|
||||
redirectingToJoin = true
|
||||
uni.redirectTo({ url: `/pages/meeting/join${paramCode ? `?code=${paramCode}` : ''}` })
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
// P2-3 修复:onLoad 已 redirectTo 跳转时,避免本页继续初始化定时器与 watcher
|
||||
if (redirectingToJoin) return
|
||||
|
||||
const startIso = meetingStore.currentRoom?.started_at || meetingStore.currentRoom?.created_at
|
||||
startedAt.value = startIso ? Date.parse(startIso) : Date.now()
|
||||
timerHandle = setInterval(() => { nowTs.value = Date.now() }, 1000)
|
||||
|
||||
Reference in New Issue
Block a user