From 8b4b5af097d51f9180386d294aa6423d042649a1 Mon Sep 17 00:00:00 2001 From: maplezzk <34745236+maplezzk@users.noreply.github.com> Date: Wed, 5 Aug 2026 13:44:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=8A=93=E5=8C=85=E8=80=97=E6=97=B6=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-ui/src/pages/CapturePage.tsx | 16 ++++++++++- locales/en/translation.json | 1 + locales/zh/translation.json | 1 + src/proxy/capture.ts | 6 ++++ src/proxy/provider.ts | 2 ++ src/types/i18n.generated.ts | 1 + test/proxy/capture.test.ts | 46 ++++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 1 deletion(-) diff --git a/admin-ui/src/pages/CapturePage.tsx b/admin-ui/src/pages/CapturePage.tsx index a2fe477..19c5b36 100644 --- a/admin-ui/src/pages/CapturePage.tsx +++ b/admin-ui/src/pages/CapturePage.tsx @@ -21,6 +21,7 @@ import { useToast } from '../lib/toast' interface CaptureEntry { id: number timestamp: number + durationMs: number | null source: string protocol: string model: string @@ -73,6 +74,15 @@ function fmtSize(s: string | null): string { return b + 'B' } +function fmtDuration(ms: number | null): string { + if (ms == null) return '—' + if (ms < 1000) return `${ms} ms` + if (ms < 60_000) return `${(ms / 1000).toFixed(ms < 10_000 ? 2 : 1)} s` + const minutes = Math.floor(ms / 60_000) + const seconds = ((ms % 60_000) / 1000).toFixed(1) + return `${minutes}m ${seconds}s` +} + async function readSSE( response: Response, signal: AbortSignal, @@ -372,6 +382,7 @@ export default function CapturePage() { # {t('admin.capture.time')} + {t('admin.capture.duration')} {t('admin.capture.sourceCol')} {t('admin.capture.adapter')} {t('admin.capture.inboundProtocol')} @@ -396,6 +407,9 @@ export default function CapturePage() { {fmtTime(e.timestamp)} + + {fmtDuration(e.durationMs)} + {e.source} {e.adapterName || '—'} {e.protocol} @@ -422,7 +436,7 @@ export default function CapturePage() { {filtered.length === 0 && ( - + {t('admin.capture.empty')} diff --git a/locales/en/translation.json b/locales/en/translation.json index 1a8ec22..588ba8d 100644 --- a/locales/en/translation.json +++ b/locales/en/translation.json @@ -306,6 +306,7 @@ "sourceProxy": "Proxy", "filterAll": "All", "time": "Time", + "duration": "Duration", "sourceCol": "Source", "adapter": "Adapter", "inboundProtocol": "Inbound Protocol", diff --git a/locales/zh/translation.json b/locales/zh/translation.json index 555d13d..d5b4d2b 100644 --- a/locales/zh/translation.json +++ b/locales/zh/translation.json @@ -306,6 +306,7 @@ "sourceProxy": "代理", "filterAll": "全部", "time": "时间", + "duration": "耗时", "sourceCol": "来源", "adapter": "适配器", "inboundProtocol": "入站协议", diff --git a/src/proxy/capture.ts b/src/proxy/capture.ts index fdbeb0d..8bc7b8d 100644 --- a/src/proxy/capture.ts +++ b/src/proxy/capture.ts @@ -14,6 +14,8 @@ export interface CaptureMeta { export interface CaptureEntry extends CaptureMeta { id: number timestamp: number + /** 从创建抓包记录到响应完整写回客户端的耗时(毫秒) */ + durationMs: number | null /** 来源:proxy(代理入口)或适配器名称 */ source: string /** 代理端协议 */ @@ -92,6 +94,7 @@ export class CaptureBuffer { const entry: CaptureEntry = { id: this.nextId++, timestamp: Date.now(), + durationMs: null, source, protocol, model, @@ -123,6 +126,9 @@ export class CaptureBuffer { const entry = this.entryMap.get(pairId) if (!entry) return entry[field] = data + if (field === 'responseOut') { + entry.durationMs = Math.max(0, Date.now() - entry.timestamp) + } this.notifySubscribers(entry) } diff --git a/src/proxy/provider.ts b/src/proxy/provider.ts index 796f93b..c752de9 100644 --- a/src/proxy/provider.ts +++ b/src/proxy/provider.ts @@ -322,6 +322,8 @@ export async function forwardRequest( 'Content-Type': response.headers.get('content-type') ?? 'application/json', 'Access-Control-Allow-Origin': '*', }) + // 同协议响应虽无需转换,仍需记录实际写回客户端的正文并结算抓包耗时。 + req.capture?.updateRequest(req.pairId!, 'responseOut', text) res.end(text) return } diff --git a/src/types/i18n.generated.ts b/src/types/i18n.generated.ts index 7c52724..9ae86d1 100644 --- a/src/types/i18n.generated.ts +++ b/src/types/i18n.generated.ts @@ -53,6 +53,7 @@ export type TranslationKey = | 'admin.adapters.updated' | 'admin.capture.adapter' | 'admin.capture.copyRaw' + | 'admin.capture.duration' | 'admin.capture.empty' | 'admin.capture.entryCount' | 'admin.capture.filterAll' diff --git a/test/proxy/capture.test.ts b/test/proxy/capture.test.ts index f8f20e9..b8d41d7 100644 --- a/test/proxy/capture.test.ts +++ b/test/proxy/capture.test.ts @@ -3,6 +3,7 @@ import assert from 'node:assert' import { EventEmitter } from 'node:events' import type { ServerResponse } from 'node:http' import { CaptureBuffer } from '../../src/proxy/capture.js' +import { forwardRequest } from '../../src/proxy/provider.js' function fakeRes(overrides: Partial<{ destroyed: boolean; writableEnded: boolean; writable: boolean }> = {}): ServerResponse { const ee = new EventEmitter() as any @@ -31,6 +32,7 @@ describe('proxy/capture', () => { assert.strictEqual(all[0].protocol, 'anthropic') assert.strictEqual(all[0].model, 'claude-3') assert.strictEqual(all[0].pairId, 1) + assert.strictEqual(all[0].durationMs, null) assert.strictEqual(all[0].requestIn, null) }) @@ -43,6 +45,7 @@ describe('proxy/capture', () => { const entry = cap.getAll()[0] assert.strictEqual(entry.requestIn, '{"model":"gpt-4"}') assert.strictEqual(entry.responseOut, '{"choices":[]}') + assert.ok(entry.durationMs !== null && entry.durationMs >= 0) // 未更新的字段仍为 null assert.strictEqual(entry.requestOut, null) assert.strictEqual(entry.responseIn, null) @@ -54,6 +57,49 @@ describe('proxy/capture', () => { cap.updateRequest(999, 'requestIn', 'data') }) + it('非流式同协议响应同时记录双向正文和耗时', async () => { + const responseText = JSON.stringify({ + id: 'chatcmpl-capture', + choices: [{ message: { role: 'assistant', content: 'hi' } }], + }) + const fetchMock = mock.method(globalThis, 'fetch', async () => new Response(responseText, { + status: 200, + headers: { 'content-type': 'application/json' }, + })) + const cap = new CaptureBuffer(100) + + try { + const pairId = cap.startRequest('proxy', 'openai', 'gpt-4') + const res = fakeRes() + let clientBody = '' + res.end = ((chunk?: unknown) => { + clientBody = chunk == null ? '' : String(chunk) + return res + }) as ServerResponse['end'] + + await forwardRequest({ + url: 'https://api.openai.com/v1/chat/completions', + method: 'POST', + headers: { 'content-type': 'application/json' }, + body: { model: 'gpt-4', messages: [{ role: 'user', content: 'hello' }] }, + crossProtocol: false, + inboundType: 'openai', + upstreamType: 'openai', + capture: cap, + pairId, + }, res) + + const entry = cap.getAll()[0] + assert.strictEqual(entry.responseIn, responseText) + assert.strictEqual(entry.responseOut, responseText) + assert.strictEqual(clientBody, responseText) + assert.ok(entry.durationMs !== null && entry.durationMs >= 0) + } finally { + fetchMock.mock.restore() + cap.destroy() + } + }) + it('startRequest 携带 meta 信息', () => { const cap = new CaptureBuffer(100) cap.startRequest('adapter', 'anthropic', 'claude-3', {