Skip to content

Commit 3ac11de

Browse files
committed
perf(web): 合并流式 Markdown 渲染
- 将高频 token 更新限制为每 50 毫秒最多触发一次 Markdown 解析。\n- 流式结束时同步刷新完整文本,并让任务列表上下文使用同一份渲染文本。\n- 保留主分支的稳定渲染器组件树;测试用虚拟时钟验证节流后的代码块交互。\n- 验证:ChatMarkdown 定向测试 79/79、格式检查和 Web 类型检查通过。
1 parent 6abdf37 commit 3ac11de

4 files changed

Lines changed: 80 additions & 3 deletions

File tree

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
3+
import {
4+
STREAMING_MARKDOWN_RENDER_INTERVAL_MS,
5+
streamingMarkdownRenderDelay,
6+
} from "./ChatMarkdown.logic";
7+
8+
describe("streamingMarkdownRenderDelay", () => {
9+
it("coalesces updates inside the render interval", () => {
10+
expect(streamingMarkdownRenderDelay({ lastRenderedAt: 1_000, now: 1_020 })).toBe(30);
11+
});
12+
13+
it("allows an immediate refresh once the interval elapsed", () => {
14+
expect(
15+
streamingMarkdownRenderDelay({
16+
lastRenderedAt: 1_000,
17+
now: 1_000 + STREAMING_MARKDOWN_RENDER_INTERVAL_MS,
18+
}),
19+
).toBe(0);
20+
expect(streamingMarkdownRenderDelay({ lastRenderedAt: 1_000, now: 2_000 })).toBe(0);
21+
});
22+
23+
it("handles a clock moving backwards without exceeding the interval", () => {
24+
expect(streamingMarkdownRenderDelay({ lastRenderedAt: 1_000, now: 900 })).toBe(
25+
STREAMING_MARKDOWN_RENDER_INTERVAL_MS,
26+
);
27+
});
28+
});
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export const STREAMING_MARKDOWN_RENDER_INTERVAL_MS = 50;
2+
3+
export function streamingMarkdownRenderDelay(input: {
4+
lastRenderedAt: number;
5+
now: number;
6+
}): number {
7+
const elapsed = Math.max(0, input.now - input.lastRenderedAt);
8+
return Math.max(0, STREAMING_MARKDOWN_RENDER_INTERVAL_MS - elapsed);
9+
}

‎apps/web/src/components/ChatMarkdown.test.tsx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { getSyntaxHighlighterPromise } from "../lib/syntaxHighlighting";
88
import { GitHubIcon } from "./Icons";
99
import { Button } from "./ui/button";
1010
import { setMarkdownTaskChecked } from "./files/filePreviewMode";
11+
import { STREAMING_MARKDOWN_RENDER_INTERVAL_MS } from "./ChatMarkdown.logic";
1112

