Commit 24b7831

Browse files
trivikraduh95
authored andcommitted
stream: fix pipeToSync byte accounting
Stop pipeToSync() from counting chunks when writeSync() or writevSync() returns false without accepting the data. Preserve writers that use false as an accepted backpressure signal. Fixes: #63562 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63564 Backport-PR-URL: #64675Fixes: #63562 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 3b5f1b5 commit 24b7831

2 files changed

Lines changed: 78 additions & 16 deletions

File tree

β€Žlib/internal/streams/iter/pull.jsβ€Ž

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,18 @@ async function* createAsyncPipeline(source, transforms, signal) {
863863
}
864864
}
865865

866+
/**
867+
* Check if a false sync write result means accepted backpressure.
868+
* @param {object} writer - The writer whose sync method returned.
869+
* @param {*} result - The return value from writeSync() or writevSync().
870+
* @returns {boolean}
871+
*/
872+
functionisAcceptedSyncWriteBackpressure(writer,result){
873+
returnresult===false&&
874+
writer[kSyncWriteAcceptedOnFalse]===true&&
875+
writer.desiredSize===0;
876+
}
877+
866878
// =============================================================================
867879
// Public API: pull() and pullSync()
868880
// =============================================================================
@@ -950,16 +962,29 @@ function pipeToSync(source, ...args) {
950962
consthasEndSync=typeofwriter.endSync==='function';
951963

952964
try{
965+
letcanContinue=true;
953966
for(constbatchofpipeline){
967+
if(!canContinue){
968+
break;
969+
}
954970
if(hasWritevSync&&batch.length>1){
955-
writer.writevSync(batch);
971+
constresult=writer.writevSync(batch);
972+
if(result===false&&
973+
!isAcceptedSyncWriteBackpressure(writer,result)){
974+
break;
975+
}
956976
for(leti=0;i<batch.length;i++){
957977
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
958978
}
959979
}else{
960980
for(leti=0;i<batch.length;i++){
961981
constchunk=batch[i];
962-
writer.writeSync(chunk);
982+
constresult=writer.writeSync(chunk);
983+
if(result===false&&
984+
!isAcceptedSyncWriteBackpressure(writer,result)){
985+
canContinue=false;
986+
break;
987+
}
963988
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
964989
}
965990
}
@@ -1011,11 +1036,6 @@ async function pipeTo(source, ...args) {
10111036
consthasWritev=typeofwriter.writev==='function';
10121037
consthasWritevSync=typeofwriter.writevSync==='function';
10131038
consthasEndSync=typeofwriter.endSync==='function';
1014-
constsyncFalseCanBeAccepted=writer[kSyncWriteAcceptedOnFalse]===true;
1015-
1016-
functionsyncFalseWasAccepted(){
1017-
returnsyncFalseCanBeAccepted&&writer.desiredSize===0;
1018-
}
10191039

10201040
functionwaitForSyncBackpressure(){
10211041
constondrain=writer[drainableProtocol];
@@ -1032,9 +1052,10 @@ async function pipeTo(source, ...args) {
10321052
asyncfunctionwriteBatchAsyncFallback(batch,startIndex){
10331053
for(leti=startIndex;i<batch.length;i++){
10341054
constchunk=batch[i];
1035-
if(hasWriteSync&&writer.writeSync(chunk)){
1055+
constresult=hasWriteSync&&writer.writeSync(chunk);
1056+
if(result){
10361057
// Sync retry succeeded
1037-
}elseif(syncFalseWasAccepted()){
1058+
}elseif(isAcceptedSyncWriteBackpressure(writer,result)){
10381059
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10391060
awaitwaitForSyncBackpressure();
10401061
continue;
@@ -1054,22 +1075,23 @@ async function pipeTo(source, ...args) {
10541075
// is required. Callers must check: const p = writeBatch(b); if (p) await p;
10551076
functionwriteBatch(batch){
10561077
if(hasWritev&&batch.length>1){
1057-
if(!hasWritevSync||!writer.writevSync(batch)){
1058-
if(hasWritevSync&&syncFalseWasAccepted()){
1078+
constresult=hasWritevSync&&writer.writevSync(batch);
1079+
if(!result){
1080+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10591081
for(leti=0;i<batch.length;i++){
10601082
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10611083
}
10621084
returnwaitForSyncBackpressure();
10631085
}
10641086
constopts=signal ? {__proto__: null, signal } : undefined;
1065-
constresult=writer.writev(batch,opts);
1066-
if(result===undefined){
1087+
constwritevResult=writer.writev(batch,opts);
1088+
if(writevResult===undefined){
10671089
for(leti=0;i<batch.length;i++){
10681090
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10691091
}
10701092
return;
10711093
}
1072-
returnPromisePrototypeThen(PromiseResolve(result),()=>{
1094+
returnPromisePrototypeThen(PromiseResolve(writevResult),()=>{
10731095
for(leti=0;i<batch.length;i++){
10741096
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10751097
}
@@ -1082,8 +1104,9 @@ async function pipeTo(source, ...args) {
10821104
}
10831105
for(leti=0;i<batch.length;i++){
10841106
constchunk=batch[i];
1085-
if(!hasWriteSync||!writer.writeSync(chunk)){
1086-
if(hasWriteSync&&syncFalseWasAccepted()){
1107+
constresult=hasWriteSync&&writer.writeSync(chunk);
1108+
if(!result){
1109+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10871110
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10881111
returnwriteBatchAfterAcceptedBackpressure(batch,i+1);
10891112
}

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,43 @@ async function testPushWriterBlockSyncFalseAccepted() {
154154
})(),'abcd',4);
155155
}
156156

157+
asyncfunctiontestPipeToSyncPushWriterStrictFalseRejected(){
158+
constdecoder=newTextDecoder();
159+
const{ writer, readable }=push({highWaterMark: 1});
160+
161+
consttotal=pipeToSync(['a','b'],writer,{preventClose: true});
162+
assert.strictEqual(total,1);
163+
164+
constiter=readable[Symbol.asyncIterator]();
165+
constfirst=awaititer.next();
166+
assert.strictEqual(first.done,false);
167+
assert.strictEqual(decoder.decode(first.value[0]),'a');
168+
169+
constsecond=awaitPromise.race([
170+
iter.next().then((result)=>{
171+
returnresult.done ? '<done>' : decoder.decode(result.value[0]);
172+
}),
173+
setImmediatePromise().then(()=>'<no second chunk>'),
174+
]);
175+
assert.strictEqual(second,'<no second chunk>');
176+
177+
awaititer.return?.();
178+
}
179+
180+
asyncfunctiontestPipeToSyncWritevFalseNotCounted(){
181+
constwriter={
182+
writevSync(){returnfalse;},
183+
writeSync: common.mustNotCall(),
184+
endSync(){return0;},
185+
};
186+
function*source(){
187+
yield[newUint8Array([1]),newUint8Array([2])];
188+
}
189+
190+
consttotal=pipeToSync(source(),writer);
191+
assert.strictEqual(total,0);
192+
}
193+
157194
// pipeToSync with writevSync
158195
asyncfunctiontestPipeToSyncWritev(){
159196
constbatches=[];
@@ -215,6 +252,8 @@ Promise.all([
215252
testWriteSyncFailsMidBatch(),
216253
testWriteSyncAlwaysFails(),
217254
testPushWriterBlockSyncFalseAccepted(),
255+
testPipeToSyncPushWriterStrictFalseRejected(),
256+
testPipeToSyncWritevFalseNotCounted(),
218257
testPipeToSyncWritev(),
219258
testPipeToSyncPlainChunksWritev(),
220259
testPipeToSyncWriteFallback(),

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 24b7831

Browse files
trivikraduh95
authored andcommitted
stream: fix pipeToSync byte accounting
Stop pipeToSync() from counting chunks when writeSync() or writevSync() returns false without accepting the data. Preserve writers that use false as an accepted backpressure signal. Fixes: #63562 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63564 Backport-PR-URL: #64675Fixes: #63562 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 3b5f1b5 commit 24b7831

2 files changed

Lines changed: 78 additions & 16 deletions

File tree

β€Žlib/internal/streams/iter/pull.jsβ€Ž

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,18 @@ async function* createAsyncPipeline(source, transforms, signal) {
863863
}
864864
}
865865

866+
/**
867+
* Check if a false sync write result means accepted backpressure.
868+
* @param {object} writer - The writer whose sync method returned.
869+
* @param {*} result - The return value from writeSync() or writevSync().
870+
* @returns {boolean}
871+
*/
872+
functionisAcceptedSyncWriteBackpressure(writer,result){
873+
returnresult===false&&
874+
writer[kSyncWriteAcceptedOnFalse]===true&&
875+
writer.desiredSize===0;
876+
}
877+
866878
// =============================================================================
867879
// Public API: pull() and pullSync()
868880
// =============================================================================
@@ -950,16 +962,29 @@ function pipeToSync(source, ...args) {
950962
consthasEndSync=typeofwriter.endSync==='function';
951963

952964
try{
965+
letcanContinue=true;
953966
for(constbatchofpipeline){
967+
if(!canContinue){
968+
break;
969+
}
954970
if(hasWritevSync&&batch.length>1){
955-
writer.writevSync(batch);
971+
constresult=writer.writevSync(batch);
972+
if(result===false&&
973+
!isAcceptedSyncWriteBackpressure(writer,result)){
974+
break;
975+
}
956976
for(leti=0;i<batch.length;i++){
957977
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
958978
}
959979
}else{
960980
for(leti=0;i<batch.length;i++){
961981
constchunk=batch[i];
962-
writer.writeSync(chunk);
982+
constresult=writer.writeSync(chunk);
983+
if(result===false&&
984+
!isAcceptedSyncWriteBackpressure(writer,result)){
985+
canContinue=false;
986+
break;
987+
}
963988
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
964989
}
965990
}
@@ -1011,11 +1036,6 @@ async function pipeTo(source, ...args) {
10111036
consthasWritev=typeofwriter.writev==='function';
10121037
consthasWritevSync=typeofwriter.writevSync==='function';
10131038
consthasEndSync=typeofwriter.endSync==='function';
1014-
constsyncFalseCanBeAccepted=writer[kSyncWriteAcceptedOnFalse]===true;
1015-
1016-
functionsyncFalseWasAccepted(){
1017-
returnsyncFalseCanBeAccepted&&writer.desiredSize===0;
1018-
}
10191039

10201040
functionwaitForSyncBackpressure(){
10211041
constondrain=writer[drainableProtocol];
@@ -1032,9 +1052,10 @@ async function pipeTo(source, ...args) {
10321052
asyncfunctionwriteBatchAsyncFallback(batch,startIndex){
10331053
for(leti=startIndex;i<batch.length;i++){
10341054
constchunk=batch[i];
1035-
if(hasWriteSync&&writer.writeSync(chunk)){
1055+
constresult=hasWriteSync&&writer.writeSync(chunk);
1056+
if(result){
10361057
// Sync retry succeeded
1037-
}elseif(syncFalseWasAccepted()){
1058+
}elseif(isAcceptedSyncWriteBackpressure(writer,result)){
10381059
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10391060
awaitwaitForSyncBackpressure();
10401061
continue;
@@ -1054,22 +1075,23 @@ async function pipeTo(source, ...args) {
10541075
// is required. Callers must check: const p = writeBatch(b); if (p) await p;
10551076
functionwriteBatch(batch){
10561077
if(hasWritev&&batch.length>1){
1057-
if(!hasWritevSync||!writer.writevSync(batch)){
1058-
if(hasWritevSync&&syncFalseWasAccepted()){
1078+
constresult=hasWritevSync&&writer.writevSync(batch);
1079+
if(!result){
1080+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10591081
for(leti=0;i<batch.length;i++){
10601082
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10611083
}
10621084
returnwaitForSyncBackpressure();
10631085
}
10641086
constopts=signal ? {__proto__: null, signal } : undefined;
1065-
constresult=writer.writev(batch,opts);
1066-
if(result===undefined){
1087+
constwritevResult=writer.writev(batch,opts);
1088+
if(writevResult===undefined){
10671089
for(leti=0;i<batch.length;i++){
10681090
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10691091
}
10701092
return;
10711093
}
1072-
returnPromisePrototypeThen(PromiseResolve(result),()=>{
1094+
returnPromisePrototypeThen(PromiseResolve(writevResult),()=>{
10731095
for(leti=0;i<batch.length;i++){
10741096
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10751097
}
@@ -1082,8 +1104,9 @@ async function pipeTo(source, ...args) {
10821104
}
10831105
for(leti=0;i<batch.length;i++){
10841106
constchunk=batch[i];
1085-
if(!hasWriteSync||!writer.writeSync(chunk)){
1086-
if(hasWriteSync&&syncFalseWasAccepted()){
1107+
constresult=hasWriteSync&&writer.writeSync(chunk);
1108+
if(!result){
1109+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10871110
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10881111
returnwriteBatchAfterAcceptedBackpressure(batch,i+1);
10891112
}

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,43 @@ async function testPushWriterBlockSyncFalseAccepted() {
154154
})(),'abcd',4);
155155
}
156156

157+
asyncfunctiontestPipeToSyncPushWriterStrictFalseRejected(){
158+
constdecoder=newTextDecoder();
159+
const{ writer, readable }=push({highWaterMark: 1});
160+
161+
consttotal=pipeToSync(['a','b'],writer,{preventClose: true});
162+
assert.strictEqual(total,1);
163+
164+
constiter=readable[Symbol.asyncIterator]();
165+
constfirst=awaititer.next();
166+
assert.strictEqual(first.done,false);
167+
assert.strictEqual(decoder.decode(first.value[0]),'a');
168+
169+
constsecond=awaitPromise.race([
170+
iter.next().then((result)=>{
171+
returnresult.done ? '<done>' : decoder.decode(result.value[0]);
172+
}),
173+
setImmediatePromise().then(()=>'<no second chunk>'),
174+
]);
175+
assert.strictEqual(second,'<no second chunk>');
176+
177+
awaititer.return?.();
178+
}
179+
180+
asyncfunctiontestPipeToSyncWritevFalseNotCounted(){
181+
constwriter={
182+
writevSync(){returnfalse;},
183+
writeSync: common.mustNotCall(),
184+
endSync(){return0;},
185+
};
186+
function*source(){
187+
yield[newUint8Array([1]),newUint8Array([2])];
188+
}
189+
190+
consttotal=pipeToSync(source(),writer);
191+
assert.strictEqual(total,0);
192+
}
193+
157194
// pipeToSync with writevSync
158195
asyncfunctiontestPipeToSyncWritev(){
159196
constbatches=[];
@@ -215,6 +252,8 @@ Promise.all([
215252
testWriteSyncFailsMidBatch(),
216253
testWriteSyncAlwaysFails(),
217254
testPushWriterBlockSyncFalseAccepted(),
255+
testPipeToSyncPushWriterStrictFalseRejected(),
256+
testPipeToSyncWritevFalseNotCounted(),
218257
testPipeToSyncWritev(),
219258
testPipeToSyncPlainChunksWritev(),
220259
testPipeToSyncWriteFallback(),

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 24b7831

Browse files
trivikraduh95
authored andcommitted
stream: fix pipeToSync byte accounting
Stop pipeToSync() from counting chunks when writeSync() or writevSync() returns false without accepting the data. Preserve writers that use false as an accepted backpressure signal. Fixes: #63562 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63564 Backport-PR-URL: #64675Fixes: #63562 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 3b5f1b5 commit 24b7831

2 files changed

Lines changed: 78 additions & 16 deletions

File tree

β€Žlib/internal/streams/iter/pull.jsβ€Ž

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,18 @@ async function* createAsyncPipeline(source, transforms, signal) {
863863
}
864864
}
865865

866+
/**
867+
* Check if a false sync write result means accepted backpressure.
868+
* @param {object} writer - The writer whose sync method returned.
869+
* @param {*} result - The return value from writeSync() or writevSync().
870+
* @returns {boolean}
871+
*/
872+
functionisAcceptedSyncWriteBackpressure(writer,result){
873+
returnresult===false&&
874+
writer[kSyncWriteAcceptedOnFalse]===true&&
875+
writer.desiredSize===0;
876+
}
877+
866878
// =============================================================================
867879
// Public API: pull() and pullSync()
868880
// =============================================================================
@@ -950,16 +962,29 @@ function pipeToSync(source, ...args) {
950962
consthasEndSync=typeofwriter.endSync==='function';
951963

952964
try{
965+
letcanContinue=true;
953966
for(constbatchofpipeline){
967+
if(!canContinue){
968+
break;
969+
}
954970
if(hasWritevSync&&batch.length>1){
955-
writer.writevSync(batch);
971+
constresult=writer.writevSync(batch);
972+
if(result===false&&
973+
!isAcceptedSyncWriteBackpressure(writer,result)){
974+
break;
975+
}
956976
for(leti=0;i<batch.length;i++){
957977
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
958978
}
959979
}else{
960980
for(leti=0;i<batch.length;i++){
961981
constchunk=batch[i];
962-
writer.writeSync(chunk);
982+
constresult=writer.writeSync(chunk);
983+
if(result===false&&
984+
!isAcceptedSyncWriteBackpressure(writer,result)){
985+
canContinue=false;
986+
break;
987+
}
963988
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
964989
}
965990
}
@@ -1011,11 +1036,6 @@ async function pipeTo(source, ...args) {
10111036
consthasWritev=typeofwriter.writev==='function';
10121037
consthasWritevSync=typeofwriter.writevSync==='function';
10131038
consthasEndSync=typeofwriter.endSync==='function';
1014-
constsyncFalseCanBeAccepted=writer[kSyncWriteAcceptedOnFalse]===true;
1015-
1016-
functionsyncFalseWasAccepted(){
1017-
returnsyncFalseCanBeAccepted&&writer.desiredSize===0;
1018-
}
10191039

10201040
functionwaitForSyncBackpressure(){
10211041
constondrain=writer[drainableProtocol];
@@ -1032,9 +1052,10 @@ async function pipeTo(source, ...args) {
10321052
asyncfunctionwriteBatchAsyncFallback(batch,startIndex){
10331053
for(leti=startIndex;i<batch.length;i++){
10341054
constchunk=batch[i];
1035-
if(hasWriteSync&&writer.writeSync(chunk)){
1055+
constresult=hasWriteSync&&writer.writeSync(chunk);
1056+
if(result){
10361057
// Sync retry succeeded
1037-
}elseif(syncFalseWasAccepted()){
1058+
}elseif(isAcceptedSyncWriteBackpressure(writer,result)){
10381059
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10391060
awaitwaitForSyncBackpressure();
10401061
continue;
@@ -1054,22 +1075,23 @@ async function pipeTo(source, ...args) {
10541075
// is required. Callers must check: const p = writeBatch(b); if (p) await p;
10551076
functionwriteBatch(batch){
10561077
if(hasWritev&&batch.length>1){
1057-
if(!hasWritevSync||!writer.writevSync(batch)){
1058-
if(hasWritevSync&&syncFalseWasAccepted()){
1078+
constresult=hasWritevSync&&writer.writevSync(batch);
1079+
if(!result){
1080+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10591081
for(leti=0;i<batch.length;i++){
10601082
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10611083
}
10621084
returnwaitForSyncBackpressure();
10631085
}
10641086
constopts=signal ? {__proto__: null, signal } : undefined;
1065-
constresult=writer.writev(batch,opts);
1066-
if(result===undefined){
1087+
constwritevResult=writer.writev(batch,opts);
1088+
if(writevResult===undefined){
10671089
for(leti=0;i<batch.length;i++){
10681090
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10691091
}
10701092
return;
10711093
}
1072-
returnPromisePrototypeThen(PromiseResolve(result),()=>{
1094+
returnPromisePrototypeThen(PromiseResolve(writevResult),()=>{
10731095
for(leti=0;i<batch.length;i++){
10741096
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10751097
}
@@ -1082,8 +1104,9 @@ async function pipeTo(source, ...args) {
10821104
}
10831105
for(leti=0;i<batch.length;i++){
10841106
constchunk=batch[i];
1085-
if(!hasWriteSync||!writer.writeSync(chunk)){
1086-
if(hasWriteSync&&syncFalseWasAccepted()){
1107+
constresult=hasWriteSync&&writer.writeSync(chunk);
1108+
if(!result){
1109+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10871110
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10881111
returnwriteBatchAfterAcceptedBackpressure(batch,i+1);
10891112
}

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,43 @@ async function testPushWriterBlockSyncFalseAccepted() {
154154
})(),'abcd',4);
155155
}
156156

157+
asyncfunctiontestPipeToSyncPushWriterStrictFalseRejected(){
158+
constdecoder=newTextDecoder();
159+
const{ writer, readable }=push({highWaterMark: 1});
160+
161+
consttotal=pipeToSync(['a','b'],writer,{preventClose: true});
162+
assert.strictEqual(total,1);
163+
164+
constiter=readable[Symbol.asyncIterator]();
165+
constfirst=awaititer.next();
166+
assert.strictEqual(first.done,false);
167+
assert.strictEqual(decoder.decode(first.value[0]),'a');
168+
169+
constsecond=awaitPromise.race([
170+
iter.next().then((result)=>{
171+
returnresult.done ? '<done>' : decoder.decode(result.value[0]);
172+
}),
173+
setImmediatePromise().then(()=>'<no second chunk>'),
174+
]);
175+
assert.strictEqual(second,'<no second chunk>');
176+
177+
awaititer.return?.();
178+
}
179+
180+
asyncfunctiontestPipeToSyncWritevFalseNotCounted(){
181+
constwriter={
182+
writevSync(){returnfalse;},
183+
writeSync: common.mustNotCall(),
184+
endSync(){return0;},
185+
};
186+
function*source(){
187+
yield[newUint8Array([1]),newUint8Array([2])];
188+
}
189+
190+
consttotal=pipeToSync(source(),writer);
191+
assert.strictEqual(total,0);
192+
}
193+
157194
// pipeToSync with writevSync
158195
asyncfunctiontestPipeToSyncWritev(){
159196
constbatches=[];
@@ -215,6 +252,8 @@ Promise.all([
215252
testWriteSyncFailsMidBatch(),
216253
testWriteSyncAlwaysFails(),
217254
testPushWriterBlockSyncFalseAccepted(),
255+
testPipeToSyncPushWriterStrictFalseRejected(),
256+
testPipeToSyncWritevFalseNotCounted(),
218257
testPipeToSyncWritev(),
219258
testPipeToSyncPlainChunksWritev(),
220259
testPipeToSyncWriteFallback(),

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 24b7831

Browse files
trivikraduh95
authored andcommitted
stream: fix pipeToSync byte accounting
Stop pipeToSync() from counting chunks when writeSync() or writevSync() returns false without accepting the data. Preserve writers that use false as an accepted backpressure signal. Fixes: #63562 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63564 Backport-PR-URL: #64675Fixes: #63562 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 3b5f1b5 commit 24b7831

2 files changed

Lines changed: 78 additions & 16 deletions

File tree

β€Žlib/internal/streams/iter/pull.jsβ€Ž

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,18 @@ async function* createAsyncPipeline(source, transforms, signal) {
863863
}
864864
}
865865

866+
/**
867+
* Check if a false sync write result means accepted backpressure.
868+
* @param {object} writer - The writer whose sync method returned.
869+
* @param {*} result - The return value from writeSync() or writevSync().
870+
* @returns {boolean}
871+
*/
872+
functionisAcceptedSyncWriteBackpressure(writer,result){
873+
returnresult===false&&
874+
writer[kSyncWriteAcceptedOnFalse]===true&&
875+
writer.desiredSize===0;
876+
}
877+
866878
// =============================================================================
867879
// Public API: pull() and pullSync()
868880
// =============================================================================
@@ -950,16 +962,29 @@ function pipeToSync(source, ...args) {
950962
consthasEndSync=typeofwriter.endSync==='function';
951963

952964
try{
965+
letcanContinue=true;
953966
for(constbatchofpipeline){
967+
if(!canContinue){
968+
break;
969+
}
954970
if(hasWritevSync&&batch.length>1){
955-
writer.writevSync(batch);
971+
constresult=writer.writevSync(batch);
972+
if(result===false&&
973+
!isAcceptedSyncWriteBackpressure(writer,result)){
974+
break;
975+
}
956976
for(leti=0;i<batch.length;i++){
957977
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
958978
}
959979
}else{
960980
for(leti=0;i<batch.length;i++){
961981
constchunk=batch[i];
962-
writer.writeSync(chunk);
982+
constresult=writer.writeSync(chunk);
983+
if(result===false&&
984+
!isAcceptedSyncWriteBackpressure(writer,result)){
985+
canContinue=false;
986+
break;
987+
}
963988
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
964989
}
965990
}
@@ -1011,11 +1036,6 @@ async function pipeTo(source, ...args) {
10111036
consthasWritev=typeofwriter.writev==='function';
10121037
consthasWritevSync=typeofwriter.writevSync==='function';
10131038
consthasEndSync=typeofwriter.endSync==='function';
1014-
constsyncFalseCanBeAccepted=writer[kSyncWriteAcceptedOnFalse]===true;
1015-
1016-
functionsyncFalseWasAccepted(){
1017-
returnsyncFalseCanBeAccepted&&writer.desiredSize===0;
1018-
}
10191039

10201040
functionwaitForSyncBackpressure(){
10211041
constondrain=writer[drainableProtocol];
@@ -1032,9 +1052,10 @@ async function pipeTo(source, ...args) {
10321052
asyncfunctionwriteBatchAsyncFallback(batch,startIndex){
10331053
for(leti=startIndex;i<batch.length;i++){
10341054
constchunk=batch[i];
1035-
if(hasWriteSync&&writer.writeSync(chunk)){
1055+
constresult=hasWriteSync&&writer.writeSync(chunk);
1056+
if(result){
10361057
// Sync retry succeeded
1037-
}elseif(syncFalseWasAccepted()){
1058+
}elseif(isAcceptedSyncWriteBackpressure(writer,result)){
10381059
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10391060
awaitwaitForSyncBackpressure();
10401061
continue;
@@ -1054,22 +1075,23 @@ async function pipeTo(source, ...args) {
10541075
// is required. Callers must check: const p = writeBatch(b); if (p) await p;
10551076
functionwriteBatch(batch){
10561077
if(hasWritev&&batch.length>1){
1057-
if(!hasWritevSync||!writer.writevSync(batch)){
1058-
if(hasWritevSync&&syncFalseWasAccepted()){
1078+
constresult=hasWritevSync&&writer.writevSync(batch);
1079+
if(!result){
1080+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10591081
for(leti=0;i<batch.length;i++){
10601082
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10611083
}
10621084
returnwaitForSyncBackpressure();
10631085
}
10641086
constopts=signal ? {__proto__: null, signal } : undefined;
1065-
constresult=writer.writev(batch,opts);
1066-
if(result===undefined){
1087+
constwritevResult=writer.writev(batch,opts);
1088+
if(writevResult===undefined){
10671089
for(leti=0;i<batch.length;i++){
10681090
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10691091
}
10701092
return;
10711093
}
1072-
returnPromisePrototypeThen(PromiseResolve(result),()=>{
1094+
returnPromisePrototypeThen(PromiseResolve(writevResult),()=>{
10731095
for(leti=0;i<batch.length;i++){
10741096
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10751097
}
@@ -1082,8 +1104,9 @@ async function pipeTo(source, ...args) {
10821104
}
10831105
for(leti=0;i<batch.length;i++){
10841106
constchunk=batch[i];
1085-
if(!hasWriteSync||!writer.writeSync(chunk)){
1086-
if(hasWriteSync&&syncFalseWasAccepted()){
1107+
constresult=hasWriteSync&&writer.writeSync(chunk);
1108+
if(!result){
1109+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10871110
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10881111
returnwriteBatchAfterAcceptedBackpressure(batch,i+1);
10891112
}

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,43 @@ async function testPushWriterBlockSyncFalseAccepted() {
154154
})(),'abcd',4);
155155
}
156156

157+
asyncfunctiontestPipeToSyncPushWriterStrictFalseRejected(){
158+
constdecoder=newTextDecoder();
159+
const{ writer, readable }=push({highWaterMark: 1});
160+
161+
consttotal=pipeToSync(['a','b'],writer,{preventClose: true});
162+
assert.strictEqual(total,1);
163+
164+
constiter=readable[Symbol.asyncIterator]();
165+
constfirst=awaititer.next();
166+
assert.strictEqual(first.done,false);
167+
assert.strictEqual(decoder.decode(first.value[0]),'a');
168+
169+
constsecond=awaitPromise.race([
170+
iter.next().then((result)=>{
171+
returnresult.done ? '<done>' : decoder.decode(result.value[0]);
172+
}),
173+
setImmediatePromise().then(()=>'<no second chunk>'),
174+
]);
175+
assert.strictEqual(second,'<no second chunk>');
176+
177+
awaititer.return?.();
178+
}
179+
180+
asyncfunctiontestPipeToSyncWritevFalseNotCounted(){
181+
constwriter={
182+
writevSync(){returnfalse;},
183+
writeSync: common.mustNotCall(),
184+
endSync(){return0;},
185+
};
186+
function*source(){
187+
yield[newUint8Array([1]),newUint8Array([2])];
188+
}
189+
190+
consttotal=pipeToSync(source(),writer);
191+
assert.strictEqual(total,0);
192+
}
193+
157194
// pipeToSync with writevSync
158195
asyncfunctiontestPipeToSyncWritev(){
159196
constbatches=[];
@@ -215,6 +252,8 @@ Promise.all([
215252
testWriteSyncFailsMidBatch(),
216253
testWriteSyncAlwaysFails(),
217254
testPushWriterBlockSyncFalseAccepted(),
255+
testPipeToSyncPushWriterStrictFalseRejected(),
256+
testPipeToSyncWritevFalseNotCounted(),
218257
testPipeToSyncWritev(),
219258
testPipeToSyncPlainChunksWritev(),
220259
testPipeToSyncWriteFallback(),

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 24b7831

Browse files
trivikraduh95
authored andcommitted
stream: fix pipeToSync byte accounting
Stop pipeToSync() from counting chunks when writeSync() or writevSync() returns false without accepting the data. Preserve writers that use false as an accepted backpressure signal. Fixes: #63562 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63564 Backport-PR-URL: #64675Fixes: #63562 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 3b5f1b5 commit 24b7831

2 files changed

Lines changed: 78 additions & 16 deletions

File tree

β€Žlib/internal/streams/iter/pull.jsβ€Ž

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,18 @@ async function* createAsyncPipeline(source, transforms, signal) {
863863
}
864864
}
865865

866+
/**
867+
* Check if a false sync write result means accepted backpressure.
868+
* @param {object} writer - The writer whose sync method returned.
869+
* @param {*} result - The return value from writeSync() or writevSync().
870+
* @returns {boolean}
871+
*/
872+
functionisAcceptedSyncWriteBackpressure(writer,result){
873+
returnresult===false&&
874+
writer[kSyncWriteAcceptedOnFalse]===true&&
875+
writer.desiredSize===0;
876+
}
877+
866878
// =============================================================================
867879
// Public API: pull() and pullSync()
868880
// =============================================================================
@@ -950,16 +962,29 @@ function pipeToSync(source, ...args) {
950962
consthasEndSync=typeofwriter.endSync==='function';
951963

952964
try{
965+
letcanContinue=true;
953966
for(constbatchofpipeline){
967+
if(!canContinue){
968+
break;
969+
}
954970
if(hasWritevSync&&batch.length>1){
955-
writer.writevSync(batch);
971+
constresult=writer.writevSync(batch);
972+
if(result===false&&
973+
!isAcceptedSyncWriteBackpressure(writer,result)){
974+
break;
975+
}
956976
for(leti=0;i<batch.length;i++){
957977
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
958978
}
959979
}else{
960980
for(leti=0;i<batch.length;i++){
961981
constchunk=batch[i];
962-
writer.writeSync(chunk);
982+
constresult=writer.writeSync(chunk);
983+
if(result===false&&
984+
!isAcceptedSyncWriteBackpressure(writer,result)){
985+
canContinue=false;
986+
break;
987+
}
963988
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
964989
}
965990
}
@@ -1011,11 +1036,6 @@ async function pipeTo(source, ...args) {
10111036
consthasWritev=typeofwriter.writev==='function';
10121037
consthasWritevSync=typeofwriter.writevSync==='function';
10131038
consthasEndSync=typeofwriter.endSync==='function';
1014-
constsyncFalseCanBeAccepted=writer[kSyncWriteAcceptedOnFalse]===true;
1015-
1016-
functionsyncFalseWasAccepted(){
1017-
returnsyncFalseCanBeAccepted&&writer.desiredSize===0;
1018-
}
10191039

10201040
functionwaitForSyncBackpressure(){
10211041
constondrain=writer[drainableProtocol];
@@ -1032,9 +1052,10 @@ async function pipeTo(source, ...args) {
10321052
asyncfunctionwriteBatchAsyncFallback(batch,startIndex){
10331053
for(leti=startIndex;i<batch.length;i++){
10341054
constchunk=batch[i];
1035-
if(hasWriteSync&&writer.writeSync(chunk)){
1055+
constresult=hasWriteSync&&writer.writeSync(chunk);
1056+
if(result){
10361057
// Sync retry succeeded
1037-
}elseif(syncFalseWasAccepted()){
1058+
}elseif(isAcceptedSyncWriteBackpressure(writer,result)){
10381059
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10391060
awaitwaitForSyncBackpressure();
10401061
continue;
@@ -1054,22 +1075,23 @@ async function pipeTo(source, ...args) {
10541075
// is required. Callers must check: const p = writeBatch(b); if (p) await p;
10551076
functionwriteBatch(batch){
10561077
if(hasWritev&&batch.length>1){
1057-
if(!hasWritevSync||!writer.writevSync(batch)){
1058-
if(hasWritevSync&&syncFalseWasAccepted()){
1078+
constresult=hasWritevSync&&writer.writevSync(batch);
1079+
if(!result){
1080+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10591081
for(leti=0;i<batch.length;i++){
10601082
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10611083
}
10621084
returnwaitForSyncBackpressure();
10631085
}
10641086
constopts=signal ? {__proto__: null, signal } : undefined;
1065-
constresult=writer.writev(batch,opts);
1066-
if(result===undefined){
1087+
constwritevResult=writer.writev(batch,opts);
1088+
if(writevResult===undefined){
10671089
for(leti=0;i<batch.length;i++){
10681090
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10691091
}
10701092
return;
10711093
}
1072-
returnPromisePrototypeThen(PromiseResolve(result),()=>{
1094+
returnPromisePrototypeThen(PromiseResolve(writevResult),()=>{
10731095
for(leti=0;i<batch.length;i++){
10741096
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10751097
}
@@ -1082,8 +1104,9 @@ async function pipeTo(source, ...args) {
10821104
}
10831105
for(leti=0;i<batch.length;i++){
10841106
constchunk=batch[i];
1085-
if(!hasWriteSync||!writer.writeSync(chunk)){
1086-
if(hasWriteSync&&syncFalseWasAccepted()){
1107+
constresult=hasWriteSync&&writer.writeSync(chunk);
1108+
if(!result){
1109+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10871110
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10881111
returnwriteBatchAfterAcceptedBackpressure(batch,i+1);
10891112
}

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,43 @@ async function testPushWriterBlockSyncFalseAccepted() {
154154
})(),'abcd',4);
155155
}
156156

157+
asyncfunctiontestPipeToSyncPushWriterStrictFalseRejected(){
158+
constdecoder=newTextDecoder();
159+
const{ writer, readable }=push({highWaterMark: 1});
160+
161+
consttotal=pipeToSync(['a','b'],writer,{preventClose: true});
162+
assert.strictEqual(total,1);
163+
164+
constiter=readable[Symbol.asyncIterator]();
165+
constfirst=awaititer.next();
166+
assert.strictEqual(first.done,false);
167+
assert.strictEqual(decoder.decode(first.value[0]),'a');
168+
169+
constsecond=awaitPromise.race([
170+
iter.next().then((result)=>{
171+
returnresult.done ? '<done>' : decoder.decode(result.value[0]);
172+
}),
173+
setImmediatePromise().then(()=>'<no second chunk>'),
174+
]);
175+
assert.strictEqual(second,'<no second chunk>');
176+
177+
awaititer.return?.();
178+
}
179+
180+
asyncfunctiontestPipeToSyncWritevFalseNotCounted(){
181+
constwriter={
182+
writevSync(){returnfalse;},
183+
writeSync: common.mustNotCall(),
184+
endSync(){return0;},
185+
};
186+
function*source(){
187+
yield[newUint8Array([1]),newUint8Array([2])];
188+
}
189+
190+
consttotal=pipeToSync(source(),writer);
191+
assert.strictEqual(total,0);
192+
}
193+
157194
// pipeToSync with writevSync
158195
asyncfunctiontestPipeToSyncWritev(){
159196
constbatches=[];
@@ -215,6 +252,8 @@ Promise.all([
215252
testWriteSyncFailsMidBatch(),
216253
testWriteSyncAlwaysFails(),
217254
testPushWriterBlockSyncFalseAccepted(),
255+
testPipeToSyncPushWriterStrictFalseRejected(),
256+
testPipeToSyncWritevFalseNotCounted(),
218257
testPipeToSyncWritev(),
219258
testPipeToSyncPlainChunksWritev(),
220259
testPipeToSyncWriteFallback(),

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 24b7831

Browse files
trivikraduh95
authored andcommitted
stream: fix pipeToSync byte accounting
Stop pipeToSync() from counting chunks when writeSync() or writevSync() returns false without accepting the data. Preserve writers that use false as an accepted backpressure signal. Fixes: #63562 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63564 Backport-PR-URL: #64675Fixes: #63562 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 3b5f1b5 commit 24b7831

2 files changed

Lines changed: 78 additions & 16 deletions

File tree

β€Žlib/internal/streams/iter/pull.jsβ€Ž

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,18 @@ async function* createAsyncPipeline(source, transforms, signal) {
863863
}
864864
}
865865

866+
/**
867+
* Check if a false sync write result means accepted backpressure.
868+
* @param {object} writer - The writer whose sync method returned.
869+
* @param {*} result - The return value from writeSync() or writevSync().
870+
* @returns {boolean}
871+
*/
872+
functionisAcceptedSyncWriteBackpressure(writer,result){
873+
returnresult===false&&
874+
writer[kSyncWriteAcceptedOnFalse]===true&&
875+
writer.desiredSize===0;
876+
}
877+
866878
// =============================================================================
867879
// Public API: pull() and pullSync()
868880
// =============================================================================
@@ -950,16 +962,29 @@ function pipeToSync(source, ...args) {
950962
consthasEndSync=typeofwriter.endSync==='function';
951963

952964
try{
965+
letcanContinue=true;
953966
for(constbatchofpipeline){
967+
if(!canContinue){
968+
break;
969+
}
954970
if(hasWritevSync&&batch.length>1){
955-
writer.writevSync(batch);
971+
constresult=writer.writevSync(batch);
972+
if(result===false&&
973+
!isAcceptedSyncWriteBackpressure(writer,result)){
974+
break;
975+
}
956976
for(leti=0;i<batch.length;i++){
957977
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
958978
}
959979
}else{
960980
for(leti=0;i<batch.length;i++){
961981
constchunk=batch[i];
962-
writer.writeSync(chunk);
982+
constresult=writer.writeSync(chunk);
983+
if(result===false&&
984+
!isAcceptedSyncWriteBackpressure(writer,result)){
985+
canContinue=false;
986+
break;
987+
}
963988
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
964989
}
965990
}
@@ -1011,11 +1036,6 @@ async function pipeTo(source, ...args) {
10111036
consthasWritev=typeofwriter.writev==='function';
10121037
consthasWritevSync=typeofwriter.writevSync==='function';
10131038
consthasEndSync=typeofwriter.endSync==='function';
1014-
constsyncFalseCanBeAccepted=writer[kSyncWriteAcceptedOnFalse]===true;
1015-
1016-
functionsyncFalseWasAccepted(){
1017-
returnsyncFalseCanBeAccepted&&writer.desiredSize===0;
1018-
}
10191039

10201040
functionwaitForSyncBackpressure(){
10211041
constondrain=writer[drainableProtocol];
@@ -1032,9 +1052,10 @@ async function pipeTo(source, ...args) {
10321052
asyncfunctionwriteBatchAsyncFallback(batch,startIndex){
10331053
for(leti=startIndex;i<batch.length;i++){
10341054
constchunk=batch[i];
1035-
if(hasWriteSync&&writer.writeSync(chunk)){
1055+
constresult=hasWriteSync&&writer.writeSync(chunk);
1056+
if(result){
10361057
// Sync retry succeeded
1037-
}elseif(syncFalseWasAccepted()){
1058+
}elseif(isAcceptedSyncWriteBackpressure(writer,result)){
10381059
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10391060
awaitwaitForSyncBackpressure();
10401061
continue;
@@ -1054,22 +1075,23 @@ async function pipeTo(source, ...args) {
10541075
// is required. Callers must check: const p = writeBatch(b); if (p) await p;
10551076
functionwriteBatch(batch){
10561077
if(hasWritev&&batch.length>1){
1057-
if(!hasWritevSync||!writer.writevSync(batch)){
1058-
if(hasWritevSync&&syncFalseWasAccepted()){
1078+
constresult=hasWritevSync&&writer.writevSync(batch);
1079+
if(!result){
1080+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10591081
for(leti=0;i<batch.length;i++){
10601082
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10611083
}
10621084
returnwaitForSyncBackpressure();
10631085
}
10641086
constopts=signal ? {__proto__: null, signal } : undefined;
1065-
constresult=writer.writev(batch,opts);
1066-
if(result===undefined){
1087+
constwritevResult=writer.writev(batch,opts);
1088+
if(writevResult===undefined){
10671089
for(leti=0;i<batch.length;i++){
10681090
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10691091
}
10701092
return;
10711093
}
1072-
returnPromisePrototypeThen(PromiseResolve(result),()=>{
1094+
returnPromisePrototypeThen(PromiseResolve(writevResult),()=>{
10731095
for(leti=0;i<batch.length;i++){
10741096
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10751097
}
@@ -1082,8 +1104,9 @@ async function pipeTo(source, ...args) {
10821104
}
10831105
for(leti=0;i<batch.length;i++){
10841106
constchunk=batch[i];
1085-
if(!hasWriteSync||!writer.writeSync(chunk)){
1086-
if(hasWriteSync&&syncFalseWasAccepted()){
1107+
constresult=hasWriteSync&&writer.writeSync(chunk);
1108+
if(!result){
1109+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10871110
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10881111
returnwriteBatchAfterAcceptedBackpressure(batch,i+1);
10891112
}

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,43 @@ async function testPushWriterBlockSyncFalseAccepted() {
154154
})(),'abcd',4);
155155
}
156156

157+
asyncfunctiontestPipeToSyncPushWriterStrictFalseRejected(){
158+
constdecoder=newTextDecoder();
159+
const{ writer, readable }=push({highWaterMark: 1});
160+
161+
consttotal=pipeToSync(['a','b'],writer,{preventClose: true});
162+
assert.strictEqual(total,1);
163+
164+
constiter=readable[Symbol.asyncIterator]();
165+
constfirst=awaititer.next();
166+
assert.strictEqual(first.done,false);
167+
assert.strictEqual(decoder.decode(first.value[0]),'a');
168+
169+
constsecond=awaitPromise.race([
170+
iter.next().then((result)=>{
171+
returnresult.done ? '<done>' : decoder.decode(result.value[0]);
172+
}),
173+
setImmediatePromise().then(()=>'<no second chunk>'),
174+
]);
175+
assert.strictEqual(second,'<no second chunk>');
176+
177+
awaititer.return?.();
178+
}
179+
180+
asyncfunctiontestPipeToSyncWritevFalseNotCounted(){
181+
constwriter={
182+
writevSync(){returnfalse;},
183+
writeSync: common.mustNotCall(),
184+
endSync(){return0;},
185+
};
186+
function*source(){
187+
yield[newUint8Array([1]),newUint8Array([2])];
188+
}
189+
190+
consttotal=pipeToSync(source(),writer);
191+
assert.strictEqual(total,0);
192+
}
193+
157194
// pipeToSync with writevSync
158195
asyncfunctiontestPipeToSyncWritev(){
159196
constbatches=[];
@@ -215,6 +252,8 @@ Promise.all([
215252
testWriteSyncFailsMidBatch(),
216253
testWriteSyncAlwaysFails(),
217254
testPushWriterBlockSyncFalseAccepted(),
255+
testPipeToSyncPushWriterStrictFalseRejected(),
256+
testPipeToSyncWritevFalseNotCounted(),
218257
testPipeToSyncWritev(),
219258
testPipeToSyncPlainChunksWritev(),
220259
testPipeToSyncWriteFallback(),

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 24b7831

Browse files
trivikraduh95
authored andcommitted
stream: fix pipeToSync byte accounting
Stop pipeToSync() from counting chunks when writeSync() or writevSync() returns false without accepting the data. Preserve writers that use false as an accepted backpressure signal. Fixes: #63562 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63564 Backport-PR-URL: #64675Fixes: #63562 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 3b5f1b5 commit 24b7831

2 files changed

Lines changed: 78 additions & 16 deletions

File tree

β€Žlib/internal/streams/iter/pull.jsβ€Ž

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,18 @@ async function* createAsyncPipeline(source, transforms, signal) {
863863
}
864864
}
865865

866+
/**
867+
* Check if a false sync write result means accepted backpressure.
868+
* @param {object} writer - The writer whose sync method returned.
869+
* @param {*} result - The return value from writeSync() or writevSync().
870+
* @returns {boolean}
871+
*/
872+
functionisAcceptedSyncWriteBackpressure(writer,result){
873+
returnresult===false&&
874+
writer[kSyncWriteAcceptedOnFalse]===true&&
875+
writer.desiredSize===0;
876+
}
877+
866878
// =============================================================================
867879
// Public API: pull() and pullSync()
868880
// =============================================================================
@@ -950,16 +962,29 @@ function pipeToSync(source, ...args) {
950962
consthasEndSync=typeofwriter.endSync==='function';
951963

952964
try{
965+
letcanContinue=true;
953966
for(constbatchofpipeline){
967+
if(!canContinue){
968+
break;
969+
}
954970
if(hasWritevSync&&batch.length>1){
955-
writer.writevSync(batch);
971+
constresult=writer.writevSync(batch);
972+
if(result===false&&
973+
!isAcceptedSyncWriteBackpressure(writer,result)){
974+
break;
975+
}
956976
for(leti=0;i<batch.length;i++){
957977
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
958978
}
959979
}else{
960980
for(leti=0;i<batch.length;i++){
961981
constchunk=batch[i];
962-
writer.writeSync(chunk);
982+
constresult=writer.writeSync(chunk);
983+
if(result===false&&
984+
!isAcceptedSyncWriteBackpressure(writer,result)){
985+
canContinue=false;
986+
break;
987+
}
963988
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
964989
}
965990
}
@@ -1011,11 +1036,6 @@ async function pipeTo(source, ...args) {
10111036
consthasWritev=typeofwriter.writev==='function';
10121037
consthasWritevSync=typeofwriter.writevSync==='function';
10131038
consthasEndSync=typeofwriter.endSync==='function';
1014-
constsyncFalseCanBeAccepted=writer[kSyncWriteAcceptedOnFalse]===true;
1015-
1016-
functionsyncFalseWasAccepted(){
1017-
returnsyncFalseCanBeAccepted&&writer.desiredSize===0;
1018-
}
10191039

10201040
functionwaitForSyncBackpressure(){
10211041
constondrain=writer[drainableProtocol];
@@ -1032,9 +1052,10 @@ async function pipeTo(source, ...args) {
10321052
asyncfunctionwriteBatchAsyncFallback(batch,startIndex){
10331053
for(leti=startIndex;i<batch.length;i++){
10341054
constchunk=batch[i];
1035-
if(hasWriteSync&&writer.writeSync(chunk)){
1055+
constresult=hasWriteSync&&writer.writeSync(chunk);
1056+
if(result){
10361057
// Sync retry succeeded
1037-
}elseif(syncFalseWasAccepted()){
1058+
}elseif(isAcceptedSyncWriteBackpressure(writer,result)){
10381059
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10391060
awaitwaitForSyncBackpressure();
10401061
continue;
@@ -1054,22 +1075,23 @@ async function pipeTo(source, ...args) {
10541075
// is required. Callers must check: const p = writeBatch(b); if (p) await p;
10551076
functionwriteBatch(batch){
10561077
if(hasWritev&&batch.length>1){
1057-
if(!hasWritevSync||!writer.writevSync(batch)){
1058-
if(hasWritevSync&&syncFalseWasAccepted()){
1078+
constresult=hasWritevSync&&writer.writevSync(batch);
1079+
if(!result){
1080+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10591081
for(leti=0;i<batch.length;i++){
10601082
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10611083
}
10621084
returnwaitForSyncBackpressure();
10631085
}
10641086
constopts=signal ? {__proto__: null, signal } : undefined;
1065-
constresult=writer.writev(batch,opts);
1066-
if(result===undefined){
1087+
constwritevResult=writer.writev(batch,opts);
1088+
if(writevResult===undefined){
10671089
for(leti=0;i<batch.length;i++){
10681090
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10691091
}
10701092
return;
10711093
}
1072-
returnPromisePrototypeThen(PromiseResolve(result),()=>{
1094+
returnPromisePrototypeThen(PromiseResolve(writevResult),()=>{
10731095
for(leti=0;i<batch.length;i++){
10741096
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10751097
}
@@ -1082,8 +1104,9 @@ async function pipeTo(source, ...args) {
10821104
}
10831105
for(leti=0;i<batch.length;i++){
10841106
constchunk=batch[i];
1085-
if(!hasWriteSync||!writer.writeSync(chunk)){
1086-
if(hasWriteSync&&syncFalseWasAccepted()){
1107+
constresult=hasWriteSync&&writer.writeSync(chunk);
1108+
if(!result){
1109+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10871110
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10881111
returnwriteBatchAfterAcceptedBackpressure(batch,i+1);
10891112
}

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,43 @@ async function testPushWriterBlockSyncFalseAccepted() {
154154
})(),'abcd',4);
155155
}
156156

157+
asyncfunctiontestPipeToSyncPushWriterStrictFalseRejected(){
158+
constdecoder=newTextDecoder();
159+
const{ writer, readable }=push({highWaterMark: 1});
160+
161+
consttotal=pipeToSync(['a','b'],writer,{preventClose: true});
162+
assert.strictEqual(total,1);
163+
164+
constiter=readable[Symbol.asyncIterator]();
165+
constfirst=awaititer.next();
166+
assert.strictEqual(first.done,false);
167+
assert.strictEqual(decoder.decode(first.value[0]),'a');
168+
169+
constsecond=awaitPromise.race([
170+
iter.next().then((result)=>{
171+
returnresult.done ? '<done>' : decoder.decode(result.value[0]);
172+
}),
173+
setImmediatePromise().then(()=>'<no second chunk>'),
174+
]);
175+
assert.strictEqual(second,'<no second chunk>');
176+
177+
awaititer.return?.();
178+
}
179+
180+
asyncfunctiontestPipeToSyncWritevFalseNotCounted(){
181+
constwriter={
182+
writevSync(){returnfalse;},
183+
writeSync: common.mustNotCall(),
184+
endSync(){return0;},
185+
};
186+
function*source(){
187+
yield[newUint8Array([1]),newUint8Array([2])];
188+
}
189+
190+
consttotal=pipeToSync(source(),writer);
191+
assert.strictEqual(total,0);
192+
}
193+
157194
// pipeToSync with writevSync
158195
asyncfunctiontestPipeToSyncWritev(){
159196
constbatches=[];
@@ -215,6 +252,8 @@ Promise.all([
215252
testWriteSyncFailsMidBatch(),
216253
testWriteSyncAlwaysFails(),
217254
testPushWriterBlockSyncFalseAccepted(),
255+
testPipeToSyncPushWriterStrictFalseRejected(),
256+
testPipeToSyncWritevFalseNotCounted(),
218257
testPipeToSyncWritev(),
219258
testPipeToSyncPlainChunksWritev(),
220259
testPipeToSyncWriteFallback(),

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 24b7831

Browse files
trivikraduh95
authored andcommitted
stream: fix pipeToSync byte accounting
Stop pipeToSync() from counting chunks when writeSync() or writevSync() returns false without accepting the data. Preserve writers that use false as an accepted backpressure signal. Fixes: #63562 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63564 Backport-PR-URL: #64675Fixes: #63562 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 3b5f1b5 commit 24b7831

2 files changed

Lines changed: 78 additions & 16 deletions

File tree

β€Žlib/internal/streams/iter/pull.jsβ€Ž

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,18 @@ async function* createAsyncPipeline(source, transforms, signal) {
863863
}
864864
}
865865

866+
/**
867+
* Check if a false sync write result means accepted backpressure.
868+
* @param {object} writer - The writer whose sync method returned.
869+
* @param {*} result - The return value from writeSync() or writevSync().
870+
* @returns {boolean}
871+
*/
872+
functionisAcceptedSyncWriteBackpressure(writer,result){
873+
returnresult===false&&
874+
writer[kSyncWriteAcceptedOnFalse]===true&&
875+
writer.desiredSize===0;
876+
}
877+
866878
// =============================================================================
867879
// Public API: pull() and pullSync()
868880
// =============================================================================
@@ -950,16 +962,29 @@ function pipeToSync(source, ...args) {
950962
consthasEndSync=typeofwriter.endSync==='function';
951963

952964
try{
965+
letcanContinue=true;
953966
for(constbatchofpipeline){
967+
if(!canContinue){
968+
break;
969+
}
954970
if(hasWritevSync&&batch.length>1){
955-
writer.writevSync(batch);
971+
constresult=writer.writevSync(batch);
972+
if(result===false&&
973+
!isAcceptedSyncWriteBackpressure(writer,result)){
974+
break;
975+
}
956976
for(leti=0;i<batch.length;i++){
957977
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
958978
}
959979
}else{
960980
for(leti=0;i<batch.length;i++){
961981
constchunk=batch[i];
962-
writer.writeSync(chunk);
982+
constresult=writer.writeSync(chunk);
983+
if(result===false&&
984+
!isAcceptedSyncWriteBackpressure(writer,result)){
985+
canContinue=false;
986+
break;
987+
}
963988
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
964989
}
965990
}
@@ -1011,11 +1036,6 @@ async function pipeTo(source, ...args) {
10111036
consthasWritev=typeofwriter.writev==='function';
10121037
consthasWritevSync=typeofwriter.writevSync==='function';
10131038
consthasEndSync=typeofwriter.endSync==='function';
1014-
constsyncFalseCanBeAccepted=writer[kSyncWriteAcceptedOnFalse]===true;
1015-
1016-
functionsyncFalseWasAccepted(){
1017-
returnsyncFalseCanBeAccepted&&writer.desiredSize===0;
1018-
}
10191039

10201040
functionwaitForSyncBackpressure(){
10211041
constondrain=writer[drainableProtocol];
@@ -1032,9 +1052,10 @@ async function pipeTo(source, ...args) {
10321052
asyncfunctionwriteBatchAsyncFallback(batch,startIndex){
10331053
for(leti=startIndex;i<batch.length;i++){
10341054
constchunk=batch[i];
1035-
if(hasWriteSync&&writer.writeSync(chunk)){
1055+
constresult=hasWriteSync&&writer.writeSync(chunk);
1056+
if(result){
10361057
// Sync retry succeeded
1037-
}elseif(syncFalseWasAccepted()){
1058+
}elseif(isAcceptedSyncWriteBackpressure(writer,result)){
10381059
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10391060
awaitwaitForSyncBackpressure();
10401061
continue;
@@ -1054,22 +1075,23 @@ async function pipeTo(source, ...args) {
10541075
// is required. Callers must check: const p = writeBatch(b); if (p) await p;
10551076
functionwriteBatch(batch){
10561077
if(hasWritev&&batch.length>1){
1057-
if(!hasWritevSync||!writer.writevSync(batch)){
1058-
if(hasWritevSync&&syncFalseWasAccepted()){
1078+
constresult=hasWritevSync&&writer.writevSync(batch);
1079+
if(!result){
1080+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10591081
for(leti=0;i<batch.length;i++){
10601082
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10611083
}
10621084
returnwaitForSyncBackpressure();
10631085
}
10641086
constopts=signal ? {__proto__: null, signal } : undefined;
1065-
constresult=writer.writev(batch,opts);
1066-
if(result===undefined){
1087+
constwritevResult=writer.writev(batch,opts);
1088+
if(writevResult===undefined){
10671089
for(leti=0;i<batch.length;i++){
10681090
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10691091
}
10701092
return;
10711093
}
1072-
returnPromisePrototypeThen(PromiseResolve(result),()=>{
1094+
returnPromisePrototypeThen(PromiseResolve(writevResult),()=>{
10731095
for(leti=0;i<batch.length;i++){
10741096
totalBytes+=TypedArrayPrototypeGetByteLength(batch[i]);
10751097
}
@@ -1082,8 +1104,9 @@ async function pipeTo(source, ...args) {
10821104
}
10831105
for(leti=0;i<batch.length;i++){
10841106
constchunk=batch[i];
1085-
if(!hasWriteSync||!writer.writeSync(chunk)){
1086-
if(hasWriteSync&&syncFalseWasAccepted()){
1107+
constresult=hasWriteSync&&writer.writeSync(chunk);
1108+
if(!result){
1109+
if(isAcceptedSyncWriteBackpressure(writer,result)){
10871110
totalBytes+=TypedArrayPrototypeGetByteLength(chunk);
10881111
returnwriteBatchAfterAcceptedBackpressure(batch,i+1);
10891112
}

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,43 @@ async function testPushWriterBlockSyncFalseAccepted() {
154154
})(),'abcd',4);
155155
}
156156

157+
asyncfunctiontestPipeToSyncPushWriterStrictFalseRejected(){
158+
constdecoder=newTextDecoder();
159+
const{ writer, readable }=push({highWaterMark: 1});
160+
161+
consttotal=pipeToSync(['a','b'],writer,{preventClose: true});
162+
assert.strictEqual(total,1);
163+
164+
constiter=readable[Symbol.asyncIterator]();
165+
constfirst=awaititer.next();
166+
assert.strictEqual(first.done,false);
167+
assert.strictEqual(decoder.decode(first.value[0]),'a');
168+
169+
constsecond=awaitPromise.race([
170+
iter.next().then((result)=>{
171+
returnresult.done ? '<done>' : decoder.decode(result.value[0]);
172+
}),
173+
setImmediatePromise().then(()=>'<no second chunk>'),
174+
]);
175+
assert.strictEqual(second,'<no second chunk>');
176+
177+
awaititer.return?.();
178+
}
179+
180+
asyncfunctiontestPipeToSyncWritevFalseNotCounted(){
181+
constwriter={
182+
writevSync(){returnfalse;},
183+
writeSync: common.mustNotCall(),
184+
endSync(){return0;},
185+
};
186+
function*source(){
187+
yield[newUint8Array([1]),newUint8Array([2])];
188+
}
189+
190+
consttotal=pipeToSync(source(),writer);
191+
assert.strictEqual(total,0);
192+
}
193+
157194
// pipeToSync with writevSync
158195
asyncfunctiontestPipeToSyncWritev(){
159196
constbatches=[];
@@ -215,6 +252,8 @@ Promise.all([
215252
testWriteSyncFailsMidBatch(),
216253
testWriteSyncAlwaysFails(),
217254
testPushWriterBlockSyncFalseAccepted(),
255+
testPipeToSyncPushWriterStrictFalseRejected(),
256+
testPipeToSyncWritevFalseNotCounted(),
218257
testPipeToSyncWritev(),
219258
testPipeToSyncPlainChunksWritev(),
220259
testPipeToSyncWriteFallback(),

0 commit comments

Comments
Β (0)