feat(phase2e-2): media-server Task 0/1/2 落地 + 代码审查修复
本次提交一次性落盘 Phase 2e-2 的 Task 0（PoC Spike）、Task 1（骨架 + Fastify 5 升级） 和 Task 2（9 个内部 REST API + code-reviewer 审查修复），覆盖 media-server 子项目 从零到可用的全部工作。 【Task 0 - PoC Spike】 - media-server/poc/：Node + mediasoup + fastify-websocket + 前端 mediasoup-client - Playwright 双 tab 自动化验证 2 人会议：4 transports / 4 producers / 4 consumers / RSS 61MB - media-server/docs/poc-notes.md 归档 7 项关键坑 + 启动步骤 + Task 1/2/9 复用映射 - 锁定技术栈：mediasoup + fastify + mediasoup-client，不改用 livekit-server 【Task 1 - 骨架 + Fastify 5 升级】 - 依赖版本：mediasoup@3.19.0 + fastify@5.8.5 + fastify-plugin@5.1.0 + @fastify/sensible@6.0.4 + @fastify/websocket@11.2.0 + pino@9.3.2 + zod@3.23.8 - src 五件套：app.ts / config.ts / utils/logger.ts / mediasoup/worker.ts / middlewares/internal-auth.ts - /healthz + /readyz + /internal/info 三端点实测通过 - X-Internal-Token 鉴权用 timingSafeEqual 防侧信道 - mediasoup Worker died 指数退避自愈通过 kill -9 验证 - 多阶段 Dockerfile：非 root + curl HEALTHCHECK + 暴露 40000-40199 UDP/TCP - Fastify 4 → 5 升级：loggerInstance: logger 消灭两个 pino 实例 【Task 2 - 9 个内部 REST API + 审查修复】 接口全部挂 /internal/v1/* 前缀，覆盖 Router/Transport/Producer/Consumer 完整生命周期： - POST /routers, DELETE /routers/:id - POST /transports, POST /transports/:id/connect - POST /producers, DELETE /producers/:id - POST /consumers, POST /consumers/:id/resume, DELETE /consumers/:id 工程特性： - zod 手动 parse + 全局 errorHandler（不引入 fastify-type-provider-zod 避免 zod v4 依赖冲突） - AppError 统一错误码（NOT_FOUND/CONFLICT/CAN_NOT_CONSUME/ROUTER_LIMIT_EXCEEDED /MEDIASOUP_ERROR/VALIDATION_ERROR/UNAUTHORIZED/INTERNAL_ERROR） - 所有资源用 Map + observer.once('close') 自清理，Consumer 监听 producerclose 级联关闭 - Consumer 强制 paused:true 创建，/resume 独立接口 - Transport direction 强约束：recv 拒 produce、send 拒 consume code-reviewer 子代理审查"有条件通过"，同步修复： - M1 _clearXxxMap 新增 src/utils/test-guard.ts#assertTestOnly 守卫（生产误调用抛错） - M2 新增 src/schemas/rtp.ts 对 rtpParameters / rtpCapabilities 做 codecs 浅层校验 （mimeType/clockRate/payloadType 必填、codecs ≥1），消除 as unknown as 双跳断言 - m1 connectTransport 改乐观锁：先置位再 await，失败回退 - m2 改读 consumer.producerPaused（更符合 mediasoup 语义） - m3 producerclose 改为 once（风格一致） - m5 internal-auth 改为反向白名单 PRIVATE_PATH_PREFIXES = ['/internal/'] 验证： - typecheck / lint 0 错误 - vitest：65 passed / 8 spec 文件 - 覆盖率 stmts 82.87% / branches 75.83% / funcs 91.3% / lines 82.87% - 9 接口 happy path + 6 类错误路径 curl 手测全部按预期返回 【文档同步】 - CURRENT_STATUS.md +232 行：新增 Task 0/1/2 完整记录 + 代码审查修复章节 + 延后清单 - project-context.mdc：Task 0/1/2 状态同步 - phase2e-2-design.md +20 行：Fastify 5 升级相关决策记录 - phase2e-2-implementation.plan.md +117 行：Task 0/1/2 实际产出 + 修复记录 余下 Minor/Nits（m4/m6~m10/n1~n10）登记至 Task 16 收尾清单一次性清扫。 Made-with: Cursor
This commit is contained in:
bujinyuan
275
media-server/tests/app.spec.ts
Normal file
275
media-server/tests/app.spec.ts
Normal file
@@ -0,0 +1,275 @@
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
|
||||
|
||||
import { buildApp } from '../src/app.js';
|
||||
import { config } from '../src/config.js';
|
||||
import { closeWorker, startWorker } from '../src/mediasoup/worker.js';
|
||||
import { _clearConsumerMap } from '../src/services/consumer.service.js';
|
||||
import { _clearProducerMap } from '../src/services/producer.service.js';
|
||||
import { _clearRouterMap } from '../src/services/router.service.js';
|
||||
import { _clearTransportMap } from '../src/services/transport.service.js';
|
||||
|
||||
let app: FastifyInstance;
|
||||
const token = config.internalToken;
|
||||
|
||||
beforeAll(async () => {
|
||||
app = (await buildApp()) as unknown as FastifyInstance;
|
||||
await app.ready();
|
||||
await startWorker();
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
_clearConsumerMap();
|
||||
_clearProducerMap();
|
||||
_clearTransportMap();
|
||||
_clearRouterMap();
|
||||
await app.close();
|
||||
await closeWorker();
|
||||
});
|
||||
|
||||
describe('HTTP layer: health + auth', () => {
|
||||
it('GET /healthz returns ok snapshot', async () => {
|
||||
const res = await app.inject({ method: 'GET', url: '/healthz' });
|
||||
expect(res.statusCode).toBe(200);
|
||||
const body = res.json();
|
||||
expect(body.service).toBe('media-server');
|
||||
expect(body.mediasoupVersion).toBeTruthy();
|
||||
});
|
||||
|
||||
it('GET /readyz returns 200 when worker ready', async () => {
|
||||
const res = await app.inject({ method: 'GET', url: '/readyz' });
|
||||
expect(res.statusCode).toBe(200);
|
||||
expect(res.json().ready).toBe(true);
|
||||
});
|
||||
|
||||
it('GET /internal/info without token returns 401', async () => {
|
||||
const res = await app.inject({ method: 'GET', url: '/internal/info' });
|
||||
expect(res.statusCode).toBe(401);
|
||||
});
|
||||
|
||||
it('GET /internal/info with wrong token returns 401', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'GET',
|
||||
url: '/internal/info',
|
||||
headers: { 'x-internal-token': 'wrong-token-wrong-token' },
|
||||
});
|
||||
expect(res.statusCode).toBe(401);
|
||||
});
|
||||
|
||||
it('GET /internal/info with valid token returns worker info', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'GET',
|
||||
url: '/internal/info',
|
||||
headers: { 'x-internal-token': token },
|
||||
});
|
||||
expect(res.statusCode).toBe(200);
|
||||
const body = res.json();
|
||||
expect(body.service).toBe('media-server');
|
||||
expect(body.mediasoupVersion).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
||||
describe('HTTP layer: /internal/v1/* routes', () => {
|
||||
let routerId = '';
|
||||
let sendTransportId = '';
|
||||
let recvTransportId = '';
|
||||
|
||||
it('POST /internal/v1/routers 201', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/routers',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: { roomCode: 'ROOM-HTTP-1' },
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
const body = res.json();
|
||||
expect(body.routerId).toBeTruthy();
|
||||
routerId = body.routerId;
|
||||
});
|
||||
|
||||
it('POST /internal/v1/routers validation error returns 400', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/routers',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: { roomCode: 'lower-case' },
|
||||
});
|
||||
expect(res.statusCode).toBe(400);
|
||||
const body = res.json();
|
||||
expect(body.code).toBe('VALIDATION_ERROR');
|
||||
expect(Array.isArray(body.fieldErrors)).toBe(true);
|
||||
});
|
||||
|
||||
it('POST /internal/v1/transports (send) 201', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/transports',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: { routerId, userId: 'u-1', direction: 'send' },
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
sendTransportId = res.json().id;
|
||||
expect(sendTransportId).toBeTruthy();
|
||||
});
|
||||
|
||||
it('POST /internal/v1/transports (recv) 201', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/transports',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: { routerId, userId: 'u-2', direction: 'recv' },
|
||||
});
|
||||
expect(res.statusCode).toBe(201);
|
||||
recvTransportId = res.json().id;
|
||||
expect(recvTransportId).toBeTruthy();
|
||||
});
|
||||
|
||||
it('POST /internal/v1/transports with unknown router returns 404', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/transports',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: { routerId: 'bogus-router', userId: 'u-3', direction: 'send' },
|
||||
});
|
||||
expect(res.statusCode).toBe(404);
|
||||
expect(res.json().code).toBe('NOT_FOUND');
|
||||
});
|
||||
|
||||
const sampleAudioRtpParameters = {
|
||||
codecs: [
|
||||
{ mimeType: 'audio/opus', clockRate: 48000, channels: 2, payloadType: 100 },
|
||||
],
|
||||
encodings: [{ ssrc: 222222 }],
|
||||
};
|
||||
|
||||
it('POST /internal/v1/producers with empty codecs returns 400 VALIDATION_ERROR', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/producers',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: {
|
||||
transportId: recvTransportId,
|
||||
kind: 'audio',
|
||||
rtpParameters: { codecs: [] },
|
||||
},
|
||||
});
|
||||
expect(res.statusCode).toBe(400);
|
||||
expect(res.json().code).toBe('VALIDATION_ERROR');
|
||||
});
|
||||
|
||||
it('POST /internal/v1/producers with recv transport returns 409', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/producers',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: {
|
||||
transportId: recvTransportId,
|
||||
kind: 'audio',
|
||||
rtpParameters: sampleAudioRtpParameters,
|
||||
},
|
||||
});
|
||||
expect(res.statusCode).toBe(409);
|
||||
expect(res.json().code).toBe('CONFLICT');
|
||||
});
|
||||
|
||||
it('POST /internal/v1/consumers with empty codecs returns 400 VALIDATION_ERROR', async () => {
|
||||
const producerRes = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/producers',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: {
|
||||
transportId: sendTransportId,
|
||||
kind: 'audio',
|
||||
rtpParameters: sampleAudioRtpParameters,
|
||||
},
|
||||
});
|
||||
expect(producerRes.statusCode).toBe(201);
|
||||
const producerId = producerRes.json().id;
|
||||
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/consumers',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: {
|
||||
routerId,
|
||||
transportId: recvTransportId,
|
||||
producerId,
|
||||
rtpCapabilities: { codecs: [] },
|
||||
},
|
||||
});
|
||||
expect(res.statusCode).toBe(400);
|
||||
expect(res.json().code).toBe('VALIDATION_ERROR');
|
||||
});
|
||||
|
||||
it('POST /internal/v1/consumers with incompatible codecs returns 400 CAN_NOT_CONSUME', async () => {
|
||||
const producerRes = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/producers',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: {
|
||||
transportId: sendTransportId,
|
||||
kind: 'audio',
|
||||
rtpParameters: {
|
||||
...sampleAudioRtpParameters,
|
||||
encodings: [{ ssrc: 333333 }],
|
||||
},
|
||||
},
|
||||
});
|
||||
expect(producerRes.statusCode).toBe(201);
|
||||
const producerId = producerRes.json().id;
|
||||
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/consumers',
|
||||
headers: { 'x-internal-token': token },
|
||||
payload: {
|
||||
routerId,
|
||||
transportId: recvTransportId,
|
||||
producerId,
|
||||
rtpCapabilities: {
|
||||
// 故意给一个 payloadType 不在 router 中的假 codec
|
||||
codecs: [{ mimeType: 'audio/unknown-fake', clockRate: 48000 }],
|
||||
},
|
||||
},
|
||||
});
|
||||
expect(res.statusCode).toBe(400);
|
||||
expect(res.json().code).toBe('CAN_NOT_CONSUME');
|
||||
});
|
||||
|
||||
it('DELETE /internal/v1/producers/:id returns 404 for unknown', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'DELETE',
|
||||
url: '/internal/v1/producers/unknown-id',
|
||||
headers: { 'x-internal-token': token },
|
||||
});
|
||||
expect(res.statusCode).toBe(404);
|
||||
});
|
||||
|
||||
it('POST /internal/v1/consumers/:id/resume returns 404 for unknown', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'POST',
|
||||
url: '/internal/v1/consumers/unknown-id/resume',
|
||||
headers: { 'x-internal-token': token },
|
||||
});
|
||||
expect(res.statusCode).toBe(404);
|
||||
});
|
||||
|
||||
it('DELETE /internal/v1/consumers/:id returns 404 for unknown', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'DELETE',
|
||||
url: '/internal/v1/consumers/unknown-id',
|
||||
headers: { 'x-internal-token': token },
|
||||
});
|
||||
expect(res.statusCode).toBe(404);
|
||||
});
|
||||
|
||||
it('DELETE /internal/v1/routers/:routerId cleans up', async () => {
|
||||
const res = await app.inject({
|
||||
method: 'DELETE',
|
||||
url: `/internal/v1/routers/${routerId}`,
|
||||
headers: { 'x-internal-token': token },
|
||||
});
|
||||
expect(res.statusCode).toBe(200);
|
||||
expect(res.json().ok).toBe(true);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user