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:
@@ -65,7 +65,10 @@ type HTTPMediaOrchestrator struct {
|
||||
func NewHTTPMediaOrchestrator(cfg *config.Config) *HTTPMediaOrchestrator {
|
||||
mc := cfg.MediaServer
|
||||
if mc.TimeoutMS <= 0 {
|
||||
mc.TimeoutMS = 5000
|
||||
// Task 16 Nit(代码审查 2026-04-23 第 15 条):
|
||||
// 原默认 5000ms 对 CreateRouter 偏紧(Worker 冷启动 + Router 首次创建在慢机上可达 6~8s),
|
||||
// 统一将默认超时放宽到 10000ms,显式配置(config.*.yaml)不受影响
|
||||
mc.TimeoutMS = 10000
|
||||
}
|
||||
if mc.CloseTimeoutMS <= 0 {
|
||||
mc.CloseTimeoutMS = 2000
|
||||
@@ -73,6 +76,14 @@ func NewHTTPMediaOrchestrator(cfg *config.Config) *HTTPMediaOrchestrator {
|
||||
if mc.CloseRetry < 0 {
|
||||
mc.CloseRetry = 0
|
||||
}
|
||||
if mc.CreateRouterRetry < 0 {
|
||||
mc.CreateRouterRetry = 0
|
||||
}
|
||||
if mc.CreateRouterRetry == 0 {
|
||||
// Task 16 Nit(代码审查 2026-04-23 第 15 条):
|
||||
// 默认允许 1 次轻量重试,300ms 退避,仅对非 404 错误生效
|
||||
mc.CreateRouterRetry = 1
|
||||
}
|
||||
// 去除 base_url 末尾斜杠,统一拼接风格
|
||||
mc.BaseURL = strings.TrimRight(mc.BaseURL, "/")
|
||||
|
||||
@@ -113,15 +124,42 @@ func (h *HTTPMediaOrchestrator) CreateRouter(ctx context.Context, roomCode strin
|
||||
RouterID string `json:"routerId"`
|
||||
RtpCapabilities json.RawMessage `json:"rtpCapabilities"`
|
||||
}
|
||||
if err := h.doRequest(ctx, requestOptions{
|
||||
method: http.MethodPost,
|
||||
path: "/internal/v1/routers",
|
||||
body: reqBody,
|
||||
timeoutMS: h.cfg.TimeoutMS,
|
||||
funcName: funcName,
|
||||
logFields: []zap.Field{zap.String("room_code", roomCode)},
|
||||
}, &resp); err != nil {
|
||||
return "", err
|
||||
|
||||
// Task 16 Nit:CreateRouter 在 5xx / 网络错误时允许 CreateRouterRetry 次重试(退避 300ms)
|
||||
// - 404 不应出现在 POST /routers,若出现视为 media-server 配置异常,不重试
|
||||
// - ctx.Err() 立即终止(上游取消或超时)
|
||||
attempts := h.cfg.CreateRouterRetry + 1
|
||||
var lastErr error
|
||||
for i := 0; i < attempts; i++ {
|
||||
if i > 0 {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return "", ctx.Err()
|
||||
case <-time.After(300 * time.Millisecond):
|
||||
}
|
||||
logs.Info(ctx, funcName, "CreateRouter 重试",
|
||||
zap.String("room_code", roomCode),
|
||||
zap.Int("attempt", i+1))
|
||||
}
|
||||
err := h.doRequest(ctx, requestOptions{
|
||||
method: http.MethodPost,
|
||||
path: "/internal/v1/routers",
|
||||
body: reqBody,
|
||||
timeoutMS: h.cfg.TimeoutMS,
|
||||
funcName: funcName,
|
||||
logFields: []zap.Field{zap.String("room_code", roomCode), zap.Int("attempt", i+1)},
|
||||
}, &resp)
|
||||
if err == nil {
|
||||
lastErr = nil
|
||||
break
|
||||
}
|
||||
lastErr = err
|
||||
if errors.Is(err, ErrMediaResourceNotFound) {
|
||||
break
|
||||
}
|
||||
}
|
||||
if lastErr != nil {
|
||||
return "", lastErr
|
||||
}
|
||||
|
||||
info := &routerInfoCache{
|
||||
@@ -257,6 +295,21 @@ func (h *HTTPMediaOrchestrator) ConnectTransport(ctx context.Context, transportI
|
||||
}, nil)
|
||||
}
|
||||
|
||||
// CloseTransport 调用 DELETE /internal/v1/transports/:id(Task 16 P2-1 引入)
|
||||
// 404 映射为 ErrMediaResourceNotFound(上层 cleanupUserResources 视为已清理)
|
||||
// 与 CloseProducer / CloseConsumer 保持同一重试/超时策略
|
||||
func (h *HTTPMediaOrchestrator) CloseTransport(ctx context.Context, transportID string) error {
|
||||
funcName := "service.http_media_orchestrator.CloseTransport"
|
||||
|
||||
err := h.doCloseRequest(ctx, fmt.Sprintf("/internal/v1/transports/%s", transportID), funcName, []zap.Field{
|
||||
zap.String("transport_id", transportID),
|
||||
})
|
||||
if errors.Is(err, ErrMediaResourceNotFound) {
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// CreateProducer 调用 POST /internal/v1/producers
|
||||
func (h *HTTPMediaOrchestrator) CreateProducer(ctx context.Context, req *CreateProducerReq) (string, error) {
|
||||
funcName := "service.http_media_orchestrator.CreateProducer"
|
||||
|
||||
@@ -103,6 +103,10 @@ type MediaOrchestrator interface {
|
||||
CreateTransport(ctx context.Context, req *CreateTransportReq) (*TransportInfo, error)
|
||||
// ConnectTransport Transport DTLS 握手(幂等:重复 connect 对已连接 transport 视为成功)
|
||||
ConnectTransport(ctx context.Context, transportID string, dtlsParameters json.RawMessage) error
|
||||
// CloseTransport 主动关闭指定 Transport(Task 16 P2-1 引入)
|
||||
// 场景:用户离会 / WS 断连时 cleanupUserResources 精确清理,避免等待 Router 级联
|
||||
// 语义:404(Transport 已关闭/不存在)返回 ErrMediaResourceNotFound,上层可视为"已清理"幂等成功
|
||||
CloseTransport(ctx context.Context, transportID string) error
|
||||
|
||||
// CreateProducer 在指定 send Transport 上创建 Producer
|
||||
CreateProducer(ctx context.Context, req *CreateProducerReq) (producerID string, err error)
|
||||
@@ -166,6 +170,11 @@ func (n *NoopMediaOrchestrator) ConnectTransport(_ context.Context, _ string, _
|
||||
return nil
|
||||
}
|
||||
|
||||
// CloseTransport 占位:直接返回 nil(Task 16 P2-1 引入)
|
||||
func (n *NoopMediaOrchestrator) CloseTransport(_ context.Context, _ string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// CreateProducer 占位:返回伪造 ID
|
||||
func (n *NoopMediaOrchestrator) CreateProducer(_ context.Context, req *CreateProducerReq) (string, error) {
|
||||
return "noop-producer-" + req.Kind, nil
|
||||
|
||||
@@ -7,7 +7,9 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/echochat/backend/app/constants"
|
||||
"github.com/echochat/backend/app/dto"
|
||||
@@ -45,6 +47,10 @@ var (
|
||||
// ErrMediaServiceUnavailable 媒体服务当前不可用(Router 创建失败 / Node 宕机等)
|
||||
// 用于 CreateRoom / JoinRoom 的补偿路径,将前台错误与"用户输入错误"区分开
|
||||
ErrMediaServiceUnavailable = errors.New("媒体服务暂时不可用,请稍后重试")
|
||||
// Task 16 P2-7:会议聊天服务端限流
|
||||
ErrChatContentEmpty = errors.New("消息内容不能为空")
|
||||
ErrChatContentTooLong = errors.New("消息长度超过上限")
|
||||
ErrChatRateLimited = errors.New("发送过于频繁,请稍后再试")
|
||||
)
|
||||
|
||||
// Redis key 前缀(设计文档 §5.4 - Redis 数据结构)
|
||||
@@ -52,6 +58,8 @@ const (
|
||||
redisKeyInvitePrefix = "echo:meeting:invite:" // 邀请 Token
|
||||
redisKeyPasswordLockPrefix = "echo:meeting:lock:" // 密码错误锁(code:user_id)
|
||||
redisPasswordAttemptPrefix = "echo:meeting:pwd_attempt:" // 密码错误计数
|
||||
// Task 16 P2-7:会议聊天限流计数键,格式 "echo:meeting:chat_rate:<room>:<user_id>"
|
||||
redisKeyChatRatePrefix = "echo:meeting:chat_rate:"
|
||||
)
|
||||
|
||||
// MeetingService 会议业务服务
|
||||
@@ -132,7 +140,12 @@ func (s *MeetingService) assertIsHost(ctx context.Context, room *model.MeetingRo
|
||||
}
|
||||
|
||||
// generateUniqueRoomCode 生成唯一的 XXX-XXX-XXX 会议号,冲突最多重试 MeetingRoomCodeRetryMax 次
|
||||
// P2-6(代码审查 2026-04-23):
|
||||
// - 重试上限由 constants.MeetingRoomCodeRetryMax 控制(当前=3),避免死循环
|
||||
// - 只要命中第 2 次及以后就打 Warn(正常情况下几乎不会碰撞,连续碰撞通常是码空间
|
||||
// / 生成器被外部污染的信号,需要及早告警)
|
||||
func (s *MeetingService) generateUniqueRoomCode(ctx context.Context) (string, error) {
|
||||
funcName := "service.meeting_service.generateUniqueRoomCode"
|
||||
for i := 0; i < constants.MeetingRoomCodeRetryMax; i++ {
|
||||
code, err := utils.GenerateMeetingRoomCode()
|
||||
if err != nil {
|
||||
@@ -143,9 +156,16 @@ func (s *MeetingService) generateUniqueRoomCode(ctx context.Context) (string, er
|
||||
return "", err
|
||||
}
|
||||
if !exists {
|
||||
if i > 0 {
|
||||
logs.Warn(ctx, funcName, "会议号生成多次冲突后成功,请关注码空间健康度",
|
||||
zap.Int("retry_count", i),
|
||||
zap.String("code", code))
|
||||
}
|
||||
return code, nil
|
||||
}
|
||||
}
|
||||
logs.Error(ctx, funcName, "会议号生成连续冲突达到上限,疑似码空间异常或并发洪水",
|
||||
zap.Int("retry_max", constants.MeetingRoomCodeRetryMax))
|
||||
return "", ErrRoomCodeConflict
|
||||
}
|
||||
|
||||
@@ -868,9 +888,24 @@ func (s *MeetingService) RedeemInviteToken(ctx context.Context, userID int64, to
|
||||
// ====== 会议内聊天 ======
|
||||
|
||||
// SendChatMessage 会议内发送文本消息
|
||||
// Task 16 P2-7:加入服务端校验 + Redis 滑窗限流
|
||||
// - 内容去除首尾空白后必须非空
|
||||
// - Unicode rune 计数不得超过 MeetingChatMaxContentLen
|
||||
// - 单用户单会议 MeetingChatRateLimitWindowS 秒内最多 MeetingChatRateLimitPerMin 条
|
||||
func (s *MeetingService) SendChatMessage(ctx context.Context, userID int64, code, content string) (*model.MeetingChat, error) {
|
||||
funcName := "service.meeting_service.SendChatMessage"
|
||||
|
||||
trimmed := strings.TrimSpace(content)
|
||||
if trimmed == "" {
|
||||
return nil, ErrChatContentEmpty
|
||||
}
|
||||
if runeCount := utf8.RuneCountInString(trimmed); runeCount > constants.MeetingChatMaxContentLen {
|
||||
logs.Debug(ctx, funcName, "聊天消息超长,拒绝",
|
||||
zap.String("room_code", code), zap.Int64("user_id", userID),
|
||||
zap.Int("rune_count", runeCount), zap.Int("limit", constants.MeetingChatMaxContentLen))
|
||||
return nil, ErrChatContentTooLong
|
||||
}
|
||||
|
||||
room, err := s.roomDAO.GetByCode(ctx, code)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -885,10 +920,29 @@ func (s *MeetingService) SendChatMessage(ctx context.Context, userID int64, code
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Redis 滑窗限流(INCR + EXPIRE 组合;首条消息初始化窗口)
|
||||
// 失败时仅 Warn 并放行,避免 Redis 抖动影响用户发消息
|
||||
rateKey := fmt.Sprintf("%s%s:%d", redisKeyChatRatePrefix, code, userID)
|
||||
cnt, rErr := s.redis.Incr(ctx, rateKey).Result()
|
||||
if rErr != nil {
|
||||
logs.Warn(ctx, funcName, "聊天限流 INCR 失败(放行)",
|
||||
zap.String("key", rateKey), zap.Error(rErr))
|
||||
} else {
|
||||
if cnt == 1 {
|
||||
_ = s.redis.Expire(ctx, rateKey, time.Duration(constants.MeetingChatRateLimitWindowS)*time.Second).Err()
|
||||
}
|
||||
if cnt > int64(constants.MeetingChatRateLimitPerMin) {
|
||||
logs.Warn(ctx, funcName, "聊天限流触发",
|
||||
zap.String("room_code", code), zap.Int64("user_id", userID),
|
||||
zap.Int64("count_in_window", cnt), zap.Int("limit", constants.MeetingChatRateLimitPerMin))
|
||||
return nil, ErrChatRateLimited
|
||||
}
|
||||
}
|
||||
|
||||
chat := &model.MeetingChat{
|
||||
RoomID: room.ID,
|
||||
UserID: userID,
|
||||
Content: content,
|
||||
Content: trimmed,
|
||||
}
|
||||
if err := s.chatDAO.Create(ctx, chat); err != nil {
|
||||
return nil, err
|
||||
@@ -903,7 +957,7 @@ func (s *MeetingService) SendChatMessage(ctx context.Context, userID int64, code
|
||||
"user_id": userID,
|
||||
"user_name": userName,
|
||||
"user_avatar": userAvatar,
|
||||
"content": content,
|
||||
"content": trimmed,
|
||||
"created_at": chat.CreatedAt.Format("2006-01-02 15:04:05"),
|
||||
}, userID)
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/echochat/backend/app/constants"
|
||||
@@ -70,7 +71,8 @@ func memberStateKey(roomCode string, userID int64) string {
|
||||
|
||||
// resourceTTL 单个用户资源追踪集合 TTL
|
||||
// 设计:会议期间维持可达即可;若用户长期不活跃由断线清理接管
|
||||
const resourceTTL = time.Hour
|
||||
// Task 16 Nit:常量已迁出至 constants.MeetingResourceTrackTTLSeconds,此处保留计算式 wrapper 方便调用侧零改动
|
||||
var resourceTTL = time.Duration(constants.MeetingResourceTrackTTLSeconds) * time.Second
|
||||
|
||||
// trackResource 记录用户在会议中持有的媒体资源 ID
|
||||
func (s *MeetingSignalService) trackResource(ctx context.Context, roomCode string, userID int64, kind, id string) {
|
||||
@@ -265,17 +267,12 @@ func (s *MeetingSignalService) pushExistingProducers(ctx context.Context, roomID
|
||||
}
|
||||
for _, m := range members {
|
||||
// 格式:"kind:id";仅关心 producer
|
||||
idx := -1
|
||||
for j, c := range m {
|
||||
if c == ':' {
|
||||
idx = j
|
||||
break
|
||||
}
|
||||
}
|
||||
if idx < 0 {
|
||||
// Nit(代码审查 2026-04-23):改用 strings.SplitN,避免 rune 解码开销
|
||||
parts := strings.SplitN(m, ":", 2)
|
||||
if len(parts) != 2 {
|
||||
continue
|
||||
}
|
||||
kind, id := m[:idx], m[idx+1:]
|
||||
kind, id := parts[0], parts[1]
|
||||
if kind != "producer" || id == "" {
|
||||
continue
|
||||
}
|
||||
@@ -410,10 +407,12 @@ func (s *MeetingSignalService) OnRoomLeave(ctx context.Context, userID int64, ro
|
||||
}
|
||||
s.cleanupUserResources(ctx, roomCode, userID)
|
||||
|
||||
// P2-8 修复:使用常量 MeetingLeftReasonDisconnect,避免 "ws_disconnect" 等硬编码
|
||||
// 与前端 MEETING_LEFT_REASON_LABEL 字面值不一致
|
||||
go s.broadcaster.BroadcastToMeeting(logs.DetachContext(ctx), room.ID, constants.MeetingWSEventMemberLeft, map[string]interface{}{
|
||||
"room_code": roomCode,
|
||||
"user_id": userID,
|
||||
"reason": "ws_disconnect",
|
||||
"reason": constants.MeetingLeftReasonDisconnect,
|
||||
}, userID)
|
||||
return nil
|
||||
}
|
||||
@@ -678,23 +677,21 @@ func (s *MeetingSignalService) cleanupUserResources(ctx context.Context, roomCod
|
||||
}
|
||||
for _, m := range members {
|
||||
// 格式:"kind:id"
|
||||
idx := -1
|
||||
for i, c := range m {
|
||||
if c == ':' {
|
||||
idx = i
|
||||
break
|
||||
}
|
||||
}
|
||||
if idx < 0 {
|
||||
// Nit(代码审查 2026-04-23):原先使用 for-range + rune 匹配 ':',对 ASCII 过度包装;
|
||||
// 改用 strings.SplitN 限定 2 段更清晰,且避免 rune 解码开销
|
||||
parts := strings.SplitN(m, ":", 2)
|
||||
if len(parts) != 2 {
|
||||
continue
|
||||
}
|
||||
kind, id := m[:idx], m[idx+1:]
|
||||
kind, id := parts[0], parts[1]
|
||||
switch kind {
|
||||
case "producer":
|
||||
_ = s.mediaOrchestrator.CloseProducer(ctx, id)
|
||||
case "consumer":
|
||||
_ = s.mediaOrchestrator.CloseConsumer(ctx, id)
|
||||
// transport 关闭一般由 Router 级联;这里不单独处理
|
||||
case "transport":
|
||||
// Task 16 P2-1:补全 transport 精确清理,短暂抖动重连场景下 Router 不会级联关闭自己的 transport
|
||||
_ = s.mediaOrchestrator.CloseTransport(ctx, id)
|
||||
}
|
||||
}
|
||||
_ = s.redis.Del(ctx, key).Err()
|
||||
|
||||
Reference in New Issue
Block a user