核心交付:
- 新建 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
65 lines
1.4 KiB
YAML
65 lines
1.4 KiB
YAML
# ============================================================
|
||
# EchoChat Docker 容器内配置
|
||
# 与 config.dev.yaml 的区别:数据库和 Redis 地址使用 Docker 服务名
|
||
# ============================================================
|
||
|
||
server:
|
||
port: 8085
|
||
mode: debug
|
||
|
||
database:
|
||
host: postgres
|
||
port: 5432
|
||
user: echochat
|
||
password: echochat_dev_2026
|
||
dbname: echochat
|
||
sslmode: disable
|
||
max_idle_conns: 10
|
||
max_open_conns: 100
|
||
|
||
redis:
|
||
host: redis
|
||
port: 6379
|
||
password: ""
|
||
db: 0
|
||
|
||
jwt:
|
||
secret: echochat-dev-jwt-secret-2026-please-change-in-production
|
||
access_expire_min: 120
|
||
refresh_expire_day: 7
|
||
issuer: echochat
|
||
|
||
log:
|
||
level: debug
|
||
format: text
|
||
output_path: stdout
|
||
file:
|
||
enable: true
|
||
dir: logs
|
||
max_size: 50
|
||
max_backups: 10
|
||
max_age: 30
|
||
compress: false
|
||
|
||
minio:
|
||
endpoint: "minio:9000"
|
||
access_key: "echochat"
|
||
secret_key: "echochat123456"
|
||
bucket: "echochat"
|
||
use_ssl: false
|
||
|
||
# Node media-server 接入配置(Phase 2e-2 Task 7)
|
||
media_server:
|
||
base_url: "http://media-server:3300" # Docker 网络内服务名
|
||
internal_token: "dev-internal-token-change-me" # 生产环境通过 ECHOCHAT_MEDIA_SERVER_INTERNAL_TOKEN 覆盖
|
||
timeout_ms: 5000
|
||
close_timeout_ms: 2000
|
||
close_retry: 2
|
||
|
||
# 会议模块生命周期参数(Phase 2e-2 Task 8)
|
||
meeting:
|
||
host_grace_seconds: 120
|
||
empty_room_ttl_seconds: 300
|
||
cleanup_interval_seconds: 30
|
||
stale_room_hours: 4
|