fix: handle CLRF and CR line endings in SSE parser

nachogarcia · nachogarcia · commit 5511bf535663 · 2025-12-10T01:46:08.000+01:00
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-core/__tests__/serverSentEvents.test.ts b/packages/openapi-ts/src/plugins/@hey-api/client-core/__tests__/serverSentEvents.test.ts
@@ -629,4 +629,64 @@ describe('createSseClient', () => {
     expect(validator).not.toHaveBeenCalled();
     expect(transformer).not.toHaveBeenCalled();
   });
+
+  it('handles CRLF line endings', async () => {
+    fetchMock.mockResolvedValue({
+      body: makeStream(['id: 1\r\nevent: test\r\ndata: {"foo":"bar"}\r\n\r\n']),
+      ok: true,
+    });
+
+    const onEvent = vi.fn();
+    const { stream } = createSseClient({
+      onSseEvent: onEvent,
+      url: 'http://localhost/sse',
+    });
+
+    const result: any[] = [];
+    for await (const ev of stream) result.push(ev);
+
+    expect(result).toEqual([{ foo: 'bar' }]);
+    expect(onEvent).toHaveBeenCalledWith({
+      data: { foo: 'bar' },
+      event: 'test',
+      id: '1',
+      retry: 3000,
+    });
+  });
+
+  it('handles CR-only line endings', async () => {
+    fetchMock.mockResolvedValue({
+      body: makeStream(['id: 2\revent: test\rdata: {"baz":"qux"}\r\r']),
+      ok: true,
+    });
+
+    const onEvent = vi.fn();
+    const { stream } = createSseClient({
+      onSseEvent: onEvent,
+      url: 'http://localhost/sse',
+    });
+
+    const result: any[] = [];
+    for await (const ev of stream) result.push(ev);
+
+    expect(result).toEqual([{ baz: 'qux' }]);
+    expect(onEvent).toHaveBeenCalledWith({
+      data: { baz: 'qux' },
+      event: 'test',
+      id: '2',
+      retry: 3000,
+    });
+  });
+
+  it('handles mixed line endings in a single stream', async () => {
+    fetchMock.mockResolvedValue({
+      body: makeStream(['data: 1\n\n', 'data: 2\r\n\r\n', 'data: 3\r\r']),
+      ok: true,
+    });
+
+    const { stream } = createSseClient({ url: 'http://localhost/sse' });
+    const result: any[] = [];
+    for await (const ev of stream) result.push(ev);
+    expect(result).toEqual([1, 2, 3]);
+  });
 });
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-core/bundle/serverSentEvents.ts b/packages/openapi-ts/src/plugins/@hey-api/client-core/bundle/serverSentEvents.ts
@@ -167,6 +167,8 @@ export const createSseClient = <TData = unknown>({
             const { done, value } = await reader.read();
             if (done) break;
             buffer += value;
+            // Normalize line endings: CRLF -> LF, then CR -> LF
+            buffer = buffer.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
 
             const chunks = buffer.split('\n\n');
             buffer = chunks.pop() ?? '';
