diff --git a/agent/infra/media/ocr_qwen.js b/agent/infra/media/ocr_qwen.js index 731190e..159fe99 100644 --- a/agent/infra/media/ocr_qwen.js +++ b/agent/infra/media/ocr_qwen.js @@ -267,7 +267,7 @@ function toMarkdownTable(header, rows) { const list = cells.slice(0, width).map(cell => cell.trim()); // 某行列数超出表头时并进最后一列,避免丢文字 if (cells.length > width) { - list[width - 1] = `${list[width - 1] || ''} ${cells.slice(width - 1).join(' ')}`.trim(); + list[width - 1] = `${list[width - 1] || ''} ${cells.slice(width).join(' ')}`.trim(); } while (list.length < width) list.push(''); return list.map(escapeTableCell); diff --git a/handler/payment.js b/handler/payment.js index 48e20c4..dbfe9b7 100644 --- a/handler/payment.js +++ b/handler/payment.js @@ -19,9 +19,11 @@ const payLocks = new Map(); function withPayLock(key, fn) { const previous = payLocks.get(key) || Promise.resolve(); const current = previous.then(fn, fn); - payLocks.set(key, current.finally(() => { - if (payLocks.get(key) === current) payLocks.delete(key); - })); + const tracked = current.then( + () => { if (payLocks.get(key) === tracked) payLocks.delete(key); }, + () => { if (payLocks.get(key) === tracked) payLocks.delete(key); } + ); + payLocks.set(key, tracked); return current; } @@ -1242,4 +1244,4 @@ function startPaymentPatrol({ intervalMs = 10 * 60 * 1000 } = {}) { return patrolTimer; } -export { HandlerPayment, startPaymentPatrol, runPaymentPatrolOnce }; +export { HandlerPayment, startPaymentPatrol, runPaymentPatrolOnce, withPayLock, payLocks }; diff --git a/test/media.test.js b/test/media.test.js index 0f7feac..9fa2cf2 100644 --- a/test/media.test.js +++ b/test/media.test.js @@ -451,6 +451,14 @@ test("原生 OCR 的制表符与全角空格分列同样还原成表格", () => assert.match(fullWidthTable, /\| 白细胞计数 WBC \| 6\.2 \| 10\^9\/L \| \| \|/); }); +test("OCR 表格超出列并入最后一列时不重复已有单元格", () => { + const formatted = formatTranscription("项目 结果 单位\n白细胞 6.2 10^9/L 偏高"); + assert.equal( + formatted, + "| 项目 | 结果 | 单位 |\n| --- | --- | --- |\n| 白细胞 | 6.2 | 10^9/L 偏高 |" + ); +}); + test("识别行只有坐标没有文字时视为未识别", () => { const result = parseVisionResult('[{"rotate_rect":[358,40,33,375,90]},{"rotate_rect":[268,96,25,453,90]}]'); assert.equal(result.text, ""); diff --git a/test/payment.test.js b/test/payment.test.js index 544c901..368aa65 100644 --- a/test/payment.test.js +++ b/test/payment.test.js @@ -11,7 +11,7 @@ import { verifyMessageSignature, decryptAesGcm, } from "../utils/wechatpay.js"; -import { createOrderQueryCache, HandlerPayment } from "../handler/payment.js"; +import { createOrderQueryCache, HandlerPayment, withPayLock, payLocks } from "../handler/payment.js"; import { DBModel } from "../models/index.js"; test("元转分按小数点拆位,不经过浮点", () => { @@ -213,3 +213,29 @@ test("退款成功后的迟到处理中结果不会回退支付与订单状态", Object.assign(DBModel, previous); } }); + +test("同一订单支付锁保持串行并在完成后清理", async () => { + const key = "payment-lock-test"; + const order = []; + let releaseFirst; + payLocks.delete(key); + + const first = withPayLock(key, async () => { + order.push("first-start"); + await new Promise((resolve) => { releaseFirst = resolve; }); + order.push("first-end"); + }); + const second = withPayLock(key, async () => { + order.push("second-start"); + order.push("second-end"); + }); + + await new Promise((resolve) => setImmediate(resolve)); + assert.deepEqual(order, ["first-start"]); + assert.equal(payLocks.has(key), true); + + releaseFirst(); + await Promise.all([first, second]); + assert.deepEqual(order, ["first-start", "first-end", "second-start", "second-end"]); + assert.equal(payLocks.has(key), false); +}); diff --git a/test/websocket_queue.test.js b/test/websocket_queue.test.js index 27217bb..10f85a7 100644 --- a/test/websocket_queue.test.js +++ b/test/websocket_queue.test.js @@ -146,3 +146,31 @@ test("同一用户的跨连接聊天轮次串行执行", async () => { await Promise.all([first, second]); assert.deepEqual(order, ["first-start", "first-end", "second-start", "second-end"]); }); + +test("ASR 解码期间取消后不再创建供应商会话", async () => { + const manager = new WebSocketServerManager(0); + const ws = createWs(); + let resolveDecode; + const state = { + failed: false, + session: null, + decoder: { + rate: 16000, + push: () => new Promise((resolve) => { resolveDecode = resolve; }), + free() {}, + }, + }; + ws.asrSession = state; + let createCalls = 0; + manager._createAsrSession = () => { + createCalls += 1; + return { push() {} }; + }; + + const pending = manager._pushAsrAudio(ws, state, Buffer.from([1])); + ws.asrSession = null; + resolveDecode(Buffer.alloc(320)); + await pending; + + assert.equal(createCalls, 0); +}); diff --git a/websocket.js b/websocket.js index e086dbf..658d1c3 100644 --- a/websocket.js +++ b/websocket.js @@ -575,6 +575,8 @@ export default class WebSocketServerManager { try { const pcm = await state.decoder.push(buffer); + // 解码期间可能收到 cancel/断连;此时不能再创建供应商会话或推送音频。 + if (ws.asrSession !== state || state.failed) return; // 首帧往往只有容器头(WebM 的 EBML / mp3 的元信息),解不出音频: // 等第一段 PCM 出来再建供应商会话 if (!pcm.length) return; @@ -626,6 +628,7 @@ export default class WebSocketServerManager { // 流式解码收尾:把解码器里剩余的音频冲出来再收(mp3 无尾部缓冲,返回空) if (state.decoder) { const tail = await state.decoder.flush(); + if (ws.asrSession !== state || state.failed) return; if (!state.session && tail.length) { state.rate = resolveAsrRate(state.decoder.rate); this._createAsrSession(ws, state, { codec: 'pcm16', rate: state.rate }); @@ -637,7 +640,9 @@ export default class WebSocketServerManager { } const text = state.session ? (await state.session.finish()) || '' : ''; - if (ws.asrSession === state) ws.asrSession = null; + // finish 等待期间取消后不再回定稿,也不能覆盖后续新轮次的状态。 + if (ws.asrSession !== state || state.failed) return; + ws.asrSession = null; logger.info('asr stream finished', { requestId: state.id, format: state.format || 'unknown',