stream: fix addAbortSignal() for web streams#62450
Draft
ikeyan wants to merge 2 commits intonodejs:mainfrom
Draft
stream: fix addAbortSignal() for web streams#62450ikeyan wants to merge 2 commits intonodejs:mainfrom
ikeyan wants to merge 2 commits intonodejs:mainfrom
Conversation
Collaborator
|
Review requested:
|
Comment on lines
+1325
to
+1327
| stream[kControllerAbortFunction] = (reason) => { | ||
| setPromiseHandled(writableStreamAbort(stream, reason)); | ||
| }; |
Contributor
There was a problem hiding this comment.
Slightly off-topic: should we make this a class method instead? For WritableStream, we could do:
class WritableStream {
[kControllerAbortFunction](reason) {
setPromiseHandled(writableStreamAbort(this, reason));
}
}For ReadableStream, the method could check the type of this[kState].controller and then call either readableStreamDefaultControllerError or readableByteStreamControllerError.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes
stream.addAbortSignal()for web streams.addAbortSignal()usedkControllerErrorFunction, which mixed stream erroringwith abort handling.
For readable byte streams,
ReadableByteStreamControllerleft the default no-ophook in place, so
addAbortSignal()could not abort the stream.For writable streams,
WritableStreamDefaultControllerwired the hook tocontroller.error(), so the stream became errored butcontroller.signal.abortedstayedfalse.This replaces
kControllerErrorFunctionwithkControllerAbortFunctionandwires each controller to the internal operation that matches its abort path:
ReadableStreamDefaultControllerusesreadableStreamDefaultControllerError()ReadableByteStreamControllerusesreadableByteStreamControllerError()WritableStreamDefaultControlleruseswritableStreamAbort()The updated test covers
addAbortSignal()on readable byte streams, abortsthat race with pending pulls, writable abort signal state, and readable and
writable controllers with overridden public methods.