From 2ed1d35bb06df0a7adbdf224c9fb7d70f5b51d33 Mon Sep 17 00:00:00 2001 From: Youenn Fablet Date: Sun, 9 Apr 2023 13:58:50 +0200 Subject: [PATCH 1/4] Add support for a new ReadableStream "owning" type. --- .github/workflows/test.yml | 2 +- index.bs | 101 ++++++++++++------ .../lib/ReadableStream-impl.js | 2 +- .../ReadableStreamDefaultController-impl.js | 5 +- .../ReadableStreamDefaultController.webidl | 6 +- .../lib/UnderlyingSource.webidl | 2 +- .../lib/abstract-ops/miscellaneous.js | 4 + .../lib/abstract-ops/queue-with-sizes.js | 20 +++- .../lib/abstract-ops/readable-streams.js | 32 ++++-- .../lib/abstract-ops/transform-streams.js | 2 +- .../lib/abstract-ops/writable-streams.js | 4 +- .../run-web-platform-tests.js | 5 +- reference-implementation/web-platform-tests | 2 +- 13 files changed, 132 insertions(+), 55 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 25ede8c9d..f22650452 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,6 +19,6 @@ jobs: submodules: true - uses: actions/setup-node@v1 with: - node-version: 14 + node-version: 19 - run: npm install - run: npm test diff --git a/index.bs b/index.bs index da6a50aed..4cc09cbc9 100644 --- a/index.bs +++ b/index.bs @@ -19,6 +19,7 @@ spec:infra; type:dfn; text:list spec:html; type:dfn; text:entangle spec:html; type:dfn; text:message port post message steps spec:html; type:dfn; text:port message queue +spec:html; type:dfn; text:transferable objects
@@ -571,7 +572,7 @@ callback UnderlyingSourceStartCallback = any (ReadableStreamController controlle
 callback UnderlyingSourcePullCallback = Promise (ReadableStreamController controller);
 callback UnderlyingSourceCancelCallback = Promise (optional any reason);
 
-enum ReadableStreamType { "bytes" };
+enum ReadableStreamType { "bytes", "owning" };
 
 
 
@@ -639,8 +640,7 @@ enum ReadableStreamType { "bytes" }; something more persistently wrong. -
type (byte streams - only)
+
type

Can be set to "bytes" to signal that the constructed {{ReadableStream}} is a readable byte stream. This ensures that the resulting @@ -651,8 +651,16 @@ enum ReadableStreamType { "bytes" };

For an example of how to set up a readable byte stream, including using the different controller interface, see [[#example-rbs-push]]. -

Setting any value other than "{{ReadableStreamType/bytes}}" or undefined will cause the - {{ReadableStream()}} constructor to throw an exception. +

Can be set to "owning" to signal that the + constructed {{ReadableStream}} will own chunks (via transfer or serialization) before enqueuing them. + This ensures that enqueued chunks are not mutable by the source. + Transferred or serialized chunks may have closing steps which are executed if + enqueued chunks are dequeued without being provided to the application, for instance when + a {{ReadableStream}} is errored. +

+ +

Setting any value other than "{{ReadableStreamType/bytes}}", "{{ReadableStreamType/owning}}" + or undefined will cause the {{ReadableStream()}} constructor to throw an exception.

autoAllocateChunkSize (byte streams only)
@@ -801,7 +809,8 @@ option. If {{UnderlyingSource/type}} is set to undefined (including via omission 1. Perform ? [$SetUpReadableByteStreamControllerFromUnderlyingSource$]([=this=], |underlyingSource|, |underlyingSourceDict|, |highWaterMark|). 1. Otherwise, - 1. Assert: |underlyingSourceDict|["{{UnderlyingSource/type}}"] does not [=map/exist=]. + 1. Assert: |underlyingSourceDict|["{{UnderlyingSource/type}}"] does not [=map/exist=] or + is "{{ReadableStreamType/owning}}". 1. Let |sizeAlgorithm| be ! [$ExtractSizeAlgorithm$](|strategy|). 1. Let |highWaterMark| be ? [$ExtractHighWaterMark$](|strategy|, 1). 1. Perform ? [$SetUpReadableStreamDefaultControllerFromUnderlyingSource$]([=this=], @@ -1461,7 +1470,7 @@ interface ReadableStreamDefaultController { readonly attribute unrestricted double? desiredSize; undefined close(); - undefined enqueue(optional any chunk); + undefined enqueue(optional any chunk, optional StructuredSerializeOptions options = { }); undefined error(optional any e); }; @@ -1523,6 +1532,10 @@ the following table: \[[stream]] The {{ReadableStream}} instance controlled + + \[[isOwning]] + A boolean flag indicating whether to take ownership of enqueued chunks + via transfer or serialization.

Methods and properties

@@ -1569,11 +1582,12 @@ the following table:
The enqueue(|chunk|) method steps are: + for="ReadableStreamDefaultController">enqueue(|chunk|, |options|) method steps are: + 1. Let |transferList| be |options|["transfer"]. 1. If ! [$ReadableStreamDefaultControllerCanCloseOrEnqueue$]([=this=]) is false, throw a {{TypeError}} exception. - 1. Perform ? [$ReadableStreamDefaultControllerEnqueue$]([=this=], |chunk|). + 1. Perform ? [$ReadableStreamDefaultControllerEnqueue$]([=this=], |chunk|, |transferList|).
@@ -2235,8 +2249,8 @@ create them does not matter. objects|transferring=] their [=chunks=]. However, it does introduce a noticeable asymmetry between the two branches, and limits the possible [=chunks=] to serializable ones. [[!HTML]] - If |stream| is a [=readable byte stream=], then |cloneForBranch2| is ignored and chunks are cloned - unconditionally. + If |stream| is a [=readable byte stream=], or if |stream| type is "{{ReadableStreamType/owning}}", + then |cloneForBranch2| is ignored and chunks are cloned unconditionally.

In this standard ReadableStreamTee is always called with |cloneForBranch2| set to false; other specifications pass true via the [=ReadableStream/tee=] wrapper algorithm. @@ -2247,6 +2261,8 @@ create them does not matter. 1. Assert: |cloneForBranch2| is a boolean. 1. If |stream|.[=ReadableStream/[[controller]]=] [=implements=] {{ReadableByteStreamController}}, return ? [$ReadableByteStreamTee$](|stream|). + 1. If |stream|.[=ReadableStream/[[controller]]=].[=ReadableStreamDefaultController/[[isOwning]]=] + is true, return ? [$ReadableStreamDefaultTee$](|stream|, true). 1. Return ? [$ReadableStreamDefaultTee$](|stream|, |cloneForBranch2|).

@@ -2287,10 +2303,10 @@ create them does not matter. 1. Otherwise, set |chunk2| to |cloneResult|.\[[Value]]. 1. If |canceled1| is false, perform ! [$ReadableStreamDefaultControllerEnqueue$](|branch1|.[=ReadableStream/[[controller]]=], - |chunk1|). + |chunk1|, undefined). 1. If |canceled2| is false, perform ! [$ReadableStreamDefaultControllerEnqueue$](|branch2|.[=ReadableStream/[[controller]]=], - |chunk2|). + |chunk2|, undefined). 1. Set |reading| to false. 1. If |readAgain| is true, perform |pullAlgorithm|. @@ -2950,13 +2966,19 @@ The following abstract operations support the implementation of the
ReadableStreamDefaultControllerEnqueue(|controller|, - |chunk|) performs the following steps: + |chunk|, |transferList|) performs the following steps: 1. If ! [$ReadableStreamDefaultControllerCanCloseOrEnqueue$](|controller|) is false, return. 1. Let |stream| be |controller|.[=ReadableStreamDefaultController/[[stream]]=]. 1. If ! [$IsReadableStreamLocked$](|stream|) is true and ! - [$ReadableStreamGetNumReadRequests$](|stream|) > 0, perform ! - [$ReadableStreamFulfillReadRequest$](|stream|, |chunk|, false). + [$ReadableStreamGetNumReadRequests$](|stream|) > 0, perform the following steps: + 1. Let |internalChunk| be |chunk|. + 1. If |controller|.[=ReadableStreamDefaultController/[[isOwning]]=] is true, perform the following steps: + 1. Set |internalChunk| to [$StructuredTransferOrClone$](|chunk|, |transferList|). + 1. If |internalChunk| is an abrupt completion, + 1. Perform ! [$ReadableStreamDefaultControllerError$](|controller|, |internalChunk|.\[[Value]]). + 1. Return |internalChunk|. + 1. Perform ! [$ReadableStreamFulfillReadRequest$](|stream|, |internalChunk|, false). 1. Otherwise, 1. Let |result| be the result of performing |controller|.[=ReadableStreamDefaultController/[[strategySizeAlgorithm]]=], passing in |chunk|, @@ -2965,7 +2987,7 @@ The following abstract operations support the implementation of the 1. Perform ! [$ReadableStreamDefaultControllerError$](|controller|, |result|.\[[Value]]). 1. Return |result|. 1. Let |chunkSize| be |result|.\[[Value]]. - 1. Let |enqueueResult| be [$EnqueueValueWithSize$](|controller|, |chunk|, |chunkSize|). + 1. Let |enqueueResult| be [$EnqueueValueWithSize$](|controller|, |chunk|, |chunkSize|, |transferList|). 1. If |enqueueResult| is an abrupt completion, 1. Perform ! [$ReadableStreamDefaultControllerError$](|controller|, |enqueueResult|.\[[Value]]). 1. Return |enqueueResult|. @@ -3029,7 +3051,7 @@ The following abstract operations support the implementation of the SetUpReadableStreamDefaultController(|stream|, |controller|, |startAlgorithm|, |pullAlgorithm|, |cancelAlgorithm|, |highWaterMark|, - |sizeAlgorithm|) performs the following steps: + |sizeAlgorithm|, |isOwning|) performs the following steps: 1. Assert: |stream|.[=ReadableStream/[[controller]]=] is undefined. 1. Set |controller|.[=ReadableStreamDefaultController/[[stream]]=] to |stream|. @@ -3039,8 +3061,9 @@ The following abstract operations support the implementation of the |controller|.[=ReadableStreamDefaultController/[[pullAgain]]=], and |controller|.[=ReadableStreamDefaultController/[[pulling]]=] to false. 1. Set |controller|.[=ReadableStreamDefaultController/[[strategySizeAlgorithm]]=] to - |sizeAlgorithm| and |controller|.[=ReadableStreamDefaultController/[[strategyHWM]]=] to - |highWaterMark|. + |sizeAlgorithm|, |controller|.[=ReadableStreamDefaultController/[[strategyHWM]]=] to + |highWaterMark| and |controller|.[=ReadableStreamDefaultController/[[isOwning]]=] to + |isOwning|. 1. Set |controller|.[=ReadableStreamDefaultController/[[pullAlgorithm]]=] to |pullAlgorithm|. 1. Set |controller|.[=ReadableStreamDefaultController/[[cancelAlgorithm]]=] to |cancelAlgorithm|. 1. Set |stream|.[=ReadableStream/[[controller]]=] to |controller|. @@ -3065,6 +3088,8 @@ The following abstract operations support the implementation of the 1. Let |startAlgorithm| be an algorithm that returns undefined. 1. Let |pullAlgorithm| be an algorithm that returns [=a promise resolved with=] undefined. 1. Let |cancelAlgorithm| be an algorithm that returns [=a promise resolved with=] undefined. + 1. Let |isOwning| be true if |underlyingSourceDict|["{{UnderlyingSource/type}}"] is + "{{ReadableStreamType/owning}}" and false otherwise. 1. If |underlyingSourceDict|["{{UnderlyingSource/start}}"] [=map/exists=], then set |startAlgorithm| to an algorithm which returns the result of [=invoking=] |underlyingSourceDict|["{{UnderlyingSource/start}}"] with argument list @@ -3078,7 +3103,7 @@ The following abstract operations support the implementation of the [=invoking=] |underlyingSourceDict|["{{UnderlyingSource/cancel}}"] with argument list « |reason| » and [=callback this value=] |underlyingSource|. 1. Perform ? [$SetUpReadableStreamDefaultController$](|stream|, |controller|, |startAlgorithm|, - |pullAlgorithm|, |cancelAlgorithm|, |highWaterMark|, |sizeAlgorithm|). + |pullAlgorithm|, |cancelAlgorithm|, |highWaterMark|, |sizeAlgorithm|, |isOwning|).

