Commit 1d6ec2d

Browse files
mcollinaaduh95
authored andcommitted
stream: encode whole chunks in TextEncoderStream
The encode-and-enqueue transform walked the chunk code unit by code unit, materializing a single-character string per index and building the output with string concatenation. The only state that crosses chunks is a trailing high (leading) surrogate, and TextEncoder.encode's USVString conversion already replaces every interior lone surrogate with U+FFFD, which is exactly what the spec loop produces. Join a pending high surrogate with the incoming chunk, hold back a new trailing high surrogate, and encode the rest in a single native call. The streaming decode path also reuses a single options object instead of allocating { stream: true } per chunk. An encoding-streams benchmark is added since the suite had no TextEncoderStream/TextDecoderStream row. Encoding improves by ~546% with 1KB string chunks and ~20% with 16-character chunks; decode is unchanged. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65414 Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Mattias Buelens <mattias@buelens.com>
1 parent 9e227ef commit 1d6ec2d

5 files changed

Lines changed: 166 additions & 35 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
TextEncoderStream,
6+
TextDecoderStream,
7+
}=require('node:stream/web');
8+
9+
constbench=common.createBenchmark(main,{
10+
n: [1e5],
11+
kind: ['encode','decode'],
12+
len: [16,1024],
13+
});
14+
15+
asyncfunctionmain({ n, kind, len }){
16+
constencoded=newTextEncoder().encode('a'.repeat(len));
17+
constdecoded='a'.repeat(len);
18+
leti=0;
19+
constrs=newReadableStream({
20+
pull(controller){
21+
if(i++<n){
22+
controller.enqueue(kind==='encode' ? decoded : encoded);
23+
}else{
24+
controller.close();
25+
}
26+
},
27+
});
28+
constts=kind==='encode' ?
29+
newTextEncoderStream() :
30+
newTextDecoderStream();
31+
32+
constreader=rs.pipeThrough(ts).getReader();
33+
bench.start();
34+
for(;;){
35+
const{ done }=awaitreader.read();
36+
if(done)break;
37+
}
38+
bench.end(n);
39+
}

‎benchmark/webstreams/from.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
}=require('node:stream/web');
6+
7+
constbench=common.createBenchmark(main,{
8+
n: [1e6],
9+
kind: ['sync','async'],
10+
});
11+
12+
asyncfunctionmain({ n, kind }){
13+
function*syncGen(){
14+
for(leti=0;i<n;i++)yieldi;
15+
}
16+
17+
asyncfunction*asyncGen(){
18+
for(leti=0;i<n;i++)yieldi;
19+
}
20+
21+
constreader=ReadableStream.from(
22+
kind==='sync' ? syncGen() : asyncGen()).getReader();
23+
bench.start();
24+
for(;;){
25+
const{ done }=awaitreader.read();
26+
if(done)break;
27+
}
28+
bench.end(n);
29+
}

‎lib/internal/webstreams/encoding.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
ObjectDefineProperties,
55
String,
66
StringPrototypeCharCodeAt,
7+
StringPrototypeSlice,
78
Uint8Array,
89
}=primordials;
910

@@ -31,6 +32,9 @@ const {
3132
kEnumerableProperty,
3233
}=require('internal/util');
3334

