覆盖 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
177 lines
8.0 KiB
Go
177 lines
8.0 KiB
Go
// Package provider 提供全局依赖注入配置
|
||
// 使用 Wire 编译时依赖注入,集中管理所有模块的 Provider Set
|
||
package provider
|
||
|
||
import (
|
||
adminController "github.com/echochat/backend/app/admin/controller"
|
||
authController "github.com/echochat/backend/app/auth/controller"
|
||
"github.com/echochat/backend/app/auth/service"
|
||
contactController "github.com/echochat/backend/app/contact/controller"
|
||
fileController "github.com/echochat/backend/app/file/controller"
|
||
groupController "github.com/echochat/backend/app/group/controller"
|
||
imController "github.com/echochat/backend/app/im/controller"
|
||
imHandler "github.com/echochat/backend/app/im/handler"
|
||
meetingController "github.com/echochat/backend/app/meeting/controller"
|
||
meetingService "github.com/echochat/backend/app/meeting/service"
|
||
meetingTask "github.com/echochat/backend/app/meeting/task"
|
||
notifyController "github.com/echochat/backend/app/notify/controller"
|
||
notifyService "github.com/echochat/backend/app/notify/service"
|
||
notifyTask "github.com/echochat/backend/app/notify/task"
|
||
wsApp "github.com/echochat/backend/app/ws"
|
||
"github.com/echochat/backend/config"
|
||
"github.com/echochat/backend/pkg/db"
|
||
"github.com/echochat/backend/pkg/storage"
|
||
"github.com/echochat/backend/pkg/ws"
|
||
"github.com/google/wire"
|
||
"github.com/minio/minio-go/v7"
|
||
"github.com/redis/go-redis/v9"
|
||
"gorm.io/gorm"
|
||
)
|
||
|
||
// App 应用根容器,持有基础设施组件和各模块的 Controller/Service
|
||
type App struct {
|
||
Config *config.Config
|
||
DB *gorm.DB
|
||
Redis *redis.Client
|
||
MinioClient *minio.Client // MinIO 对象存储客户端
|
||
AuthService *service.AuthService // Auth 认证服务
|
||
AuthController *authController.AuthController // 前台认证控制器
|
||
AdminAuthController *authController.AdminAuthController // 后台认证控制器
|
||
UserManageController *adminController.UserManageController // 管理端用户管理控制器
|
||
OnlineController *adminController.OnlineController // 管理端在线监控控制器
|
||
ContactManageController *adminController.ContactManageController // 管理端好友关系管理控制器
|
||
GroupManageController *adminController.GroupManageController // 管理端群组管理控制器
|
||
MessageManageController *adminController.MessageManageController // 管理端消息管理控制器
|
||
WSHandler *wsApp.Handler // WebSocket 连接处理器
|
||
Hub *ws.Hub // WebSocket Hub 连接管理
|
||
PubSub *ws.PubSub // Redis Pub/Sub 消息路由
|
||
OnlineService *wsApp.OnlineService // 在线状态管理服务
|
||
ContactController *contactController.ContactController // 联系人控制器
|
||
IMController *imController.IMController // IM 即时通讯控制器
|
||
IMEventHandler *imHandler.EventHandler // IM WS 事件处理器
|
||
OfflinePusher *imHandler.OfflinePusher // 离线消息推送器
|
||
FileController *fileController.FileController // 文件上传控制器
|
||
GroupController *groupController.GroupController // 群聊管理控制器
|
||
NotifyService *notifyService.NotifyService // 通知业务服务(兼 Pusher、ConnectHook)
|
||
NotifyController *notifyController.NotificationController // 通知控制器
|
||
NotifyCleanupTask *notifyTask.CleanupTask // 通知清理定时任务
|
||
MeetingService *meetingService.MeetingService // 会议 REST 业务服务(Task 5 落地)
|
||
MeetingSignalService *meetingService.MeetingSignalService // 会议 WS 信令业务服务(Task 6 落地)
|
||
MeetingLifecycleSvc *meetingService.MeetingLifecycleService // 会议生命周期状态机(Task 8 落地)
|
||
MeetingController *meetingController.MeetingController // 会议 REST 控制器
|
||
MeetingWSHandler *meetingController.MeetingWSHandler // 会议 WS 事件 Handler(构造时自动注册路由到 Hub)
|
||
MeetingCleanupTask *meetingTask.MeetingCleanupTask // 会议生命周期兜底定时任务(Task 8 落地)
|
||
}
|
||
|
||
// NewApp 创建应用实例
|
||
func NewApp(
|
||
cfg *config.Config,
|
||
gormDB *gorm.DB,
|
||
redisClient *redis.Client,
|
||
minioClient *minio.Client,
|
||
authService *service.AuthService,
|
||
authCtrl *authController.AuthController,
|
||
adminAuthCtrl *authController.AdminAuthController,
|
||
userManageCtrl *adminController.UserManageController,
|
||
onlineCtrl *adminController.OnlineController,
|
||
contactManageCtrl *adminController.ContactManageController,
|
||
groupManageCtrl *adminController.GroupManageController,
|
||
msgManageCtrl *adminController.MessageManageController,
|
||
wsHandler *wsApp.Handler,
|
||
hub *ws.Hub,
|
||
pubsub *ws.PubSub,
|
||
onlineService *wsApp.OnlineService,
|
||
contactCtrl *contactController.ContactController,
|
||
imCtrl *imController.IMController,
|
||
imEventHandler *imHandler.EventHandler,
|
||
offlinePusher *imHandler.OfflinePusher,
|
||
fileCtrl *fileController.FileController,
|
||
groupCtrl *groupController.GroupController,
|
||
notifySvc *notifyService.NotifyService,
|
||
notifyCtrl *notifyController.NotificationController,
|
||
notifyCleanup *notifyTask.CleanupTask,
|
||
meetingSvc *meetingService.MeetingService,
|
||
meetingSignalSvc *meetingService.MeetingSignalService,
|
||
meetingLifecycleSvc *meetingService.MeetingLifecycleService,
|
||
meetingCtrl *meetingController.MeetingController,
|
||
meetingWSHandler *meetingController.MeetingWSHandler,
|
||
meetingCleanup *meetingTask.MeetingCleanupTask,
|
||
) *App {
|
||
wsHandler.SetOfflinePusher(offlinePusher)
|
||
wsHandler.SetNotifyConnectHook(notifySvc)
|
||
wsHandler.SetMeetingDisconnectHook(meetingSignalSvc)
|
||
|
||
return &App{
|
||
Config: cfg,
|
||
DB: gormDB,
|
||
Redis: redisClient,
|
||
MinioClient: minioClient,
|
||
AuthService: authService,
|
||
AuthController: authCtrl,
|
||
AdminAuthController: adminAuthCtrl,
|
||
UserManageController: userManageCtrl,
|
||
OnlineController: onlineCtrl,
|
||
ContactManageController: contactManageCtrl,
|
||
GroupManageController: groupManageCtrl,
|
||
MessageManageController: msgManageCtrl,
|
||
WSHandler: wsHandler,
|
||
Hub: hub,
|
||
PubSub: pubsub,
|
||
OnlineService: onlineService,
|
||
ContactController: contactCtrl,
|
||
IMController: imCtrl,
|
||
IMEventHandler: imEventHandler,
|
||
OfflinePusher: offlinePusher,
|
||
FileController: fileCtrl,
|
||
GroupController: groupCtrl,
|
||
NotifyService: notifySvc,
|
||
NotifyController: notifyCtrl,
|
||
NotifyCleanupTask: notifyCleanup,
|
||
MeetingService: meetingSvc,
|
||
MeetingSignalService: meetingSignalSvc,
|
||
MeetingLifecycleSvc: meetingLifecycleSvc,
|
||
MeetingController: meetingCtrl,
|
||
MeetingWSHandler: meetingWSHandler,
|
||
MeetingCleanupTask: meetingCleanup,
|
||
}
|
||
}
|
||
|
||
// provideDBConfig 从全局 Config 中提取 DatabaseConfig
|
||
func provideDBConfig(cfg *config.Config) *config.DatabaseConfig {
|
||
return &cfg.Database
|
||
}
|
||
|
||
// provideRedisConfig 从全局 Config 中提取 RedisConfig
|
||
func provideRedisConfig(cfg *config.Config) *config.RedisConfig {
|
||
return &cfg.Redis
|
||
}
|
||
|
||
// provideJWTConfig 从全局 Config 中提取 JWTConfig
|
||
func provideJWTConfig(cfg *config.Config) *config.JWTConfig {
|
||
return &cfg.JWT
|
||
}
|
||
|
||
// provideMinioConfig 从全局 Config 中提取 MinioConfig
|
||
func provideMinioConfig(cfg *config.Config) *config.MinioConfig {
|
||
return &cfg.Minio
|
||
}
|
||
|
||
// provideServerConfig 从全局 Config 中提取 ServerConfig
|
||
// Task 16 Nit:WebSocket CheckOrigin 白名单收敛需要 server.ws_allowed_origins + server.mode
|
||
func provideServerConfig(cfg *config.Config) *config.ServerConfig {
|
||
return &cfg.Server
|
||
}
|
||
|
||
// InfraSet 基础设施层 Provider Set
|
||
var InfraSet = wire.NewSet(
|
||
provideDBConfig,
|
||
provideRedisConfig,
|
||
provideJWTConfig,
|
||
provideMinioConfig,
|
||
provideServerConfig,
|
||
db.NewPostgres,
|
||
db.NewRedis,
|
||
storage.NewMinioClient,
|
||
NewApp,
|
||
)
|