Skip to content

Commit

Permalink
Revert "Fix stream cancellation in RenderResult.pipe() and `sendRes…
Browse files Browse the repository at this point in the history
  • Loading branch information
ijjk committed Jul 5, 2023
1 parent 9151362 commit 5046ee1
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 333 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,11 @@ async function render(request: NextRequest, event: NextFetchEvent) {
response.headers.append('Vary', RSC_VARY_HEADER)

const writer = tranform.writable.getWriter()
const target = {
result.pipe({
write: (chunk: Uint8Array) => writer.write(chunk),
end: () => writer.close(),
destroy: (reason?: Error) => writer.abort(reason),
closed: false,
}
const onClose = () => {
target.closed = true
}
// No, this cannot be replaced with `finally`, because early cancelling
// the stream will create a rejected promise, and finally will create an
// unhandled rejection.
writer.closed.then(onClose, onClose)
result.pipe(target)
})

return response
}
Expand Down
21 changes: 13 additions & 8 deletions packages/next/src/server/render-result.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export interface PipeTarget {
end: () => unknown
flush?: () => unknown
destroy: (err?: Error) => unknown
get closed(): boolean
}

export default class RenderResult {
Expand Down Expand Up @@ -112,25 +111,31 @@ export default class RenderResult {
: () => {}
const reader = this.response.getReader()

let shouldFatalError = false
try {
while (true) {
const result = await reader.read()

if (res.closed || result.done) {
break
}
let result = await reader.read()
if (!result.done) {
// As we're going to write to the response, we should destroy the
// response if an error occurs.
shouldFatalError = true
}

while (!result.done) {
// Write the data to the response.
res.write(result.value)

// Flush it to the client (if it supports flushing).
flush()

// Read the next chunk.
result = await reader.read()
}

// We're done writing to the response, so we can end it.
res.end()
} catch (err) {
if (!res.closed) {
// If we've written to the response, we should destroy it.
if (shouldFatalError) {
res.destroy(err as any)
}

Expand Down
1 change: 0 additions & 1 deletion packages/next/src/server/send-response.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export async function sendResponse(
const iterator = consumeUint8ArrayReadableStream(response.body)
try {
for await (const chunk of iterator) {
if (originalResponse.closed) break
originalResponse.write(chunk)
}
} finally {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ export const streamToBufferedResult = async (
},
end() {},
destroy() {},
closed: false,
}
await renderResult.pipe(writable)
await renderResult.pipe(writable as any)
return renderChunks.join('')
}

Expand Down
16 changes: 5 additions & 11 deletions packages/next/src/server/web-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,20 +421,14 @@ export default class NextWebServer extends BaseServer<WebServerOptions> {

if (options.result.isDynamic) {
const writer = res.transformStream.writable.getWriter()
const target = {
options.result.pipe({
write: (chunk: Uint8Array) => writer.write(chunk),
end: () => writer.close(),
destroy: (err: Error) => writer.abort(err),
closed: false,
} as any
const onClose = () => {
target.closed = true
}
// No, this cannot be replaced with `finally`, because early cancelling
// the stream will create a rejected promise, and finally will create an
// unhandled rejection.
writer.closed.then(onClose, onClose)
options.result.pipe(target)
cork: () => {},
uncork: () => {},
// Not implemented: on/removeListener
} as any)
} else {
const payload = await options.result.toUnchunkedString()
res.setHeader('Content-Length', String(byteLength(payload)))
Expand Down
26 changes: 0 additions & 26 deletions test/e2e/cancel-request/app/edge-route/route.ts

This file was deleted.

28 changes: 0 additions & 28 deletions test/e2e/cancel-request/app/node-route/route.ts

This file was deleted.

28 changes: 0 additions & 28 deletions test/e2e/cancel-request/middleware.ts

This file was deleted.

28 changes: 0 additions & 28 deletions test/e2e/cancel-request/pages/api/edge-api.ts

This file was deleted.

36 changes: 0 additions & 36 deletions test/e2e/cancel-request/pages/api/node-api.ts

This file was deleted.

22 changes: 0 additions & 22 deletions test/e2e/cancel-request/readable.ts

This file was deleted.

3 changes: 0 additions & 3 deletions test/e2e/cancel-request/sleep.ts

This file was deleted.

Loading

0 comments on commit 5046ee1

Please sign in to comment.