Skip to content

Try reading the whole body to fix concurrent request bug #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cdloh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Try reading the whole body to fix concurrent request bug #224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 11 additions & 23 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export class esi {
mutResponse.headers.delete("Surrogate-Control");

// `streamBody` will free the request context when finished
this.streamBody(eventData, response.body, writable);
this.streamBody(eventData, response, writable);

return mutResponse;
}
Expand Down Expand Up @@ -236,18 +236,17 @@ export class esi {

async streamBody(
eventData: ESIEventData,
readable: ReadableStream,
rsp: Response,
writable: WritableStream
): Promise<void> {
const reader = readable.getReader();
const encoder = new TextEncoder();
const decoder = new TextDecoder();
const rspTxt = await rsp.text();

// Output
// pending actions awaiting a response
const output: Array<Promise<string>> = [];
let pending: boolean;
let ended: boolean;
let ended = false;

/**
* Flushes output to the Writeable Stream
Expand All @@ -270,7 +269,9 @@ export class esi {
// on error
// Write nothing out
console.log(e);
return "";
pending = false;
flush_output();
return '';
})
.then(function (r) {
const writer = writable.getWriter();
Expand Down Expand Up @@ -303,23 +304,10 @@ export class esi {
const writerBound = writer.bind(this);

const handler = createHandleChunk(writerBound);

reader.read().then(async function processBlob(blob): Promise<void> {
const chunk: ArrayBuffer = blob.value;
const done: boolean = blob.done;
// decode it
const decodedChunk: string = decoder.decode(chunk, { stream: true });
await handler(decodedChunk, done);

// we're done bail out
if (done) {
ended = true;
flush_output();
return;
}

return reader.read().then(processBlob);
});
await handler(rspTxt, true)
ended = true;
flush_output();
return;
}

validContentType(response: Response): boolean {
Expand Down