核心交付:
- 新建 MeetingLifecycleService(6 钩子 + sync.Map 本地 timer + Redis key 双保险 + RescheduleFromRedis)
- 新建 MeetingCleanupTask(启动重建 timer + 每 N 秒扫 host_grace/empty_ttl 兜底 + 4h stale active 回收)
- MediaOrchestrator 新增 ResolveRouterID;HTTPMediaOrchestrator.CreateRouter 入口 sync.Map 幂等防御
- 业务层 JoinRoom 移除 CreateRouter 调用改走 CancelEmptyTTL + ResolveRouterID;LeaveRoom 空房分支改调 OnAllMembersLeft 不再立即销毁
- MeetingSignalService 新增 OnWSDisconnect 实现 ws.MeetingDisconnectHook;OnRoomJoin 追加 host 重连钩子
- ws.handler 定义 MeetingDisconnectHook 接口 + SetMeetingDisconnectHook,解耦 ws→meeting 反向依赖
- config 新增 MeetingConfig{HostGrace=120, EmptyRoomTTL=300, CleanupInterval=30, StaleRoomHours=4}
关键设计决策:
- Redis key TTL = 业务时长 + max(CleanupIntervalSeconds*2, 30s) buffer:避免本地 timer 与
Redis 自动过期同步到期导致 DEL 返回 0 被误判为"已被其他路径处理"而跳过业务逻辑
- Router 幂等双层防御(决策 q2_router_dedup=a2_both):业务层不重复调 + HTTP 层 sync.Map 命中直接返回
- 普通成员 WS 断开仅清 media 资源不动 participant 表(决策 q1_nonhost_disconnect=a1_keep_current)
E2E 验证:docs/verify/meeting_t8_verify.mjs PASS=20 FAIL=0,覆盖 5 场景:
- S1 host 宽限期过期自动转让(meeting.host.changed + DB host_id 更新)
- S2 宽限期内重连保留身份
- S3 empty_ttl 期内新成员加入复活房间
- S4 empty_ttl 过期 → 房间 Ended + 新 join 被拒
- S5 CreateRoom +1 Router / JoinRoom 不再创建新 Router(通过 media-server /internal/info stats.routers 断言)
media-server:/internal/info 响应追加 stats.routers + routers[] 供 E2E 断言 Router 幂等
文档同步:
- docs/progress/CURRENT_STATUS.md 头部 + 新增 Task 8 交付条目
- docs/plans/2026-04-21-phase2e-2-implementation.plan.md Task 8 标记完成 + 实际产出/决策/验证
- docs/api/frontend/meeting.md 补充 host.changed.auto_reason / room.ended.reason=system_error / 空房 TTL 复活语义 + Task 8 验证记录
- docs/architecture/system-architecture.md meeting 模块职责补充"会议生命周期状态机"
- .cursor/rules/project-context.mdc 追加 Task 8 条目并更新 Phase 2e-2 进度(Task 0-8 ✅)
Made-with: Cursor
170 lines
7.8 KiB
Go
170 lines
7.8 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
|
||
}
|
||
|
||
// InfraSet 基础设施层 Provider Set
|
||
var InfraSet = wire.NewSet(
|
||
provideDBConfig,
|
||
provideRedisConfig,
|
||
provideJWTConfig,
|
||
provideMinioConfig,
|
||
db.NewPostgres,
|
||
db.NewRedis,
|
||
storage.NewMinioClient,
|
||
NewApp,
|
||
)
|