Revert "fix: Invoke cancel, only if the stream is not closed (#55684)"

ztanner · ztanner · commit 916e1bff9b77 · 2023-09-21T14:04:08.000-07:00
This reverts commit ea01649.
diff --git a/packages/next/src/server/pipe-readable.ts b/packages/next/src/server/pipe-readable.ts
@@ -58,7 +58,7 @@ export async function pipeReadable(
     // will also ensure the read promise rejects and frees our resources.
     if (!readerDone) {
       readerDone = true
-      if (!reader.closed) reader.cancel().catch(() => {})
+      reader.cancel().catch(() => {})
     }
   }
   writable.on('close', onClose)
@@ -88,7 +88,7 @@ export async function pipeReadable(
     // If we broke out of the loop because of a client disconnect, and the
     // close event hasn't yet fired, we can early cancel.
     if (!readerDone) {
-      if (!reader.closed) reader.cancel().catch(() => {})
+      reader.cancel().catch(() => {})
     }
 
     // If the client hasn't disconnected yet, end the writable so that the

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export async function pipeReadable(`
`58`	`58`	`// will also ensure the read promise rejects and frees our resources.`
`59`	`59`	`if (!readerDone) {`
`60`	`60`	`readerDone = true`
`61`		`- if (!reader.closed) reader.cancel().catch(() => {})`
	`61`	`+ reader.cancel().catch(() => {})`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`writable.on('close', onClose)`
`@@ -88,7 +88,7 @@ export async function pipeReadable(`
`88`	`88`	`// If we broke out of the loop because of a client disconnect, and the`
`89`	`89`	`// close event hasn't yet fired, we can early cancel.`
`90`	`90`	`if (!readerDone) {`
`91`		`- if (!reader.closed) reader.cancel().catch(() => {})`
	`91`	`+ reader.cancel().catch(() => {})`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// If the client hasn't disconnected yet, end the writable so that the`