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
62 lines
2.7 KiB
Go
62 lines
2.7 KiB
Go
//go:build wireinject
|
||
|
||
// Package provider 提供 Wire 依赖注入入口
|
||
package provider
|
||
|
||
import (
|
||
"github.com/echochat/backend/app/admin"
|
||
"github.com/echochat/backend/app/auth"
|
||
authService "github.com/echochat/backend/app/auth/service"
|
||
"github.com/echochat/backend/app/contact"
|
||
contactDAO "github.com/echochat/backend/app/contact/dao"
|
||
contactService "github.com/echochat/backend/app/contact/service"
|
||
fileApp "github.com/echochat/backend/app/file"
|
||
groupApp "github.com/echochat/backend/app/group"
|
||
groupDAO "github.com/echochat/backend/app/group/dao"
|
||
groupService "github.com/echochat/backend/app/group/service"
|
||
imApp "github.com/echochat/backend/app/im"
|
||
imDAO "github.com/echochat/backend/app/im/dao"
|
||
imService "github.com/echochat/backend/app/im/service"
|
||
meetingApp "github.com/echochat/backend/app/meeting"
|
||
meetingService "github.com/echochat/backend/app/meeting/service"
|
||
notifyApp "github.com/echochat/backend/app/notify"
|
||
notifyService "github.com/echochat/backend/app/notify/service"
|
||
wsApp "github.com/echochat/backend/app/ws"
|
||
"github.com/echochat/backend/config"
|
||
"github.com/google/wire"
|
||
)
|
||
|
||
// InitializeApp 初始化整个应用（Wire 自动生成实现）
|
||
func InitializeApp(cfg *config.Config) (*App, error) {
|
||
wire.Build(
|
||
InfraSet,
|
||
auth.AuthSet,
|
||
admin.AdminSet,
|
||
wsApp.WSSet,
|
||
contact.ContactSet,
|
||
imApp.IMSet,
|
||
fileApp.FileSet,
|
||
groupApp.GroupSet,
|
||
notifyApp.NotifySet,
|
||
meetingApp.MeetingSet,
|
||
wire.Bind(new(wsApp.FriendIDsGetter), new(*contactDAO.FriendshipDAO)),
|
||
wire.Bind(new(groupService.UserInfoProvider), new(*contactDAO.FriendshipDAO)),
|
||
wire.Bind(new(imService.GroupInfoGetter), new(*groupDAO.GroupDAO)),
|
||
wire.Bind(new(imService.MessageReadRecorder), new(*groupDAO.MessageReadDAO)),
|
||
wire.Bind(new(wsApp.TokenValidator), new(*authService.AuthService)),
|
||
wire.Bind(new(imService.FriendChecker), new(*contactDAO.FriendshipDAO)),
|
||
wire.Bind(new(imService.UserInfoGetter), new(*contactDAO.FriendshipDAO)),
|
||
wire.Bind(new(contactService.OnlineChecker), new(*wsApp.OnlineService)),
|
||
wire.Bind(new(groupService.MessageWriter), new(*imDAO.MessageDAO)),
|
||
wire.Bind(new(notifyService.UserInfoResolver), new(*contactDAO.FriendshipDAO)),
|
||
wire.Bind(new(contactService.NotifyPusher), new(*notifyService.NotifyService)),
|
||
wire.Bind(new(groupService.NotifyPusher), new(*notifyService.NotifyService)),
|
||
wire.Bind(new(meetingService.NotifyPusher), new(*notifyService.NotifyService)),
|
||
wire.Bind(new(meetingService.UserInfoResolver), new(*contactDAO.FriendshipDAO)),
|
||
wire.Bind(new(meetingService.OnlineChecker), new(*wsApp.OnlineService)),
|
||
// Task 8：WS 断线钩子 → MeetingSignalService
|
||
wire.Bind(new(wsApp.MeetingDisconnectHook), new(*meetingService.MeetingSignalService)),
|
||
)
|
||
return nil, nil
|
||
}
|