Byte stream controllers

@@ -5186,7 +5211,7 @@ The following abstract operations support the implementation of the id="writable-stream-default-controller-close">WritableStreamDefaultControllerClose(|controller|) performs the following steps: - 1. Perform ! [$EnqueueValueWithSize$](|controller|, [=close sentinel=], 0). + 1. Perform ! [$EnqueueValueWithSize$](|controller|, [=close sentinel=], 0, undefined). 1. Perform ! [$WritableStreamDefaultControllerAdvanceQueueIfNeeded$](|controller|). @@ -5290,7 +5315,7 @@ The following abstract operations support the implementation of the id="writable-stream-default-controller-write">WritableStreamDefaultControllerWrite(|controller|, |chunk|, |chunkSize|) performs the following steps: - 1. Let |enqueueResult| be [$EnqueueValueWithSize$](|controller|, |chunk|, |chunkSize|). + 1. Let |enqueueResult| be [$EnqueueValueWithSize$](|controller|, |chunk|, |chunkSize|, undefined). 1. If |enqueueResult| is an abrupt completion, 1. Perform ! [$WritableStreamDefaultControllerErrorIfNeeded$](|controller|, |enqueueResult|.\[[Value]]). @@ -5884,7 +5909,7 @@ The following abstract operations support the implementaiton of the 1. If ! [$ReadableStreamDefaultControllerCanCloseOrEnqueue$](|readableController|) is false, throw a {{TypeError}} exception. 1. Let |enqueueResult| be [$ReadableStreamDefaultControllerEnqueue$](|readableController|, - |chunk|). + |chunk|, undefined). 1. If |enqueueResult| is an abrupt completion, 1. Perform ! [$TransformStreamErrorWritableAndUnblockWrite$](|stream|, |enqueueResult|.\[[Value]]). @@ -6362,13 +6387,17 @@ for="value-with-size">value and size.
EnqueueValueWithSize(|container|, |value|, |size|) performs the + id="enqueue-value-with-size">EnqueueValueWithSize(|container|, |value|, |size|, |transferList|) performs the following steps: 1. Assert: |container| has \[[queue]] and \[[queueTotalSize]] internal slots. 1. If ! [$IsNonNegativeNumber$](|size|) is false, throw a {{RangeError}} exception. 1. If |size| is +∞, throw a {{RangeError}} exception. - 1. [=list/Append=] a new [=value-with-size=] with [=value-with-size/value=] |value| and + 1. Let |enqueuedValue| be |value|. + 1. If |container| has a \[[isOwning]] internal slot whose value is true, perform the following steps: + 1. Set |enqueuedValue| to [$StructuredTransferOrClone$](|value|, |transferList|). + 1. If |enqueuedValue| is an abrupt completion, return |enqueuedValue|. + 1. [=list/Append=] a new [=value-with-size=] with [=value-with-size/value=] |enqueuedValue| and [=value-with-size/size=] |size| to |container|.\[[queue]]. 1. Set |container|.\[[queueTotalSize]] to |container|.\[[queueTotalSize]] + |size|.
@@ -6388,6 +6417,10 @@ for="value-with-size">value and size. performs the following steps: 1. Assert: |container| has \[[queue]] and \[[queueTotalSize]] internal slots. + 1. If |container| has a \[[isOwning]] internal slot whose value is true, perform the following steps until |container|.\[[queue]] + is [=list/is empty|empty=]: + 1. Let |chunk| be ! [$DequeueValue$]([=this=]). + 1. If |chunk| has [=closing steps=], perform the [=closing steps=] given |chunk|. 1. Set |container|.\[[queue]] to a new empty [=list=]. 1. Set |container|.\[[queueTotalSize]] to 0. @@ -6447,7 +6480,7 @@ abstract operations are used to implement these "cross-realm transforms". 1. Let |value| be ! [$Get$](|data|, "`value`"). 1. Assert: [$Type$](|type|) is String. 1. If |type| is "`chunk`", - 1. Perform ! [$ReadableStreamDefaultControllerEnqueue$](|controller|, |value|). + 1. Perform ! [$ReadableStreamDefaultControllerEnqueue$](|controller|, |value|, undefined). 1. Otherwise, if |type| is "`close`", 1. Perform ! [$ReadableStreamDefaultControllerClose$](|controller|). 1. Disentangle |port|. @@ -6596,6 +6629,14 @@ The following abstract operations are a grab-bag of utilities. 1. Return ? [$StructuredDeserialize$](|serialized|, [=the current Realm=]). +
+ StructuredTransferOrClone(|value|, |transferList|) + performs the following steps: + 1. Let |serialized| be ! [$StructuredSerializeWithTransfer$](|value|, |transferList|). + 1. Let |deserialized| be ! [$StructuredDeserializeWithTransfer$](|serialized|, [=the current Realm=]). + 1. Return |deserialized|.\[[Deserialized]]. +
+