35+
// Shared per-chunk decode options; decode() only reads the flag.
36+
constkDecodeStreamingOptions={__proto__: null,stream: true};
37+
3438
/**
3539
* @typedef {import('./readablestream').ReadableStream} ReadableStream
3640
* @typedef {import('./writablestream').WritableStream} WritableStream
@@ -46,34 +50,26 @@ class TextEncoderStream {
4650
this.#transform =newTransformStream({
4751
transform: (chunk,controller)=>{
4852
// https://encoding.spec.whatwg.org/#encode-and-enqueue-a-chunk
53+
// The only cross-chunk state is a trailing high surrogate;
54+
// encode() replaces interior lone surrogates with U+FFFD exactly
55+
// like the spec's per-code-unit walk.
4956
chunk=String(chunk);
50-
letfinalChunk='';
51-
for(leti=0;i<chunk.length;i++){
52-
constitem=chunk[i];
53-
constcodeUnit=StringPrototypeCharCodeAt(item,0);
54-
if(this.#pendingHighSurrogate !==null){
55-
consthighSurrogate=this.#pendingHighSurrogate;
56-
this.#pendingHighSurrogate =null;
57-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
58-
finalChunk+=highSurrogate+item;
59-
continue;
60-
}
61-
finalChunk+='\uFFFD';
62-
}
63-
if(0xD800<=codeUnit&&codeUnit<=0xDBFF){
64-
this.#pendingHighSurrogate =item;
65-
continue;
66-
}
67-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
68-
finalChunk+='\uFFFD';
69-
continue;
70-
}
71-
finalChunk+=item;
57+
if(chunk.length===0)
58+
return;
59+
if(this.#pendingHighSurrogate !==null){
60+
chunk=this.#pendingHighSurrogate +chunk;
61+
this.#pendingHighSurrogate =null;
7262
}
73-
if(finalChunk){
74-
constvalue=this.#handle.encode(finalChunk);
75-
controller.enqueue(value);
63+
constlastCodeUnit=
64+
StringPrototypeCharCodeAt(chunk,chunk.length-1);
65+
if(0xD800<=lastCodeUnit&&lastCodeUnit<=0xDBFF){
66+
this.#pendingHighSurrogate =
67+
StringPrototypeSlice(chunk,-1);
68+
chunk=StringPrototypeSlice(chunk,0,-1);
69+
if(chunk.length===0)
70+
return;
7671
}
72+
controller.enqueue(this.#handle.encode(chunk));
7773
},
7874
flush: (controller)=>{
7975
// https://encoding.spec.whatwg.org/#encode-and-flush
@@ -137,7 +133,7 @@ class TextDecoderStream {
137133
if(chunk===undefined){
138134
thrownewERR_INVALID_ARG_TYPE('chunk','string',chunk);
139135
}
140-
constvalue=this.#handle.decode(chunk,{stream: true});
136+
constvalue=this.#handle.decode(chunk,kDecodeStreamingOptions);
141137
if(value)
142138
controller.enqueue(value);
143139
},

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
getNonWritablePropertyDescriptor,
113113
isBrandCheck,
114114
kEmptyQueue,
115+
kParkedAlgorithmResult,
115116
kResolvedPromise,
116117
kState,
117118
kType,
@@ -1446,19 +1447,85 @@ function readableStreamFromIterable(iterable) {
14461447
if(iterator===null||(typeofiterator!=='object'&&typeofiterator!=='function')){
14471448
thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');
14481449
}
1450+
// Per GetIteratorDirect, the next method is looked up once.
1451+
constnextMethod=iterator.next;
14491452
conststartAlgorithm=nonOpCallback;
14501453

1451-
asyncfunctionpullAlgorithm(){
1452-
constiterResult=awaititerator.next();
1454+
// Callback-style pull: the reaction steps are reused across chunks and
1455+
// completion is delivered to the controller's cached pull reactions
1456+
// (the kParkedAlgorithmResult contract). One pull runs at a time, so a
1457+
// single slot carries a non-thenable next() result between steps.
1458+
letpendingIterResult;
1459+
1460+
functionrejectPull(error){
1461+
readableStreamDefaultControllerError(stream[kState].controller,error);
1462+
}
1463+
1464+
functionprocessIterResult(iterResult){
1465+
constcontroller=stream[kState].controller;
14531466
if(typeofiterResult!=='object'||iterResult===null){
1454-
thrownewERR_INVALID_STATE.TypeError(
1455-
'The promise returned by the iterator.next() method must fulfill with an object');
1467+
rejectPull(newERR_INVALID_STATE.TypeError(
1468+
'The promise returned by the iterator.next() method must fulfill with an object'));
1469+
return;
14561470
}
1457-
if(iterResult.done){
1458-
readableStreamDefaultControllerClose(stream[kState].controller);
1459-
}else{
1460-
readableStreamDefaultControllerEnqueue(stream[kState].controller,awaititerResult.value);
1471+
try{
1472+
if(iterResult.done){
1473+
readableStreamDefaultControllerClose(controller);
1474+
}else{
1475+
constvalue=iterResult.value;
1476+
if(value!==null&&
1477+
(typeofvalue==='object'||typeofvalue==='function')){
1478+
// Adopted like `await iterResult.value`, keeping the observable
1479+
// .then lookup on plain objects.
1480+
PromisePrototypeThen(PromiseResolve(value),enqueueValue,rejectPull);
1481+
return;
1482+
}
1483+
readableStreamDefaultControllerEnqueue(controller,value);
1484+
}
1485+
}catch(error){
1486+
rejectPull(error);
1487+
return;
1488+
}
1489+
// pullFulfilled exists: the controller creates it before the pull.
1490+
controller[kState].pullFulfilled();
1491+
}
1492+
1493+
functionenqueueValue(value){
1494+
constcontroller=stream[kState].controller;
1495+
try{
1496+
readableStreamDefaultControllerEnqueue(controller,value);
1497+
}catch(error){
1498+
rejectPull(error);
1499+
return;
1500+
}
1501+
controller[kState].pullFulfilled();
1502+
}
1503+
1504+
functionprocessPendingIterResult(){
1505+
constiterResult=pendingIterResult;
1506+
pendingIterResult=undefined;
1507+
processIterResult(iterResult);
1508+
}
1509+
1510+
functionpullAlgorithm(){
1511+
letnextResult;
1512+
try{
1513+
nextResult=FunctionPrototypeCall(nextMethod,iterator);
1514+
}catch(error){
1515+
returnPromiseReject(error);
1516+
}
1517+
if(nextResult!==null&&
1518+
(typeofnextResult==='object'||typeofnextResult==='function')){
1519+
// Mirrors `await iterator.next()`: processIterResult runs at the
1520+
// microtask position the await resumed.
1521+
PromisePrototypeThen(
1522+
PromiseResolve(nextResult),processIterResult,rejectPull);
1523+
returnkParkedAlgorithmResult;
14611524
}
1525+
// A non-thenable next() result fails validation a microtask later.
1526+
pendingIterResult=nextResult;
1527+
PromisePrototypeThen(kResolvedPromise,processPendingIterResult);
1528+
returnkParkedAlgorithmResult;
14621529
}
14631530

14641531
asyncfunctioncancelAlgorithm(reason){

‎lib/internal/webstreams/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const kResolvedPromise = PromiseResolve();
359359
// operation and takes responsibility for delivering the fulfilled (or
360360
// rejected) continuation itself later, instead of settling a promise
361361
// (see the transform stream source pull algorithm).
362-
constkParkedAlgorithmResult={__proto__: null};
362+
constkParkedAlgorithmResult=Symbol('kParkedAlgorithmResult');
363363

364364
// Wires the (possibly non-thenable) result of an underlying algorithm
365365
// callback to its fulfilled/rejected continuations. A non-thenable result

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit 1d6ec2d

Browse files
mcollinaaduh95
authored andcommitted
stream: encode whole chunks in TextEncoderStream
The encode-and-enqueue transform walked the chunk code unit by code unit, materializing a single-character string per index and building the output with string concatenation. The only state that crosses chunks is a trailing high (leading) surrogate, and TextEncoder.encode's USVString conversion already replaces every interior lone surrogate with U+FFFD, which is exactly what the spec loop produces. Join a pending high surrogate with the incoming chunk, hold back a new trailing high surrogate, and encode the rest in a single native call. The streaming decode path also reuses a single options object instead of allocating { stream: true } per chunk. An encoding-streams benchmark is added since the suite had no TextEncoderStream/TextDecoderStream row. Encoding improves by ~546% with 1KB string chunks and ~20% with 16-character chunks; decode is unchanged. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65414 Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Mattias Buelens <mattias@buelens.com>
1 parent 9e227ef commit 1d6ec2d

5 files changed

Lines changed: 166 additions & 35 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
TextEncoderStream,
6+
TextDecoderStream,
7+
}=require('node:stream/web');
8+
9+
constbench=common.createBenchmark(main,{
10+
n: [1e5],
11+
kind: ['encode','decode'],
12+
len: [16,1024],
13+
});
14+
15+
asyncfunctionmain({ n, kind, len }){
16+
constencoded=newTextEncoder().encode('a'.repeat(len));
17+
constdecoded='a'.repeat(len);
18+
leti=0;
19+
constrs=newReadableStream({
20+
pull(controller){
21+
if(i++<n){
22+
controller.enqueue(kind==='encode' ? decoded : encoded);
23+
}else{
24+
controller.close();
25+
}
26+
},
27+
});
28+
constts=kind==='encode' ?
29+
newTextEncoderStream() :
30+
newTextDecoderStream();
31+
32+
constreader=rs.pipeThrough(ts).getReader();
33+
bench.start();
34+
for(;;){
35+
const{ done }=awaitreader.read();
36+
if(done)break;
37+
}
38+
bench.end(n);
39+
}

‎benchmark/webstreams/from.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
}=require('node:stream/web');
6+
7+
constbench=common.createBenchmark(main,{
8+
n: [1e6],
9+
kind: ['sync','async'],
10+
});
11+
12+
asyncfunctionmain({ n, kind }){
13+
function*syncGen(){
14+
for(leti=0;i<n;i++)yieldi;
15+
}
16+
17+
asyncfunction*asyncGen(){
18+
for(leti=0;i<n;i++)yieldi;
19+
}
20+
21+
constreader=ReadableStream.from(
22+
kind==='sync' ? syncGen() : asyncGen()).getReader();
23+
bench.start();
24+
for(;;){
25+
const{ done }=awaitreader.read();
26+
if(done)break;
27+
}
28+
bench.end(n);
29+
}

‎lib/internal/webstreams/encoding.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
ObjectDefineProperties,
55
String,
66
StringPrototypeCharCodeAt,
7+
StringPrototypeSlice,
78
Uint8Array,
89
}=primordials;
910

@@ -31,6 +32,9 @@ const {
3132
kEnumerableProperty,
3233
}=require('internal/util');
3334

35+
// Shared per-chunk decode options; decode() only reads the flag.
36+
constkDecodeStreamingOptions={__proto__: null,stream: true};
37+
3438
/**
3539
* @typedef {import('./readablestream').ReadableStream} ReadableStream
3640
* @typedef {import('./writablestream').WritableStream} WritableStream
@@ -46,34 +50,26 @@ class TextEncoderStream {
4650
this.#transform =newTransformStream({
4751
transform: (chunk,controller)=>{
4852
// https://encoding.spec.whatwg.org/#encode-and-enqueue-a-chunk
53+
// The only cross-chunk state is a trailing high surrogate;
54+
// encode() replaces interior lone surrogates with U+FFFD exactly
55+
// like the spec's per-code-unit walk.
4956
chunk=String(chunk);
50-
letfinalChunk='';
51-
for(leti=0;i<chunk.length;i++){
52-
constitem=chunk[i];
53-
constcodeUnit=StringPrototypeCharCodeAt(item,0);
54-
if(this.#pendingHighSurrogate !==null){
55-
consthighSurrogate=this.#pendingHighSurrogate;
56-
this.#pendingHighSurrogate =null;
57-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
58-
finalChunk+=highSurrogate+item;
59-
continue;
60-
}
61-
finalChunk+='\uFFFD';
62-
}
63-
if(0xD800<=codeUnit&&codeUnit<=0xDBFF){
64-
this.#pendingHighSurrogate =item;
65-
continue;
66-
}
67-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
68-
finalChunk+='\uFFFD';
69-
continue;
70-
}
71-
finalChunk+=item;
57+
if(chunk.length===0)
58+
return;
59+
if(this.#pendingHighSurrogate !==null){
60+
chunk=this.#pendingHighSurrogate +chunk;
61+
this.#pendingHighSurrogate =null;
7262
}
73-
if(finalChunk){
74-
constvalue=this.#handle.encode(finalChunk);
75-
controller.enqueue(value);
63+
constlastCodeUnit=
64+
StringPrototypeCharCodeAt(chunk,chunk.length-1);
65+
if(0xD800<=lastCodeUnit&&lastCodeUnit<=0xDBFF){
66+
this.#pendingHighSurrogate =
67+
StringPrototypeSlice(chunk,-1);
68+
chunk=StringPrototypeSlice(chunk,0,-1);
69+
if(chunk.length===0)
70+
return;
7671
}
72+
controller.enqueue(this.#handle.encode(chunk));
7773
},
7874
flush: (controller)=>{
7975
// https://encoding.spec.whatwg.org/#encode-and-flush
@@ -137,7 +133,7 @@ class TextDecoderStream {
137133
if(chunk===undefined){
138134
thrownewERR_INVALID_ARG_TYPE('chunk','string',chunk);
139135
}
140-
constvalue=this.#handle.decode(chunk,{stream: true});
136+
constvalue=this.#handle.decode(chunk,kDecodeStreamingOptions);
141137
if(value)
142138
controller.enqueue(value);
143139
},

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
getNonWritablePropertyDescriptor,
113113
isBrandCheck,
114114
kEmptyQueue,
115+
kParkedAlgorithmResult,
115116
kResolvedPromise,
116117
kState,
117118
kType,
@@ -1446,19 +1447,85 @@ function readableStreamFromIterable(iterable) {
14461447
if(iterator===null||(typeofiterator!=='object'&&typeofiterator!=='function')){
14471448
thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');
14481449
}
1450+
// Per GetIteratorDirect, the next method is looked up once.
1451+
constnextMethod=iterator.next;
14491452
conststartAlgorithm=nonOpCallback;
14501453

1451-
asyncfunctionpullAlgorithm(){
1452-
constiterResult=awaititerator.next();
1454+
// Callback-style pull: the reaction steps are reused across chunks and
1455+
// completion is delivered to the controller's cached pull reactions
1456+
// (the kParkedAlgorithmResult contract). One pull runs at a time, so a
1457+
// single slot carries a non-thenable next() result between steps.
1458+
letpendingIterResult;
1459+
1460+
functionrejectPull(error){
1461+
readableStreamDefaultControllerError(stream[kState].controller,error);
1462+
}
1463+
1464+
functionprocessIterResult(iterResult){
1465+
constcontroller=stream[kState].controller;
14531466
if(typeofiterResult!=='object'||iterResult===null){
1454-
thrownewERR_INVALID_STATE.TypeError(
1455-
'The promise returned by the iterator.next() method must fulfill with an object');
1467+
rejectPull(newERR_INVALID_STATE.TypeError(
1468+
'The promise returned by the iterator.next() method must fulfill with an object'));
1469+
return;
14561470
}
1457-
if(iterResult.done){
1458-
readableStreamDefaultControllerClose(stream[kState].controller);
1459-
}else{
1460-
readableStreamDefaultControllerEnqueue(stream[kState].controller,awaititerResult.value);
1471+
try{
1472+
if(iterResult.done){
1473+
readableStreamDefaultControllerClose(controller);
1474+
}else{
1475+
constvalue=iterResult.value;
1476+
if(value!==null&&
1477+
(typeofvalue==='object'||typeofvalue==='function')){
1478+
// Adopted like `await iterResult.value`, keeping the observable
1479+
// .then lookup on plain objects.
1480+
PromisePrototypeThen(PromiseResolve(value),enqueueValue,rejectPull);
1481+
return;
1482+
}
1483+
readableStreamDefaultControllerEnqueue(controller,value);
1484+
}
1485+
}catch(error){
1486+
rejectPull(error);
1487+
return;
1488+
}
1489+
// pullFulfilled exists: the controller creates it before the pull.
1490+
controller[kState].pullFulfilled();
1491+
}
1492+
1493+
functionenqueueValue(value){
1494+
constcontroller=stream[kState].controller;
1495+
try{
1496+
readableStreamDefaultControllerEnqueue(controller,value);
1497+
}catch(error){
1498+
rejectPull(error);
1499+
return;
1500+
}
1501+
controller[kState].pullFulfilled();
1502+
}
1503+
1504+
functionprocessPendingIterResult(){
1505+
constiterResult=pendingIterResult;
1506+
pendingIterResult=undefined;
1507+
processIterResult(iterResult);
1508+
}
1509+
1510+
functionpullAlgorithm(){
1511+
letnextResult;
1512+
try{
1513+
nextResult=FunctionPrototypeCall(nextMethod,iterator);
1514+
}catch(error){
1515+
returnPromiseReject(error);
1516+
}
1517+
if(nextResult!==null&&
1518+
(typeofnextResult==='object'||typeofnextResult==='function')){
1519+
// Mirrors `await iterator.next()`: processIterResult runs at the
1520+
// microtask position the await resumed.
1521+
PromisePrototypeThen(
1522+
PromiseResolve(nextResult),processIterResult,rejectPull);
1523+
returnkParkedAlgorithmResult;
14611524
}
1525+
// A non-thenable next() result fails validation a microtask later.
1526+
pendingIterResult=nextResult;
1527+
PromisePrototypeThen(kResolvedPromise,processPendingIterResult);
1528+
returnkParkedAlgorithmResult;
14621529
}
14631530

14641531
asyncfunctioncancelAlgorithm(reason){

‎lib/internal/webstreams/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const kResolvedPromise = PromiseResolve();
359359
// operation and takes responsibility for delivering the fulfilled (or
360360
// rejected) continuation itself later, instead of settling a promise
361361
// (see the transform stream source pull algorithm).
362-
constkParkedAlgorithmResult={__proto__: null};
362+
constkParkedAlgorithmResult=Symbol('kParkedAlgorithmResult');
363363

364364
// Wires the (possibly non-thenable) result of an underlying algorithm
365365
// callback to its fulfilled/rejected continuations. A non-thenable result

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 1d6ec2d

Browse files
mcollinaaduh95
authored andcommitted
stream: encode whole chunks in TextEncoderStream
The encode-and-enqueue transform walked the chunk code unit by code unit, materializing a single-character string per index and building the output with string concatenation. The only state that crosses chunks is a trailing high (leading) surrogate, and TextEncoder.encode's USVString conversion already replaces every interior lone surrogate with U+FFFD, which is exactly what the spec loop produces. Join a pending high surrogate with the incoming chunk, hold back a new trailing high surrogate, and encode the rest in a single native call. The streaming decode path also reuses a single options object instead of allocating { stream: true } per chunk. An encoding-streams benchmark is added since the suite had no TextEncoderStream/TextDecoderStream row. Encoding improves by ~546% with 1KB string chunks and ~20% with 16-character chunks; decode is unchanged. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65414 Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Mattias Buelens <mattias@buelens.com>
1 parent 9e227ef commit 1d6ec2d

5 files changed

Lines changed: 166 additions & 35 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
TextEncoderStream,
6+
TextDecoderStream,
7+
}=require('node:stream/web');
8+
9+
constbench=common.createBenchmark(main,{
10+
n: [1e5],
11+
kind: ['encode','decode'],
12+
len: [16,1024],
13+
});
14+
15+
asyncfunctionmain({ n, kind, len }){
16+
constencoded=newTextEncoder().encode('a'.repeat(len));
17+
constdecoded='a'.repeat(len);
18+
leti=0;
19+
constrs=newReadableStream({
20+
pull(controller){
21+
if(i++<n){
22+
controller.enqueue(kind==='encode' ? decoded : encoded);
23+
}else{
24+
controller.close();
25+
}
26+
},
27+
});
28+
constts=kind==='encode' ?
29+
newTextEncoderStream() :
30+
newTextDecoderStream();
31+
32+
constreader=rs.pipeThrough(ts).getReader();
33+
bench.start();
34+
for(;;){
35+
const{ done }=awaitreader.read();
36+
if(done)break;
37+
}
38+
bench.end(n);
39+
}

‎benchmark/webstreams/from.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
}=require('node:stream/web');
6+
7+
constbench=common.createBenchmark(main,{
8+
n: [1e6],
9+
kind: ['sync','async'],
10+
});
11+
12+
asyncfunctionmain({ n, kind }){
13+
function*syncGen(){
14+
for(leti=0;i<n;i++)yieldi;
15+
}
16+
17+
asyncfunction*asyncGen(){
18+
for(leti=0;i<n;i++)yieldi;
19+
}
20+
21+
constreader=ReadableStream.from(
22+
kind==='sync' ? syncGen() : asyncGen()).getReader();
23+
bench.start();
24+
for(;;){
25+
const{ done }=awaitreader.read();
26+
if(done)break;
27+
}
28+
bench.end(n);
29+
}

‎lib/internal/webstreams/encoding.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
ObjectDefineProperties,
55
String,
66
StringPrototypeCharCodeAt,
7+
StringPrototypeSlice,
78
Uint8Array,
89
}=primordials;
910

@@ -31,6 +32,9 @@ const {
3132
kEnumerableProperty,
3233
}=require('internal/util');
3334

35+
// Shared per-chunk decode options; decode() only reads the flag.
36+
constkDecodeStreamingOptions={__proto__: null,stream: true};
37+
3438
/**
3539
* @typedef {import('./readablestream').ReadableStream} ReadableStream
3640
* @typedef {import('./writablestream').WritableStream} WritableStream
@@ -46,34 +50,26 @@ class TextEncoderStream {
4650
this.#transform =newTransformStream({
4751
transform: (chunk,controller)=>{
4852
// https://encoding.spec.whatwg.org/#encode-and-enqueue-a-chunk
53+
// The only cross-chunk state is a trailing high surrogate;
54+
// encode() replaces interior lone surrogates with U+FFFD exactly
55+
// like the spec's per-code-unit walk.
4956
chunk=String(chunk);
50-
letfinalChunk='';
51-
for(leti=0;i<chunk.length;i++){
52-
constitem=chunk[i];
53-
constcodeUnit=StringPrototypeCharCodeAt(item,0);
54-
if(this.#pendingHighSurrogate !==null){
55-
consthighSurrogate=this.#pendingHighSurrogate;
56-
this.#pendingHighSurrogate =null;
57-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
58-
finalChunk+=highSurrogate+item;
59-
continue;
60-
}
61-
finalChunk+='\uFFFD';
62-
}
63-
if(0xD800<=codeUnit&&codeUnit<=0xDBFF){
64-
this.#pendingHighSurrogate =item;
65-
continue;
66-
}
67-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
68-
finalChunk+='\uFFFD';
69-
continue;
70-
}
71-
finalChunk+=item;
57+
if(chunk.length===0)
58+
return;
59+
if(this.#pendingHighSurrogate !==null){
60+
chunk=this.#pendingHighSurrogate +chunk;
61+
this.#pendingHighSurrogate =null;
7262
}
73-
if(finalChunk){
74-
constvalue=this.#handle.encode(finalChunk);
75-
controller.enqueue(value);
63+
constlastCodeUnit=
64+
StringPrototypeCharCodeAt(chunk,chunk.length-1);
65+
if(0xD800<=lastCodeUnit&&lastCodeUnit<=0xDBFF){
66+
this.#pendingHighSurrogate =
67+
StringPrototypeSlice(chunk,-1);
68+
chunk=StringPrototypeSlice(chunk,0,-1);
69+
if(chunk.length===0)
70+
return;
7671
}
72+
controller.enqueue(this.#handle.encode(chunk));
7773
},
7874
flush: (controller)=>{
7975
// https://encoding.spec.whatwg.org/#encode-and-flush
@@ -137,7 +133,7 @@ class TextDecoderStream {
137133
if(chunk===undefined){
138134
thrownewERR_INVALID_ARG_TYPE('chunk','string',chunk);
139135
}
140-
constvalue=this.#handle.decode(chunk,{stream: true});
136+
constvalue=this.#handle.decode(chunk,kDecodeStreamingOptions);
141137
if(value)
142138
controller.enqueue(value);
143139
},

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
getNonWritablePropertyDescriptor,
113113
isBrandCheck,
114114
kEmptyQueue,
115+
kParkedAlgorithmResult,
115116
kResolvedPromise,
116117
kState,
117118
kType,
@@ -1446,19 +1447,85 @@ function readableStreamFromIterable(iterable) {
14461447
if(iterator===null||(typeofiterator!=='object'&&typeofiterator!=='function')){
14471448
thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');
14481449
}
1450+
// Per GetIteratorDirect, the next method is looked up once.
1451+
constnextMethod=iterator.next;
14491452
conststartAlgorithm=nonOpCallback;
14501453

1451-
asyncfunctionpullAlgorithm(){
1452-
constiterResult=awaititerator.next();
1454+
// Callback-style pull: the reaction steps are reused across chunks and
1455+
// completion is delivered to the controller's cached pull reactions
1456+
// (the kParkedAlgorithmResult contract). One pull runs at a time, so a
1457+
// single slot carries a non-thenable next() result between steps.
1458+
letpendingIterResult;
1459+
1460+
functionrejectPull(error){
1461+
readableStreamDefaultControllerError(stream[kState].controller,error);
1462+
}
1463+
1464+
functionprocessIterResult(iterResult){
1465+
constcontroller=stream[kState].controller;
14531466
if(typeofiterResult!=='object'||iterResult===null){
1454-
thrownewERR_INVALID_STATE.TypeError(
1455-
'The promise returned by the iterator.next() method must fulfill with an object');
1467+
rejectPull(newERR_INVALID_STATE.TypeError(
1468+
'The promise returned by the iterator.next() method must fulfill with an object'));
1469+
return;
14561470
}
1457-
if(iterResult.done){
1458-
readableStreamDefaultControllerClose(stream[kState].controller);
1459-
}else{
1460-
readableStreamDefaultControllerEnqueue(stream[kState].controller,awaititerResult.value);
1471+
try{
1472+
if(iterResult.done){
1473+
readableStreamDefaultControllerClose(controller);
1474+
}else{
1475+
constvalue=iterResult.value;
1476+
if(value!==null&&
1477+
(typeofvalue==='object'||typeofvalue==='function')){
1478+
// Adopted like `await iterResult.value`, keeping the observable
1479+
// .then lookup on plain objects.
1480+
PromisePrototypeThen(PromiseResolve(value),enqueueValue,rejectPull);
1481+
return;
1482+
}
1483+
readableStreamDefaultControllerEnqueue(controller,value);
1484+
}
1485+
}catch(error){
1486+
rejectPull(error);
1487+
return;
1488+
}
1489+
// pullFulfilled exists: the controller creates it before the pull.
1490+
controller[kState].pullFulfilled();
1491+
}
1492+
1493+
functionenqueueValue(value){
1494+
constcontroller=stream[kState].controller;
1495+
try{
1496+
readableStreamDefaultControllerEnqueue(controller,value);
1497+
}catch(error){
1498+
rejectPull(error);
1499+
return;
1500+
}
1501+
controller[kState].pullFulfilled();
1502+
}
1503+
1504+
functionprocessPendingIterResult(){
1505+
constiterResult=pendingIterResult;
1506+
pendingIterResult=undefined;
1507+
processIterResult(iterResult);
1508+
}
1509+
1510+
functionpullAlgorithm(){
1511+
letnextResult;
1512+
try{
1513+
nextResult=FunctionPrototypeCall(nextMethod,iterator);
1514+
}catch(error){
1515+
returnPromiseReject(error);
1516+
}
1517+
if(nextResult!==null&&
1518+
(typeofnextResult==='object'||typeofnextResult==='function')){
1519+
// Mirrors `await iterator.next()`: processIterResult runs at the
1520+
// microtask position the await resumed.
1521+
PromisePrototypeThen(
1522+
PromiseResolve(nextResult),processIterResult,rejectPull);
1523+
returnkParkedAlgorithmResult;
14611524
}
1525+
// A non-thenable next() result fails validation a microtask later.
1526+
pendingIterResult=nextResult;
1527+
PromisePrototypeThen(kResolvedPromise,processPendingIterResult);
1528+
returnkParkedAlgorithmResult;
14621529
}
14631530

14641531
asyncfunctioncancelAlgorithm(reason){

‎lib/internal/webstreams/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const kResolvedPromise = PromiseResolve();
359359
// operation and takes responsibility for delivering the fulfilled (or
360360
// rejected) continuation itself later, instead of settling a promise
361361
// (see the transform stream source pull algorithm).
362-
constkParkedAlgorithmResult={__proto__: null};
362+
constkParkedAlgorithmResult=Symbol('kParkedAlgorithmResult');
363363

364364
// Wires the (possibly non-thenable) result of an underlying algorithm
365365
// callback to its fulfilled/rejected continuations. A non-thenable result

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 1d6ec2d

Browse files
mcollinaaduh95
authored andcommitted
stream: encode whole chunks in TextEncoderStream
The encode-and-enqueue transform walked the chunk code unit by code unit, materializing a single-character string per index and building the output with string concatenation. The only state that crosses chunks is a trailing high (leading) surrogate, and TextEncoder.encode's USVString conversion already replaces every interior lone surrogate with U+FFFD, which is exactly what the spec loop produces. Join a pending high surrogate with the incoming chunk, hold back a new trailing high surrogate, and encode the rest in a single native call. The streaming decode path also reuses a single options object instead of allocating { stream: true } per chunk. An encoding-streams benchmark is added since the suite had no TextEncoderStream/TextDecoderStream row. Encoding improves by ~546% with 1KB string chunks and ~20% with 16-character chunks; decode is unchanged. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65414 Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Mattias Buelens <mattias@buelens.com>
1 parent 9e227ef commit 1d6ec2d

5 files changed

Lines changed: 166 additions & 35 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
TextEncoderStream,
6+
TextDecoderStream,
7+
}=require('node:stream/web');
8+
9+
constbench=common.createBenchmark(main,{
10+
n: [1e5],
11+
kind: ['encode','decode'],
12+
len: [16,1024],
13+
});
14+
15+
asyncfunctionmain({ n, kind, len }){
16+
constencoded=newTextEncoder().encode('a'.repeat(len));
17+
constdecoded='a'.repeat(len);
18+
leti=0;
19+
constrs=newReadableStream({
20+
pull(controller){
21+
if(i++<n){
22+
controller.enqueue(kind==='encode' ? decoded : encoded);
23+
}else{
24+
controller.close();
25+
}
26+
},
27+
});
28+
constts=kind==='encode' ?
29+
newTextEncoderStream() :
30+
newTextDecoderStream();
31+
32+
constreader=rs.pipeThrough(ts).getReader();
33+
bench.start();
34+
for(;;){
35+
const{ done }=awaitreader.read();
36+
if(done)break;
37+
}
38+
bench.end(n);
39+
}

‎benchmark/webstreams/from.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
}=require('node:stream/web');
6+
7+
constbench=common.createBenchmark(main,{
8+
n: [1e6],
9+
kind: ['sync','async'],
10+
});
11+
12+
asyncfunctionmain({ n, kind }){
13+
function*syncGen(){
14+
for(leti=0;i<n;i++)yieldi;
15+
}
16+
17+
asyncfunction*asyncGen(){
18+
for(leti=0;i<n;i++)yieldi;
19+
}
20+
21+
constreader=ReadableStream.from(
22+
kind==='sync' ? syncGen() : asyncGen()).getReader();
23+
bench.start();
24+
for(;;){
25+
const{ done }=awaitreader.read();
26+
if(done)break;
27+
}
28+
bench.end(n);
29+
}

‎lib/internal/webstreams/encoding.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
ObjectDefineProperties,
55
String,
66
StringPrototypeCharCodeAt,
7+
StringPrototypeSlice,
78
Uint8Array,
89
}=primordials;
910

@@ -31,6 +32,9 @@ const {
3132
kEnumerableProperty,
3233
}=require('internal/util');
3334

35+
// Shared per-chunk decode options; decode() only reads the flag.
36+
constkDecodeStreamingOptions={__proto__: null,stream: true};
37+
3438
/**
3539
* @typedef {import('./readablestream').ReadableStream} ReadableStream
3640
* @typedef {import('./writablestream').WritableStream} WritableStream
@@ -46,34 +50,26 @@ class TextEncoderStream {
4650
this.#transform =newTransformStream({
4751
transform: (chunk,controller)=>{
4852
// https://encoding.spec.whatwg.org/#encode-and-enqueue-a-chunk
53+
// The only cross-chunk state is a trailing high surrogate;
54+
// encode() replaces interior lone surrogates with U+FFFD exactly
55+
// like the spec's per-code-unit walk.
4956
chunk=String(chunk);
50-
letfinalChunk='';
51-
for(leti=0;i<chunk.length;i++){
52-
constitem=chunk[i];
53-
constcodeUnit=StringPrototypeCharCodeAt(item,0);
54-
if(this.#pendingHighSurrogate !==null){
55-
consthighSurrogate=this.#pendingHighSurrogate;
56-
this.#pendingHighSurrogate =null;
57-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
58-
finalChunk+=highSurrogate+item;
59-
continue;
60-
}
61-
finalChunk+='\uFFFD';
62-
}
63-
if(0xD800<=codeUnit&&codeUnit<=0xDBFF){
64-
this.#pendingHighSurrogate =item;
65-
continue;
66-
}
67-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
68-
finalChunk+='\uFFFD';
69-
continue;
70-
}
71-
finalChunk+=item;
57+
if(chunk.length===0)
58+
return;
59+
if(this.#pendingHighSurrogate !==null){
60+
chunk=this.#pendingHighSurrogate +chunk;
61+
this.#pendingHighSurrogate =null;
7262
}
73-
if(finalChunk){
74-
constvalue=this.#handle.encode(finalChunk);
75-
controller.enqueue(value);
63+
constlastCodeUnit=
64+
StringPrototypeCharCodeAt(chunk,chunk.length-1);
65+
if(0xD800<=lastCodeUnit&&lastCodeUnit<=0xDBFF){
66+
this.#pendingHighSurrogate =
67+
StringPrototypeSlice(chunk,-1);
68+
chunk=StringPrototypeSlice(chunk,0,-1);
69+
if(chunk.length===0)
70+
return;
7671
}
72+
controller.enqueue(this.#handle.encode(chunk));
7773
},
7874
flush: (controller)=>{
7975
// https://encoding.spec.whatwg.org/#encode-and-flush
@@ -137,7 +133,7 @@ class TextDecoderStream {
137133
if(chunk===undefined){
138134
thrownewERR_INVALID_ARG_TYPE('chunk','string',chunk);
139135
}
140-
constvalue=this.#handle.decode(chunk,{stream: true});
136+
constvalue=this.#handle.decode(chunk,kDecodeStreamingOptions);
141137
if(value)
142138
controller.enqueue(value);
143139
},

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
getNonWritablePropertyDescriptor,
113113
isBrandCheck,
114114
kEmptyQueue,
115+
kParkedAlgorithmResult,
115116
kResolvedPromise,
116117
kState,
117118
kType,
@@ -1446,19 +1447,85 @@ function readableStreamFromIterable(iterable) {
14461447
if(iterator===null||(typeofiterator!=='object'&&typeofiterator!=='function')){
14471448
thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');
14481449
}
1450+
// Per GetIteratorDirect, the next method is looked up once.
1451+
constnextMethod=iterator.next;
14491452
conststartAlgorithm=nonOpCallback;
14501453

1451-
asyncfunctionpullAlgorithm(){
1452-
constiterResult=awaititerator.next();
1454+
// Callback-style pull: the reaction steps are reused across chunks and
1455+
// completion is delivered to the controller's cached pull reactions
1456+
// (the kParkedAlgorithmResult contract). One pull runs at a time, so a
1457+
// single slot carries a non-thenable next() result between steps.
1458+
letpendingIterResult;
1459+
1460+
functionrejectPull(error){
1461+
readableStreamDefaultControllerError(stream[kState].controller,error);
1462+
}
1463+
1464+
functionprocessIterResult(iterResult){
1465+
constcontroller=stream[kState].controller;
14531466
if(typeofiterResult!=='object'||iterResult===null){
1454-
thrownewERR_INVALID_STATE.TypeError(
1455-
'The promise returned by the iterator.next() method must fulfill with an object');
1467+
rejectPull(newERR_INVALID_STATE.TypeError(
1468+
'The promise returned by the iterator.next() method must fulfill with an object'));
1469+
return;
14561470
}
1457-
if(iterResult.done){
1458-
readableStreamDefaultControllerClose(stream[kState].controller);
1459-
}else{
1460-
readableStreamDefaultControllerEnqueue(stream[kState].controller,awaititerResult.value);
1471+
try{
1472+
if(iterResult.done){
1473+
readableStreamDefaultControllerClose(controller);
1474+
}else{
1475+
constvalue=iterResult.value;
1476+
if(value!==null&&
1477+
(typeofvalue==='object'||typeofvalue==='function')){
1478+
// Adopted like `await iterResult.value`, keeping the observable
1479+
// .then lookup on plain objects.
1480+
PromisePrototypeThen(PromiseResolve(value),enqueueValue,rejectPull);
1481+
return;
1482+
}
1483+
readableStreamDefaultControllerEnqueue(controller,value);
1484+
}
1485+
}catch(error){
1486+
rejectPull(error);
1487+
return;
1488+
}
1489+
// pullFulfilled exists: the controller creates it before the pull.
1490+
controller[kState].pullFulfilled();
1491+
}
1492+
1493+
functionenqueueValue(value){
1494+
constcontroller=stream[kState].controller;
1495+
try{
1496+
readableStreamDefaultControllerEnqueue(controller,value);
1497+
}catch(error){
1498+
rejectPull(error);
1499+
return;
1500+
}
1501+
controller[kState].pullFulfilled();
1502+
}
1503+
1504+
functionprocessPendingIterResult(){
1505+
constiterResult=pendingIterResult;
1506+
pendingIterResult=undefined;
1507+
processIterResult(iterResult);
1508+
}
1509+
1510+
functionpullAlgorithm(){
1511+
letnextResult;
1512+
try{
1513+
nextResult=FunctionPrototypeCall(nextMethod,iterator);
1514+
}catch(error){
1515+
returnPromiseReject(error);
1516+
}
1517+
if(nextResult!==null&&
1518+
(typeofnextResult==='object'||typeofnextResult==='function')){
1519+
// Mirrors `await iterator.next()`: processIterResult runs at the
1520+
// microtask position the await resumed.
1521+
PromisePrototypeThen(
1522+
PromiseResolve(nextResult),processIterResult,rejectPull);
1523+
returnkParkedAlgorithmResult;
14611524
}
1525+
// A non-thenable next() result fails validation a microtask later.
1526+
pendingIterResult=nextResult;
1527+
PromisePrototypeThen(kResolvedPromise,processPendingIterResult);
1528+
returnkParkedAlgorithmResult;
14621529
}
14631530

14641531
asyncfunctioncancelAlgorithm(reason){

‎lib/internal/webstreams/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const kResolvedPromise = PromiseResolve();
359359
// operation and takes responsibility for delivering the fulfilled (or
360360
// rejected) continuation itself later, instead of settling a promise
361361
// (see the transform stream source pull algorithm).
362-
constkParkedAlgorithmResult={__proto__: null};
362+
constkParkedAlgorithmResult=Symbol('kParkedAlgorithmResult');
363363

364364
// Wires the (possibly non-thenable) result of an underlying algorithm
365365
// callback to its fulfilled/rejected continuations. A non-thenable result

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit 1d6ec2d

Browse files
mcollinaaduh95
authored andcommitted
stream: encode whole chunks in TextEncoderStream
The encode-and-enqueue transform walked the chunk code unit by code unit, materializing a single-character string per index and building the output with string concatenation. The only state that crosses chunks is a trailing high (leading) surrogate, and TextEncoder.encode's USVString conversion already replaces every interior lone surrogate with U+FFFD, which is exactly what the spec loop produces. Join a pending high surrogate with the incoming chunk, hold back a new trailing high surrogate, and encode the rest in a single native call. The streaming decode path also reuses a single options object instead of allocating { stream: true } per chunk. An encoding-streams benchmark is added since the suite had no TextEncoderStream/TextDecoderStream row. Encoding improves by ~546% with 1KB string chunks and ~20% with 16-character chunks; decode is unchanged. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65414 Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Mattias Buelens <mattias@buelens.com>
1 parent 9e227ef commit 1d6ec2d

5 files changed

Lines changed: 166 additions & 35 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
TextEncoderStream,
6+
TextDecoderStream,
7+
}=require('node:stream/web');
8+
9+
constbench=common.createBenchmark(main,{
10+
n: [1e5],
11+
kind: ['encode','decode'],
12+
len: [16,1024],
13+
});
14+
15+
asyncfunctionmain({ n, kind, len }){
16+
constencoded=newTextEncoder().encode('a'.repeat(len));
17+
constdecoded='a'.repeat(len);
18+
leti=0;
19+
constrs=newReadableStream({
20+
pull(controller){
21+
if(i++<n){
22+
controller.enqueue(kind==='encode' ? decoded : encoded);
23+
}else{
24+
controller.close();
25+
}
26+
},
27+
});
28+
constts=kind==='encode' ?
29+
newTextEncoderStream() :
30+
newTextDecoderStream();
31+
32+
constreader=rs.pipeThrough(ts).getReader();
33+
bench.start();
34+
for(;;){
35+
const{ done }=awaitreader.read();
36+
if(done)break;
37+
}
38+
bench.end(n);
39+
}

‎benchmark/webstreams/from.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
}=require('node:stream/web');
6+
7+
constbench=common.createBenchmark(main,{
8+
n: [1e6],
9+
kind: ['sync','async'],
10+
});
11+
12+
asyncfunctionmain({ n, kind }){
13+
function*syncGen(){
14+
for(leti=0;i<n;i++)yieldi;
15+
}
16+
17+
asyncfunction*asyncGen(){
18+
for(leti=0;i<n;i++)yieldi;
19+
}
20+
21+
constreader=ReadableStream.from(
22+
kind==='sync' ? syncGen() : asyncGen()).getReader();
23+
bench.start();
24+
for(;;){
25+
const{ done }=awaitreader.read();
26+
if(done)break;
27+
}
28+
bench.end(n);
29+
}

‎lib/internal/webstreams/encoding.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
ObjectDefineProperties,
55
String,
66
StringPrototypeCharCodeAt,
7+
StringPrototypeSlice,
78
Uint8Array,
89
}=primordials;
910

@@ -31,6 +32,9 @@ const {
3132
kEnumerableProperty,
3233
}=require('internal/util');
3334

35+
// Shared per-chunk decode options; decode() only reads the flag.
36+
constkDecodeStreamingOptions={__proto__: null,stream: true};
37+
3438
/**
3539
* @typedef {import('./readablestream').ReadableStream} ReadableStream
3640
* @typedef {import('./writablestream').WritableStream} WritableStream
@@ -46,34 +50,26 @@ class TextEncoderStream {
4650
this.#transform =newTransformStream({
4751
transform: (chunk,controller)=>{
4852
// https://encoding.spec.whatwg.org/#encode-and-enqueue-a-chunk
53+
// The only cross-chunk state is a trailing high surrogate;
54+
// encode() replaces interior lone surrogates with U+FFFD exactly
55+
// like the spec's per-code-unit walk.
4956
chunk=String(chunk);
50-
letfinalChunk='';
51-
for(leti=0;i<chunk.length;i++){
52-
constitem=chunk[i];
53-
constcodeUnit=StringPrototypeCharCodeAt(item,0);
54-
if(this.#pendingHighSurrogate !==null){
55-
consthighSurrogate=this.#pendingHighSurrogate;
56-
this.#pendingHighSurrogate =null;
57-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
58-
finalChunk+=highSurrogate+item;
59-
continue;
60-
}
61-
finalChunk+='\uFFFD';
62-
}
63-
if(0xD800<=codeUnit&&codeUnit<=0xDBFF){
64-
this.#pendingHighSurrogate =item;
65-
continue;
66-
}
67-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
68-
finalChunk+='\uFFFD';
69-
continue;
70-
}
71-
finalChunk+=item;
57+
if(chunk.length===0)
58+
return;
59+
if(this.#pendingHighSurrogate !==null){
60+
chunk=this.#pendingHighSurrogate +chunk;
61+
this.#pendingHighSurrogate =null;
7262
}
73-
if(finalChunk){
74-
constvalue=this.#handle.encode(finalChunk);
75-
controller.enqueue(value);
63+
constlastCodeUnit=
64+
StringPrototypeCharCodeAt(chunk,chunk.length-1);
65+
if(0xD800<=lastCodeUnit&&lastCodeUnit<=0xDBFF){
66+
this.#pendingHighSurrogate =
67+
StringPrototypeSlice(chunk,-1);
68+
chunk=StringPrototypeSlice(chunk,0,-1);
69+
if(chunk.length===0)
70+
return;
7671
}
72+
controller.enqueue(this.#handle.encode(chunk));
7773
},
7874
flush: (controller)=>{
7975
// https://encoding.spec.whatwg.org/#encode-and-flush
@@ -137,7 +133,7 @@ class TextDecoderStream {
137133
if(chunk===undefined){
138134
thrownewERR_INVALID_ARG_TYPE('chunk','string',chunk);
139135
}
140-
constvalue=this.#handle.decode(chunk,{stream: true});
136+
constvalue=this.#handle.decode(chunk,kDecodeStreamingOptions);
141137
if(value)
142138
controller.enqueue(value);
143139
},

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
getNonWritablePropertyDescriptor,
113113
isBrandCheck,
114114
kEmptyQueue,
115+
kParkedAlgorithmResult,
115116
kResolvedPromise,
116117
kState,
117118
kType,
@@ -1446,19 +1447,85 @@ function readableStreamFromIterable(iterable) {
14461447
if(iterator===null||(typeofiterator!=='object'&&typeofiterator!=='function')){
14471448
thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');
14481449
}
1450+
// Per GetIteratorDirect, the next method is looked up once.
1451+
constnextMethod=iterator.next;
14491452
conststartAlgorithm=nonOpCallback;
14501453

1451-
asyncfunctionpullAlgorithm(){
1452-
constiterResult=awaititerator.next();
1454+
// Callback-style pull: the reaction steps are reused across chunks and
1455+
// completion is delivered to the controller's cached pull reactions
1456+
// (the kParkedAlgorithmResult contract). One pull runs at a time, so a
1457+
// single slot carries a non-thenable next() result between steps.
1458+
letpendingIterResult;
1459+
1460+
functionrejectPull(error){
1461+
readableStreamDefaultControllerError(stream[kState].controller,error);
1462+
}
1463+
1464+
functionprocessIterResult(iterResult){
1465+
constcontroller=stream[kState].controller;
14531466
if(typeofiterResult!=='object'||iterResult===null){
1454-
thrownewERR_INVALID_STATE.TypeError(
1455-
'The promise returned by the iterator.next() method must fulfill with an object');
1467+
rejectPull(newERR_INVALID_STATE.TypeError(
1468+
'The promise returned by the iterator.next() method must fulfill with an object'));
1469+
return;
14561470
}
1457-
if(iterResult.done){
1458-
readableStreamDefaultControllerClose(stream[kState].controller);
1459-
}else{
1460-
readableStreamDefaultControllerEnqueue(stream[kState].controller,awaititerResult.value);
1471+
try{
1472+
if(iterResult.done){
1473+
readableStreamDefaultControllerClose(controller);
1474+
}else{
1475+
constvalue=iterResult.value;
1476+
if(value!==null&&
1477+
(typeofvalue==='object'||typeofvalue==='function')){
1478+
// Adopted like `await iterResult.value`, keeping the observable
1479+
// .then lookup on plain objects.
1480+
PromisePrototypeThen(PromiseResolve(value),enqueueValue,rejectPull);
1481+
return;
1482+
}
1483+
readableStreamDefaultControllerEnqueue(controller,value);
1484+
}
1485+
}catch(error){
1486+
rejectPull(error);
1487+
return;
1488+
}
1489+
// pullFulfilled exists: the controller creates it before the pull.
1490+
controller[kState].pullFulfilled();
1491+
}
1492+
1493+
functionenqueueValue(value){
1494+
constcontroller=stream[kState].controller;
1495+
try{
1496+
readableStreamDefaultControllerEnqueue(controller,value);
1497+
}catch(error){
1498+
rejectPull(error);
1499+
return;
1500+
}
1501+
controller[kState].pullFulfilled();
1502+
}
1503+
1504+
functionprocessPendingIterResult(){
1505+
constiterResult=pendingIterResult;
1506+
pendingIterResult=undefined;
1507+
processIterResult(iterResult);
1508+
}
1509+
1510+
functionpullAlgorithm(){
1511+
letnextResult;
1512+
try{
1513+
nextResult=FunctionPrototypeCall(nextMethod,iterator);
1514+
}catch(error){
1515+
returnPromiseReject(error);
1516+
}
1517+
if(nextResult!==null&&
1518+
(typeofnextResult==='object'||typeofnextResult==='function')){
1519+
// Mirrors `await iterator.next()`: processIterResult runs at the
1520+
// microtask position the await resumed.
1521+
PromisePrototypeThen(
1522+
PromiseResolve(nextResult),processIterResult,rejectPull);
1523+
returnkParkedAlgorithmResult;
14611524
}
1525+
// A non-thenable next() result fails validation a microtask later.
1526+
pendingIterResult=nextResult;
1527+
PromisePrototypeThen(kResolvedPromise,processPendingIterResult);
1528+
returnkParkedAlgorithmResult;
14621529
}
14631530

14641531
asyncfunctioncancelAlgorithm(reason){

‎lib/internal/webstreams/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const kResolvedPromise = PromiseResolve();
359359
// operation and takes responsibility for delivering the fulfilled (or
360360
// rejected) continuation itself later, instead of settling a promise
361361
// (see the transform stream source pull algorithm).
362-
constkParkedAlgorithmResult={__proto__: null};
362+
constkParkedAlgorithmResult=Symbol('kParkedAlgorithmResult');
363363

364364
// Wires the (possibly non-thenable) result of an underlying algorithm
365365
// callback to its fulfilled/rejected continuations. A non-thenable result

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 1d6ec2d

Browse files
mcollinaaduh95
authored andcommitted
stream: encode whole chunks in TextEncoderStream
The encode-and-enqueue transform walked the chunk code unit by code unit, materializing a single-character string per index and building the output with string concatenation. The only state that crosses chunks is a trailing high (leading) surrogate, and TextEncoder.encode's USVString conversion already replaces every interior lone surrogate with U+FFFD, which is exactly what the spec loop produces. Join a pending high surrogate with the incoming chunk, hold back a new trailing high surrogate, and encode the rest in a single native call. The streaming decode path also reuses a single options object instead of allocating { stream: true } per chunk. An encoding-streams benchmark is added since the suite had no TextEncoderStream/TextDecoderStream row. Encoding improves by ~546% with 1KB string chunks and ~20% with 16-character chunks; decode is unchanged. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65414 Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Mattias Buelens <mattias@buelens.com>
1 parent 9e227ef commit 1d6ec2d

5 files changed

Lines changed: 166 additions & 35 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
TextEncoderStream,
6+
TextDecoderStream,
7+
}=require('node:stream/web');
8+
9+
constbench=common.createBenchmark(main,{
10+
n: [1e5],
11+
kind: ['encode','decode'],
12+
len: [16,1024],
13+
});
14+
15+
asyncfunctionmain({ n, kind, len }){
16+
constencoded=newTextEncoder().encode('a'.repeat(len));
17+
constdecoded='a'.repeat(len);
18+
leti=0;
19+
constrs=newReadableStream({
20+
pull(controller){
21+
if(i++<n){
22+
controller.enqueue(kind==='encode' ? decoded : encoded);
23+
}else{
24+
controller.close();
25+
}
26+
},
27+
});
28+
constts=kind==='encode' ?
29+
newTextEncoderStream() :
30+
newTextDecoderStream();
31+
32+
constreader=rs.pipeThrough(ts).getReader();
33+
bench.start();
34+
for(;;){
35+
const{ done }=awaitreader.read();
36+
if(done)break;
37+
}
38+
bench.end(n);
39+
}

‎benchmark/webstreams/from.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
}=require('node:stream/web');
6+
7+
constbench=common.createBenchmark(main,{
8+
n: [1e6],
9+
kind: ['sync','async'],
10+
});
11+
12+
asyncfunctionmain({ n, kind }){
13+
function*syncGen(){
14+
for(leti=0;i<n;i++)yieldi;
15+
}
16+
17+
asyncfunction*asyncGen(){
18+
for(leti=0;i<n;i++)yieldi;
19+
}
20+
21+
constreader=ReadableStream.from(
22+
kind==='sync' ? syncGen() : asyncGen()).getReader();
23+
bench.start();
24+
for(;;){
25+
const{ done }=awaitreader.read();
26+
if(done)break;
27+
}
28+
bench.end(n);
29+
}

‎lib/internal/webstreams/encoding.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
ObjectDefineProperties,
55
String,
66
StringPrototypeCharCodeAt,
7+
StringPrototypeSlice,
78
Uint8Array,
89
}=primordials;
910

@@ -31,6 +32,9 @@ const {
3132
kEnumerableProperty,
3233
}=require('internal/util');
3334

35+
// Shared per-chunk decode options; decode() only reads the flag.
36+
constkDecodeStreamingOptions={__proto__: null,stream: true};
37+
3438
/**
3539
* @typedef {import('./readablestream').ReadableStream} ReadableStream
3640
* @typedef {import('./writablestream').WritableStream} WritableStream
@@ -46,34 +50,26 @@ class TextEncoderStream {
4650
this.#transform =newTransformStream({
4751
transform: (chunk,controller)=>{
4852
// https://encoding.spec.whatwg.org/#encode-and-enqueue-a-chunk
53+
// The only cross-chunk state is a trailing high surrogate;
54+
// encode() replaces interior lone surrogates with U+FFFD exactly
55+
// like the spec's per-code-unit walk.
4956
chunk=String(chunk);
50-
letfinalChunk='';
51-
for(leti=0;i<chunk.length;i++){
52-
constitem=chunk[i];
53-
constcodeUnit=StringPrototypeCharCodeAt(item,0);
54-
if(this.#pendingHighSurrogate !==null){
55-
consthighSurrogate=this.#pendingHighSurrogate;
56-
this.#pendingHighSurrogate =null;
57-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
58-
finalChunk+=highSurrogate+item;
59-
continue;
60-
}
61-
finalChunk+='\uFFFD';
62-
}
63-
if(0xD800<=codeUnit&&codeUnit<=0xDBFF){
64-
this.#pendingHighSurrogate =item;
65-
continue;
66-
}
67-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
68-
finalChunk+='\uFFFD';
69-
continue;
70-
}
71-
finalChunk+=item;
57+
if(chunk.length===0)
58+
return;
59+
if(this.#pendingHighSurrogate !==null){
60+
chunk=this.#pendingHighSurrogate +chunk;
61+
this.#pendingHighSurrogate =null;
7262
}
73-
if(finalChunk){
74-
constvalue=this.#handle.encode(finalChunk);
75-
controller.enqueue(value);
63+
constlastCodeUnit=
64+
StringPrototypeCharCodeAt(chunk,chunk.length-1);
65+
if(0xD800<=lastCodeUnit&&lastCodeUnit<=0xDBFF){
66+
this.#pendingHighSurrogate =
67+
StringPrototypeSlice(chunk,-1);
68+
chunk=StringPrototypeSlice(chunk,0,-1);
69+
if(chunk.length===0)
70+
return;
7671
}
72+
controller.enqueue(this.#handle.encode(chunk));
7773
},
7874
flush: (controller)=>{
7975
// https://encoding.spec.whatwg.org/#encode-and-flush
@@ -137,7 +133,7 @@ class TextDecoderStream {
137133
if(chunk===undefined){
138134
thrownewERR_INVALID_ARG_TYPE('chunk','string',chunk);
139135
}
140-
constvalue=this.#handle.decode(chunk,{stream: true});
136+
constvalue=this.#handle.decode(chunk,kDecodeStreamingOptions);
141137
if(value)
142138
controller.enqueue(value);
143139
},

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
getNonWritablePropertyDescriptor,
113113
isBrandCheck,
114114
kEmptyQueue,
115+
kParkedAlgorithmResult,
115116
kResolvedPromise,
116117
kState,
117118
kType,
@@ -1446,19 +1447,85 @@ function readableStreamFromIterable(iterable) {
14461447
if(iterator===null||(typeofiterator!=='object'&&typeofiterator!=='function')){
14471448
thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');
14481449
}
1450+
// Per GetIteratorDirect, the next method is looked up once.
1451+
constnextMethod=iterator.next;
14491452
conststartAlgorithm=nonOpCallback;
14501453

1451-
asyncfunctionpullAlgorithm(){
1452-
constiterResult=awaititerator.next();
1454+
// Callback-style pull: the reaction steps are reused across chunks and
1455+
// completion is delivered to the controller's cached pull reactions
1456+
// (the kParkedAlgorithmResult contract). One pull runs at a time, so a
1457+
// single slot carries a non-thenable next() result between steps.
1458+
letpendingIterResult;
1459+
1460+
functionrejectPull(error){
1461+
readableStreamDefaultControllerError(stream[kState].controller,error);
1462+
}
1463+
1464+
functionprocessIterResult(iterResult){
1465+
constcontroller=stream[kState].controller;
14531466
if(typeofiterResult!=='object'||iterResult===null){
1454-
thrownewERR_INVALID_STATE.TypeError(
1455-
'The promise returned by the iterator.next() method must fulfill with an object');
1467+
rejectPull(newERR_INVALID_STATE.TypeError(
1468+
'The promise returned by the iterator.next() method must fulfill with an object'));
1469+
return;
14561470
}
1457-
if(iterResult.done){
1458-
readableStreamDefaultControllerClose(stream[kState].controller);
1459-
}else{
1460-
readableStreamDefaultControllerEnqueue(stream[kState].controller,awaititerResult.value);
1471+
try{
1472+
if(iterResult.done){
1473+
readableStreamDefaultControllerClose(controller);
1474+
}else{
1475+
constvalue=iterResult.value;
1476+
if(value!==null&&
1477+
(typeofvalue==='object'||typeofvalue==='function')){
1478+
// Adopted like `await iterResult.value`, keeping the observable
1479+
// .then lookup on plain objects.
1480+
PromisePrototypeThen(PromiseResolve(value),enqueueValue,rejectPull);
1481+
return;
1482+
}
1483+
readableStreamDefaultControllerEnqueue(controller,value);
1484+
}
1485+
}catch(error){
1486+
rejectPull(error);
1487+
return;
1488+
}
1489+
// pullFulfilled exists: the controller creates it before the pull.
1490+
controller[kState].pullFulfilled();
1491+
}
1492+
1493+
functionenqueueValue(value){
1494+
constcontroller=stream[kState].controller;
1495+
try{
1496+
readableStreamDefaultControllerEnqueue(controller,value);
1497+
}catch(error){
1498+
rejectPull(error);
1499+
return;
1500+
}
1501+
controller[kState].pullFulfilled();
1502+
}
1503+
1504+
functionprocessPendingIterResult(){
1505+
constiterResult=pendingIterResult;
1506+
pendingIterResult=undefined;
1507+
processIterResult(iterResult);
1508+
}
1509+
1510+
functionpullAlgorithm(){
1511+
letnextResult;
1512+
try{
1513+
nextResult=FunctionPrototypeCall(nextMethod,iterator);
1514+
}catch(error){
1515+
returnPromiseReject(error);
1516+
}
1517+
if(nextResult!==null&&
1518+
(typeofnextResult==='object'||typeofnextResult==='function')){
1519+
// Mirrors `await iterator.next()`: processIterResult runs at the
1520+
// microtask position the await resumed.
1521+
PromisePrototypeThen(
1522+
PromiseResolve(nextResult),processIterResult,rejectPull);
1523+
returnkParkedAlgorithmResult;
14611524
}
1525+
// A non-thenable next() result fails validation a microtask later.
1526+
pendingIterResult=nextResult;
1527+
PromisePrototypeThen(kResolvedPromise,processPendingIterResult);
1528+
returnkParkedAlgorithmResult;
14621529
}
14631530

14641531
asyncfunctioncancelAlgorithm(reason){

‎lib/internal/webstreams/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const kResolvedPromise = PromiseResolve();
359359
// operation and takes responsibility for delivering the fulfilled (or
360360
// rejected) continuation itself later, instead of settling a promise
361361
// (see the transform stream source pull algorithm).
362-
constkParkedAlgorithmResult={__proto__: null};
362+
constkParkedAlgorithmResult=Symbol('kParkedAlgorithmResult');
363363

364364
// Wires the (possibly non-thenable) result of an underlying algorithm
365365
// callback to its fulfilled/rejected continuations. A non-thenable result

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 1d6ec2d

Browse files
mcollinaaduh95
authored andcommitted
stream: encode whole chunks in TextEncoderStream
The encode-and-enqueue transform walked the chunk code unit by code unit, materializing a single-character string per index and building the output with string concatenation. The only state that crosses chunks is a trailing high (leading) surrogate, and TextEncoder.encode's USVString conversion already replaces every interior lone surrogate with U+FFFD, which is exactly what the spec loop produces. Join a pending high surrogate with the incoming chunk, hold back a new trailing high surrogate, and encode the rest in a single native call. The streaming decode path also reuses a single options object instead of allocating { stream: true } per chunk. An encoding-streams benchmark is added since the suite had no TextEncoderStream/TextDecoderStream row. Encoding improves by ~546% with 1KB string chunks and ~20% with 16-character chunks; decode is unchanged. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65414 Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Mattias Buelens <mattias@buelens.com>
1 parent 9e227ef commit 1d6ec2d

5 files changed

Lines changed: 166 additions & 35 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
TextEncoderStream,
6+
TextDecoderStream,
7+
}=require('node:stream/web');
8+
9+
constbench=common.createBenchmark(main,{
10+
n: [1e5],
11+
kind: ['encode','decode'],
12+
len: [16,1024],
13+
});
14+
15+
asyncfunctionmain({ n, kind, len }){
16+
constencoded=newTextEncoder().encode('a'.repeat(len));
17+
constdecoded='a'.repeat(len);
18+
leti=0;
19+
constrs=newReadableStream({
20+
pull(controller){
21+
if(i++<n){
22+
controller.enqueue(kind==='encode' ? decoded : encoded);
23+
}else{
24+
controller.close();
25+
}
26+
},
27+
});
28+
constts=kind==='encode' ?
29+
newTextEncoderStream() :
30+
newTextDecoderStream();
31+
32+
constreader=rs.pipeThrough(ts).getReader();
33+
bench.start();
34+
for(;;){
35+
const{ done }=awaitreader.read();
36+
if(done)break;
37+
}
38+
bench.end(n);
39+
}

‎benchmark/webstreams/from.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
}=require('node:stream/web');
6+
7+
constbench=common.createBenchmark(main,{
8+
n: [1e6],
9+
kind: ['sync','async'],
10+
});
11+
12+
asyncfunctionmain({ n, kind }){
13+
function*syncGen(){
14+
for(leti=0;i<n;i++)yieldi;
15+
}
16+
17+
asyncfunction*asyncGen(){
18+
for(leti=0;i<n;i++)yieldi;
19+
}
20+
21+
constreader=ReadableStream.from(
22+
kind==='sync' ? syncGen() : asyncGen()).getReader();
23+
bench.start();
24+
for(;;){
25+
const{ done }=awaitreader.read();
26+
if(done)break;
27+
}
28+
bench.end(n);
29+
}

‎lib/internal/webstreams/encoding.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
ObjectDefineProperties,
55
String,
66
StringPrototypeCharCodeAt,
7+
StringPrototypeSlice,
78
Uint8Array,
89
}=primordials;
910

@@ -31,6 +32,9 @@ const {
3132
kEnumerableProperty,
3233
}=require('internal/util');
3334

35+
// Shared per-chunk decode options; decode() only reads the flag.
36+
constkDecodeStreamingOptions={__proto__: null,stream: true};
37+
3438
/**
3539
* @typedef {import('./readablestream').ReadableStream} ReadableStream
3640
* @typedef {import('./writablestream').WritableStream} WritableStream
@@ -46,34 +50,26 @@ class TextEncoderStream {
4650
this.#transform =newTransformStream({
4751
transform: (chunk,controller)=>{
4852
// https://encoding.spec.whatwg.org/#encode-and-enqueue-a-chunk
53+
// The only cross-chunk state is a trailing high surrogate;
54+
// encode() replaces interior lone surrogates with U+FFFD exactly
55+
// like the spec's per-code-unit walk.
4956
chunk=String(chunk);
50-
letfinalChunk='';
51-
for(leti=0;i<chunk.length;i++){
52-
constitem=chunk[i];
53-
constcodeUnit=StringPrototypeCharCodeAt(item,0);
54-
if(this.#pendingHighSurrogate !==null){
55-
consthighSurrogate=this.#pendingHighSurrogate;
56-
this.#pendingHighSurrogate =null;
57-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
58-
finalChunk+=highSurrogate+item;
59-
continue;
60-
}
61-
finalChunk+='\uFFFD';
62-
}
63-
if(0xD800<=codeUnit&&codeUnit<=0xDBFF){
64-
this.#pendingHighSurrogate =item;
65-
continue;
66-
}
67-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
68-
finalChunk+='\uFFFD';
69-
continue;
70-
}
71-
finalChunk+=item;
57+
if(chunk.length===0)
58+
return;
59+
if(this.#pendingHighSurrogate !==null){
60+
chunk=this.#pendingHighSurrogate +chunk;
61+
this.#pendingHighSurrogate =null;
7262
}
73-
if(finalChunk){
74-
constvalue=this.#handle.encode(finalChunk);
75-
controller.enqueue(value);
63+
constlastCodeUnit=
64+
StringPrototypeCharCodeAt(chunk,chunk.length-1);
65+
if(0xD800<=lastCodeUnit&&lastCodeUnit<=0xDBFF){
66+
this.#pendingHighSurrogate =
67+
StringPrototypeSlice(chunk,-1);
68+
chunk=StringPrototypeSlice(chunk,0,-1);
69+
if(chunk.length===0)
70+
return;
7671
}
72+
controller.enqueue(this.#handle.encode(chunk));
7773
},
7874
flush: (controller)=>{
7975
// https://encoding.spec.whatwg.org/#encode-and-flush
@@ -137,7 +133,7 @@ class TextDecoderStream {
137133
if(chunk===undefined){
138134
thrownewERR_INVALID_ARG_TYPE('chunk','string',chunk);
139135
}
140-
constvalue=this.#handle.decode(chunk,{stream: true});
136+
constvalue=this.#handle.decode(chunk,kDecodeStreamingOptions);
141137
if(value)
142138
controller.enqueue(value);
143139
},

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
getNonWritablePropertyDescriptor,
113113
isBrandCheck,
114114
kEmptyQueue,
115+
kParkedAlgorithmResult,
115116
kResolvedPromise,
116117
kState,
117118
kType,
@@ -1446,19 +1447,85 @@ function readableStreamFromIterable(iterable) {
14461447
if(iterator===null||(typeofiterator!=='object'&&typeofiterator!=='function')){
14471448
thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');
14481449
}
1450+
// Per GetIteratorDirect, the next method is looked up once.
1451+
constnextMethod=iterator.next;
14491452
conststartAlgorithm=nonOpCallback;
14501453

1451-
asyncfunctionpullAlgorithm(){
1452-
constiterResult=awaititerator.next();
1454+
// Callback-style pull: the reaction steps are reused across chunks and
1455+
// completion is delivered to the controller's cached pull reactions
1456+
// (the kParkedAlgorithmResult contract). One pull runs at a time, so a
1457+
// single slot carries a non-thenable next() result between steps.
1458+
letpendingIterResult;
1459+
1460+
functionrejectPull(error){
1461+
readableStreamDefaultControllerError(stream[kState].controller,error);
1462+
}
1463+
1464+
functionprocessIterResult(iterResult){
1465+
constcontroller=stream[kState].controller;
14531466
if(typeofiterResult!=='object'||iterResult===null){
1454-
thrownewERR_INVALID_STATE.TypeError(
1455-
'The promise returned by the iterator.next() method must fulfill with an object');
1467+
rejectPull(newERR_INVALID_STATE.TypeError(
1468+
'The promise returned by the iterator.next() method must fulfill with an object'));
1469+
return;
14561470
}
1457-
if(iterResult.done){
1458-
readableStreamDefaultControllerClose(stream[kState].controller);
1459-
}else{
1460-
readableStreamDefaultControllerEnqueue(stream[kState].controller,awaititerResult.value);
1471+
try{
1472+
if(iterResult.done){
1473+
readableStreamDefaultControllerClose(controller);
1474+
}else{
1475+
constvalue=iterResult.value;
1476+
if(value!==null&&
1477+
(typeofvalue==='object'||typeofvalue==='function')){
1478+
// Adopted like `await iterResult.value`, keeping the observable
1479+
// .then lookup on plain objects.
1480+
PromisePrototypeThen(PromiseResolve(value),enqueueValue,rejectPull);
1481+
return;
1482+
}
1483+
readableStreamDefaultControllerEnqueue(controller,value);
1484+
}
1485+
}catch(error){
1486+
rejectPull(error);
1487+
return;
1488+
}
1489+
// pullFulfilled exists: the controller creates it before the pull.
1490+
controller[kState].pullFulfilled();
1491+
}
1492+
1493+
functionenqueueValue(value){
1494+
constcontroller=stream[kState].controller;
1495+
try{
1496+
readableStreamDefaultControllerEnqueue(controller,value);
1497+
}catch(error){
1498+
rejectPull(error);
1499+
return;
1500+
}
1501+
controller[kState].pullFulfilled();
1502+
}
1503+
1504+
functionprocessPendingIterResult(){
1505+
constiterResult=pendingIterResult;
1506+
pendingIterResult=undefined;
1507+
processIterResult(iterResult);
1508+
}
1509+
1510+
functionpullAlgorithm(){
1511+
letnextResult;
1512+
try{
1513+
nextResult=FunctionPrototypeCall(nextMethod,iterator);
1514+
}catch(error){
1515+
returnPromiseReject(error);
1516+
}
1517+
if(nextResult!==null&&
1518+
(typeofnextResult==='object'||typeofnextResult==='function')){
1519+
// Mirrors `await iterator.next()`: processIterResult runs at the
1520+
// microtask position the await resumed.
1521+
PromisePrototypeThen(
1522+
PromiseResolve(nextResult),processIterResult,rejectPull);
1523+
returnkParkedAlgorithmResult;
14611524
}
1525+
// A non-thenable next() result fails validation a microtask later.
1526+
pendingIterResult=nextResult;
1527+
PromisePrototypeThen(kResolvedPromise,processPendingIterResult);
1528+
returnkParkedAlgorithmResult;
14621529
}
14631530

14641531
asyncfunctioncancelAlgorithm(reason){

‎lib/internal/webstreams/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const kResolvedPromise = PromiseResolve();
359359
// operation and takes responsibility for delivering the fulfilled (or
360360
// rejected) continuation itself later, instead of settling a promise
361361
// (see the transform stream source pull algorithm).
362-
constkParkedAlgorithmResult={__proto__: null};
362+
constkParkedAlgorithmResult=Symbol('kParkedAlgorithmResult');
363363

364364
// Wires the (possibly non-thenable) result of an underlying algorithm
365365
// callback to its fulfilled/rejected continuations. A non-thenable result

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit 1d6ec2d

Browse files
mcollinaaduh95
authored andcommitted
stream: encode whole chunks in TextEncoderStream
The encode-and-enqueue transform walked the chunk code unit by code unit, materializing a single-character string per index and building the output with string concatenation. The only state that crosses chunks is a trailing high (leading) surrogate, and TextEncoder.encode's USVString conversion already replaces every interior lone surrogate with U+FFFD, which is exactly what the spec loop produces. Join a pending high surrogate with the incoming chunk, hold back a new trailing high surrogate, and encode the rest in a single native call. The streaming decode path also reuses a single options object instead of allocating { stream: true } per chunk. An encoding-streams benchmark is added since the suite had no TextEncoderStream/TextDecoderStream row. Encoding improves by ~546% with 1KB string chunks and ~20% with 16-character chunks; decode is unchanged. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65414 Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Mattias Buelens <mattias@buelens.com>
1 parent 9e227ef commit 1d6ec2d

5 files changed

Lines changed: 166 additions & 35 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
TextEncoderStream,
6+
TextDecoderStream,
7+
}=require('node:stream/web');
8+
9+
constbench=common.createBenchmark(main,{
10+
n: [1e5],
11+
kind: ['encode','decode'],
12+
len: [16,1024],
13+
});
14+
15+
asyncfunctionmain({ n, kind, len }){
16+
constencoded=newTextEncoder().encode('a'.repeat(len));
17+
constdecoded='a'.repeat(len);
18+
leti=0;
19+
constrs=newReadableStream({
20+
pull(controller){
21+
if(i++<n){
22+
controller.enqueue(kind==='encode' ? decoded : encoded);
23+
}else{
24+
controller.close();
25+
}
26+
},
27+
});
28+
constts=kind==='encode' ?
29+
newTextEncoderStream() :
30+
newTextDecoderStream();
31+
32+
constreader=rs.pipeThrough(ts).getReader();
33+
bench.start();
34+
for(;;){
35+
const{ done }=awaitreader.read();
36+
if(done)break;
37+
}
38+
bench.end(n);
39+
}

‎benchmark/webstreams/from.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
constcommon=require('../common.js');
3+
const{
4+
ReadableStream,
5+
}=require('node:stream/web');
6+
7+
constbench=common.createBenchmark(main,{
8+
n: [1e6],
9+
kind: ['sync','async'],
10+
});
11+
12+
asyncfunctionmain({ n, kind }){
13+
function*syncGen(){
14+
for(leti=0;i<n;i++)yieldi;
15+
}
16+
17+
asyncfunction*asyncGen(){
18+
for(leti=0;i<n;i++)yieldi;
19+
}
20+
21+
constreader=ReadableStream.from(
22+
kind==='sync' ? syncGen() : asyncGen()).getReader();
23+
bench.start();
24+
for(;;){
25+
const{ done }=awaitreader.read();
26+
if(done)break;
27+
}
28+
bench.end(n);
29+
}

‎lib/internal/webstreams/encoding.js‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
ObjectDefineProperties,
55
String,
66
StringPrototypeCharCodeAt,
7+
StringPrototypeSlice,
78
Uint8Array,
89
}=primordials;
910

@@ -31,6 +32,9 @@ const {
3132
kEnumerableProperty,
3233
}=require('internal/util');
3334

35+
// Shared per-chunk decode options; decode() only reads the flag.
36+
constkDecodeStreamingOptions={__proto__: null,stream: true};
37+
3438
/**
3539
* @typedef {import('./readablestream').ReadableStream} ReadableStream
3640
* @typedef {import('./writablestream').WritableStream} WritableStream
@@ -46,34 +50,26 @@ class TextEncoderStream {
4650
this.#transform =newTransformStream({
4751
transform: (chunk,controller)=>{
4852
// https://encoding.spec.whatwg.org/#encode-and-enqueue-a-chunk
53+
// The only cross-chunk state is a trailing high surrogate;
54+
// encode() replaces interior lone surrogates with U+FFFD exactly
55+
// like the spec's per-code-unit walk.
4956
chunk=String(chunk);
50-
letfinalChunk='';
51-
for(leti=0;i<chunk.length;i++){
52-
constitem=chunk[i];
53-
constcodeUnit=StringPrototypeCharCodeAt(item,0);
54-
if(this.#pendingHighSurrogate !==null){
55-
consthighSurrogate=this.#pendingHighSurrogate;
56-
this.#pendingHighSurrogate =null;
57-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
58-
finalChunk+=highSurrogate+item;
59-
continue;
60-
}
61-
finalChunk+='\uFFFD';
62-
}
63-
if(0xD800<=codeUnit&&codeUnit<=0xDBFF){
64-
this.#pendingHighSurrogate =item;
65-
continue;
66-
}
67-
if(0xDC00<=codeUnit&&codeUnit<=0xDFFF){
68-
finalChunk+='\uFFFD';
69-
continue;
70-
}
71-
finalChunk+=item;
57+
if(chunk.length===0)
58+
return;
59+
if(this.#pendingHighSurrogate !==null){
60+
chunk=this.#pendingHighSurrogate +chunk;
61+
this.#pendingHighSurrogate =null;
7262
}
73-
if(finalChunk){
74-
constvalue=this.#handle.encode(finalChunk);
75-
controller.enqueue(value);
63+
constlastCodeUnit=
64+
StringPrototypeCharCodeAt(chunk,chunk.length-1);
65+
if(0xD800<=lastCodeUnit&&lastCodeUnit<=0xDBFF){
66+
this.#pendingHighSurrogate =
67+
StringPrototypeSlice(chunk,-1);
68+
chunk=StringPrototypeSlice(chunk,0,-1);
69+
if(chunk.length===0)
70+
return;
7671
}
72+
controller.enqueue(this.#handle.encode(chunk));
7773
},
7874
flush: (controller)=>{
7975
// https://encoding.spec.whatwg.org/#encode-and-flush
@@ -137,7 +133,7 @@ class TextDecoderStream {
137133
if(chunk===undefined){
138134
thrownewERR_INVALID_ARG_TYPE('chunk','string',chunk);
139135
}
140-
constvalue=this.#handle.decode(chunk,{stream: true});
136+
constvalue=this.#handle.decode(chunk,kDecodeStreamingOptions);
141137
if(value)
142138
controller.enqueue(value);
143139
},

‎lib/internal/webstreams/readablestream.js‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const {
112112
getNonWritablePropertyDescriptor,
113113
isBrandCheck,
114114
kEmptyQueue,
115+
kParkedAlgorithmResult,
115116
kResolvedPromise,
116117
kState,
117118
kType,
@@ -1446,19 +1447,85 @@ function readableStreamFromIterable(iterable) {
14461447
if(iterator===null||(typeofiterator!=='object'&&typeofiterator!=='function')){
14471448
thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');
14481449
}
1450+
// Per GetIteratorDirect, the next method is looked up once.
1451+
constnextMethod=iterator.next;
14491452
conststartAlgorithm=nonOpCallback;
14501453

1451-
asyncfunctionpullAlgorithm(){
1452-
constiterResult=awaititerator.next();
1454+
// Callback-style pull: the reaction steps are reused across chunks and
1455+
// completion is delivered to the controller's cached pull reactions
1456+
// (the kParkedAlgorithmResult contract). One pull runs at a time, so a
1457+
// single slot carries a non-thenable next() result between steps.
1458+
letpendingIterResult;
1459+
1460+
functionrejectPull(error){
1461+
readableStreamDefaultControllerError(stream[kState].controller,error);
1462+
}
1463+
1464+
functionprocessIterResult(iterResult){
1465+
constcontroller=stream[kState].controller;
14531466
if(typeofiterResult!=='object'||iterResult===null){
1454-
thrownewERR_INVALID_STATE.TypeError(
1455-
'The promise returned by the iterator.next() method must fulfill with an object');
1467+
rejectPull(newERR_INVALID_STATE.TypeError(
1468+
'The promise returned by the iterator.next() method must fulfill with an object'));
1469+
return;
14561470
}
1457-
if(iterResult.done){
1458-
readableStreamDefaultControllerClose(stream[kState].controller);
1459-
}else{
1460-
readableStreamDefaultControllerEnqueue(stream[kState].controller,awaititerResult.value);
1471+
try{
1472+
if(iterResult.done){
1473+
readableStreamDefaultControllerClose(controller);
1474+
}else{
1475+
constvalue=iterResult.value;
1476+
if(value!==null&&
1477+
(typeofvalue==='object'||typeofvalue==='function')){
1478+
// Adopted like `await iterResult.value`, keeping the observable
1479+
// .then lookup on plain objects.
1480+
PromisePrototypeThen(PromiseResolve(value),enqueueValue,rejectPull);
1481+
return;
1482+
}
1483+
readableStreamDefaultControllerEnqueue(controller,value);
1484+
}
1485+
}catch(error){
1486+
rejectPull(error);
1487+
return;
1488+
}
1489+
// pullFulfilled exists: the controller creates it before the pull.
1490+
controller[kState].pullFulfilled();
1491+
}
1492+
1493+
functionenqueueValue(value){
1494+
constcontroller=stream[kState].controller;
1495+
try{
1496+
readableStreamDefaultControllerEnqueue(controller,value);
1497+
}catch(error){
1498+
rejectPull(error);
1499+
return;
1500+
}
1501+
controller[kState].pullFulfilled();
1502+
}
1503+
1504+
functionprocessPendingIterResult(){
1505+
constiterResult=pendingIterResult;
1506+
pendingIterResult=undefined;
1507+
processIterResult(iterResult);
1508+
}
1509+
1510+
functionpullAlgorithm(){
1511+
letnextResult;
1512+
try{
1513+
nextResult=FunctionPrototypeCall(nextMethod,iterator);
1514+
}catch(error){
1515+
returnPromiseReject(error);
1516+
}
1517+
if(nextResult!==null&&
1518+
(typeofnextResult==='object'||typeofnextResult==='function')){
1519+
// Mirrors `await iterator.next()`: processIterResult runs at the
1520+
// microtask position the await resumed.
1521+
PromisePrototypeThen(
1522+
PromiseResolve(nextResult),processIterResult,rejectPull);
1523+
returnkParkedAlgorithmResult;
14611524
}
1525+
// A non-thenable next() result fails validation a microtask later.
1526+
pendingIterResult=nextResult;
1527+
PromisePrototypeThen(kResolvedPromise,processPendingIterResult);
1528+
returnkParkedAlgorithmResult;
14621529
}
14631530

14641531
asyncfunctioncancelAlgorithm(reason){

‎lib/internal/webstreams/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const kResolvedPromise = PromiseResolve();
359359
// operation and takes responsibility for delivering the fulfilled (or
360360
// rejected) continuation itself later, instead of settling a promise
361361
// (see the transform stream source pull algorithm).
362-
constkParkedAlgorithmResult={__proto__: null};
362+
constkParkedAlgorithmResult=Symbol('kParkedAlgorithmResult');
363363

364364
// Wires the (possibly non-thenable) result of an underlying algorithm
365365
// callback to its fulfilled/rejected continuations. A non-thenable result

0 commit comments

Comments
 (0)