Unverified Commit f1aac90c authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix unhandled rejections with edge runtime (#39091)

This corrects some unhandledRejection errors showing when a connection is canceled with the edge runtime since the changes needed for https://github.com/vercel/next.js/commit/14463ddd10eb24c308c96df12874fb9862abefe4. This also adds a regression test to ensure we don't have these class of errors in our middleware tests. 

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

Fixes: [slack thread](https://vercel.slack.com/archives/C03Q1UU3Z4H/p1658960102013969)
parent c4d41255
...@@ -56,9 +56,13 @@ export function getClonableBody<T extends IncomingMessage>( ...@@ -56,9 +56,13 @@ export function getClonableBody<T extends IncomingMessage>(
): ClonableBody { ): ClonableBody {
let buffered: Readable | null = null let buffered: Readable | null = null
const endPromise = new Promise((resolve, reject) => { const endPromise = new Promise<void | { error?: unknown }>(
readable.on('end', resolve) (resolve, reject) => {
readable.on('error', reject) readable.on('end', resolve)
readable.on('error', reject)
}
).catch((error) => {
return { error }
}) })
return { return {
...@@ -69,7 +73,11 @@ export function getClonableBody<T extends IncomingMessage>( ...@@ -69,7 +73,11 @@ export function getClonableBody<T extends IncomingMessage>(
*/ */
async finalize(): Promise<void> { async finalize(): Promise<void> {
if (buffered) { if (buffered) {
await endPromise const res = await endPromise
if (res && typeof res === 'object' && res.error) {
throw res.error
}
replaceRequestBody(readable, buffered) replaceRequestBody(readable, buffered)
buffered = readable buffered = readable
} }
......
...@@ -680,6 +680,11 @@ describe('Middleware Rewrite', () => { ...@@ -680,6 +680,11 @@ describe('Middleware Rewrite', () => {
logs.every((log) => log.source === 'log' || log.source === 'info') logs.every((log) => log.source === 'log' || log.source === 'info')
).toEqual(true) ).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) { function getCookieFromResponse(res, cookieName) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment