feat: WebSocket 实时识别帧改走独立队列
asr 分片只与同一轮识别串行,不再排在在途模型生成后面, 避免用户边等回复边说话时 PCM 整段堆积;ping 心跳也立即应答
This commit is contained in:
@@ -0,0 +1,127 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
import WebSocketServerManager from "../websocket.js";
|
||||
|
||||
function createWs() {
|
||||
const sent = [];
|
||||
return {
|
||||
readyState: 1,
|
||||
sent,
|
||||
send(payload) {
|
||||
sent.push(JSON.parse(payload));
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function frame(payload) {
|
||||
return Buffer.from(JSON.stringify(payload));
|
||||
}
|
||||
|
||||
test("ASR 分片不等待在途的聊天生成", async () => {
|
||||
const manager = new WebSocketServerManager(0);
|
||||
const ws = createWs();
|
||||
const order = [];
|
||||
let releaseChat;
|
||||
|
||||
manager._handleMessage = async (ws, msg) => {
|
||||
if (msg.type === "chat") {
|
||||
order.push("chat-start");
|
||||
await new Promise((resolve) => {
|
||||
releaseChat = resolve;
|
||||
});
|
||||
order.push("chat-end");
|
||||
return;
|
||||
}
|
||||
if (msg.type === "asr_chunk") {
|
||||
order.push("asr-chunk");
|
||||
}
|
||||
};
|
||||
|
||||
const chat = manager._dispatchMessage(ws, frame({ type: "chat", content: "你好" }));
|
||||
const asr = manager._dispatchMessage(ws, frame({ type: "asr_chunk", audio: "x" }));
|
||||
|
||||
await asr;
|
||||
// 聊天还卡在生成中,ASR 分片已经处理完
|
||||
assert.deepEqual(order, ["chat-start", "asr-chunk"]);
|
||||
|
||||
releaseChat();
|
||||
await chat;
|
||||
assert.deepEqual(order, ["chat-start", "asr-chunk", "chat-end"]);
|
||||
});
|
||||
|
||||
test("ASR 帧之间保持串行,不会乱序", async () => {
|
||||
const manager = new WebSocketServerManager(0);
|
||||
const ws = createWs();
|
||||
const order = [];
|
||||
let releaseFirst;
|
||||
|
||||
manager._handleMessage = async (ws, msg) => {
|
||||
if (msg.id === "1") {
|
||||
order.push("start-1");
|
||||
await new Promise((resolve) => {
|
||||
releaseFirst = resolve;
|
||||
});
|
||||
order.push("end-1");
|
||||
return;
|
||||
}
|
||||
order.push("start-2");
|
||||
};
|
||||
|
||||
const first = manager._dispatchMessage(ws, frame({ type: "asr_start", id: "1" }));
|
||||
const second = manager._dispatchMessage(ws, frame({ type: "asr_start", id: "2" }));
|
||||
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
assert.deepEqual(order, ["start-1"]);
|
||||
|
||||
releaseFirst();
|
||||
await first;
|
||||
await second;
|
||||
assert.deepEqual(order, ["start-1", "end-1", "start-2"]);
|
||||
});
|
||||
|
||||
test("ping 立即应答,不排在长回复后面", async () => {
|
||||
const manager = new WebSocketServerManager(0);
|
||||
const ws = createWs();
|
||||
let release;
|
||||
|
||||
manager._handleMessage = async () => new Promise((resolve) => {
|
||||
release = resolve;
|
||||
});
|
||||
|
||||
const chat = manager._dispatchMessage(ws, frame({ type: "chat", content: "长问题" }));
|
||||
manager._dispatchMessage(ws, frame({ type: "ping", id: "p1" }));
|
||||
|
||||
assert.equal(ws.sent.at(-1).type, "pong");
|
||||
assert.equal(ws.sent.at(-1).id, "p1");
|
||||
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
release();
|
||||
await chat;
|
||||
});
|
||||
|
||||
test("非法 JSON 帧回错误帧而不是抛异常", () => {
|
||||
const manager = new WebSocketServerManager(0);
|
||||
const ws = createWs();
|
||||
|
||||
manager._dispatchMessage(ws, Buffer.from("{"));
|
||||
|
||||
assert.equal(ws.sent.length, 1);
|
||||
assert.equal(ws.sent[0].type, "error");
|
||||
assert.equal(ws.sent[0].content, "消息格式错误");
|
||||
});
|
||||
|
||||
test("null / 数组等非对象帧同样按消息格式错误处理", () => {
|
||||
const manager = new WebSocketServerManager(0);
|
||||
const ws = createWs();
|
||||
|
||||
manager._dispatchMessage(ws, Buffer.from("null"));
|
||||
manager._dispatchMessage(ws, Buffer.from("[]"));
|
||||
manager._dispatchMessage(ws, Buffer.from("123"));
|
||||
|
||||
assert.equal(ws.sent.length, 3);
|
||||
for (const item of ws.sent) {
|
||||
assert.equal(item.type, "error");
|
||||
assert.equal(item.content, "消息格式错误");
|
||||
}
|
||||
});
|
||||
+51
-10
@@ -38,6 +38,10 @@ const ASR_LIMITS = {
|
||||
sniffBytes: 16 * 1024
|
||||
};
|
||||
|
||||
// 实时识别帧走独立队列:识别分片不能被在途的模型生成阻塞,
|
||||
// 否则用户一边等回复一边说话时,PCM 会整段堆到回复结束才被处理
|
||||
const ASR_FRAME_TYPES = new Set(['asr_start', 'asr_chunk', 'asr_stop', 'asr_cancel']);
|
||||
|
||||
/**
|
||||
* WebM 解码出的 PCM 采样率归一
|
||||
*
|
||||
@@ -112,13 +116,13 @@ export default class WebSocketServerManager {
|
||||
_handleChatConnection(ws) {
|
||||
sendFrame(ws, 'system', 'connected', 'Connected to chat server');
|
||||
|
||||
// 同一连接的消息串行处理:agent 的 messages 数组是共享状态,
|
||||
// 并发跑同一个 agent 会让上下文交错、回复错乱
|
||||
// 两条独立队列:
|
||||
// - messageQueue:chat/clear/format,agent 的 messages 是共享状态,必须串行
|
||||
// - asrQueue:实时识别分片只与同一轮识别串行,不能被在途的模型生成堵住
|
||||
ws.messageQueue = Promise.resolve();
|
||||
ws.asrQueue = Promise.resolve();
|
||||
ws.on('message', (data) => {
|
||||
ws.messageQueue = ws.messageQueue
|
||||
.then(() => this._handleMessage(ws, data))
|
||||
.catch((err) => console.error('WebSocket message handling error:', err));
|
||||
this._dispatchMessage(ws, data);
|
||||
});
|
||||
|
||||
ws.on('close', () => {
|
||||
@@ -126,6 +130,7 @@ export default class WebSocketServerManager {
|
||||
this._abortAsrSession(ws);
|
||||
// 断开后释放队列引用,避免连接对象被闭包长期持有
|
||||
ws.messageQueue = null;
|
||||
ws.asrQueue = null;
|
||||
console.log('Chat client disconnected');
|
||||
});
|
||||
|
||||
@@ -134,11 +139,47 @@ export default class WebSocketServerManager {
|
||||
});
|
||||
}
|
||||
|
||||
async _handleMessage(ws, data) {
|
||||
/**
|
||||
* 帧分发:先解析,再按类型放入对应队列
|
||||
*
|
||||
* asr_* 入识别队列,其余聊天帧入聊天队列;ping 立即应答,
|
||||
* 不排在模型生成后面,避免长回复期间心跳超时。
|
||||
*
|
||||
* @param {Object} ws 连接
|
||||
* @param {Buffer|string} data 原始帧
|
||||
* @returns {Promise} 当前帧所在队列的完成 Promise
|
||||
*/
|
||||
_dispatchMessage(ws, data) {
|
||||
let msg;
|
||||
try {
|
||||
const raw = data.toString();
|
||||
msg = JSON.parse(data.toString());
|
||||
} catch (err) {
|
||||
sendFrame(ws, 'system', 'error', '消息格式错误');
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
const msg = JSON.parse(raw);
|
||||
// JSON.parse("null") / 数组 / 标量都能成功解析,但不是合法帧
|
||||
if (!msg || typeof msg !== 'object' || Array.isArray(msg)) {
|
||||
sendFrame(ws, 'system', 'error', '消息格式错误');
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
if (msg.type === 'ping') {
|
||||
sendFrame(ws, 'system', 'pong', '', msg.id);
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
const queueKey = ASR_FRAME_TYPES.has(msg.type) ? 'asrQueue' : 'messageQueue';
|
||||
const previous = ws[queueKey] || Promise.resolve();
|
||||
const current = previous
|
||||
.then(() => this._handleMessage(ws, msg))
|
||||
.catch((err) => console.error('WebSocket message handling error:', err));
|
||||
ws[queueKey] = current;
|
||||
return current;
|
||||
}
|
||||
|
||||
async _handleMessage(ws, msg) {
|
||||
try {
|
||||
// 只记录消息类型:正文含健康描述、token/userId 属敏感信息,不进日志。
|
||||
// 实时识别的分片按秒级频率到达,逐帧打日志会把日志刷满,这里跳过
|
||||
if (msg.type !== 'asr_chunk') {
|
||||
@@ -233,8 +274,8 @@ export default class WebSocketServerManager {
|
||||
|
||||
console.log('[Unknown message type]', msg.type);
|
||||
} catch (e) {
|
||||
console.error('Message parse error:', e);
|
||||
sendFrame(ws, 'system', 'error', '消息格式错误');
|
||||
console.error('WebSocket message handling error:', e);
|
||||
sendFrame(ws, 'system', 'error', '处理消息失败,请稍后重试');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user