Mirrors
/
oai-reverse-proxy
mirror of https://gitgud.io/khanon/oai-reverse-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some corner cases in SSE parsing (khanon/oai-reverse-proxy!56)

This commit is contained in:
valadaptive 2023-12-09 06:18:01 +00:00 committed by khanon
parent 94d4efe9bb
commit e0624e30fd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/proxy/middleware/response/streaming/sse-stream-adapter.ts
View File

@ -1,4 +1,5 @@
import { Transform, TransformOptions } from "stream";
import { StringDecoder } from "string_decoder";
// @ts-ignore
import { Parser } from "lifion-aws-event-stream";
import { logger } from "../../../../logger";
@ -23,6 +24,7 @@ export class SSEStreamAdapter extends Transform {
private readonly isAwsStream;
private parser = new Parser();
private partialMessage = "";
private decoder = new StringDecoder("utf8");
constructor(options?: SSEStreamAdapterOptions) {
super(options);
@ -79,16 +81,16 @@ export class SSEStreamAdapter extends Transform {
// We may receive multiple (or partial) SSE messages in a single chunk,
// so we need to buffer and emit separate stream events for full
// messages so we can parse/transform them properly.
const str = chunk.toString("utf8");
const str = this.decoder.write(chunk);
const fullMessages = (this.partialMessage + str).split(/\r?\n\r?\n/);
const fullMessages = (this.partialMessage + str).split(/\r\r|\n\n|\r\n\r\n/);
this.partialMessage = fullMessages.pop() || "";
for (const message of fullMessages) {
// Mixing line endings will break some clients and our request queue
// will have already sent \n for heartbeats, so we need to normalize
// to \n.
this.push(message.replace(/\r\n/g, "\n") + "\n\n");
this.push(message.replace(/\r\n?/g, "\n") + "\n\n");
}
}
callback();