Merge branch 'main' of https://git.nianxx.cn/wangxuming/makelore

electron/services/learning-agent-client.ts

@@ -50,6 +50,72 @@ function isLearningAccountChanged(error: unknown): boolean {
   return record(error).code === 'LEARNING_ACCOUNT_CHANGED';
 }
 
+function createSseDataParser() {
+  let line = '';
+  let pendingCarriageReturn = false;
+  let dataLines: string[] = [];
+
+  const assertBufferSize = () => {
+    const size = line.length + dataLines.reduce((total, data) => total + data.length, 0);
+    if (size > MAX_SSE_BUFFER_LENGTH) throw new Error('助教服务暂时不可用');
+  };
+
+  const commitLine = (events: string[]) => {
+    if (line === '') {
+      if (dataLines.length > 0) events.push(dataLines.join('\n'));
+      dataLines = [];
+      return;
+    }
+    if (!line.startsWith(':')) {
+      const separator = line.indexOf(':');
+      const field = separator === -1 ? line : line.slice(0, separator);
+      let value = separator === -1 ? '' : line.slice(separator + 1);
+      if (value.startsWith(' ')) value = value.slice(1);
+      if (field === 'data') {
+        dataLines.push(value);
+        assertBufferSize();
+      }
+    }
+    line = '';
+  };
+
+  const push = (chunk: string): string[] => {
+    const events: string[] = [];
+    for (const character of chunk) {
+      if (pendingCarriageReturn) {
+        pendingCarriageReturn = false;
+        commitLine(events);
+        if (character === '\n') continue;
+      }
+      if (character === '\r') {
+        pendingCarriageReturn = true;
+      } else if (character === '\n') {
+        commitLine(events);
+      } else {
+        line += character;
+        assertBufferSize();
+      }
+    }
+    return events;
+  };
+
+  const finish = (): string[] => {
+    const events: string[] = [];
+    if (pendingCarriageReturn) {
+      pendingCarriageReturn = false;
+      commitLine(events);
+    }
+    if (line !== '') commitLine(events);
+    if (dataLines.length > 0) {
+      events.push(dataLines.join('\n'));
+      dataLines = [];
+    }
+    return events;
+  };
+
+  return { push, finish };
+}
+
 export function createLearningAgentClient(dependencies: Dependencies = {}) {
   const fetchImpl = dependencies.fetchImpl ?? proxyAwareFetch;
   const getAccessToken = dependencies.getAccessToken ?? getValidWorksSquareAccessToken;
@@ -217,40 +283,47 @@ export function createLearningAgentClient(dependencies: Dependencies = {}) {
     }
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
-    let buffer = '';
+    const parser = createSseDataParser();
     let text = '';
+    const consume = (data: string): { text?: string; completed?: true } => {
+      if (!data) return {};
+      let envelope: Record<string, unknown>;
+      try {
+        envelope = record(JSON.parse(data));
+      } catch {
+        throw new Error('助教服务暂时不可用');
+      }
+      if (envelope.run_id !== runId) return {};
+      const payload = record(envelope.payload);
+      if (envelope.type === 'learning.assistant.delta' && typeof payload.delta === 'string') {
+        if (text.length + payload.delta.length > MAX_ANSWER_LENGTH) throw new Error('助教服务暂时不可用');
+        text += payload.delta;
+      }
+      if (envelope.type === 'learning.assistant.failed') {
+        throw new Error('助教回答失败');
+      }
+      if (envelope.type === 'learning.assistant.completed') {
+        const answer = text.trim();
+        if (!answer) throw new Error('助教回答失败');
+        return { text: answer, completed: true };
+      }
+      return {};
+    };
     try {
       while (true) {
         const chunk = await reader.read();
         assertCurrentAccount();
-        if (chunk.done) break;
+        const events = chunk.done
-        buffer += decoder.decode(chunk.value, { stream: true });
+          ? [...parser.push(decoder.decode()), ...parser.finish()]
-        if (buffer.length > MAX_SSE_BUFFER_LENGTH) throw new Error('助教服务暂时不可用');
+          : parser.push(decoder.decode(chunk.value, { stream: true }));
-        const frames = buffer.split('\n\n');
+        for (const data of events) {
-        buffer = frames.pop() || '';
+          const result = consume(data);
-        for (const frame of frames) {
+          if (result.completed) {
-          const data = frame.split('\n').find((line) => line.startsWith('data:'))?.slice(5).trim();
-          if (!data) continue;
-          let envelope: Record<string, unknown>;
-          try {
-            envelope = record(JSON.parse(data));
-          } catch {
-            throw new Error('助教服务暂时不可用');
-          }
-          if (envelope.run_id !== runId) continue;
-          const payload = record(envelope.payload);
-          if (envelope.type === 'learning.assistant.delta' && typeof payload.delta === 'string') {
-            if (text.length + payload.delta.length > MAX_ANSWER_LENGTH) throw new Error('助教服务暂时不可用');
-            text += payload.delta;
-          }
-          if (envelope.type === 'learning.assistant.failed') throw new Error('助教回答失败');
-          if (envelope.type === 'learning.assistant.completed') {
             controller.abort();
-            const answer = text.trim();
+            return { text: result.text ?? '' };
-            if (!answer) throw new Error('助教回答失败');
-            return { text: answer };
           }
         }
+        if (chunk.done) break;
       }
     } finally {
       clearTimeout(timeout);

tests/unit/learning-agent-client.test.ts

@@ -6,6 +6,32 @@ describe('Learning Agent client', () => {
   const fetchImpl = vi.fn<typeof fetch>();
   const getAccessToken = vi.fn();
 
+  const chunkedStream = (...chunks: string[]) => new Response(new ReadableStream<Uint8Array>({
+    start(controller) {
+      const encoder = new TextEncoder();
+      for (const chunk of chunks) controller.enqueue(encoder.encode(chunk));
+      controller.close();
+    },
+  }), { status: 200, headers: { 'Content-Type': 'text/event-stream' } });
+
+  const mockRun = (stream: Response) => {
+    fetchImpl
+      .mockResolvedValueOnce(new Response(JSON.stringify({ session_id: 'session-1' }), { status: 201 }))
+      .mockResolvedValueOnce(new Response(JSON.stringify({ run_id: 'run-1' }), { status: 202 }))
+      .mockResolvedValueOnce(new Response(JSON.stringify({ stream_url: '/api/agents/sessions/session-1/events?ticket=ticket-1' }), { status: 200 }))
+      .mockResolvedValueOnce(stream);
+  };
+
+  const ask = () => createLearningAgentClient({
+    fetchImpl,
+    getAccessToken,
+    apiBaseUrl: 'https://square.example',
+  }).ask({
+    courseId: 'course-1',
+    contentHash: 'a'.repeat(64),
+    message: '为什么要学 Python？',
+  });
+
   beforeEach(() => {
     fetchImpl.mockReset();
     getAccessToken.mockReset();
@@ -68,6 +94,60 @@ describe('Learning Agent client', () => {
     expect(fetchImpl.mock.calls.some((call) => call[1]?.method === 'DELETE')).toBe(false);
   });
 
+  it('parses production CRLF-delimited SSE frames', async () => {
+    const event = (type: string, payload: Record<string, unknown>) => (
+      `id: 1\r\nevent: agent.event\r\ndata: ${JSON.stringify({ run_id: 'run-1', type, payload })}\r\n\r\n`
+    );
+    mockRun(chunkedStream(
+      event('learning.assistant.delta', { delta: 'CRLF 正常。' }),
+      event('learning.assistant.completed', {}),
+    ));
+
+    await expect(ask()).resolves.toEqual({ text: 'CRLF 正常。' });
+  });
+
+  it('parses a CRLF frame delimiter split across stream chunks', async () => {
+    const delta = JSON.stringify({
+      run_id: 'run-1',
+      type: 'learning.assistant.delta',
+      payload: { delta: '跨块正常。' },
+    });
+    const completed = JSON.stringify({
+      run_id: 'run-1',
+      type: 'learning.assistant.completed',
+      payload: {},
+    });
+    mockRun(chunkedStream(
+      `data: ${delta}\r\n\r`,
+      `\ndata: ${completed}\r`,
+      '\n\r',
+      '\n',
+    ));
+
+    await expect(ask()).resolves.toEqual({ text: '跨块正常。' });
+  });
+
+  it('joins multiple data lines and ignores other SSE fields and comments', async () => {
+    const delta = JSON.stringify({
+      run_id: 'run-1',
+      type: 'learning.assistant.delta',
+      payload: { delta: '多行正常。' },
+    });
+    const split = delta.indexOf(',"type"');
+    const completed = JSON.stringify({
+      run_id: 'run-1',
+      type: 'learning.assistant.completed',
+      payload: {},
+    });
+    mockRun(chunkedStream(
+      ': keep-alive\r\nid: 9\r\nevent: agent.event\r\nretry: 3000\r\n',
+      `data: ${delta.slice(0, split)},\r\ndata: ${delta.slice(split + 1)}\r\n\r\n`,
+      `data: ${completed}\r\n\r\n`,
+    ));
+
+    await expect(ask()).resolves.toEqual({ text: '多行正常。' });
+  });
+
   it('stops before the network for an invalid package hash', async () => {
     const client = createLearningAgentClient({ fetchImpl, getAccessToken });
     await expect(client.ask({ courseId: 'course-1', contentHash: 'bad', message: '你好' })).rejects.toThrow('助教请求无效');