3b83c79036
核心交付：
- 新建 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
116 lines
6.6 KiB
Go
116 lines
6.6 KiB
Go
// Code generated by Wire. DO NOT EDIT.
|
||
|
||
//go:generate go run -mod=mod github.com/google/wire/cmd/wire
|
||
//go:build !wireinject
|
||
// +build !wireinject
|
||
|
||
package provider
|
||
|
||
import (
|
||
controller2 "github.com/echochat/backend/app/admin/controller"
|
||
dao2 "github.com/echochat/backend/app/admin/dao"
|
||
service2 "github.com/echochat/backend/app/admin/service"
|
||
"github.com/echochat/backend/app/auth/controller"
|
||
"github.com/echochat/backend/app/auth/dao"
|
||
"github.com/echochat/backend/app/auth/service"
|
||
controller3 "github.com/echochat/backend/app/contact/controller"
|
||
dao3 "github.com/echochat/backend/app/contact/dao"
|
||
service4 "github.com/echochat/backend/app/contact/service"
|
||
controller4 "github.com/echochat/backend/app/file/controller"
|
||
service5 "github.com/echochat/backend/app/file/service"
|
||
controller5 "github.com/echochat/backend/app/group/controller"
|
||
dao4 "github.com/echochat/backend/app/group/dao"
|
||
service6 "github.com/echochat/backend/app/group/service"
|
||
"github.com/echochat/backend/app/im"
|
||
controller7 "github.com/echochat/backend/app/meeting/controller"
|
||
dao6 "github.com/echochat/backend/app/meeting/dao"
|
||
service7 "github.com/echochat/backend/app/meeting/service"
|
||
task2 "github.com/echochat/backend/app/meeting/task"
|
||
controller6 "github.com/echochat/backend/app/notify/controller"
|
||
dao5 "github.com/echochat/backend/app/notify/dao"
|
||
service3 "github.com/echochat/backend/app/notify/service"
|
||
"github.com/echochat/backend/app/notify/task"
|
||
"github.com/echochat/backend/app/ws"
|
||
"github.com/echochat/backend/config"
|
||
"github.com/echochat/backend/pkg/db"
|
||
"github.com/echochat/backend/pkg/storage"
|
||
)
|
||
|
||
// Injectors from wire.go:
|
||
|
||
// InitializeApp 初始化整个应用（Wire 自动生成实现）
|
||
func InitializeApp(cfg *config.Config) (*App, error) {
|
||
databaseConfig := provideDBConfig(cfg)
|
||
gormDB, err := db.NewPostgres(databaseConfig)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
redisConfig := provideRedisConfig(cfg)
|
||
client, err := db.NewRedis(redisConfig)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
minioConfig := provideMinioConfig(cfg)
|
||
minioClient, err := storage.NewMinioClient(minioConfig)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
userDAO := dao.NewUserDAO(gormDB)
|
||
roleDAO := dao.NewRoleDAO(gormDB)
|
||
jwtConfig := provideJWTConfig(cfg)
|
||
tokenStore := service.NewTokenStore(client, jwtConfig)
|
||
authService := service.NewAuthService(userDAO, roleDAO, jwtConfig, tokenStore)
|
||
authController := controller.NewAuthController(authService)
|
||
adminAuthController := controller.NewAdminAuthController(authService)
|
||
userManageDAO := dao2.NewUserManageDAO(gormDB)
|
||
userManageService := service2.NewUserManageService(userManageDAO, userDAO, roleDAO)
|
||
userManageController := controller2.NewUserManageController(userManageService)
|
||
hub := ws.ProvideHub()
|
||
pubSub := ws.ProvidePubSub(client, hub)
|
||
friendshipDAO := dao3.NewFriendshipDAO(gormDB)
|
||
onlineService := ws.ProvideOnlineService(client, hub, pubSub, friendshipDAO)
|
||
onlineManageService := service2.NewOnlineManageService(onlineService, gormDB)
|
||
onlineController := controller2.NewOnlineController(onlineManageService)
|
||
contactManageService := service2.NewContactManageService(gormDB)
|
||
contactManageController := controller2.NewContactManageController(contactManageService)
|
||
groupDAO := dao4.NewGroupDAO(gormDB)
|
||
groupManageService := service2.NewGroupManageService(gormDB, groupDAO)
|
||
groupManageController := controller2.NewGroupManageController(groupManageService)
|
||
messageManageDAO := dao2.NewMessageManageDAO(gormDB)
|
||
conversationDAO := im.ProvideConversationDAO(gormDB)
|
||
messageManageService := service2.NewMessageManageService(messageManageDAO, userDAO, conversationDAO, pubSub)
|
||
messageManageController := controller2.NewMessageManageController(messageManageService)
|
||
handler := ws.ProvideWSHandler(hub, pubSub, jwtConfig, onlineService, authService)
|
||
friendGroupDAO := dao3.NewFriendGroupDAO(gormDB)
|
||
notificationDAO := dao5.NewNotificationDAO(gormDB)
|
||
notifyService := service3.NewNotifyService(notificationDAO, pubSub, friendshipDAO)
|
||
contactService := service4.NewContactService(friendshipDAO, friendGroupDAO, onlineService, notifyService)
|
||
contactController := controller3.NewContactController(contactService)
|
||
messageDAO := im.ProvideMessageDAO(gormDB)
|
||
messageReadDAO := dao4.NewMessageReadDAO(gormDB)
|
||
imService := im.ProvideIMService(conversationDAO, messageDAO, pubSub, client, friendshipDAO, friendshipDAO, groupDAO, messageReadDAO)
|
||
imController := im.ProvideIMController(imService)
|
||
eventHandler := im.ProvideIMEventHandler(imService, hub)
|
||
offlinePusher := im.ProvideOfflinePusher(imService, conversationDAO, pubSub)
|
||
fileService := service5.NewFileService(minioClient, minioConfig)
|
||
fileController := controller4.NewFileController(fileService)
|
||
joinRequestDAO := dao4.NewJoinRequestDAO(gormDB)
|
||
groupService := service6.NewGroupService(groupDAO, joinRequestDAO, friendshipDAO, pubSub, messageDAO, notifyService)
|
||
groupController := controller5.NewGroupController(groupService)
|
||
notificationController := controller6.NewNotificationController(notifyService)
|
||
cleanupTask := task.NewCleanupTask(notificationDAO)
|
||
meetingRoomDAO := dao6.NewMeetingRoomDAO(gormDB)
|
||
meetingParticipantDAO := dao6.NewMeetingParticipantDAO(gormDB)
|
||
meetingChatDAO := dao6.NewMeetingChatDAO(gormDB)
|
||
meetingBroadcaster := service7.NewMeetingBroadcaster(meetingParticipantDAO, pubSub)
|
||
httpMediaOrchestrator := service7.NewHTTPMediaOrchestrator(cfg)
|
||
meetingLifecycleService := service7.NewMeetingLifecycleService(meetingRoomDAO, meetingParticipantDAO, client, meetingBroadcaster, httpMediaOrchestrator, cfg)
|
||
meetingService := service7.NewMeetingService(meetingRoomDAO, meetingParticipantDAO, meetingChatDAO, gormDB, client, meetingBroadcaster, notifyService, friendshipDAO, onlineService, httpMediaOrchestrator, meetingLifecycleService)
|
||
meetingSignalService := service7.NewMeetingSignalService(meetingRoomDAO, meetingParticipantDAO, client, meetingBroadcaster, httpMediaOrchestrator, meetingLifecycleService)
|
||
meetingController := controller7.NewMeetingController(meetingService)
|
||
meetingWSHandler := controller7.NewMeetingWSHandler(meetingSignalService, hub)
|
||
meetingCleanupTask := task2.NewMeetingCleanupTask(meetingLifecycleService, meetingRoomDAO, meetingChatDAO)
|
||
app := NewApp(cfg, gormDB, client, minioClient, authService, authController, adminAuthController, userManageController, onlineController, contactManageController, groupManageController, messageManageController, handler, hub, pubSub, onlineService, contactController, imController, eventHandler, offlinePusher, fileController, groupController, notifyService, notificationController, cleanupTask, meetingService, meetingSignalService, meetingLifecycleService, meetingController, meetingWSHandler, meetingCleanupTask)
|
||
return app, nil
|
||
}
|