1213
vi.mock("@effect/atom-react", () => ({ useAtomValue: () => null }));
1314
vi.mock("../hooks/useTheme", () => ({ useTheme: () => ({ resolvedTheme: "dark" }) }));
@@ -121,6 +122,7 @@ describe("ChatMarkdown streaming", () => {
121122
vi.spyOn(console, "error").mockImplementation(() => {});
122123
vi.spyOn(console, "warn").mockImplementation(() => {});
123124
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
125+
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
124126
let renderer: ReactTestRenderer | undefined;
125127

126128
try {
@@ -144,11 +146,15 @@ describe("ChatMarkdown streaming", () => {
144146
<ChatMarkdown cwd="/tmp/project" text={"```text\nrecovered\n```"} isStreaming />,
145147
);
146148
});
149+
await act(async () => {
150+
await vi.advanceTimersByTimeAsync(STREAMING_MARKDOWN_RENDER_INTERVAL_MS);
151+
});
147152
expect(mounted.root.findAllByProps({ className: "chat-markdown-shiki" })).toHaveLength(1);
148153
expect(mounted.root.findByProps({ "data-language": "text" })).toBe(codeBlock);
149154
expect(codeBlock.props["data-wrap"]).toBe(String(!initialWrap));
150155
} finally {
151156
await act(async () => renderer?.unmount());
157+
vi.useRealTimers();
152158
vi.unstubAllGlobals();
153159
vi.restoreAllMocks();
154160
}
@@ -222,6 +228,9 @@ describe("ChatMarkdown streaming", () => {
222228
/>,
223229
);
224230
});
231+
await act(async () => {
232+
await vi.advanceTimersByTimeAsync(STREAMING_MARKDOWN_RENDER_INTERVAL_MS);
233+
});
225234
const copyUpdated = codeButton(mounted, "Copied");
226235
await act(async () => {
227236
copyUpdated.onClick?.({} as Parameters<NonNullable<typeof copyUpdated.onClick>>[0]);

‎apps/web/src/components/ChatMarkdown.tsx‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ import {
181181
} from "../browser/openFileInPreview";
182182
import { resolveLinkTarget } from "../browser/browserLinkTarget";
183183
import { PullRequestLinkPreview } from "./pullRequest/PullRequestLinkPreview";
184+
import { streamingMarkdownRenderDelay } from "./ChatMarkdown.logic";
184185

185186
interface ChatMarkdownProps {
186187
text: string;
@@ -324,6 +325,33 @@ const highlightedCodeCache = new LRUCache<string>(
324325
MAX_HIGHLIGHT_CACHE_MEMORY_BYTES,
325326
);
326327

328+
function useStreamingMarkdownText(text: string, isStreaming: boolean): string {
329+
const [renderedText, setRenderedText] = useState(text);
330+
const lastRenderedAtRef = useRef(Date.now());
331+
332+
useEffect(() => {
333+
if (!isStreaming) {
334+
lastRenderedAtRef.current = Date.now();
335+
setRenderedText((current) => (current === text ? current : text));
336+
return;
337+
}
338+
339+
const delay = streamingMarkdownRenderDelay({
340+
lastRenderedAt: lastRenderedAtRef.current,
341+
now: Date.now(),
342+
});
343+
const timeout = setTimeout(() => {
344+
lastRenderedAtRef.current = Date.now();
345+
setRenderedText(text);
346+
}, delay);
347+
return () => {
348+
clearTimeout(timeout);
349+
};
350+
}, [isStreaming, text]);
351+
352+
return isStreaming ? renderedText : text;
353+
}
354+
327355
function findTaskListMarkerOffset(markdown: string, listItemStart: number): number | null {
328356
const firstLineEnd = markdown.indexOf("\n", listItemStart);
329357
const firstLine = markdown.slice(
@@ -2168,6 +2196,7 @@ function useChatMarkdownState({
21682196
imageBaseDir,
21692197
onImageExpand,
21702198
}: ChatMarkdownProps) {
2199+
const renderedText = useStreamingMarkdownText(text, isStreaming);
21712200
const { resolvedTheme } = useTheme();
21722201
const [localMediaPreview, setLocalMediaPreview] = useState<ExpandedImagePreview | null>(null);
21732202
const expandMedia = onImageExpand ?? setLocalMediaPreview;
@@ -2588,7 +2617,7 @@ function useChatMarkdownState({
25882617
resolvedTheme,
25892618
serverConfig,
25902619
skills,
2591-
text,
2620+
text: renderedText,
25922621
threadRef,
25932622
updateThreadPullRequestLink,
25942623
}),
@@ -2614,7 +2643,7 @@ function useChatMarkdownState({
26142643
resolvedTheme,
26152644
serverConfig,
26162645
skills,
2617-
text,
2646+
renderedText,
26182647
threadRef,
26192648
updateThreadPullRequestLink,
26202649
],
@@ -2624,6 +2653,7 @@ function useChatMarkdownState({
26242653
handleCopy,
26252654
markdownUrlTransform,
26262655
localMediaPreview,
2656+
renderedText,
26272657
setLocalMediaPreview,
26282658
};
26292659
}
@@ -3110,6 +3140,7 @@ function ChatMarkdown({
31103140
handleCopy,
31113141
markdownUrlTransform,
31123142
localMediaPreview,
3143+
renderedText,
31133144
setLocalMediaPreview,
31143145
} = useChatMarkdownState({ text, ...props });
31153146
const remarkPlugins = useMemo(
@@ -3139,7 +3170,7 @@ function ChatMarkdown({
31393170
components={CHAT_MARKDOWN_COMPONENTS}
31403171
urlTransform={markdownUrlTransform}
31413172
>
3142-
{text}
3173+
{renderedText}
31433174
</ReactMarkdown>
31443175
</ChatMarkdownRendererContext>
31453176
{localMediaPreview ? (

0 commit comments

Comments
 (0)