GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — stream: fix recursive WritableStream abort · nodejs/node@b89c8f5

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • lib/internal/webstreams
    • writablestream.js
  • test/wpt/status
    • streams.json
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎lib/internal/webstreams/writablestream.js‎

Copy file name to clipboardExpand all lines: lib/internal/webstreams/writablestream.js
+9-6Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -701,15 +701,18 @@ function writerReadyPromise(writer) {
701701
}
702702

703703
function writableStreamAbort(stream, reason) {
704-
const {
705-
state,
706-
controller,
707-
} = stream[kState];
704+
const { controller } = stream[kState];
705+
706+
let state = stream[kState].state;
708707
if (state === 'closed' || state === 'errored')
709708
return PromiseResolve();
710709

711710
controller[kState].abortController.abort(reason);
712711

712+
state = stream[kState].state;
713+
if (state === 'closed' || state === 'errored')
714+
return PromiseResolve();
715+
713716
if (stream[kState].pendingAbortRequest.abort.promise !== undefined)
714717
return stream[kState].pendingAbortRequest.abort.promise;
715718

@@ -807,7 +810,7 @@ function writableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
807810
}
808811

809812
const closedPromiseCache = stream[kState].closedPromise;
810-
if (closedPromiseCache !== undefined) {
813+
if (closedPromiseCache !== undefined && isPromisePending(closedPromiseCache.promise)) {
811814
setPromiseHandled(closedPromiseCache.promise);
812815
closedPromiseCache.reject(stream[kState].storedError);
813816
}
@@ -817,7 +820,7 @@ function writableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
817820
} = stream[kState];
818821
if (writer !== undefined) {
819822
const closeCache = writer[kState].close;
820-
if (closeCache !== undefined) {
823+
if (closeCache !== undefined && isPromisePending(closeCache.promise)) {
821824
setPromiseHandled(closeCache.promise);
822825
closeCache.reject(stream[kState].storedError);
823826
}
Collapse file

‎test/wpt/status/streams.json‎

Copy file name to clipboardExpand all lines: test/wpt/status/streams.json
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,5 @@
4343
},
4444
"transform-streams/invalid-realm.tentative.window.js": {
4545
"skip": "Browser-specific test"
46-
},
47-
"writable-streams/aborting.any.js": {
48-
"fail": {
49-
"note": "Recursive abort() call from within an abort algorithm triggers ERR_INTERNAL_ASSERTION",
50-
"expected": [
51-
"recursive abort() call from abort() aborting signal"
52-
]
53-
}
5446
}
5547
}

0 commit comments

Comments
0 (0)
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.