Skip to content
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

Jump to bottom

Fix unhandled rejections with edge runtime #39091

Merged
merged 2 commits into from Jul 28, 2022
Merged

Fix unhandled rejections with edge runtime #39091

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c00ae4
Fix unhandled rejections with edge runtime
ijjk Jul 28, 2022
95b8caf
Merge branch 'canary' into fix/edge-unexpected-rejection
kodiakhq[bot] Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 12 additions & 4 deletions packages/next/server/body-streams.ts
View file
Open in desktop
Expand Up @@ -56,9 +56,13 @@ export function getClonableBody<T extends IncomingMessage>(
): ClonableBody {
let buffered: Readable | null = null

const endPromise = new Promise((resolve, reject) => {
readable.on('end', resolve)
readable.on('error', reject)
const endPromise = new Promise<void | { error?: unknown }>(
(resolve, reject) => {
readable.on('end', resolve)
readable.on('error', reject)
}
).catch((error) => {
return { error }
})

return {
Expand All @@ -69,7 +73,11 @@ export function getClonableBody<T extends IncomingMessage>(
*/
async finalize(): Promise<void> {
if (buffered) {
await endPromise
const res = await endPromise

if (res && typeof res === 'object' && res.error) {
ijjk marked this conversation as resolved.
Show resolved Hide resolved
throw res.error
}
replaceRequestBody(readable, buffered)
buffered = readable
}
Expand Down
5 changes: 5 additions & 0 deletions test/e2e/middleware-rewrites/test/index.test.ts
View file
Open in desktop
Expand Up @@ -680,6 +680,11 @@ describe('Middleware Rewrite', () => {
logs.every((log) => log.source === 'log' || log.source === 'info')
).toEqual(true)
})

it('should not have unexpected errors', async () => {
expect(next.cliOutput).not.toContain('unhandledRejection')
expect(next.cliOutput).not.toContain('ECONNRESET')
})
}

function getCookieFromResponse(res, cookieName) {
Expand Down