Using streams in other specifications

Much of this standard concerns itself with the internal machinery of streams. Other specifications @@ -6727,13 +6768,13 @@ mark=] is greater than zero.
- To enqueue the JavaScript value |chunk| into a - {{ReadableStream}} |stream|: + To enqueue the JavaScript value |chunk| + with an optional |transferList| into a {{ReadableStream}} |stream|: 1. If |stream|.[=ReadableStream/[[controller]]=] [=implements=] {{ReadableStreamDefaultController}}, 1. Perform ! [$ReadableStreamDefaultControllerEnqueue$](|stream|.[=ReadableStream/[[controller]]=], - |chunk|). + |chunk|, |transferList|). 1. Otherwise, 1. Assert: |stream|.[=ReadableStream/[[controller]]=] [=implements=] {{ReadableByteStreamController}}. diff --git a/reference-implementation/lib/ReadableStream-impl.js b/reference-implementation/lib/ReadableStream-impl.js index 1eda283e1..47bde08b7 100644 --- a/reference-implementation/lib/ReadableStream-impl.js +++ b/reference-implementation/lib/ReadableStream-impl.js @@ -29,7 +29,7 @@ exports.implementation = class ReadableStreamImpl { this, underlyingSource, underlyingSourceDict, highWaterMark ); } else { - assert(!('type' in underlyingSourceDict)); + assert(!('type' in underlyingSourceDict) || underlyingSourceDict.type === 'owning'); const sizeAlgorithm = ExtractSizeAlgorithm(strategy); const highWaterMark = ExtractHighWaterMark(strategy, 1); aos.SetUpReadableStreamDefaultControllerFromUnderlyingSource( diff --git a/reference-implementation/lib/ReadableStreamDefaultController-impl.js b/reference-implementation/lib/ReadableStreamDefaultController-impl.js index 5c7ec7033..d29faf89b 100644 --- a/reference-implementation/lib/ReadableStreamDefaultController-impl.js +++ b/reference-implementation/lib/ReadableStreamDefaultController-impl.js @@ -17,12 +17,13 @@ exports.implementation = class ReadableStreamDefaultControllerImpl { aos.ReadableStreamDefaultControllerClose(this); } - enqueue(chunk) { + enqueue(chunk, options) { + const transferList = options ? options.transfer : undefined; if (aos.ReadableStreamDefaultControllerCanCloseOrEnqueue(this) === false) { throw new TypeError('The stream is not in a state that permits enqueue'); } - return aos.ReadableStreamDefaultControllerEnqueue(this, chunk); + return aos.ReadableStreamDefaultControllerEnqueue(this, chunk, transferList); } error(e) { diff --git a/reference-implementation/lib/ReadableStreamDefaultController.webidl b/reference-implementation/lib/ReadableStreamDefaultController.webidl index aeea7249f..dc02cfdcb 100644 --- a/reference-implementation/lib/ReadableStreamDefaultController.webidl +++ b/reference-implementation/lib/ReadableStreamDefaultController.webidl @@ -1,8 +1,12 @@ +dictionary StructuredSerializeOptions { + sequence transfer = []; +}; + [Exposed=(Window,Worker,Worklet)] interface ReadableStreamDefaultController { readonly attribute unrestricted double? desiredSize; undefined close(); - undefined enqueue(optional any chunk); + undefined enqueue(optional any chunk, optional StructuredSerializeOptions options = { }); undefined error(optional any e); }; diff --git a/reference-implementation/lib/UnderlyingSource.webidl b/reference-implementation/lib/UnderlyingSource.webidl index 7a0047638..b8aa75b70 100644 --- a/reference-implementation/lib/UnderlyingSource.webidl +++ b/reference-implementation/lib/UnderlyingSource.webidl @@ -12,4 +12,4 @@ callback UnderlyingSourceStartCallback = any (ReadableStreamController controlle callback UnderlyingSourcePullCallback = Promise (ReadableStreamController controller); callback UnderlyingSourceCancelCallback = Promise (optional any reason); -enum ReadableStreamType { "bytes" }; +enum ReadableStreamType { "bytes", "owning" }; diff --git a/reference-implementation/lib/abstract-ops/miscellaneous.js b/reference-implementation/lib/abstract-ops/miscellaneous.js index 08589a740..ed55a5268 100644 --- a/reference-implementation/lib/abstract-ops/miscellaneous.js +++ b/reference-implementation/lib/abstract-ops/miscellaneous.js @@ -20,3 +20,7 @@ exports.CloneAsUint8Array = O => { const buffer = O.buffer.slice(O.byteOffset, O.byteOffset + O.byteLength); return new Uint8Array(buffer); }; + +exports.StructuredTransferOrClone = (value, transferList) => { + return globalThis.structuredClone(value, { transfer: transferList }); +}; diff --git a/reference-implementation/lib/abstract-ops/queue-with-sizes.js b/reference-implementation/lib/abstract-ops/queue-with-sizes.js index 22086caa5..4cc668e57 100644 --- a/reference-implementation/lib/abstract-ops/queue-with-sizes.js +++ b/reference-implementation/lib/abstract-ops/queue-with-sizes.js @@ -1,6 +1,6 @@ 'use strict'; const assert = require('assert'); -const { IsNonNegativeNumber } = require('./miscellaneous.js'); +const { IsNonNegativeNumber, StructuredTransferOrClone } = require('./miscellaneous.js'); exports.DequeueValue = container => { assert('_queue' in container && '_queueTotalSize' in container); @@ -15,7 +15,7 @@ exports.DequeueValue = container => { return pair.value; }; -exports.EnqueueValueWithSize = (container, value, size) => { +exports.EnqueueValueWithSize = (container, value, size, transferList) => { assert('_queue' in container && '_queueTotalSize' in container); if (!IsNonNegativeNumber(size)) { @@ -24,7 +24,9 @@ exports.EnqueueValueWithSize = (container, value, size) => { if (size === Infinity) { throw new RangeError('Size must be a finite, non-NaN, non-negative number.'); } - + if (container._isOwning) { + value = StructuredTransferOrClone(value, transferList); + } container._queue.push({ value, size }); container._queueTotalSize += size; }; @@ -40,6 +42,18 @@ exports.PeekQueueValue = container => { exports.ResetQueue = container => { assert('_queue' in container && '_queueTotalSize' in container); + if (container._isOwning) { + while (container._queue.length > 0) { + const value = exports.DequeueValue(container); + if (typeof value.close === 'function') { + try { + value.close(); + } catch (closeException) { + // Nothing to do. + } + } + } + } container._queue = []; container._queueTotalSize = 0; }; diff --git a/reference-implementation/lib/abstract-ops/readable-streams.js b/reference-implementation/lib/abstract-ops/readable-streams.js index db1da4c73..98b0a35fb 100644 --- a/reference-implementation/lib/abstract-ops/readable-streams.js +++ b/reference-implementation/lib/abstract-ops/readable-streams.js @@ -6,7 +6,7 @@ const { promiseResolvedWith, promiseRejectedWith, newPromise, resolvePromise, re require('../helpers/webidl.js'); const { CanTransferArrayBuffer, CopyDataBlockBytes, CreateArrayFromList, IsDetachedBuffer, TransferArrayBuffer } = require('./ecmascript.js'); -const { CloneAsUint8Array, IsNonNegativeNumber } = require('./miscellaneous.js'); +const { CloneAsUint8Array, IsNonNegativeNumber, StructuredTransferOrClone } = require('./miscellaneous.js'); const { EnqueueValueWithSize, ResetQueue } = require('./queue-with-sizes.js'); const { AcquireWritableStreamDefaultWriter, IsWritableStreamLocked, WritableStreamAbort, WritableStreamDefaultWriterCloseWithErrorPropagation, WritableStreamDefaultWriterRelease, @@ -89,7 +89,7 @@ function CreateReadableStream(startAlgorithm, pullAlgorithm, cancelAlgorithm, hi const controller = ReadableStreamDefaultController.new(globalThis); SetUpReadableStreamDefaultController( - stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm + stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm, false ); return stream; @@ -340,7 +340,7 @@ function ReadableStreamTee(stream, cloneForBranch2) { if (ReadableByteStreamController.isImpl(stream._controller)) { return ReadableByteStreamTee(stream); } - return ReadableStreamDefaultTee(stream, cloneForBranch2); + return ReadableStreamDefaultTee(stream, stream._controller._isOwning ? true : cloneForBranch2); } function ReadableStreamDefaultTee(stream, cloneForBranch2) { @@ -392,10 +392,10 @@ function ReadableStreamDefaultTee(stream, cloneForBranch2) { // } if (canceled1 === false) { - ReadableStreamDefaultControllerEnqueue(branch1._controller, chunk1); + ReadableStreamDefaultControllerEnqueue(branch1._controller, chunk1, undefined); } if (canceled2 === false) { - ReadableStreamDefaultControllerEnqueue(branch2._controller, chunk2); + ReadableStreamDefaultControllerEnqueue(branch2._controller, chunk2, undefined); } reading = false; @@ -1074,7 +1074,7 @@ function ReadableStreamDefaultControllerClose(controller) { } } -function ReadableStreamDefaultControllerEnqueue(controller, chunk) { +function ReadableStreamDefaultControllerEnqueue(controller, chunk, transferList) { if (ReadableStreamDefaultControllerCanCloseOrEnqueue(controller) === false) { return; } @@ -1082,6 +1082,14 @@ function ReadableStreamDefaultControllerEnqueue(controller, chunk) { const stream = controller._stream; if (IsReadableStreamLocked(stream) === true && ReadableStreamGetNumReadRequests(stream) > 0) { + if (controller._isOwning) { + try { + chunk = StructuredTransferOrClone(chunk, transferList); + } catch (chunkCloneError) { + ReadableStreamDefaultControllerError(controller, chunkCloneError); + throw chunkCloneError; + } + } ReadableStreamFulfillReadRequest(stream, chunk, false); } else { let chunkSize; @@ -1093,7 +1101,7 @@ function ReadableStreamDefaultControllerEnqueue(controller, chunk) { } try { - EnqueueValueWithSize(controller, chunk, chunkSize); + EnqueueValueWithSize(controller, chunk, chunkSize, transferList); } catch (enqueueE) { ReadableStreamDefaultControllerError(controller, enqueueE); throw enqueueE; @@ -1148,7 +1156,7 @@ function ReadableStreamDefaultControllerCanCloseOrEnqueue(controller) { } function SetUpReadableStreamDefaultController( - stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm) { + stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm, isOwning) { assert(stream._controller === undefined); controller._stream = stream; @@ -1169,6 +1177,8 @@ function SetUpReadableStreamDefaultController( controller._pullAlgorithm = pullAlgorithm; controller._cancelAlgorithm = cancelAlgorithm; + controller._isOwning = isOwning; + stream._controller = controller; const startResult = startAlgorithm(); @@ -1195,7 +1205,7 @@ function SetUpReadableStreamDefaultControllerFromUnderlyingSource( let startAlgorithm = () => undefined; let pullAlgorithm = () => promiseResolvedWith(undefined); let cancelAlgorithm = () => promiseResolvedWith(undefined); - + const isOwning = underlyingSourceDict.type === 'owning'; if ('start' in underlyingSourceDict) { startAlgorithm = () => underlyingSourceDict.start.call(underlyingSource, controller); } @@ -1207,8 +1217,8 @@ function SetUpReadableStreamDefaultControllerFromUnderlyingSource( } SetUpReadableStreamDefaultController( - stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm - ); + stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm, + isOwning); } // Byte stream controllers diff --git a/reference-implementation/lib/abstract-ops/transform-streams.js b/reference-implementation/lib/abstract-ops/transform-streams.js index 8e3f5fcc3..1152d19de 100644 --- a/reference-implementation/lib/abstract-ops/transform-streams.js +++ b/reference-implementation/lib/abstract-ops/transform-streams.js @@ -155,7 +155,7 @@ function TransformStreamDefaultControllerEnqueue(controller, chunk) { // accept TransformStreamDefaultControllerEnqueue() calls. try { - ReadableStreamDefaultControllerEnqueue(readableController, chunk); + ReadableStreamDefaultControllerEnqueue(readableController, chunk, undefined); } catch (e) { // This happens when readableStrategy.size() throws. TransformStreamErrorWritableAndUnblockWrite(stream, e); diff --git a/reference-implementation/lib/abstract-ops/writable-streams.js b/reference-implementation/lib/abstract-ops/writable-streams.js index cf303bfe7..88eef0888 100644 --- a/reference-implementation/lib/abstract-ops/writable-streams.js +++ b/reference-implementation/lib/abstract-ops/writable-streams.js @@ -637,7 +637,7 @@ function WritableStreamDefaultControllerClearAlgorithms(controller) { } function WritableStreamDefaultControllerClose(controller) { - EnqueueValueWithSize(controller, closeSentinel, 0); + EnqueueValueWithSize(controller, closeSentinel, 0, undefined); WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller); } @@ -729,7 +729,7 @@ function WritableStreamDefaultControllerProcessWrite(controller, chunk) { function WritableStreamDefaultControllerWrite(controller, chunk, chunkSize) { try { - EnqueueValueWithSize(controller, chunk, chunkSize); + EnqueueValueWithSize(controller, chunk, chunkSize, undefined); } catch (enqueueE) { WritableStreamDefaultControllerErrorIfNeeded(controller, enqueueE); return; diff --git a/reference-implementation/run-web-platform-tests.js b/reference-implementation/run-web-platform-tests.js index 836911eeb..8d857c9f7 100644 --- a/reference-implementation/run-web-platform-tests.js +++ b/reference-implementation/run-web-platform-tests.js @@ -35,7 +35,9 @@ async function main() { const excludeGlobs = [ // These tests use ArrayBuffers backed by WebAssembly.Memory objects, which *should* be non-transferable. // However, our TransferArrayBuffer implementation cannot detect these, and will incorrectly "transfer" them anyway. - 'readable-byte-streams/non-transferable-buffers.any.html' + 'readable-byte-streams/non-transferable-buffers.any.html', + 'readable-streams/owning-type-message-port.any.html', // MessagePort is not defined. + 'readable-streams/owning-type-video-frame.any.html' // VideoFrame is not defined. ]; const anyTestPattern = /\.any\.html$/; @@ -58,6 +60,7 @@ async function main() { } }; }; + window.structuredClone = globalThis.structuredClone; window.eval(bundledJS); }, filter(testPath) { diff --git a/reference-implementation/web-platform-tests b/reference-implementation/web-platform-tests index 6a46d9cb8..35ad0cf07 160000 --- a/reference-implementation/web-platform-tests +++ b/reference-implementation/web-platform-tests @@ -1 +1 @@ -Subproject commit 6a46d9cb8d20c510a620141c721b81b460a4ee55 +Subproject commit 35ad0cf07278adce002370d29d94aeb1da83e537 From c4ebc021c4db9fffd3d27e4f66cb55c9d2f854e1 Mon Sep 17 00:00:00 2001 From: Youenn Fablet Date: Mon, 17 Apr 2023 18:16:22 +0200 Subject: [PATCH 2/4] Add writable stream owning type --- index.bs | 72 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 18 deletions(-) diff --git a/index.bs b/index.bs index 4cc09cbc9..4e70906b4 100644 --- a/index.bs +++ b/index.bs @@ -2155,6 +2155,26 @@ The following abstract operations operate on {{ReadableStream}} instances at a h the operations below, the JavaScript-modifiable reader, writer, and stream APIs (i.e. methods on the appropriate prototypes) must not be used. Instead, the streams must be manipulated directly. +

+ {{WritableStream}} "{{WritableStreamType/owning}}" and {{ReadableStream}} "{{ReadableStreamType/owning}}" + has some impact on the piping operation: + - Piping a not owning {{ReadableStream}} to a not owning {{WritableStream}} will enqueue + the exact samne JavaScript values. + - Piping an owning {{ReadableStream}} to an owning {{WritableStream}} is similar to the above case, + as ownership will be transferred from the {{ReadableStream}} to the {{WritableStream}}. + In case of error during the piping operation, the user Agent is responsible to call the + necessary [=closing steps=] of the JavaScript values that were dequeud from the + {{ReadableStream}} but not successfully enqueued in the {{WritableStream}}. + - Piping an owning {{ReadableStream}} to a not owning {{WritableStream}} will enqueue + the serialized/transfered JavaScript values. + In case of error during the piping operation, the user Agent is responsible to call the + necessary [=closing steps=] of the JavaScript values that were dequeud from the + {{ReadableStream}} but not successfully enqueued in the {{WritableStream}}. + Note that [=closing steps=] of the enqueued JavaScript values in the {{WritableStream}} + will not be called automatically. It is up to the application to handle this. + - Piping a not owning {{ReadableStream}} to an owning {{WritableStream}} will trigger + serialization of the {{ReadableStream}} chunks when enqueued in {{WritableStream}}. + Piping may fail if the serialization fails, say in case of transferable-only JavaScript values. * Backpressure must be enforced: * While [$WritableStreamDefaultWriterGetDesiredSize$](|writer|) is ≤ 0 or is null, the user agent must not read from |reader|. @@ -4004,13 +4024,14 @@ dictionary UnderlyingSink { UnderlyingSinkWriteCallback write; UnderlyingSinkCloseCallback close; UnderlyingSinkAbortCallback abort; - any type; + WritableStreamType type; }; callback UnderlyingSinkStartCallback = any (WritableStreamDefaultController controller); callback UnderlyingSinkWriteCallback = Promise (any chunk, WritableStreamDefaultController controller); callback UnderlyingSinkCloseCallback = Promise (); callback UnderlyingSinkAbortCallback = Promise (optional any reason); +enum WritableStreamType { "owning" };

@@ -4096,8 +4117,15 @@ callback UnderlyingSinkAbortCallback = Promise (optional any reason);
type
-

This property is reserved for future use, so any attempts to supply a value will throw an - exception. +

Can be set to "owning" to signal that the + constructed {{WritableStream}} will own chunks (via transfer or serialization) before enqueuing them. + This ensures that enqueued chunks are not mutable by the source. + Transferred or serialized chunks may have [=closing steps=]] which are executed if + enqueued chunks are dequeued without being provided to the application, for instance when + a {{WritableStream}} is errored. + +

Setting any value other than "{{WritableStreamType/owning}}" or undefined will cause the + {{WritableStream()}} constructor to throw an exception.

The controller argument passed to {{UnderlyingSink/start|start()}} and @@ -4166,10 +4194,6 @@ as seen for example in [[#example-ws-no-backpressure]].

We cannot declare the |underlyingSink| argument as having the {{UnderlyingSink}} type directly, because doing so would lose the reference to the original object. We need to retain the object so we can [=invoke=] the various methods on it. - 1. If |underlyingSinkDict|["{{UnderlyingSink/type}}"] [=map/exists=], throw a {{RangeError}} - exception. -

This is to allow us to add new potential types in the future, without - backward-compatibility concerns. 1. Perform ! [$InitializeWritableStream$]([=this=]). 1. Let |sizeAlgorithm| be ! [$ExtractSizeAlgorithm$](|strategy|). 1. Let |highWaterMark| be ? [$ExtractHighWaterMark$](|strategy|, 1). @@ -4264,7 +4288,7 @@ interface WritableStreamDefaultWriter { Promise abort(optional any reason); Promise close(); undefined releaseLock(); - Promise write(optional any chunk); + Promise write(optional any chunk, optional StructuredSerializeOptions options = { }); }; @@ -4349,19 +4373,23 @@ following table: lock on the writer for the duration of the write; the lock instead simply prevents other [=producers=] from writing in an interleaved manner. -

await writer.{{WritableStreamDefaultWriter/write(chunk)|write}}(chunk) +
await writer.{{WritableStreamDefaultWriter/write(chunk, options)|write}}(chunk, options)

Writes the given [=chunk=] to the writable stream, by waiting until any previous writes have finished successfully, and then sending the [=chunk=] to the [=underlying sink=]'s {{UnderlyingSink/write|write()}} method. It will return a promise that fulfills with undefined upon a successful write, or rejects if the write fails or stream becomes errored before the writing process is initiated. +

If the writable stream has its type set to "{{WritableStreamType/owning}}", the given [=chunk=] + is serialized with [=options=], which ensures that mutating [=chunk=] will have no impact on what + is written by the writable stream.

Note that what "success" means is up to the [=underlying sink=]; it might indicate simply that the [=chunk=] has been accepted, and not necessarily that it is safely saved to its ultimate destination. -

If chunk is mutable, [=producers=] are advised to +

If chunk is mutable and the writable stream type is + not "{{WritableStreamType/owning}}", [=producers=] are advised to avoid mutating it after passing it to {{WritableStreamDefaultWriter/write()}}, until after the promise returned by {{WritableStreamDefaultWriter/write()}} settles. This ensures that the [=underlying sink=] receives and processes the same value that was passed in. @@ -4429,12 +4457,13 @@ following table:

- The write(|chunk|) + The write(|chunk|, |options|) method steps are: + 1. Let |transferList| be |options|["transfer"]. 1. If [=this=].[=WritableStreamDefaultWriter/[[stream]]=] is undefined, return [=a promise rejected with=] a {{TypeError}} exception. - 1. Return ! [$WritableStreamDefaultWriterWrite$]([=this=], |chunk|). + 1. Return ! [$WritableStreamDefaultWriterWrite$]([=this=], |chunk|, |transferList|).

The {{WritableStreamDefaultController}} class

@@ -4505,6 +4534,10 @@ the following table: \[[writeAlgorithm]] A promise-returning algorithm, taking one argument (the [=chunk=] to write), which writes data to the [=underlying sink=] + + \[[isOwning]] + A boolean flag indicating whether to take ownership of enqueued chunks + via transfer or serialization. The close sentinel is a unique value enqueued into @@ -5069,7 +5102,7 @@ The following abstract operations support the implementation and manipulation of
WritableStreamDefaultWriterWrite(|writer|, |chunk|) + id="writable-stream-default-writer-write">WritableStreamDefaultWriterWrite(|writer|, |chunk|, |transferList|) performs the following steps: 1. Let |stream| be |writer|.[=WritableStreamDefaultWriter/[[stream]]=]. @@ -5088,7 +5121,7 @@ The following abstract operations support the implementation and manipulation of |stream|.[=WritableStream/[[storedError]]=]. 1. Assert: |state| is "`writable`". 1. Let |promise| be ! [$WritableStreamAddWriteRequest$](|stream|). - 1. Perform ! [$WritableStreamDefaultControllerWrite$](|controller|, |chunk|, |chunkSize|). + 1. Perform ! [$WritableStreamDefaultControllerWrite$](|controller|, |chunk|, |chunkSize|, |transferList|). 1. Return |promise|.
@@ -5102,7 +5135,7 @@ The following abstract operations support the implementation of the SetUpWritableStreamDefaultController(|stream|, |controller|, |startAlgorithm|, |writeAlgorithm|, |closeAlgorithm|, |abortAlgorithm|, - |highWaterMark|, |sizeAlgorithm|) performs the following steps: + |highWaterMark|, |sizeAlgorithm|, |isOwning|) performs the following steps: 1. Assert: |stream| [=implements=] {{WritableStream}}. 1. Assert: |stream|.[=WritableStream/[[controller]]=] is undefined. @@ -5113,6 +5146,7 @@ The following abstract operations support the implementation of the 1. Set |controller|.[=WritableStreamDefaultController/[[started]]=] to false. 1. Set |controller|.[=WritableStreamDefaultController/[[strategySizeAlgorithm]]=] to |sizeAlgorithm|. + 1. Set |controller|.[=WritableStreamDefaultController/[[isOwning]]=] to |isOwning|. 1. Set |controller|.[=WritableStreamDefaultController/[[strategyHWM]]=] to |highWaterMark|. 1. Set |controller|.[=WritableStreamDefaultController/[[writeAlgorithm]]=] to |writeAlgorithm|. 1. Set |controller|.[=WritableStreamDefaultController/[[closeAlgorithm]]=] to |closeAlgorithm|. @@ -5142,6 +5176,8 @@ The following abstract operations support the implementation of the 1. Let |writeAlgorithm| be an algorithm that returns [=a promise resolved with=] undefined. 1. Let |closeAlgorithm| be an algorithm that returns [=a promise resolved with=] undefined. 1. Let |abortAlgorithm| be an algorithm that returns [=a promise resolved with=] undefined. + 1. Let |isOwning| be true if |underlyingSinkDict|["{{UnderlyingSink/type}}"] is + "{{WritableStreamType/owning}}" and false otherwise. 1. If |underlyingSinkDict|["{{UnderlyingSink/start}}"] [=map/exists=], then set |startAlgorithm| to an algorithm which returns the result of [=invoking=] |underlyingSinkDict|["{{UnderlyingSink/start}}"] with argument list « |controller| » @@ -5159,7 +5195,7 @@ The following abstract operations support the implementation of the |underlyingSinkDict|["{{UnderlyingSink/abort}}"] with argument list « |reason| » and [=callback this value=] |underlyingSink|. 1. Perform ? [$SetUpWritableStreamDefaultController$](|stream|, |controller|, |startAlgorithm|, - |writeAlgorithm|, |closeAlgorithm|, |abortAlgorithm|, |highWaterMark|, |sizeAlgorithm|). + |writeAlgorithm|, |closeAlgorithm|, |abortAlgorithm|, |highWaterMark|, |sizeAlgorithm|, |isOwning|).
@@ -5313,9 +5349,9 @@ The following abstract operations support the implementation of the
WritableStreamDefaultControllerWrite(|controller|, - |chunk|, |chunkSize|) performs the following steps: + |chunk|, |chunkSize|, |transferList|) performs the following steps: - 1. Let |enqueueResult| be [$EnqueueValueWithSize$](|controller|, |chunk|, |chunkSize|, undefined). + 1. Let |enqueueResult| be [$EnqueueValueWithSize$](|controller|, |chunk|, |chunkSize|, |transferList|). 1. If |enqueueResult| is an abrupt completion, 1. Perform ! [$WritableStreamDefaultControllerErrorIfNeeded$](|controller|, |enqueueResult|.\[[Value]]). From 599386094d112164d0de635381d0b24211bfbf5d Mon Sep 17 00:00:00 2001 From: Youenn Fablet Date: Mon, 17 Apr 2023 18:16:53 +0200 Subject: [PATCH 3/4] Owning WritableStream reference implementation --- reference-implementation/lib/UnderlyingSink.webidl | 4 +++- reference-implementation/lib/WritableStream-impl.js | 2 +- .../lib/WritableStreamDefaultWriter-impl.js | 5 +++-- .../lib/WritableStreamDefaultWriter.webidl | 6 +++++- .../lib/abstract-ops/writable-streams.js | 9 ++++++--- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/reference-implementation/lib/UnderlyingSink.webidl b/reference-implementation/lib/UnderlyingSink.webidl index 53ae15c8e..ba193d4df 100644 --- a/reference-implementation/lib/UnderlyingSink.webidl +++ b/reference-implementation/lib/UnderlyingSink.webidl @@ -3,10 +3,12 @@ dictionary UnderlyingSink { UnderlyingSinkWriteCallback write; UnderlyingSinkCloseCallback close; UnderlyingSinkAbortCallback abort; - any type; + WritableStreamType type; }; callback UnderlyingSinkStartCallback = any (WritableStreamDefaultController controller); callback UnderlyingSinkWriteCallback = Promise (any chunk, WritableStreamDefaultController controller); callback UnderlyingSinkCloseCallback = Promise (); callback UnderlyingSinkAbortCallback = Promise (optional any reason); + +enum WritableStreamType { "owning" }; diff --git a/reference-implementation/lib/WritableStream-impl.js b/reference-implementation/lib/WritableStream-impl.js index 7d23802d4..06a801c3a 100644 --- a/reference-implementation/lib/WritableStream-impl.js +++ b/reference-implementation/lib/WritableStream-impl.js @@ -12,7 +12,7 @@ exports.implementation = class WritableStreamImpl { underlyingSink = null; } const underlyingSinkDict = UnderlyingSink.convert(underlyingSink); - if ('type' in underlyingSinkDict) { + if ('type' in underlyingSinkDict && underlyingSinkDict.type !== 'owning') { throw new RangeError('Invalid type is specified'); } diff --git a/reference-implementation/lib/WritableStreamDefaultWriter-impl.js b/reference-implementation/lib/WritableStreamDefaultWriter-impl.js index 1c8934331..10da58236 100644 --- a/reference-implementation/lib/WritableStreamDefaultWriter-impl.js +++ b/reference-implementation/lib/WritableStreamDefaultWriter-impl.js @@ -59,12 +59,13 @@ exports.implementation = class WritableStreamDefaultWriterImpl { aos.WritableStreamDefaultWriterRelease(this); } - write(chunk) { + write(chunk, options) { + const transferList = options ? options.transfer : undefined; if (this._stream === undefined) { return promiseRejectedWith(defaultWriterLockException('write to')); } - return aos.WritableStreamDefaultWriterWrite(this, chunk); + return aos.WritableStreamDefaultWriterWrite(this, chunk, transferList); } }; diff --git a/reference-implementation/lib/WritableStreamDefaultWriter.webidl b/reference-implementation/lib/WritableStreamDefaultWriter.webidl index 6a542d2e1..50a8f9544 100644 --- a/reference-implementation/lib/WritableStreamDefaultWriter.webidl +++ b/reference-implementation/lib/WritableStreamDefaultWriter.webidl @@ -1,3 +1,7 @@ +dictionary StructuredSerializeOptions { + sequence transfer = []; +}; + [Exposed=(Window,Worker,Worklet)] interface WritableStreamDefaultWriter { constructor(WritableStream stream); @@ -9,5 +13,5 @@ interface WritableStreamDefaultWriter { Promise abort(optional any reason); Promise close(); undefined releaseLock(); - Promise write(optional any chunk); + Promise write(optional any chunk, optional StructuredSerializeOptions options = { }); }; diff --git a/reference-implementation/lib/abstract-ops/writable-streams.js b/reference-implementation/lib/abstract-ops/writable-streams.js index 88eef0888..d830fb429 100644 --- a/reference-implementation/lib/abstract-ops/writable-streams.js +++ b/reference-implementation/lib/abstract-ops/writable-streams.js @@ -529,7 +529,7 @@ function WritableStreamDefaultWriterWrite(writer, chunk) { // Default controllers function SetUpWritableStreamDefaultController(stream, controller, startAlgorithm, writeAlgorithm, closeAlgorithm, - abortAlgorithm, highWaterMark, sizeAlgorithm) { + abortAlgorithm, highWaterMark, sizeAlgorithm, isOwning) { assert(WritableStream.isImpl(stream)); assert(stream._controller === undefined); @@ -551,6 +551,8 @@ function SetUpWritableStreamDefaultController(stream, controller, startAlgorithm controller._closeAlgorithm = closeAlgorithm; controller._abortAlgorithm = abortAlgorithm; + controller._isOwning = isOwning; + const backpressure = WritableStreamDefaultControllerGetBackpressure(controller); WritableStreamUpdateBackpressure(stream, backpressure); @@ -579,6 +581,7 @@ function SetUpWritableStreamDefaultControllerFromUnderlyingSink(stream, underlyi let writeAlgorithm = () => promiseResolvedWith(undefined); let closeAlgorithm = () => promiseResolvedWith(undefined); let abortAlgorithm = () => promiseResolvedWith(undefined); + const isOwning = underlyingSinkDict.type === 'owning'; if ('start' in underlyingSinkDict) { startAlgorithm = () => underlyingSinkDict.start.call(underlyingSink, controller); @@ -594,8 +597,8 @@ function SetUpWritableStreamDefaultControllerFromUnderlyingSink(stream, underlyi } SetUpWritableStreamDefaultController( - stream, controller, startAlgorithm, writeAlgorithm, closeAlgorithm, abortAlgorithm, highWaterMark, sizeAlgorithm - ); + stream, controller, startAlgorithm, writeAlgorithm, closeAlgorithm, abortAlgorithm, highWaterMark, sizeAlgorithm, + isOwning); } function WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller) { From c585a6cf473b230d2c5fcdf5b10e42039b3ed5a7 Mon Sep 17 00:00:00 2001 From: Youenn Fablet Date: Mon, 17 Apr 2023 18:17:27 +0200 Subject: [PATCH 4/4] PipeTo initial implementation --- .../lib/abstract-ops/miscellaneous.js | 11 +++++++++++ .../lib/abstract-ops/queue-with-sizes.js | 12 +++--------- .../lib/abstract-ops/readable-streams.js | 11 +++++++++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/reference-implementation/lib/abstract-ops/miscellaneous.js b/reference-implementation/lib/abstract-ops/miscellaneous.js index ed55a5268..d4d9a054f 100644 --- a/reference-implementation/lib/abstract-ops/miscellaneous.js +++ b/reference-implementation/lib/abstract-ops/miscellaneous.js @@ -24,3 +24,14 @@ exports.CloneAsUint8Array = O => { exports.StructuredTransferOrClone = (value, transferList) => { return globalThis.structuredClone(value, { transfer: transferList }); }; + +exports.RunCloseSteps = value => { + if (typeof value.close === 'function') { + return; + } + try { + value.close(); + } catch (closeException) { + // Nothing to do. + } +}; diff --git a/reference-implementation/lib/abstract-ops/queue-with-sizes.js b/reference-implementation/lib/abstract-ops/queue-with-sizes.js index 4cc668e57..2a0d5b21d 100644 --- a/reference-implementation/lib/abstract-ops/queue-with-sizes.js +++ b/reference-implementation/lib/abstract-ops/queue-with-sizes.js @@ -1,6 +1,6 @@ 'use strict'; const assert = require('assert'); -const { IsNonNegativeNumber, StructuredTransferOrClone } = require('./miscellaneous.js'); +const { IsNonNegativeNumber, RunCloseSteps, StructuredTransferOrClone } = require('./miscellaneous.js'); exports.DequeueValue = container => { assert('_queue' in container && '_queueTotalSize' in container); @@ -24,7 +24,7 @@ exports.EnqueueValueWithSize = (container, value, size, transferList) => { if (size === Infinity) { throw new RangeError('Size must be a finite, non-NaN, non-negative number.'); } - if (container._isOwning) { + if (container._isOwning && !container._isPipeToOptimizedTransfer) { value = StructuredTransferOrClone(value, transferList); } container._queue.push({ value, size }); @@ -45,13 +45,7 @@ exports.ResetQueue = container => { if (container._isOwning) { while (container._queue.length > 0) { const value = exports.DequeueValue(container); - if (typeof value.close === 'function') { - try { - value.close(); - } catch (closeException) { - // Nothing to do. - } - } + RunCloseSteps(value); } } container._queue = []; diff --git a/reference-implementation/lib/abstract-ops/readable-streams.js b/reference-implementation/lib/abstract-ops/readable-streams.js index 98b0a35fb..b26223943 100644 --- a/reference-implementation/lib/abstract-ops/readable-streams.js +++ b/reference-implementation/lib/abstract-ops/readable-streams.js @@ -6,7 +6,8 @@ const { promiseResolvedWith, promiseRejectedWith, newPromise, resolvePromise, re require('../helpers/webidl.js'); const { CanTransferArrayBuffer, CopyDataBlockBytes, CreateArrayFromList, IsDetachedBuffer, TransferArrayBuffer } = require('./ecmascript.js'); -const { CloneAsUint8Array, IsNonNegativeNumber, StructuredTransferOrClone } = require('./miscellaneous.js'); +const { CloneAsUint8Array, IsNonNegativeNumber, RunCloseSteps, StructuredTransferOrClone } = + require('./miscellaneous.js'); const { EnqueueValueWithSize, ResetQueue } = require('./queue-with-sizes.js'); const { AcquireWritableStreamDefaultWriter, IsWritableStreamLocked, WritableStreamAbort, WritableStreamDefaultWriterCloseWithErrorPropagation, WritableStreamDefaultWriterRelease, @@ -136,6 +137,7 @@ function ReadableStreamPipeTo(source, dest, preventClose, preventAbort, preventC const reader = AcquireReadableStreamDefaultReader(source); const writer = AcquireWritableStreamDefaultWriter(dest); + writer._stream._controller._isPipeToOptimizedTransfer = source._controller._isOwning && dest._controller._isOwning; source._disturbed = true; @@ -206,7 +208,11 @@ function ReadableStreamPipeTo(source, dest, preventClose, preventAbort, preventC { chunkSteps: chunk => { currentWrite = transformPromiseWith( - WritableStreamDefaultWriterWrite(writer, chunk), undefined, () => {} + WritableStreamDefaultWriterWrite(writer, chunk), undefined, () => { + if (reader._stream._controller._isOwning) { + RunCloseSteps(chunk); + } + } ); resolveRead(false); }, @@ -319,6 +325,7 @@ function ReadableStreamPipeTo(source, dest, preventClose, preventAbort, preventC } function finalize(isError, error) { + writer._stream._controller._isPipeToOptimizedTransfer = undefined; WritableStreamDefaultWriterRelease(writer); ReadableStreamDefaultReaderRelease(reader);