nodejs
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stream: fix `ReadableStreamReader.releaseLock()` 

Signed-off-by: Daeyeon Jeong daeyeon.dev@gmail.com
PR-URL: https://github.com/nodejs/node/pull/44292
Refs: https://streams.spec.whatwg.org/#default-reader-release-lock
Refs: https://streams.spec.whatwg.org/#byob-reader-release-lock
Refs: https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader/releaseLock
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
This commit is contained in:
Daeyeon Jeong 2022-08-27 20:27:10 +09:00 committed by GitHub
parent 5a40b074ab
commit cc75a3c11e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/internal/webstreams/readablestream.js
View File

@ -809,11 +809,7 @@ class ReadableStreamDefaultReader {
throw new ERR_INVALID_THIS('ReadableStreamDefaultReader');
if (this[kState].stream === undefined)
return;
if (this[kState].readRequests.length) {
throw new ERR_INVALID_STATE.TypeError(
'Cannot release with pending read requests');
}
readableStreamReaderGenericRelease(this);
readableStreamDefaultReaderRelease(this);
}
/**
@ -930,11 +926,7 @@ class ReadableStreamBYOBReader {
throw new ERR_INVALID_THIS('ReadableStreamBYOBReader');
if (this[kState].stream === undefined)
return;
if (this[kState].readIntoRequests.length) {
throw new ERR_INVALID_STATE.TypeError(
'Cannot release with pending read requests');
}
readableStreamReaderGenericRelease(this);
readableStreamBYOBReaderRelease(this);
}
/**
@ -1730,6 +1722,36 @@ function readableStreamReaderGenericInitialize(reader, stream) {
}
}
function readableStreamDefaultReaderRelease(reader) {
readableStreamReaderGenericRelease(reader);
readableStreamDefaultReaderErrorReadRequests(
reader,
new ERR_INVALID_STATE.TypeError('Releasing reader')
);
}
function readableStreamDefaultReaderErrorReadRequests(reader, e) {
for (let n = 0; n < reader[kState].readRequests.length; ++n) {
reader[kState].readRequests[n][kError](e);
}
reader[kState].readRequests = [];
}
function readableStreamBYOBReaderRelease(reader) {
readableStreamReaderGenericRelease(reader);
readableStreamBYOBReaderErrorReadIntoRequests(
reader,
new ERR_INVALID_STATE.TypeError('Releasing reader')
);
}
function readableStreamBYOBReaderErrorReadIntoRequests(reader, e) {
for (let n = 0; n < reader[kState].readIntoRequests.length; ++n) {
reader[kState].readIntoRequests[n][kError](e);
}
reader[kState].readIntoRequests = [];
}
function readableStreamReaderGenericRelease(reader) {
const {
stream,

18
test/parallel/test-whatwg-readablestream.js
View File

@ -328,17 +328,8 @@ assert.throws(() => {
const read1 = reader.read();
const read2 = reader.read();
// The stream is empty so the read will never settle.
read1.then(
common.mustNotCall(),
common.mustNotCall()
);
// The stream is empty so the read will never settle.
read2.then(
common.mustNotCall(),
common.mustNotCall()
);
read1.then(common.mustNotCall(), common.mustCall());
read2.then(common.mustNotCall(), common.mustCall());
assert.notStrictEqual(read1, read2);
@ -346,10 +337,9 @@ assert.throws(() => {
delay().then(common.mustCall());
assert.throws(() => reader.releaseLock(), {
code: 'ERR_INVALID_STATE',
});
assert(stream.locked);
reader.releaseLock();
assert(!stream.locked);
}
{

17
test/wpt/status/streams.json
View File

@ -31,9 +31,6 @@
"readable-byte-streams/general.any.js": {
"fail": {
"expected": [
"ReadableStream with byte source: releaseLock() on ReadableStreamDefaultReader must reject pending read()",
"ReadableStream with byte source: releaseLock() on ReadableStreamBYOBReader must reject pending read()",
"pull() resolving should not resolve read()",
"ReadableStream with byte source: enqueue() discards auto-allocated BYOB request",
"ReadableStream with byte source: releaseLock() with pending read(view), read(view) on second reader, respond()",
"ReadableStream with byte source: releaseLock() with pending read(view), read(view) on second reader with 1 element Uint16Array, respond(1)",
@ -87,20 +84,6 @@
"readable-streams/cross-realm-crash.window.js": {
"skip": "Browser-specific test"
},
"readable-streams/default-reader.any.js": {
"fail": {
"expected": [
"Second reader can read chunks after first reader was released with pending read requests"
]
}
},
"readable-streams/templated.any.js": {
"fail": {
"expected": [
"ReadableStream (empty) reader: releasing the lock should reject all pending read requests"
]
}
},
"transferable/deserialize-error.window.js": {
"skip": "Browser-specific test"
},