fix(websocket): 同一账号的聊天轮次跨连接串行
单条连接的队列只能保证连接内串行,同一账号多设备/多标签页共享 Agent 历史,AI(tool_calls) 与工具结果会跨请求交错。新增按用户维度的轮次锁, 完整聊天轮次再串行一层。
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
import WebSocketServerManager from "../websocket.js";
|
||||
import WebSocketServerManager, { withChatTurnLock } from "../websocket.js";
|
||||
|
||||
function createWs() {
|
||||
const sent = [];
|
||||
@@ -125,3 +125,24 @@ test("null / 数组等非对象帧同样按消息格式错误处理", () => {
|
||||
assert.equal(item.content, "消息格式错误");
|
||||
}
|
||||
});
|
||||
|
||||
test("同一用户的跨连接聊天轮次串行执行", async () => {
|
||||
const order = [];
|
||||
let releaseFirst;
|
||||
const first = withChatTurnLock("user-1", async () => {
|
||||
order.push("first-start");
|
||||
await new Promise((resolve) => { releaseFirst = resolve; });
|
||||
order.push("first-end");
|
||||
});
|
||||
const second = withChatTurnLock("user-1", async () => {
|
||||
order.push("second-start");
|
||||
order.push("second-end");
|
||||
});
|
||||
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
assert.deepEqual(order, ["first-start"]);
|
||||
|
||||
releaseFirst();
|
||||
await Promise.all([first, second]);
|
||||
assert.deepEqual(order, ["first-start", "first-end", "second-start", "second-end"]);
|
||||
});
|
||||
|
||||
+36
-15
@@ -29,6 +29,21 @@ const chatLimiter = createUserLimiter(20);
|
||||
// 实时语音识别同样按次计费:每轮 asr_start 计一次,与聊天额度分开
|
||||
const asrLimiter = createUserLimiter(20);
|
||||
|
||||
// WebSocket 队列只能串行化单条连接;同一账号多设备/多标签页仍共享 Agent 历史,
|
||||
// 因此完整聊天轮次再按用户串行,避免 AI(tool_calls) 与工具结果跨请求交错。
|
||||
const chatTurnLocks = new Map();
|
||||
function withChatTurnLock(userId, fn) {
|
||||
const key = String(userId);
|
||||
const previous = chatTurnLocks.get(key) || Promise.resolve();
|
||||
const current = previous.then(fn, fn);
|
||||
const tracked = current.then(
|
||||
() => { if (chatTurnLocks.get(key) === tracked) chatTurnLocks.delete(key); },
|
||||
() => { if (chatTurnLocks.get(key) === tracked) chatTurnLocks.delete(key); }
|
||||
);
|
||||
chatTurnLocks.set(key, tracked);
|
||||
return current;
|
||||
}
|
||||
|
||||
// 实时识别分片上限:单帧按客户端 frameSize=8KB 留足余量,
|
||||
// 整轮按 60 秒录音的一倍余量收口,超过直接中止本轮,避免连接内存被刷满
|
||||
const ASR_LIMITS = {
|
||||
@@ -242,22 +257,26 @@ export default class WebSocketServerManager {
|
||||
}
|
||||
}
|
||||
|
||||
if (msg.agent === 'escort-admin') {
|
||||
// 管理端 agent 按角色收敛工具:管理员可跨用户/写库,陪诊员只能看本人订单。
|
||||
// 身份以 Employee 记录为准,普通 C 端账号不能借 agent 升级权限。
|
||||
const role = await resolveEscortAdminRole(userInfo);
|
||||
if (!role) {
|
||||
send('system', 'error', '当前账号未绑定在职陪诊员档案,请联系管理员开通', msg.id);
|
||||
return;
|
||||
await withChatTurnLock(userInfo._id, async () => {
|
||||
// 等待前一轮期间连接可能已断开,获得锁后必须再检查一次。
|
||||
if (ws.readyState !== WebSocket.OPEN) return;
|
||||
if (msg.agent === 'escort-admin') {
|
||||
// 管理端 agent 按角色收敛工具:管理员可跨用户/写库,陪诊员只能看本人订单。
|
||||
// 身份以 Employee 记录为准,普通 C 端账号不能借 agent 升级权限。
|
||||
const role = await resolveEscortAdminRole(userInfo);
|
||||
if (!role) {
|
||||
send('system', 'error', '当前账号未绑定在职陪诊员档案,请联系管理员开通', msg.id);
|
||||
return;
|
||||
}
|
||||
await adminAgent.streamChat(userInfo, [msg], (source, type, content, id) => {
|
||||
send(source, type, content, id);
|
||||
}, role);
|
||||
} else {
|
||||
await chatTask.streamChat(userInfo, msg, (source, type, content, id) => {
|
||||
send(source, type, content, id);
|
||||
});
|
||||
}
|
||||
await adminAgent.streamChat(userInfo, [msg], (source, type, content, id) => {
|
||||
send(source, type, content, id);
|
||||
}, role);
|
||||
} else {
|
||||
await chatTask.streamChat(userInfo, msg, (source, type, content, id) => {
|
||||
send(source, type, content, id);
|
||||
});
|
||||
}
|
||||
});
|
||||
// 流式 chunk 可能携带不同的模型消息 ID,结束帧统一关联本次客户端请求。
|
||||
send('system', 'end', '', msg.id);
|
||||
} catch (err) {
|
||||
@@ -675,3 +694,5 @@ export default class WebSocketServerManager {
|
||||
return this.wss.clients.size;
|
||||
}
|
||||
}
|
||||
|
||||
export { withChatTurnLock };
|
||||
|
||||
Reference in New Issue
Block a user