Skip to content

Commit 79e7d3a

Browse files
mrlubosmrlubos
authored
Merge pull request #3686 from hey-api/refactor/sse-line-endings
fix: sse line endings
2 parents 8d3167c + c9c1d44 commit 79e7d3a

283 files changed

Lines changed: 1149 additions & 1389 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/afraid-dragons-enter.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@hey-api/client-axios)**: simplify SSE line endings normalization

‎.changeset/brave-tools-yell.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@hey-api/client-fetch)**: simplify SSE line endings normalization

‎.changeset/funny-candies-brush.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@hey-api/client-next)**: simplify SSE line endings normalization

‎.changeset/khaki-steaks-battle.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@hey-api/client-nuxt)**: simplify SSE line endings normalization

‎.changeset/sad-baboons-learn.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@hey-api/client-ky)**: simplify SSE line endings normalization

‎.changeset/social-weeks-press.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@hey-api/client-angular)**: simplify SSE line endings normalization

‎.changeset/true-carpets-rule.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hey-api/openapi-ts": patch
3+
---
4+
5+
**plugin(@hey-api/client-ofetch)**: simplify SSE line endings normalization

‎examples/openapi-ts-angular-common/src/client/core/serverSentEvents.gen.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export type ServerSentEventsResult<TData = unknown, TReturn = void, TNext = unkn
7979
>;
8080
};
8181

82-
export const createSseClient = <TData = unknown>({
82+
export function createSseClient<TData = unknown>({
8383
onRequest,
8484
onSseError,
8585
onSseEvent,
@@ -91,7 +91,7 @@ export const createSseClient = <TData = unknown>({
9191
sseSleepFn,
9292
url,
9393
...options
94-
}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
94+
}: ServerSentEventsOptions): ServerSentEventsResult<TData> {
9595
let lastEventId: string | undefined;
9696

9797
const sleep = sseSleepFn ?? ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -155,8 +155,7 @@ export const createSseClient = <TData = unknown>({
155155
const { done, value } = await reader.read();
156156
if (done) break;
157157
buffer += value;
158-
// Normalize line endings: CRLF -> LF, then CR -> LF
159-
buffer = buffer.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
158+
buffer = buffer.replace(/\r\n?/g, '\n'); // normalize line endings
160159

161160
const chunks = buffer.split('\n\n');
162161
buffer = chunks.pop() ?? '';
@@ -240,4 +239,4 @@ export const createSseClient = <TData = unknown>({
240239
const stream = createStream();
241240

242241
return { stream };
243-
};
242+
}

‎examples/openapi-ts-angular/src/client/core/serverSentEvents.gen.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export type ServerSentEventsResult<TData = unknown, TReturn = void, TNext = unkn
7979
>;
8080
};
8181

82-
export const createSseClient = <TData = unknown>({
82+
export function createSseClient<TData = unknown>({
8383
onRequest,
8484
onSseError,
8585
onSseEvent,
@@ -91,7 +91,7 @@ export const createSseClient = <TData = unknown>({
9191
sseSleepFn,
9292
url,
9393
...options
94-
}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
94+
}: ServerSentEventsOptions): ServerSentEventsResult<TData> {
9595
let lastEventId: string | undefined;
9696

9797
const sleep = sseSleepFn ?? ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -155,8 +155,7 @@ export const createSseClient = <TData = unknown>({
155155
const { done, value } = await reader.read();
156156
if (done) break;
157157
buffer += value;
158-
// Normalize line endings: CRLF -> LF, then CR -> LF
159-
buffer = buffer.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
158+
buffer = buffer.replace(/\r\n?/g, '\n'); // normalize line endings
160159

161160
const chunks = buffer.split('\n\n');
162161
buffer = chunks.pop() ?? '';
@@ -240,4 +239,4 @@ export const createSseClient = <TData = unknown>({
240239
const stream = createStream();
241240

242241
return { stream };
243-
};
242+
}

‎examples/openapi-ts-axios/src/client/core/serverSentEvents.gen.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export type ServerSentEventsResult<TData = unknown, TReturn = void, TNext = unkn
7979
>;
8080
};
8181

82-
export const createSseClient = <TData = unknown>({
82+
export function createSseClient<TData = unknown>({
8383
onRequest,
8484
onSseError,
8585
onSseEvent,
@@ -91,7 +91,7 @@ export const createSseClient = <TData = unknown>({
9191
sseSleepFn,
9292
url,
9393
...options
94-
}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
94+
}: ServerSentEventsOptions): ServerSentEventsResult<TData> {
9595
let lastEventId: string | undefined;
9696

9797
const sleep = sseSleepFn ?? ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -155,8 +155,7 @@ export const createSseClient = <TData = unknown>({
155155
const { done, value } = await reader.read();
156156
if (done) break;
157157
buffer += value;
158-
// Normalize line endings: CRLF -> LF, then CR -> LF
159-
buffer = buffer.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
158+
buffer = buffer.replace(/\r\n?/g, '\n'); // normalize line endings
160159

161160
const chunks = buffer.split('\n\n');
162161
buffer = chunks.pop() ?? '';
@@ -240,4 +239,4 @@ export const createSseClient = <TData = unknown>({
240239
const stream = createStream();
241240

242241
return { stream };
243-
};
242+
}

0 commit comments

Comments
 (0)