Skip to content

Commit

Permalink
Fix prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
ardatan committed Sep 26, 2022
1 parent 5a884ee commit f89d8a5
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 22 deletions.
4 changes: 2 additions & 2 deletions packages/server/CHANGELOG.md
Expand Up @@ -64,8 +64,8 @@

```ts
createServerAdapter(req => {
return new Response(`I got ${req.url}`);
});
return new Response(`I got ${req.url}`)
})
```

Breaking Changes;
Expand Down
22 changes: 13 additions & 9 deletions packages/server/src/utils.ts
Expand Up @@ -185,21 +185,25 @@ export async function sendNodeResponse(
const reader = body.getReader();
serverResponse.once('close', () => {
reader.cancel().finally(() => {
reader.releaseLock();
body.cancel();
});
});
// eslint-disable-next-line no-inner-declarations
function pump() {
reader.read().then(({ done, value }) => {
if (done) {
reader
.read()
.then(({ done, value }) => {
if (done) {
serverResponse.end(resolve);
return;
}
serverResponse.write(value, pump);
})
.catch(error => {
console.error(error);
serverResponse.end(resolve);
return;
}
serverResponse.write(value, pump);
}).catch(error => {
console.error(error);
serverResponse.end(resolve);
});
});
}
pump();
} else if (isAsyncIterable(body)) {
Expand Down
24 changes: 13 additions & 11 deletions packages/server/test/node.spec.ts
Expand Up @@ -68,15 +68,18 @@ describe('Node Specific Cases', () => {

it('should handle cancellation of incremental responses', async () => {
const cancelFn = jest.fn();
const serverAdapter = createServerAdapter(() => new Response(
new ReadableStream({
async pull(controller) {
await sleep(100);
controller.enqueue(Date.now().toString());
},
cancel: cancelFn,
})
));
const serverAdapter = createServerAdapter(
() =>
new Response(
new ReadableStream({
async pull(controller) {
await sleep(100);
controller.enqueue(Date.now().toString());
},
cancel: cancelFn,
})
)
);
server.on('request', serverAdapter);
const abortCtrl = new AbortController();
const response = await fetch(url, {
Expand All @@ -99,8 +102,7 @@ describe('Node Specific Cases', () => {
expect(collectedValues).toHaveLength(3);
await sleep(100);
expect(cancelFn).toHaveBeenCalled();

})
});
});

function sleep(ms: number) {
Expand Down

0 comments on commit f89d8a5

Please sign in to comment.