Commit 870273c

Browse files
trivikraduh95
authored andcommitted
stream: reject iter consumers on abort
Make stream/iter async consumers observe abort signals while waiting for a pending async iterator read. This lets bytes(), text(), arrayBuffer(), and array() reject promptly with the abort reason instead of waiting for another batch. Move the shared abort-aware iterator wrapper to stream/iter utils so pull and consumers use the same helper. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64066 Backport-PR-URL: #64675Fixes: #64065 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 8a4a997 commit 870273c

4 files changed

Lines changed: 143 additions & 84 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const {
5252

5353
const{
5454
concatBytes,
55+
yieldAbortable,
5556
}=require('internal/streams/iter/utils');
5657

5758
const{
@@ -125,7 +126,9 @@ async function collectAsync(source, signal, limit) {
125126
signal?.throwIfAborted();
126127

127128
// Normalize source via from() - accepts strings, ArrayBuffers, protocols, etc.
128-
constnormalized=from(source);
129+
constabortableSource=signal&&isAsyncIterable(source) ?
130+
yieldAbortable(source,signal) : source;
131+
constnormalized=from(abortableSource);
129132
constchunks=[];
130133

131134
// Fast path: no signal and no limit
@@ -140,8 +143,9 @@ async function collectAsync(source, signal, limit) {
140143

141144
// Slow path: with signal or limit checks
142145
lettotalBytes=0;
146+
constiterable=signal ? yieldAbortable(normalized,signal) : normalized;
143147

144-
forawait(constbatchofnormalized){
148+
forawait(constbatchofiterable){
145149
signal?.throwIfAborted();
146150
for(leti=0;i<batch.length;i++){
147151
constchunk=batch[i];

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

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ const {
1414
ArrayPrototypeSlice,
1515
PromisePrototypeThen,
1616
PromiseResolve,
17-
PromiseWithResolvers,
18-
SafePromisePrototypeFinally,
19-
SafePromiseRace,
2017
SymbolAsyncIterator,
2118
SymbolIterator,
2219
TypedArrayPrototypeGetByteLength,
2320
Uint8Array,
2421
}=primordials;
2522

26-
const{
27-
markPromiseAsHandled,
28-
}=internalBinding('util');
29-
3023
const{
3124
codes: {
3225
ERR_INVALID_ARG_TYPE,
@@ -60,6 +53,7 @@ const {
6053
parsePullArgs,
6154
toUint8Array,
6255
wrapError,
56+
yieldAbortable,
6357
}=require('internal/streams/iter/utils');
6458

6559
const{
@@ -690,81 +684,6 @@ async function* applyValidatedStatefulAsyncTransform(source, transform, options)
690684
options.signal?.throwIfAborted();
691685
}
692686

693-
functiongetOnAbort(reject,signal){
694-
return()=>reject(signal.reason);
695-
}
696-
697-
/**
698-
* Read one item from an async iterator, rejecting early if the signal aborts.
699-
* @param {AsyncIterator} iterator - The iterator to read from.
700-
* @param {AbortSignal|undefined} signal - Optional abort signal.
701-
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
702-
*/
703-
functionabortableNext(iterator,signal){
704-
if(signal===undefined){
705-
returniterator.next();
706-
}
707-
708-
signal.throwIfAborted();
709-
710-
constnext=iterator.next();
711-
const{ promise, reject }=PromiseWithResolvers();
712-
constonAbort=getOnAbort(reject,signal);
713-
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
714-
if(signal.aborted){
715-
onAbort();
716-
}
717-
718-
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
719-
signal.removeEventListener('abort',onAbort);
720-
});
721-
}
722-
723-
/**
724-
* Wrap an async source so each pending read is abort-aware.
725-
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
726-
* @param {AbortSignal|undefined} signal - Optional abort signal.
727-
* @returns {AsyncIterable<Uint8Array[]>}
728-
*/
729-
functionyieldAbortable(source,signal){
730-
if(signal===undefined){
731-
returnsource;
732-
}
733-
734-
return{
735-
__proto__: null,
736-
async*[SymbolAsyncIterator](){
737-
constiterator=source[SymbolAsyncIterator]();
738-
letcompleted=false;
739-
letaborted=false;
740-
741-
try{
742-
while(true){
743-
const{ done, value }=awaitabortableNext(iterator,signal);
744-
if(done){
745-
completed=true;
746-
return;
747-
}
748-
signal.throwIfAborted();
749-
yieldvalue;
750-
}
751-
}catch(error){
752-
aborted=signal.aborted;
753-
throwerror;
754-
}finally{
755-
if(!completed&&typeofiterator.return==='function'){
756-
constresult=iterator.return();
757-
if(aborted){
758-
markPromiseAsHandled(result);
759-
}else{
760-
awaitresult;
761-
}
762-
}
763-
}
764-
},
765-
};
766-
}
767-
768687
/**
769688
* Create an async pipeline from source through transforms.
770689
* @yields {Uint8Array[]}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ const {
88
MathMin,
99
NumberMAX_SAFE_INTEGER,
1010
PromiseResolve,
11+
PromiseWithResolvers,
12+
SafePromisePrototypeFinally,
13+
SafePromiseRace,
1114
String,
15+
SymbolAsyncIterator,
1216
TypedArrayPrototypeGetBuffer,
1317
TypedArrayPrototypeGetByteLength,
1418
TypedArrayPrototypeGetByteOffset,
1519
TypedArrayPrototypeSet,
1620
Uint8Array,
1721
}=primordials;
1822

23+
const{
24+
markPromiseAsHandled,
25+
}=internalBinding('util');
26+
1927
const{ TextEncoder }=require('internal/encoding');
2028
const{
2129
codes: {
@@ -69,6 +77,81 @@ function onSignalAbort(signal, handler) {
6977
}
7078
}
7179

80+
functiongetOnAbort(reject,signal){
81+
return()=>reject(signal.reason);
82+
}
83+
84+
/**
85+
* Read one item from an async iterator, rejecting early if the signal aborts.
86+
* @param {AsyncIterator} iterator - The iterator to read from.
87+
* @param {AbortSignal|undefined} signal - Optional abort signal.
88+
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
89+
*/
90+
functionabortableNext(iterator,signal){
91+
if(signal===undefined){
92+
returniterator.next();
93+
}
94+
95+
signal.throwIfAborted();
96+
97+
constnext=iterator.next();
98+
const{ promise, reject }=PromiseWithResolvers();
99+
constonAbort=getOnAbort(reject,signal);
100+
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
101+
if(signal.aborted){
102+
onAbort();
103+
}
104+
105+
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
106+
signal.removeEventListener('abort',onAbort);
107+
});
108+
}
109+
110+
/**
111+
* Wrap an async source so each pending read is abort-aware.
112+
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
113+
* @param {AbortSignal|undefined} signal - Optional abort signal.
114+
* @returns {AsyncIterable<Uint8Array[]>}
115+
*/
116+
functionyieldAbortable(source,signal){
117+
if(signal===undefined){
118+
returnsource;
119+
}
120+
121+
return{
122+
__proto__: null,
123+
async*[SymbolAsyncIterator](){
124+
constiterator=source[SymbolAsyncIterator]();
125+
letcompleted=false;
126+
letaborted=false;
127+
128+
try{
129+
while(true){
130+
const{ done, value }=awaitabortableNext(iterator,signal);
131+
if(done){
132+
completed=true;
133+
return;
134+
}
135+
signal.throwIfAborted();
136+
yieldvalue;
137+
}
138+
}catch(error){
139+
aborted=signal.aborted;
140+
throwerror;
141+
}finally{
142+
if(!completed&&typeofiterator.return==='function'){
143+
constresult=iterator.return();
144+
if(aborted){
145+
markPromiseAsHandled(result);
146+
}else{
147+
awaitresult;
148+
}
149+
}
150+
}
151+
},
152+
};
153+
}
154+
72155
/**
73156
* Compute the minimum cursor across a set of consumers and count how many
74157
* consumers are at that cursor.
@@ -301,4 +384,5 @@ module.exports = {
301384
toUint8Array,
302385
validateBackpressure,
303386
wrapError,
387+
yieldAbortable,
304388
};

β€Žtest/parallel/test-stream-iter-consumers-bytes.jsβ€Ž

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const {
1414
arrayBufferSync,
1515
array,
1616
arraySync,
17+
toAsyncStreamable,
1718
}=require('stream/iter');
1819

1920
// =============================================================================
@@ -53,6 +54,55 @@ async function testBytesAsyncAbort() {
5354
);
5455
}
5556

57+
asyncfunctiontestAsyncConsumersAbortPendingNext(){
58+
constconsumers=[
59+
['bytes',bytes],
60+
['text',text],
61+
['arrayBuffer',arrayBuffer],
62+
['array',array],
63+
];
64+
65+
for(const[name,consumer]ofconsumers){
66+
constac=newAbortController();
67+
constreason=newError(`${name} boom`);
68+
69+
asyncfunction*never(){
70+
awaitnewPromise(()=>{});
71+
yield[];
72+
}
73+
74+
constpromise=consumer(never(),{__proto__: null,signal: ac.signal});
75+
ac.abort(reason);
76+
77+
awaitassert.rejects(promise,reason);
78+
}
79+
}
80+
81+
asyncfunctiontestAsyncConsumersAbortPendingNormalization(){
82+
constconsumers=[
83+
['bytes',bytes],
84+
['text',text],
85+
['arrayBuffer',arrayBuffer],
86+
['array',array],
87+
];
88+
89+
for(const[name,consumer]ofconsumers){
90+
constac=newAbortController();
91+
constreason=newError(`${name} normalization boom`);
92+
constsource={
93+
__proto__: null,
94+
[toAsyncStreamable](){
95+
returnnewPromise(()=>{});
96+
},
97+
};
98+
99+
constpromise=consumer(source,{__proto__: null,signal: ac.signal});
100+
ac.abort(reason);
101+
102+
awaitassert.rejects(promise,reason);
103+
}
104+
}
105+
56106
asyncfunctiontestBytesEmpty(){
57107
constdata=awaitbytes(from([]));
58108
assert.ok(datainstanceofUint8Array);
@@ -205,6 +255,8 @@ Promise.all([
205255
testBytesAsync(),
206256
testBytesAsyncLimit(),
207257
testBytesAsyncAbort(),
258+
testAsyncConsumersAbortPendingNext(),
259+
testAsyncConsumersAbortPendingNormalization(),
208260
testBytesEmpty(),
209261
testArrayBufferSyncBasic(),
210262
testArrayBufferAsync(),

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 870273c

Browse files
trivikraduh95
authored andcommitted
stream: reject iter consumers on abort
Make stream/iter async consumers observe abort signals while waiting for a pending async iterator read. This lets bytes(), text(), arrayBuffer(), and array() reject promptly with the abort reason instead of waiting for another batch. Move the shared abort-aware iterator wrapper to stream/iter utils so pull and consumers use the same helper. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64066 Backport-PR-URL: #64675Fixes: #64065 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 8a4a997 commit 870273c

4 files changed

Lines changed: 143 additions & 84 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const {
5252

5353
const{
5454
concatBytes,
55+
yieldAbortable,
5556
}=require('internal/streams/iter/utils');
5657

5758
const{
@@ -125,7 +126,9 @@ async function collectAsync(source, signal, limit) {
125126
signal?.throwIfAborted();
126127

127128
// Normalize source via from() - accepts strings, ArrayBuffers, protocols, etc.
128-
constnormalized=from(source);
129+
constabortableSource=signal&&isAsyncIterable(source) ?
130+
yieldAbortable(source,signal) : source;
131+
constnormalized=from(abortableSource);
129132
constchunks=[];
130133

131134
// Fast path: no signal and no limit
@@ -140,8 +143,9 @@ async function collectAsync(source, signal, limit) {
140143

141144
// Slow path: with signal or limit checks
142145
lettotalBytes=0;
146+
constiterable=signal ? yieldAbortable(normalized,signal) : normalized;
143147

144-
forawait(constbatchofnormalized){
148+
forawait(constbatchofiterable){
145149
signal?.throwIfAborted();
146150
for(leti=0;i<batch.length;i++){
147151
constchunk=batch[i];

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

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ const {
1414
ArrayPrototypeSlice,
1515
PromisePrototypeThen,
1616
PromiseResolve,
17-
PromiseWithResolvers,
18-
SafePromisePrototypeFinally,
19-
SafePromiseRace,
2017
SymbolAsyncIterator,
2118
SymbolIterator,
2219
TypedArrayPrototypeGetByteLength,
2320
Uint8Array,
2421
}=primordials;
2522

26-
const{
27-
markPromiseAsHandled,
28-
}=internalBinding('util');
29-
3023
const{
3124
codes: {
3225
ERR_INVALID_ARG_TYPE,
@@ -60,6 +53,7 @@ const {
6053
parsePullArgs,
6154
toUint8Array,
6255
wrapError,
56+
yieldAbortable,
6357
}=require('internal/streams/iter/utils');
6458

6559
const{
@@ -690,81 +684,6 @@ async function* applyValidatedStatefulAsyncTransform(source, transform, options)
690684
options.signal?.throwIfAborted();
691685
}
692686

693-
functiongetOnAbort(reject,signal){
694-
return()=>reject(signal.reason);
695-
}
696-
697-
/**
698-
* Read one item from an async iterator, rejecting early if the signal aborts.
699-
* @param {AsyncIterator} iterator - The iterator to read from.
700-
* @param {AbortSignal|undefined} signal - Optional abort signal.
701-
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
702-
*/
703-
functionabortableNext(iterator,signal){
704-
if(signal===undefined){
705-
returniterator.next();
706-
}
707-
708-
signal.throwIfAborted();
709-
710-
constnext=iterator.next();
711-
const{ promise, reject }=PromiseWithResolvers();
712-
constonAbort=getOnAbort(reject,signal);
713-
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
714-
if(signal.aborted){
715-
onAbort();
716-
}
717-
718-
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
719-
signal.removeEventListener('abort',onAbort);
720-
});
721-
}
722-
723-
/**
724-
* Wrap an async source so each pending read is abort-aware.
725-
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
726-
* @param {AbortSignal|undefined} signal - Optional abort signal.
727-
* @returns {AsyncIterable<Uint8Array[]>}
728-
*/
729-
functionyieldAbortable(source,signal){
730-
if(signal===undefined){
731-
returnsource;
732-
}
733-
734-
return{
735-
__proto__: null,
736-
async*[SymbolAsyncIterator](){
737-
constiterator=source[SymbolAsyncIterator]();
738-
letcompleted=false;
739-
letaborted=false;
740-
741-
try{
742-
while(true){
743-
const{ done, value }=awaitabortableNext(iterator,signal);
744-
if(done){
745-
completed=true;
746-
return;
747-
}
748-
signal.throwIfAborted();
749-
yieldvalue;
750-
}
751-
}catch(error){
752-
aborted=signal.aborted;
753-
throwerror;
754-
}finally{
755-
if(!completed&&typeofiterator.return==='function'){
756-
constresult=iterator.return();
757-
if(aborted){
758-
markPromiseAsHandled(result);
759-
}else{
760-
awaitresult;
761-
}
762-
}
763-
}
764-
},
765-
};
766-
}
767-
768687
/**
769688
* Create an async pipeline from source through transforms.
770689
* @yields {Uint8Array[]}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ const {
88
MathMin,
99
NumberMAX_SAFE_INTEGER,
1010
PromiseResolve,
11+
PromiseWithResolvers,
12+
SafePromisePrototypeFinally,
13+
SafePromiseRace,
1114
String,
15+
SymbolAsyncIterator,
1216
TypedArrayPrototypeGetBuffer,
1317
TypedArrayPrototypeGetByteLength,
1418
TypedArrayPrototypeGetByteOffset,
1519
TypedArrayPrototypeSet,
1620
Uint8Array,
1721
}=primordials;
1822

23+
const{
24+
markPromiseAsHandled,
25+
}=internalBinding('util');
26+
1927
const{ TextEncoder }=require('internal/encoding');
2028
const{
2129
codes: {
@@ -69,6 +77,81 @@ function onSignalAbort(signal, handler) {
6977
}
7078
}
7179

80+
functiongetOnAbort(reject,signal){
81+
return()=>reject(signal.reason);
82+
}
83+
84+
/**
85+
* Read one item from an async iterator, rejecting early if the signal aborts.
86+
* @param {AsyncIterator} iterator - The iterator to read from.
87+
* @param {AbortSignal|undefined} signal - Optional abort signal.
88+
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
89+
*/
90+
functionabortableNext(iterator,signal){
91+
if(signal===undefined){
92+
returniterator.next();
93+
}
94+
95+
signal.throwIfAborted();
96+
97+
constnext=iterator.next();
98+
const{ promise, reject }=PromiseWithResolvers();
99+
constonAbort=getOnAbort(reject,signal);
100+
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
101+
if(signal.aborted){
102+
onAbort();
103+
}
104+
105+
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
106+
signal.removeEventListener('abort',onAbort);
107+
});
108+
}
109+
110+
/**
111+
* Wrap an async source so each pending read is abort-aware.
112+
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
113+
* @param {AbortSignal|undefined} signal - Optional abort signal.
114+
* @returns {AsyncIterable<Uint8Array[]>}
115+
*/
116+
functionyieldAbortable(source,signal){
117+
if(signal===undefined){
118+
returnsource;
119+
}
120+
121+
return{
122+
__proto__: null,
123+
async*[SymbolAsyncIterator](){
124+
constiterator=source[SymbolAsyncIterator]();
125+
letcompleted=false;
126+
letaborted=false;
127+
128+
try{
129+
while(true){
130+
const{ done, value }=awaitabortableNext(iterator,signal);
131+
if(done){
132+
completed=true;
133+
return;
134+
}
135+
signal.throwIfAborted();
136+
yieldvalue;
137+
}
138+
}catch(error){
139+
aborted=signal.aborted;
140+
throwerror;
141+
}finally{
142+
if(!completed&&typeofiterator.return==='function'){
143+
constresult=iterator.return();
144+
if(aborted){
145+
markPromiseAsHandled(result);
146+
}else{
147+
awaitresult;
148+
}
149+
}
150+
}
151+
},
152+
};
153+
}
154+
72155
/**
73156
* Compute the minimum cursor across a set of consumers and count how many
74157
* consumers are at that cursor.
@@ -301,4 +384,5 @@ module.exports = {
301384
toUint8Array,
302385
validateBackpressure,
303386
wrapError,
387+
yieldAbortable,
304388
};

β€Žtest/parallel/test-stream-iter-consumers-bytes.jsβ€Ž

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const {
1414
arrayBufferSync,
1515
array,
1616
arraySync,
17+
toAsyncStreamable,
1718
}=require('stream/iter');
1819

1920
// =============================================================================
@@ -53,6 +54,55 @@ async function testBytesAsyncAbort() {
5354
);
5455
}
5556

57+
asyncfunctiontestAsyncConsumersAbortPendingNext(){
58+
constconsumers=[
59+
['bytes',bytes],
60+
['text',text],
61+
['arrayBuffer',arrayBuffer],
62+
['array',array],
63+
];
64+
65+
for(const[name,consumer]ofconsumers){
66+
constac=newAbortController();
67+
constreason=newError(`${name} boom`);
68+
69+
asyncfunction*never(){
70+
awaitnewPromise(()=>{});
71+
yield[];
72+
}
73+
74+
constpromise=consumer(never(),{__proto__: null,signal: ac.signal});
75+
ac.abort(reason);
76+
77+
awaitassert.rejects(promise,reason);
78+
}
79+
}
80+
81+
asyncfunctiontestAsyncConsumersAbortPendingNormalization(){
82+
constconsumers=[
83+
['bytes',bytes],
84+
['text',text],
85+
['arrayBuffer',arrayBuffer],
86+
['array',array],
87+
];
88+
89+
for(const[name,consumer]ofconsumers){
90+
constac=newAbortController();
91+
constreason=newError(`${name} normalization boom`);
92+
constsource={
93+
__proto__: null,
94+
[toAsyncStreamable](){
95+
returnnewPromise(()=>{});
96+
},
97+
};
98+
99+
constpromise=consumer(source,{__proto__: null,signal: ac.signal});
100+
ac.abort(reason);
101+
102+
awaitassert.rejects(promise,reason);
103+
}
104+
}
105+
56106
asyncfunctiontestBytesEmpty(){
57107
constdata=awaitbytes(from([]));
58108
assert.ok(datainstanceofUint8Array);
@@ -205,6 +255,8 @@ Promise.all([
205255
testBytesAsync(),
206256
testBytesAsyncLimit(),
207257
testBytesAsyncAbort(),
258+
testAsyncConsumersAbortPendingNext(),
259+
testAsyncConsumersAbortPendingNormalization(),
208260
testBytesEmpty(),
209261
testArrayBufferSyncBasic(),
210262
testArrayBufferAsync(),

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 870273c

Browse files
trivikraduh95
authored andcommitted
stream: reject iter consumers on abort
Make stream/iter async consumers observe abort signals while waiting for a pending async iterator read. This lets bytes(), text(), arrayBuffer(), and array() reject promptly with the abort reason instead of waiting for another batch. Move the shared abort-aware iterator wrapper to stream/iter utils so pull and consumers use the same helper. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64066 Backport-PR-URL: #64675Fixes: #64065 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 8a4a997 commit 870273c

4 files changed

Lines changed: 143 additions & 84 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const {
5252

5353
const{
5454
concatBytes,
55+
yieldAbortable,
5556
}=require('internal/streams/iter/utils');
5657

5758
const{
@@ -125,7 +126,9 @@ async function collectAsync(source, signal, limit) {
125126
signal?.throwIfAborted();
126127

127128
// Normalize source via from() - accepts strings, ArrayBuffers, protocols, etc.
128-
constnormalized=from(source);
129+
constabortableSource=signal&&isAsyncIterable(source) ?
130+
yieldAbortable(source,signal) : source;
131+
constnormalized=from(abortableSource);
129132
constchunks=[];
130133

131134
// Fast path: no signal and no limit
@@ -140,8 +143,9 @@ async function collectAsync(source, signal, limit) {
140143

141144
// Slow path: with signal or limit checks
142145
lettotalBytes=0;
146+
constiterable=signal ? yieldAbortable(normalized,signal) : normalized;
143147

144-
forawait(constbatchofnormalized){
148+
forawait(constbatchofiterable){
145149
signal?.throwIfAborted();
146150
for(leti=0;i<batch.length;i++){
147151
constchunk=batch[i];

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

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ const {
1414
ArrayPrototypeSlice,
1515
PromisePrototypeThen,
1616
PromiseResolve,
17-
PromiseWithResolvers,
18-
SafePromisePrototypeFinally,
19-
SafePromiseRace,
2017
SymbolAsyncIterator,
2118
SymbolIterator,
2219
TypedArrayPrototypeGetByteLength,
2320
Uint8Array,
2421
}=primordials;
2522

26-
const{
27-
markPromiseAsHandled,
28-
}=internalBinding('util');
29-
3023
const{
3124
codes: {
3225
ERR_INVALID_ARG_TYPE,
@@ -60,6 +53,7 @@ const {
6053
parsePullArgs,
6154
toUint8Array,
6255
wrapError,
56+
yieldAbortable,
6357
}=require('internal/streams/iter/utils');
6458

6559
const{
@@ -690,81 +684,6 @@ async function* applyValidatedStatefulAsyncTransform(source, transform, options)
690684
options.signal?.throwIfAborted();
691685
}
692686

693-
functiongetOnAbort(reject,signal){
694-
return()=>reject(signal.reason);
695-
}
696-
697-
/**
698-
* Read one item from an async iterator, rejecting early if the signal aborts.
699-
* @param {AsyncIterator} iterator - The iterator to read from.
700-
* @param {AbortSignal|undefined} signal - Optional abort signal.
701-
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
702-
*/
703-
functionabortableNext(iterator,signal){
704-
if(signal===undefined){
705-
returniterator.next();
706-
}
707-
708-
signal.throwIfAborted();
709-
710-
constnext=iterator.next();
711-
const{ promise, reject }=PromiseWithResolvers();
712-
constonAbort=getOnAbort(reject,signal);
713-
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
714-
if(signal.aborted){
715-
onAbort();
716-
}
717-
718-
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
719-
signal.removeEventListener('abort',onAbort);
720-
});
721-
}
722-
723-
/**
724-
* Wrap an async source so each pending read is abort-aware.
725-
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
726-
* @param {AbortSignal|undefined} signal - Optional abort signal.
727-
* @returns {AsyncIterable<Uint8Array[]>}
728-
*/
729-
functionyieldAbortable(source,signal){
730-
if(signal===undefined){
731-
returnsource;
732-
}
733-
734-
return{
735-
__proto__: null,
736-
async*[SymbolAsyncIterator](){
737-
constiterator=source[SymbolAsyncIterator]();
738-
letcompleted=false;
739-
letaborted=false;
740-
741-
try{
742-
while(true){
743-
const{ done, value }=awaitabortableNext(iterator,signal);
744-
if(done){
745-
completed=true;
746-
return;
747-
}
748-
signal.throwIfAborted();
749-
yieldvalue;
750-
}
751-
}catch(error){
752-
aborted=signal.aborted;
753-
throwerror;
754-
}finally{
755-
if(!completed&&typeofiterator.return==='function'){
756-
constresult=iterator.return();
757-
if(aborted){
758-
markPromiseAsHandled(result);
759-
}else{
760-
awaitresult;
761-
}
762-
}
763-
}
764-
},
765-
};
766-
}
767-
768687
/**
769688
* Create an async pipeline from source through transforms.
770689
* @yields {Uint8Array[]}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ const {
88
MathMin,
99
NumberMAX_SAFE_INTEGER,
1010
PromiseResolve,
11+
PromiseWithResolvers,
12+
SafePromisePrototypeFinally,
13+
SafePromiseRace,
1114
String,
15+
SymbolAsyncIterator,
1216
TypedArrayPrototypeGetBuffer,
1317
TypedArrayPrototypeGetByteLength,
1418
TypedArrayPrototypeGetByteOffset,
1519
TypedArrayPrototypeSet,
1620
Uint8Array,
1721
}=primordials;
1822

23+
const{
24+
markPromiseAsHandled,
25+
}=internalBinding('util');
26+
1927
const{ TextEncoder }=require('internal/encoding');
2028
const{
2129
codes: {
@@ -69,6 +77,81 @@ function onSignalAbort(signal, handler) {
6977
}
7078
}
7179

80+
functiongetOnAbort(reject,signal){
81+
return()=>reject(signal.reason);
82+
}
83+
84+
/**
85+
* Read one item from an async iterator, rejecting early if the signal aborts.
86+
* @param {AsyncIterator} iterator - The iterator to read from.
87+
* @param {AbortSignal|undefined} signal - Optional abort signal.
88+
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
89+
*/
90+
functionabortableNext(iterator,signal){
91+
if(signal===undefined){
92+
returniterator.next();
93+
}
94+
95+
signal.throwIfAborted();
96+
97+
constnext=iterator.next();
98+
const{ promise, reject }=PromiseWithResolvers();
99+
constonAbort=getOnAbort(reject,signal);
100+
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
101+
if(signal.aborted){
102+
onAbort();
103+
}
104+
105+
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
106+
signal.removeEventListener('abort',onAbort);
107+
});
108+
}
109+
110+
/**
111+
* Wrap an async source so each pending read is abort-aware.
112+
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
113+
* @param {AbortSignal|undefined} signal - Optional abort signal.
114+
* @returns {AsyncIterable<Uint8Array[]>}
115+
*/
116+
functionyieldAbortable(source,signal){
117+
if(signal===undefined){
118+
returnsource;
119+
}
120+
121+
return{
122+
__proto__: null,
123+
async*[SymbolAsyncIterator](){
124+
constiterator=source[SymbolAsyncIterator]();
125+
letcompleted=false;
126+
letaborted=false;
127+
128+
try{
129+
while(true){
130+
const{ done, value }=awaitabortableNext(iterator,signal);
131+
if(done){
132+
completed=true;
133+
return;
134+
}
135+
signal.throwIfAborted();
136+
yieldvalue;
137+
}
138+
}catch(error){
139+
aborted=signal.aborted;
140+
throwerror;
141+
}finally{
142+
if(!completed&&typeofiterator.return==='function'){
143+
constresult=iterator.return();
144+
if(aborted){
145+
markPromiseAsHandled(result);
146+
}else{
147+
awaitresult;
148+
}
149+
}
150+
}
151+
},
152+
};
153+
}
154+
72155
/**
73156
* Compute the minimum cursor across a set of consumers and count how many
74157
* consumers are at that cursor.
@@ -301,4 +384,5 @@ module.exports = {
301384
toUint8Array,
302385
validateBackpressure,
303386
wrapError,
387+
yieldAbortable,
304388
};

β€Žtest/parallel/test-stream-iter-consumers-bytes.jsβ€Ž

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const {
1414
arrayBufferSync,
1515
array,
1616
arraySync,
17+
toAsyncStreamable,
1718
}=require('stream/iter');
1819

1920
// =============================================================================
@@ -53,6 +54,55 @@ async function testBytesAsyncAbort() {
5354
);
5455
}
5556

57+
asyncfunctiontestAsyncConsumersAbortPendingNext(){
58+
constconsumers=[
59+
['bytes',bytes],
60+
['text',text],
61+
['arrayBuffer',arrayBuffer],
62+
['array',array],
63+
];
64+
65+
for(const[name,consumer]ofconsumers){
66+
constac=newAbortController();
67+
constreason=newError(`${name} boom`);
68+
69+
asyncfunction*never(){
70+
awaitnewPromise(()=>{});
71+
yield[];
72+
}
73+
74+
constpromise=consumer(never(),{__proto__: null,signal: ac.signal});
75+
ac.abort(reason);
76+
77+
awaitassert.rejects(promise,reason);
78+
}
79+
}
80+
81+
asyncfunctiontestAsyncConsumersAbortPendingNormalization(){
82+
constconsumers=[
83+
['bytes',bytes],
84+
['text',text],
85+
['arrayBuffer',arrayBuffer],
86+
['array',array],
87+
];
88+
89+
for(const[name,consumer]ofconsumers){
90+
constac=newAbortController();
91+
constreason=newError(`${name} normalization boom`);
92+
constsource={
93+
__proto__: null,
94+
[toAsyncStreamable](){
95+
returnnewPromise(()=>{});
96+
},
97+
};
98+
99+
constpromise=consumer(source,{__proto__: null,signal: ac.signal});
100+
ac.abort(reason);
101+
102+
awaitassert.rejects(promise,reason);
103+
}
104+
}
105+
56106
asyncfunctiontestBytesEmpty(){
57107
constdata=awaitbytes(from([]));
58108
assert.ok(datainstanceofUint8Array);
@@ -205,6 +255,8 @@ Promise.all([
205255
testBytesAsync(),
206256
testBytesAsyncLimit(),
207257
testBytesAsyncAbort(),
258+
testAsyncConsumersAbortPendingNext(),
259+
testAsyncConsumersAbortPendingNormalization(),
208260
testBytesEmpty(),
209261
testArrayBufferSyncBasic(),
210262
testArrayBufferAsync(),

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 870273c

Browse files
trivikraduh95
authored andcommitted
stream: reject iter consumers on abort
Make stream/iter async consumers observe abort signals while waiting for a pending async iterator read. This lets bytes(), text(), arrayBuffer(), and array() reject promptly with the abort reason instead of waiting for another batch. Move the shared abort-aware iterator wrapper to stream/iter utils so pull and consumers use the same helper. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64066 Backport-PR-URL: #64675Fixes: #64065 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 8a4a997 commit 870273c

4 files changed

Lines changed: 143 additions & 84 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const {
5252

5353
const{
5454
concatBytes,
55+
yieldAbortable,
5556
}=require('internal/streams/iter/utils');
5657

5758
const{
@@ -125,7 +126,9 @@ async function collectAsync(source, signal, limit) {
125126
signal?.throwIfAborted();
126127

127128
// Normalize source via from() - accepts strings, ArrayBuffers, protocols, etc.
128-
constnormalized=from(source);
129+
constabortableSource=signal&&isAsyncIterable(source) ?
130+
yieldAbortable(source,signal) : source;
131+
constnormalized=from(abortableSource);
129132
constchunks=[];
130133

131134
// Fast path: no signal and no limit
@@ -140,8 +143,9 @@ async function collectAsync(source, signal, limit) {
140143

141144
// Slow path: with signal or limit checks
142145
lettotalBytes=0;
146+
constiterable=signal ? yieldAbortable(normalized,signal) : normalized;
143147

144-
forawait(constbatchofnormalized){
148+
forawait(constbatchofiterable){
145149
signal?.throwIfAborted();
146150
for(leti=0;i<batch.length;i++){
147151
constchunk=batch[i];

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

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ const {
1414
ArrayPrototypeSlice,
1515
PromisePrototypeThen,
1616
PromiseResolve,
17-
PromiseWithResolvers,
18-
SafePromisePrototypeFinally,
19-
SafePromiseRace,
2017
SymbolAsyncIterator,
2118
SymbolIterator,
2219
TypedArrayPrototypeGetByteLength,
2320
Uint8Array,
2421
}=primordials;
2522

26-
const{
27-
markPromiseAsHandled,
28-
}=internalBinding('util');
29-
3023
const{
3124
codes: {
3225
ERR_INVALID_ARG_TYPE,
@@ -60,6 +53,7 @@ const {
6053
parsePullArgs,
6154
toUint8Array,
6255
wrapError,
56+
yieldAbortable,
6357
}=require('internal/streams/iter/utils');
6458

6559
const{
@@ -690,81 +684,6 @@ async function* applyValidatedStatefulAsyncTransform(source, transform, options)
690684
options.signal?.throwIfAborted();
691685
}
692686

693-
functiongetOnAbort(reject,signal){
694-
return()=>reject(signal.reason);
695-
}
696-
697-
/**
698-
* Read one item from an async iterator, rejecting early if the signal aborts.
699-
* @param {AsyncIterator} iterator - The iterator to read from.
700-
* @param {AbortSignal|undefined} signal - Optional abort signal.
701-
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
702-
*/
703-
functionabortableNext(iterator,signal){
704-
if(signal===undefined){
705-
returniterator.next();
706-
}
707-
708-
signal.throwIfAborted();
709-
710-
constnext=iterator.next();
711-
const{ promise, reject }=PromiseWithResolvers();
712-
constonAbort=getOnAbort(reject,signal);
713-
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
714-
if(signal.aborted){
715-
onAbort();
716-
}
717-
718-
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
719-
signal.removeEventListener('abort',onAbort);
720-
});
721-
}
722-
723-
/**
724-
* Wrap an async source so each pending read is abort-aware.
725-
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
726-
* @param {AbortSignal|undefined} signal - Optional abort signal.
727-
* @returns {AsyncIterable<Uint8Array[]>}
728-
*/
729-
functionyieldAbortable(source,signal){
730-
if(signal===undefined){
731-
returnsource;
732-
}
733-
734-
return{
735-
__proto__: null,
736-
async*[SymbolAsyncIterator](){
737-
constiterator=source[SymbolAsyncIterator]();
738-
letcompleted=false;
739-
letaborted=false;
740-
741-
try{
742-
while(true){
743-
const{ done, value }=awaitabortableNext(iterator,signal);
744-
if(done){
745-
completed=true;
746-
return;
747-
}
748-
signal.throwIfAborted();
749-
yieldvalue;
750-
}
751-
}catch(error){
752-
aborted=signal.aborted;
753-
throwerror;
754-
}finally{
755-
if(!completed&&typeofiterator.return==='function'){
756-
constresult=iterator.return();
757-
if(aborted){
758-
markPromiseAsHandled(result);
759-
}else{
760-
awaitresult;
761-
}
762-
}
763-
}
764-
},
765-
};
766-
}
767-
768687
/**
769688
* Create an async pipeline from source through transforms.
770689
* @yields {Uint8Array[]}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ const {
88
MathMin,
99
NumberMAX_SAFE_INTEGER,
1010
PromiseResolve,
11+
PromiseWithResolvers,
12+
SafePromisePrototypeFinally,
13+
SafePromiseRace,
1114
String,
15+
SymbolAsyncIterator,
1216
TypedArrayPrototypeGetBuffer,
1317
TypedArrayPrototypeGetByteLength,
1418
TypedArrayPrototypeGetByteOffset,
1519
TypedArrayPrototypeSet,
1620
Uint8Array,
1721
}=primordials;
1822

23+
const{
24+
markPromiseAsHandled,
25+
}=internalBinding('util');
26+
1927
const{ TextEncoder }=require('internal/encoding');
2028
const{
2129
codes: {
@@ -69,6 +77,81 @@ function onSignalAbort(signal, handler) {
6977
}
7078
}
7179

80+
functiongetOnAbort(reject,signal){
81+
return()=>reject(signal.reason);
82+
}
83+
84+
/**
85+
* Read one item from an async iterator, rejecting early if the signal aborts.
86+
* @param {AsyncIterator} iterator - The iterator to read from.
87+
* @param {AbortSignal|undefined} signal - Optional abort signal.
88+
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
89+
*/
90+
functionabortableNext(iterator,signal){
91+
if(signal===undefined){
92+
returniterator.next();
93+
}
94+
95+
signal.throwIfAborted();
96+
97+
constnext=iterator.next();
98+
const{ promise, reject }=PromiseWithResolvers();
99+
constonAbort=getOnAbort(reject,signal);
100+
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
101+
if(signal.aborted){
102+
onAbort();
103+
}
104+
105+
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
106+
signal.removeEventListener('abort',onAbort);
107+
});
108+
}
109+
110+
/**
111+
* Wrap an async source so each pending read is abort-aware.
112+
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
113+
* @param {AbortSignal|undefined} signal - Optional abort signal.
114+
* @returns {AsyncIterable<Uint8Array[]>}
115+
*/
116+
functionyieldAbortable(source,signal){
117+
if(signal===undefined){
118+
returnsource;
119+
}
120+
121+
return{
122+
__proto__: null,
123+
async*[SymbolAsyncIterator](){
124+
constiterator=source[SymbolAsyncIterator]();
125+
letcompleted=false;
126+
letaborted=false;
127+
128+
try{
129+
while(true){
130+
const{ done, value }=awaitabortableNext(iterator,signal);
131+
if(done){
132+
completed=true;
133+
return;
134+
}
135+
signal.throwIfAborted();
136+
yieldvalue;
137+
}
138+
}catch(error){
139+
aborted=signal.aborted;
140+
throwerror;
141+
}finally{
142+
if(!completed&&typeofiterator.return==='function'){
143+
constresult=iterator.return();
144+
if(aborted){
145+
markPromiseAsHandled(result);
146+
}else{
147+
awaitresult;
148+
}
149+
}
150+
}
151+
},
152+
};
153+
}
154+
72155
/**
73156
* Compute the minimum cursor across a set of consumers and count how many
74157
* consumers are at that cursor.
@@ -301,4 +384,5 @@ module.exports = {
301384
toUint8Array,
302385
validateBackpressure,
303386
wrapError,
387+
yieldAbortable,
304388
};

β€Žtest/parallel/test-stream-iter-consumers-bytes.jsβ€Ž

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const {
1414
arrayBufferSync,
1515
array,
1616
arraySync,
17+
toAsyncStreamable,
1718
}=require('stream/iter');
1819

1920
// =============================================================================
@@ -53,6 +54,55 @@ async function testBytesAsyncAbort() {
5354
);
5455
}
5556

57+
asyncfunctiontestAsyncConsumersAbortPendingNext(){
58+
constconsumers=[
59+
['bytes',bytes],
60+
['text',text],
61+
['arrayBuffer',arrayBuffer],
62+
['array',array],
63+
];
64+
65+
for(const[name,consumer]ofconsumers){
66+
constac=newAbortController();
67+
constreason=newError(`${name} boom`);
68+
69+
asyncfunction*never(){
70+
awaitnewPromise(()=>{});
71+
yield[];
72+
}
73+
74+
constpromise=consumer(never(),{__proto__: null,signal: ac.signal});
75+
ac.abort(reason);
76+
77+
awaitassert.rejects(promise,reason);
78+
}
79+
}
80+
81+
asyncfunctiontestAsyncConsumersAbortPendingNormalization(){
82+
constconsumers=[
83+
['bytes',bytes],
84+
['text',text],
85+
['arrayBuffer',arrayBuffer],
86+
['array',array],
87+
];
88+
89+
for(const[name,consumer]ofconsumers){
90+
constac=newAbortController();
91+
constreason=newError(`${name} normalization boom`);
92+
constsource={
93+
__proto__: null,
94+
[toAsyncStreamable](){
95+
returnnewPromise(()=>{});
96+
},
97+
};
98+
99+
constpromise=consumer(source,{__proto__: null,signal: ac.signal});
100+
ac.abort(reason);
101+
102+
awaitassert.rejects(promise,reason);
103+
}
104+
}
105+
56106
asyncfunctiontestBytesEmpty(){
57107
constdata=awaitbytes(from([]));
58108
assert.ok(datainstanceofUint8Array);
@@ -205,6 +255,8 @@ Promise.all([
205255
testBytesAsync(),
206256
testBytesAsyncLimit(),
207257
testBytesAsyncAbort(),
258+
testAsyncConsumersAbortPendingNext(),
259+
testAsyncConsumersAbortPendingNormalization(),
208260
testBytesEmpty(),
209261
testArrayBufferSyncBasic(),
210262
testArrayBufferAsync(),

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 870273c

Browse files
trivikraduh95
authored andcommitted
stream: reject iter consumers on abort
Make stream/iter async consumers observe abort signals while waiting for a pending async iterator read. This lets bytes(), text(), arrayBuffer(), and array() reject promptly with the abort reason instead of waiting for another batch. Move the shared abort-aware iterator wrapper to stream/iter utils so pull and consumers use the same helper. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64066 Backport-PR-URL: #64675Fixes: #64065 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 8a4a997 commit 870273c

4 files changed

Lines changed: 143 additions & 84 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const {
5252

5353
const{
5454
concatBytes,
55+
yieldAbortable,
5556
}=require('internal/streams/iter/utils');
5657

5758
const{
@@ -125,7 +126,9 @@ async function collectAsync(source, signal, limit) {
125126
signal?.throwIfAborted();
126127

127128
// Normalize source via from() - accepts strings, ArrayBuffers, protocols, etc.
128-
constnormalized=from(source);
129+
constabortableSource=signal&&isAsyncIterable(source) ?
130+
yieldAbortable(source,signal) : source;
131+
constnormalized=from(abortableSource);
129132
constchunks=[];
130133

131134
// Fast path: no signal and no limit
@@ -140,8 +143,9 @@ async function collectAsync(source, signal, limit) {
140143

141144
// Slow path: with signal or limit checks
142145
lettotalBytes=0;
146+
constiterable=signal ? yieldAbortable(normalized,signal) : normalized;
143147

144-
forawait(constbatchofnormalized){
148+
forawait(constbatchofiterable){
145149
signal?.throwIfAborted();
146150
for(leti=0;i<batch.length;i++){
147151
constchunk=batch[i];

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

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ const {
1414
ArrayPrototypeSlice,
1515
PromisePrototypeThen,
1616
PromiseResolve,
17-
PromiseWithResolvers,
18-
SafePromisePrototypeFinally,
19-
SafePromiseRace,
2017
SymbolAsyncIterator,
2118
SymbolIterator,
2219
TypedArrayPrototypeGetByteLength,
2320
Uint8Array,
2421
}=primordials;
2522

26-
const{
27-
markPromiseAsHandled,
28-
}=internalBinding('util');
29-
3023
const{
3124
codes: {
3225
ERR_INVALID_ARG_TYPE,
@@ -60,6 +53,7 @@ const {
6053
parsePullArgs,
6154
toUint8Array,
6255
wrapError,
56+
yieldAbortable,
6357
}=require('internal/streams/iter/utils');
6458

6559
const{
@@ -690,81 +684,6 @@ async function* applyValidatedStatefulAsyncTransform(source, transform, options)
690684
options.signal?.throwIfAborted();
691685
}
692686

693-
functiongetOnAbort(reject,signal){
694-
return()=>reject(signal.reason);
695-
}
696-
697-
/**
698-
* Read one item from an async iterator, rejecting early if the signal aborts.
699-
* @param {AsyncIterator} iterator - The iterator to read from.
700-
* @param {AbortSignal|undefined} signal - Optional abort signal.
701-
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
702-
*/
703-
functionabortableNext(iterator,signal){
704-
if(signal===undefined){
705-
returniterator.next();
706-
}
707-
708-
signal.throwIfAborted();
709-
710-
constnext=iterator.next();
711-
const{ promise, reject }=PromiseWithResolvers();
712-
constonAbort=getOnAbort(reject,signal);
713-
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
714-
if(signal.aborted){
715-
onAbort();
716-
}
717-
718-
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
719-
signal.removeEventListener('abort',onAbort);
720-
});
721-
}
722-
723-
/**
724-
* Wrap an async source so each pending read is abort-aware.
725-
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
726-
* @param {AbortSignal|undefined} signal - Optional abort signal.
727-
* @returns {AsyncIterable<Uint8Array[]>}
728-
*/
729-
functionyieldAbortable(source,signal){
730-
if(signal===undefined){
731-
returnsource;
732-
}
733-
734-
return{
735-
__proto__: null,
736-
async*[SymbolAsyncIterator](){
737-
constiterator=source[SymbolAsyncIterator]();
738-
letcompleted=false;
739-
letaborted=false;
740-
741-
try{
742-
while(true){
743-
const{ done, value }=awaitabortableNext(iterator,signal);
744-
if(done){
745-
completed=true;
746-
return;
747-
}
748-
signal.throwIfAborted();
749-
yieldvalue;
750-
}
751-
}catch(error){
752-
aborted=signal.aborted;
753-
throwerror;
754-
}finally{
755-
if(!completed&&typeofiterator.return==='function'){
756-
constresult=iterator.return();
757-
if(aborted){
758-
markPromiseAsHandled(result);
759-
}else{
760-
awaitresult;
761-
}
762-
}
763-
}
764-
},
765-
};
766-
}
767-
768687
/**
769688
* Create an async pipeline from source through transforms.
770689
* @yields {Uint8Array[]}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ const {
88
MathMin,
99
NumberMAX_SAFE_INTEGER,
1010
PromiseResolve,
11+
PromiseWithResolvers,
12+
SafePromisePrototypeFinally,
13+
SafePromiseRace,
1114
String,
15+
SymbolAsyncIterator,
1216
TypedArrayPrototypeGetBuffer,
1317
TypedArrayPrototypeGetByteLength,
1418
TypedArrayPrototypeGetByteOffset,
1519
TypedArrayPrototypeSet,
1620
Uint8Array,
1721
}=primordials;
1822

23+
const{
24+
markPromiseAsHandled,
25+
}=internalBinding('util');
26+
1927
const{ TextEncoder }=require('internal/encoding');
2028
const{
2129
codes: {
@@ -69,6 +77,81 @@ function onSignalAbort(signal, handler) {
6977
}
7078
}
7179

80+
functiongetOnAbort(reject,signal){
81+
return()=>reject(signal.reason);
82+
}
83+
84+
/**
85+
* Read one item from an async iterator, rejecting early if the signal aborts.
86+
* @param {AsyncIterator} iterator - The iterator to read from.
87+
* @param {AbortSignal|undefined} signal - Optional abort signal.
88+
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
89+
*/
90+
functionabortableNext(iterator,signal){
91+
if(signal===undefined){
92+
returniterator.next();
93+
}
94+
95+
signal.throwIfAborted();
96+
97+
constnext=iterator.next();
98+
const{ promise, reject }=PromiseWithResolvers();
99+
constonAbort=getOnAbort(reject,signal);
100+
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
101+
if(signal.aborted){
102+
onAbort();
103+
}
104+
105+
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
106+
signal.removeEventListener('abort',onAbort);
107+
});
108+
}
109+
110+
/**
111+
* Wrap an async source so each pending read is abort-aware.
112+
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
113+
* @param {AbortSignal|undefined} signal - Optional abort signal.
114+
* @returns {AsyncIterable<Uint8Array[]>}
115+
*/
116+
functionyieldAbortable(source,signal){
117+
if(signal===undefined){
118+
returnsource;
119+
}
120+
121+
return{
122+
__proto__: null,
123+
async*[SymbolAsyncIterator](){
124+
constiterator=source[SymbolAsyncIterator]();
125+
letcompleted=false;
126+
letaborted=false;
127+
128+
try{
129+
while(true){
130+
const{ done, value }=awaitabortableNext(iterator,signal);
131+
if(done){
132+
completed=true;
133+
return;
134+
}
135+
signal.throwIfAborted();
136+
yieldvalue;
137+
}
138+
}catch(error){
139+
aborted=signal.aborted;
140+
throwerror;
141+
}finally{
142+
if(!completed&&typeofiterator.return==='function'){
143+
constresult=iterator.return();
144+
if(aborted){
145+
markPromiseAsHandled(result);
146+
}else{
147+
awaitresult;
148+
}
149+
}
150+
}
151+
},
152+
};
153+
}
154+
72155
/**
73156
* Compute the minimum cursor across a set of consumers and count how many
74157
* consumers are at that cursor.
@@ -301,4 +384,5 @@ module.exports = {
301384
toUint8Array,
302385
validateBackpressure,
303386
wrapError,
387+
yieldAbortable,
304388
};

β€Žtest/parallel/test-stream-iter-consumers-bytes.jsβ€Ž

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const {
1414
arrayBufferSync,
1515
array,
1616
arraySync,
17+
toAsyncStreamable,
1718
}=require('stream/iter');
1819

1920
// =============================================================================
@@ -53,6 +54,55 @@ async function testBytesAsyncAbort() {
5354
);
5455
}
5556

57+
asyncfunctiontestAsyncConsumersAbortPendingNext(){
58+
constconsumers=[
59+
['bytes',bytes],
60+
['text',text],
61+
['arrayBuffer',arrayBuffer],
62+
['array',array],
63+
];
64+
65+
for(const[name,consumer]ofconsumers){
66+
constac=newAbortController();
67+
constreason=newError(`${name} boom`);
68+
69+
asyncfunction*never(){
70+
awaitnewPromise(()=>{});
71+
yield[];
72+
}
73+
74+
constpromise=consumer(never(),{__proto__: null,signal: ac.signal});
75+
ac.abort(reason);
76+
77+
awaitassert.rejects(promise,reason);
78+
}
79+
}
80+
81+
asyncfunctiontestAsyncConsumersAbortPendingNormalization(){
82+
constconsumers=[
83+
['bytes',bytes],
84+
['text',text],
85+
['arrayBuffer',arrayBuffer],
86+
['array',array],
87+
];
88+
89+
for(const[name,consumer]ofconsumers){
90+
constac=newAbortController();
91+
constreason=newError(`${name} normalization boom`);
92+
constsource={
93+
__proto__: null,
94+
[toAsyncStreamable](){
95+
returnnewPromise(()=>{});
96+
},
97+
};
98+
99+
constpromise=consumer(source,{__proto__: null,signal: ac.signal});
100+
ac.abort(reason);
101+
102+
awaitassert.rejects(promise,reason);
103+
}
104+
}
105+
56106
asyncfunctiontestBytesEmpty(){
57107
constdata=awaitbytes(from([]));
58108
assert.ok(datainstanceofUint8Array);
@@ -205,6 +255,8 @@ Promise.all([
205255
testBytesAsync(),
206256
testBytesAsyncLimit(),
207257
testBytesAsyncAbort(),
258+
testAsyncConsumersAbortPendingNext(),
259+
testAsyncConsumersAbortPendingNormalization(),
208260
testBytesEmpty(),
209261
testArrayBufferSyncBasic(),
210262
testArrayBufferAsync(),

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 870273c

Browse files
trivikraduh95
authored andcommitted
stream: reject iter consumers on abort
Make stream/iter async consumers observe abort signals while waiting for a pending async iterator read. This lets bytes(), text(), arrayBuffer(), and array() reject promptly with the abort reason instead of waiting for another batch. Move the shared abort-aware iterator wrapper to stream/iter utils so pull and consumers use the same helper. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64066 Backport-PR-URL: #64675Fixes: #64065 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 8a4a997 commit 870273c

4 files changed

Lines changed: 143 additions & 84 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const {
5252

5353
const{
5454
concatBytes,
55+
yieldAbortable,
5556
}=require('internal/streams/iter/utils');
5657

5758
const{
@@ -125,7 +126,9 @@ async function collectAsync(source, signal, limit) {
125126
signal?.throwIfAborted();
126127

127128
// Normalize source via from() - accepts strings, ArrayBuffers, protocols, etc.
128-
constnormalized=from(source);
129+
constabortableSource=signal&&isAsyncIterable(source) ?
130+
yieldAbortable(source,signal) : source;
131+
constnormalized=from(abortableSource);
129132
constchunks=[];
130133

131134
// Fast path: no signal and no limit
@@ -140,8 +143,9 @@ async function collectAsync(source, signal, limit) {
140143

141144
// Slow path: with signal or limit checks
142145
lettotalBytes=0;
146+
constiterable=signal ? yieldAbortable(normalized,signal) : normalized;
143147

144-
forawait(constbatchofnormalized){
148+
forawait(constbatchofiterable){
145149
signal?.throwIfAborted();
146150
for(leti=0;i<batch.length;i++){
147151
constchunk=batch[i];

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

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ const {
1414
ArrayPrototypeSlice,
1515
PromisePrototypeThen,
1616
PromiseResolve,
17-
PromiseWithResolvers,
18-
SafePromisePrototypeFinally,
19-
SafePromiseRace,
2017
SymbolAsyncIterator,
2118
SymbolIterator,
2219
TypedArrayPrototypeGetByteLength,
2320
Uint8Array,
2421
}=primordials;
2522

26-
const{
27-
markPromiseAsHandled,
28-
}=internalBinding('util');
29-
3023
const{
3124
codes: {
3225
ERR_INVALID_ARG_TYPE,
@@ -60,6 +53,7 @@ const {
6053
parsePullArgs,
6154
toUint8Array,
6255
wrapError,
56+
yieldAbortable,
6357
}=require('internal/streams/iter/utils');
6458

6559
const{
@@ -690,81 +684,6 @@ async function* applyValidatedStatefulAsyncTransform(source, transform, options)
690684
options.signal?.throwIfAborted();
691685
}
692686

693-
functiongetOnAbort(reject,signal){
694-
return()=>reject(signal.reason);
695-
}
696-
697-
/**
698-
* Read one item from an async iterator, rejecting early if the signal aborts.
699-
* @param {AsyncIterator} iterator - The iterator to read from.
700-
* @param {AbortSignal|undefined} signal - Optional abort signal.
701-
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
702-
*/
703-
functionabortableNext(iterator,signal){
704-
if(signal===undefined){
705-
returniterator.next();
706-
}
707-
708-
signal.throwIfAborted();
709-
710-
constnext=iterator.next();
711-
const{ promise, reject }=PromiseWithResolvers();
712-
constonAbort=getOnAbort(reject,signal);
713-
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
714-
if(signal.aborted){
715-
onAbort();
716-
}
717-
718-
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
719-
signal.removeEventListener('abort',onAbort);
720-
});
721-
}
722-
723-
/**
724-
* Wrap an async source so each pending read is abort-aware.
725-
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
726-
* @param {AbortSignal|undefined} signal - Optional abort signal.
727-
* @returns {AsyncIterable<Uint8Array[]>}
728-
*/
729-
functionyieldAbortable(source,signal){
730-
if(signal===undefined){
731-
returnsource;
732-
}
733-
734-
return{
735-
__proto__: null,
736-
async*[SymbolAsyncIterator](){
737-
constiterator=source[SymbolAsyncIterator]();
738-
letcompleted=false;
739-
letaborted=false;
740-
741-
try{
742-
while(true){
743-
const{ done, value }=awaitabortableNext(iterator,signal);
744-
if(done){
745-
completed=true;
746-
return;
747-
}
748-
signal.throwIfAborted();
749-
yieldvalue;
750-
}
751-
}catch(error){
752-
aborted=signal.aborted;
753-
throwerror;
754-
}finally{
755-
if(!completed&&typeofiterator.return==='function'){
756-
constresult=iterator.return();
757-
if(aborted){
758-
markPromiseAsHandled(result);
759-
}else{
760-
awaitresult;
761-
}
762-
}
763-
}
764-
},
765-
};
766-
}
767-
768687
/**
769688
* Create an async pipeline from source through transforms.
770689
* @yields {Uint8Array[]}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ const {
88
MathMin,
99
NumberMAX_SAFE_INTEGER,
1010
PromiseResolve,
11+
PromiseWithResolvers,
12+
SafePromisePrototypeFinally,
13+
SafePromiseRace,
1114
String,
15+
SymbolAsyncIterator,
1216
TypedArrayPrototypeGetBuffer,
1317
TypedArrayPrototypeGetByteLength,
1418
TypedArrayPrototypeGetByteOffset,
1519
TypedArrayPrototypeSet,
1620
Uint8Array,
1721
}=primordials;
1822

23+
const{
24+
markPromiseAsHandled,
25+
}=internalBinding('util');
26+
1927
const{ TextEncoder }=require('internal/encoding');
2028
const{
2129
codes: {
@@ -69,6 +77,81 @@ function onSignalAbort(signal, handler) {
6977
}
7078
}
7179

80+
functiongetOnAbort(reject,signal){
81+
return()=>reject(signal.reason);
82+
}
83+
84+
/**
85+
* Read one item from an async iterator, rejecting early if the signal aborts.
86+
* @param {AsyncIterator} iterator - The iterator to read from.
87+
* @param {AbortSignal|undefined} signal - Optional abort signal.
88+
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
89+
*/
90+
functionabortableNext(iterator,signal){
91+
if(signal===undefined){
92+
returniterator.next();
93+
}
94+
95+
signal.throwIfAborted();
96+
97+
constnext=iterator.next();
98+
const{ promise, reject }=PromiseWithResolvers();
99+
constonAbort=getOnAbort(reject,signal);
100+
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
101+
if(signal.aborted){
102+
onAbort();
103+
}
104+
105+
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
106+
signal.removeEventListener('abort',onAbort);
107+
});
108+
}
109+
110+
/**
111+
* Wrap an async source so each pending read is abort-aware.
112+
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
113+
* @param {AbortSignal|undefined} signal - Optional abort signal.
114+
* @returns {AsyncIterable<Uint8Array[]>}
115+
*/
116+
functionyieldAbortable(source,signal){
117+
if(signal===undefined){
118+
returnsource;
119+
}
120+
121+
return{
122+
__proto__: null,
123+
async*[SymbolAsyncIterator](){
124+
constiterator=source[SymbolAsyncIterator]();
125+
letcompleted=false;
126+
letaborted=false;
127+
128+
try{
129+
while(true){
130+
const{ done, value }=awaitabortableNext(iterator,signal);
131+
if(done){
132+
completed=true;
133+
return;
134+
}
135+
signal.throwIfAborted();
136+
yieldvalue;
137+
}
138+
}catch(error){
139+
aborted=signal.aborted;
140+
throwerror;
141+
}finally{
142+
if(!completed&&typeofiterator.return==='function'){
143+
constresult=iterator.return();
144+
if(aborted){
145+
markPromiseAsHandled(result);
146+
}else{
147+
awaitresult;
148+
}
149+
}
150+
}
151+
},
152+
};
153+
}
154+
72155
/**
73156
* Compute the minimum cursor across a set of consumers and count how many
74157
* consumers are at that cursor.
@@ -301,4 +384,5 @@ module.exports = {
301384
toUint8Array,
302385
validateBackpressure,
303386
wrapError,
387+
yieldAbortable,
304388
};

β€Žtest/parallel/test-stream-iter-consumers-bytes.jsβ€Ž

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const {
1414
arrayBufferSync,
1515
array,
1616
arraySync,
17+
toAsyncStreamable,
1718
}=require('stream/iter');
1819

1920
// =============================================================================
@@ -53,6 +54,55 @@ async function testBytesAsyncAbort() {
5354
);
5455
}
5556

57+
asyncfunctiontestAsyncConsumersAbortPendingNext(){
58+
constconsumers=[
59+
['bytes',bytes],
60+
['text',text],
61+
['arrayBuffer',arrayBuffer],
62+
['array',array],
63+
];
64+
65+
for(const[name,consumer]ofconsumers){
66+
constac=newAbortController();
67+
constreason=newError(`${name} boom`);
68+
69+
asyncfunction*never(){
70+
awaitnewPromise(()=>{});
71+
yield[];
72+
}
73+
74+
constpromise=consumer(never(),{__proto__: null,signal: ac.signal});
75+
ac.abort(reason);
76+
77+
awaitassert.rejects(promise,reason);
78+
}
79+
}
80+
81+
asyncfunctiontestAsyncConsumersAbortPendingNormalization(){
82+
constconsumers=[
83+
['bytes',bytes],
84+
['text',text],
85+
['arrayBuffer',arrayBuffer],
86+
['array',array],
87+
];
88+
89+
for(const[name,consumer]ofconsumers){
90+
constac=newAbortController();
91+
constreason=newError(`${name} normalization boom`);
92+
constsource={
93+
__proto__: null,
94+
[toAsyncStreamable](){
95+
returnnewPromise(()=>{});
96+
},
97+
};
98+
99+
constpromise=consumer(source,{__proto__: null,signal: ac.signal});
100+
ac.abort(reason);
101+
102+
awaitassert.rejects(promise,reason);
103+
}
104+
}
105+
56106
asyncfunctiontestBytesEmpty(){
57107
constdata=awaitbytes(from([]));
58108
assert.ok(datainstanceofUint8Array);
@@ -205,6 +255,8 @@ Promise.all([
205255
testBytesAsync(),
206256
testBytesAsyncLimit(),
207257
testBytesAsyncAbort(),
258+
testAsyncConsumersAbortPendingNext(),
259+
testAsyncConsumersAbortPendingNormalization(),
208260
testBytesEmpty(),
209261
testArrayBufferSyncBasic(),
210262
testArrayBufferAsync(),

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 870273c

Browse files
trivikraduh95
authored andcommitted
stream: reject iter consumers on abort
Make stream/iter async consumers observe abort signals while waiting for a pending async iterator read. This lets bytes(), text(), arrayBuffer(), and array() reject promptly with the abort reason instead of waiting for another batch. Move the shared abort-aware iterator wrapper to stream/iter utils so pull and consumers use the same helper. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64066 Backport-PR-URL: #64675Fixes: #64065 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 8a4a997 commit 870273c

4 files changed

Lines changed: 143 additions & 84 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const {
5252

5353
const{
5454
concatBytes,
55+
yieldAbortable,
5556
}=require('internal/streams/iter/utils');
5657

5758
const{
@@ -125,7 +126,9 @@ async function collectAsync(source, signal, limit) {
125126
signal?.throwIfAborted();
126127

127128
// Normalize source via from() - accepts strings, ArrayBuffers, protocols, etc.
128-
constnormalized=from(source);
129+
constabortableSource=signal&&isAsyncIterable(source) ?
130+
yieldAbortable(source,signal) : source;
131+
constnormalized=from(abortableSource);
129132
constchunks=[];
130133

131134
// Fast path: no signal and no limit
@@ -140,8 +143,9 @@ async function collectAsync(source, signal, limit) {
140143

141144
// Slow path: with signal or limit checks
142145
lettotalBytes=0;
146+
constiterable=signal ? yieldAbortable(normalized,signal) : normalized;
143147

144-
forawait(constbatchofnormalized){
148+
forawait(constbatchofiterable){
145149
signal?.throwIfAborted();
146150
for(leti=0;i<batch.length;i++){
147151
constchunk=batch[i];

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

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ const {
1414
ArrayPrototypeSlice,
1515
PromisePrototypeThen,
1616
PromiseResolve,
17-
PromiseWithResolvers,
18-
SafePromisePrototypeFinally,
19-
SafePromiseRace,
2017
SymbolAsyncIterator,
2118
SymbolIterator,
2219
TypedArrayPrototypeGetByteLength,
2320
Uint8Array,
2421
}=primordials;
2522

26-
const{
27-
markPromiseAsHandled,
28-
}=internalBinding('util');
29-
3023
const{
3124
codes: {
3225
ERR_INVALID_ARG_TYPE,
@@ -60,6 +53,7 @@ const {
6053
parsePullArgs,
6154
toUint8Array,
6255
wrapError,
56+
yieldAbortable,
6357
}=require('internal/streams/iter/utils');
6458

6559
const{
@@ -690,81 +684,6 @@ async function* applyValidatedStatefulAsyncTransform(source, transform, options)
690684
options.signal?.throwIfAborted();
691685
}
692686

693-
functiongetOnAbort(reject,signal){
694-
return()=>reject(signal.reason);
695-
}
696-
697-
/**
698-
* Read one item from an async iterator, rejecting early if the signal aborts.
699-
* @param {AsyncIterator} iterator - The iterator to read from.
700-
* @param {AbortSignal|undefined} signal - Optional abort signal.
701-
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
702-
*/
703-
functionabortableNext(iterator,signal){
704-
if(signal===undefined){
705-
returniterator.next();
706-
}
707-
708-
signal.throwIfAborted();
709-
710-
constnext=iterator.next();
711-
const{ promise, reject }=PromiseWithResolvers();
712-
constonAbort=getOnAbort(reject,signal);
713-
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
714-
if(signal.aborted){
715-
onAbort();
716-
}
717-
718-
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
719-
signal.removeEventListener('abort',onAbort);
720-
});
721-
}
722-
723-
/**
724-
* Wrap an async source so each pending read is abort-aware.
725-
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
726-
* @param {AbortSignal|undefined} signal - Optional abort signal.
727-
* @returns {AsyncIterable<Uint8Array[]>}
728-
*/
729-
functionyieldAbortable(source,signal){
730-
if(signal===undefined){
731-
returnsource;
732-
}
733-
734-
return{
735-
__proto__: null,
736-
async*[SymbolAsyncIterator](){
737-
constiterator=source[SymbolAsyncIterator]();
738-
letcompleted=false;
739-
letaborted=false;
740-
741-
try{
742-
while(true){
743-
const{ done, value }=awaitabortableNext(iterator,signal);
744-
if(done){
745-
completed=true;
746-
return;
747-
}
748-
signal.throwIfAborted();
749-
yieldvalue;
750-
}
751-
}catch(error){
752-
aborted=signal.aborted;
753-
throwerror;
754-
}finally{
755-
if(!completed&&typeofiterator.return==='function'){
756-
constresult=iterator.return();
757-
if(aborted){
758-
markPromiseAsHandled(result);
759-
}else{
760-
awaitresult;
761-
}
762-
}
763-
}
764-
},
765-
};
766-
}
767-
768687
/**
769688
* Create an async pipeline from source through transforms.
770689
* @yields {Uint8Array[]}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ const {
88
MathMin,
99
NumberMAX_SAFE_INTEGER,
1010
PromiseResolve,
11+
PromiseWithResolvers,
12+
SafePromisePrototypeFinally,
13+
SafePromiseRace,
1114
String,
15+
SymbolAsyncIterator,
1216
TypedArrayPrototypeGetBuffer,
1317
TypedArrayPrototypeGetByteLength,
1418
TypedArrayPrototypeGetByteOffset,
1519
TypedArrayPrototypeSet,
1620
Uint8Array,
1721
}=primordials;
1822

23+
const{
24+
markPromiseAsHandled,
25+
}=internalBinding('util');
26+
1927
const{ TextEncoder }=require('internal/encoding');
2028
const{
2129
codes: {
@@ -69,6 +77,81 @@ function onSignalAbort(signal, handler) {
6977
}
7078
}
7179

80+
functiongetOnAbort(reject,signal){
81+
return()=>reject(signal.reason);
82+
}
83+
84+
/**
85+
* Read one item from an async iterator, rejecting early if the signal aborts.
86+
* @param {AsyncIterator} iterator - The iterator to read from.
87+
* @param {AbortSignal|undefined} signal - Optional abort signal.
88+
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
89+
*/
90+
functionabortableNext(iterator,signal){
91+
if(signal===undefined){
92+
returniterator.next();
93+
}
94+
95+
signal.throwIfAborted();
96+
97+
constnext=iterator.next();
98+
const{ promise, reject }=PromiseWithResolvers();
99+
constonAbort=getOnAbort(reject,signal);
100+
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
101+
if(signal.aborted){
102+
onAbort();
103+
}
104+
105+
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
106+
signal.removeEventListener('abort',onAbort);
107+
});
108+
}
109+
110+
/**
111+
* Wrap an async source so each pending read is abort-aware.
112+
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
113+
* @param {AbortSignal|undefined} signal - Optional abort signal.
114+
* @returns {AsyncIterable<Uint8Array[]>}
115+
*/
116+
functionyieldAbortable(source,signal){
117+
if(signal===undefined){
118+
returnsource;
119+
}
120+
121+
return{
122+
__proto__: null,
123+
async*[SymbolAsyncIterator](){
124+
constiterator=source[SymbolAsyncIterator]();
125+
letcompleted=false;
126+
letaborted=false;
127+
128+
try{
129+
while(true){
130+
const{ done, value }=awaitabortableNext(iterator,signal);
131+
if(done){
132+
completed=true;
133+
return;
134+
}
135+
signal.throwIfAborted();
136+
yieldvalue;
137+
}
138+
}catch(error){
139+
aborted=signal.aborted;
140+
throwerror;
141+
}finally{
142+
if(!completed&&typeofiterator.return==='function'){
143+
constresult=iterator.return();
144+
if(aborted){
145+
markPromiseAsHandled(result);
146+
}else{
147+
awaitresult;
148+
}
149+
}
150+
}
151+
},
152+
};
153+
}
154+
72155
/**
73156
* Compute the minimum cursor across a set of consumers and count how many
74157
* consumers are at that cursor.
@@ -301,4 +384,5 @@ module.exports = {
301384
toUint8Array,
302385
validateBackpressure,
303386
wrapError,
387+
yieldAbortable,
304388
};

β€Žtest/parallel/test-stream-iter-consumers-bytes.jsβ€Ž

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const {
1414
arrayBufferSync,
1515
array,
1616
arraySync,
17+
toAsyncStreamable,
1718
}=require('stream/iter');
1819

1920
// =============================================================================
@@ -53,6 +54,55 @@ async function testBytesAsyncAbort() {
5354
);
5455
}
5556

57+
asyncfunctiontestAsyncConsumersAbortPendingNext(){
58+
constconsumers=[
59+
['bytes',bytes],
60+
['text',text],
61+
['arrayBuffer',arrayBuffer],
62+
['array',array],
63+
];
64+
65+
for(const[name,consumer]ofconsumers){
66+
constac=newAbortController();
67+
constreason=newError(`${name} boom`);
68+
69+
asyncfunction*never(){
70+
awaitnewPromise(()=>{});
71+
yield[];
72+
}
73+
74+
constpromise=consumer(never(),{__proto__: null,signal: ac.signal});
75+
ac.abort(reason);
76+
77+
awaitassert.rejects(promise,reason);
78+
}
79+
}
80+
81+
asyncfunctiontestAsyncConsumersAbortPendingNormalization(){
82+
constconsumers=[
83+
['bytes',bytes],
84+
['text',text],
85+
['arrayBuffer',arrayBuffer],
86+
['array',array],
87+
];
88+
89+
for(const[name,consumer]ofconsumers){
90+
constac=newAbortController();
91+
constreason=newError(`${name} normalization boom`);
92+
constsource={
93+
__proto__: null,
94+
[toAsyncStreamable](){
95+
returnnewPromise(()=>{});
96+
},
97+
};
98+
99+
constpromise=consumer(source,{__proto__: null,signal: ac.signal});
100+
ac.abort(reason);
101+
102+
awaitassert.rejects(promise,reason);
103+
}
104+
}
105+
56106
asyncfunctiontestBytesEmpty(){
57107
constdata=awaitbytes(from([]));
58108
assert.ok(datainstanceofUint8Array);
@@ -205,6 +255,8 @@ Promise.all([
205255
testBytesAsync(),
206256
testBytesAsyncLimit(),
207257
testBytesAsyncAbort(),
258+
testAsyncConsumersAbortPendingNext(),
259+
testAsyncConsumersAbortPendingNormalization(),
208260
testBytesEmpty(),
209261
testArrayBufferSyncBasic(),
210262
testArrayBufferAsync(),

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 870273c

Browse files
trivikraduh95
authored andcommitted
stream: reject iter consumers on abort
Make stream/iter async consumers observe abort signals while waiting for a pending async iterator read. This lets bytes(), text(), arrayBuffer(), and array() reject promptly with the abort reason instead of waiting for another batch. Move the shared abort-aware iterator wrapper to stream/iter utils so pull and consumers use the same helper. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64066 Backport-PR-URL: #64675Fixes: #64065 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 8a4a997 commit 870273c

4 files changed

Lines changed: 143 additions & 84 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const {
5252

5353
const{
5454
concatBytes,
55+
yieldAbortable,
5556
}=require('internal/streams/iter/utils');
5657

5758
const{
@@ -125,7 +126,9 @@ async function collectAsync(source, signal, limit) {
125126
signal?.throwIfAborted();
126127

127128
// Normalize source via from() - accepts strings, ArrayBuffers, protocols, etc.
128-
constnormalized=from(source);
129+
constabortableSource=signal&&isAsyncIterable(source) ?
130+
yieldAbortable(source,signal) : source;
131+
constnormalized=from(abortableSource);
129132
constchunks=[];
130133

131134
// Fast path: no signal and no limit
@@ -140,8 +143,9 @@ async function collectAsync(source, signal, limit) {
140143

141144
// Slow path: with signal or limit checks
142145
lettotalBytes=0;
146+
constiterable=signal ? yieldAbortable(normalized,signal) : normalized;
143147

144-
forawait(constbatchofnormalized){
148+
forawait(constbatchofiterable){
145149
signal?.throwIfAborted();
146150
for(leti=0;i<batch.length;i++){
147151
constchunk=batch[i];

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

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,12 @@ const {
1414
ArrayPrototypeSlice,
1515
PromisePrototypeThen,
1616
PromiseResolve,
17-
PromiseWithResolvers,
18-
SafePromisePrototypeFinally,
19-
SafePromiseRace,
2017
SymbolAsyncIterator,
2118
SymbolIterator,
2219
TypedArrayPrototypeGetByteLength,
2320
Uint8Array,
2421
}=primordials;
2522

26-
const{
27-
markPromiseAsHandled,
28-
}=internalBinding('util');
29-
3023
const{
3124
codes: {
3225
ERR_INVALID_ARG_TYPE,
@@ -60,6 +53,7 @@ const {
6053
parsePullArgs,
6154
toUint8Array,
6255
wrapError,
56+
yieldAbortable,
6357
}=require('internal/streams/iter/utils');
6458

6559
const{
@@ -690,81 +684,6 @@ async function* applyValidatedStatefulAsyncTransform(source, transform, options)
690684
options.signal?.throwIfAborted();
691685
}
692686

693-
functiongetOnAbort(reject,signal){
694-
return()=>reject(signal.reason);
695-
}
696-
697-
/**
698-
* Read one item from an async iterator, rejecting early if the signal aborts.
699-
* @param {AsyncIterator} iterator - The iterator to read from.
700-
* @param {AbortSignal|undefined} signal - Optional abort signal.
701-
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
702-
*/
703-
functionabortableNext(iterator,signal){
704-
if(signal===undefined){
705-
returniterator.next();
706-
}
707-
708-
signal.throwIfAborted();
709-
710-
constnext=iterator.next();
711-
const{ promise, reject }=PromiseWithResolvers();
712-
constonAbort=getOnAbort(reject,signal);
713-
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
714-
if(signal.aborted){
715-
onAbort();
716-
}
717-
718-
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
719-
signal.removeEventListener('abort',onAbort);
720-
});
721-
}
722-
723-
/**
724-
* Wrap an async source so each pending read is abort-aware.
725-
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
726-
* @param {AbortSignal|undefined} signal - Optional abort signal.
727-
* @returns {AsyncIterable<Uint8Array[]>}
728-
*/
729-
functionyieldAbortable(source,signal){
730-
if(signal===undefined){
731-
returnsource;
732-
}
733-
734-
return{
735-
__proto__: null,
736-
async*[SymbolAsyncIterator](){
737-
constiterator=source[SymbolAsyncIterator]();
738-
letcompleted=false;
739-
letaborted=false;
740-
741-
try{
742-
while(true){
743-
const{ done, value }=awaitabortableNext(iterator,signal);
744-
if(done){
745-
completed=true;
746-
return;
747-
}
748-
signal.throwIfAborted();
749-
yieldvalue;
750-
}
751-
}catch(error){
752-
aborted=signal.aborted;
753-
throwerror;
754-
}finally{
755-
if(!completed&&typeofiterator.return==='function'){
756-
constresult=iterator.return();
757-
if(aborted){
758-
markPromiseAsHandled(result);
759-
}else{
760-
awaitresult;
761-
}
762-
}
763-
}
764-
},
765-
};
766-
}
767-
768687
/**
769688
* Create an async pipeline from source through transforms.
770689
* @yields {Uint8Array[]}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ const {
88
MathMin,
99
NumberMAX_SAFE_INTEGER,
1010
PromiseResolve,
11+
PromiseWithResolvers,
12+
SafePromisePrototypeFinally,
13+
SafePromiseRace,
1114
String,
15+
SymbolAsyncIterator,
1216
TypedArrayPrototypeGetBuffer,
1317
TypedArrayPrototypeGetByteLength,
1418
TypedArrayPrototypeGetByteOffset,
1519
TypedArrayPrototypeSet,
1620
Uint8Array,
1721
}=primordials;
1822

23+
const{
24+
markPromiseAsHandled,
25+
}=internalBinding('util');
26+
1927
const{ TextEncoder }=require('internal/encoding');
2028
const{
2129
codes: {
@@ -69,6 +77,81 @@ function onSignalAbort(signal, handler) {
6977
}
7078
}
7179

80+
functiongetOnAbort(reject,signal){
81+
return()=>reject(signal.reason);
82+
}
83+
84+
/**
85+
* Read one item from an async iterator, rejecting early if the signal aborts.
86+
* @param {AsyncIterator} iterator - The iterator to read from.
87+
* @param {AbortSignal|undefined} signal - Optional abort signal.
88+
* @returns {Promise<IteratorResult<Uint8Array[]>>|IteratorResult<Uint8Array[]>}
89+
*/
90+
functionabortableNext(iterator,signal){
91+
if(signal===undefined){
92+
returniterator.next();
93+
}
94+
95+
signal.throwIfAborted();
96+
97+
constnext=iterator.next();
98+
const{ promise, reject }=PromiseWithResolvers();
99+
constonAbort=getOnAbort(reject,signal);
100+
signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
101+
if(signal.aborted){
102+
onAbort();
103+
}
104+
105+
returnSafePromisePrototypeFinally(SafePromiseRace([next,promise]),()=>{
106+
signal.removeEventListener('abort',onAbort);
107+
});
108+
}
109+
110+
/**
111+
* Wrap an async source so each pending read is abort-aware.
112+
* @param {AsyncIterable<Uint8Array[]>} source - The source to read from.
113+
* @param {AbortSignal|undefined} signal - Optional abort signal.
114+
* @returns {AsyncIterable<Uint8Array[]>}
115+
*/
116+
functionyieldAbortable(source,signal){
117+
if(signal===undefined){
118+
returnsource;
119+
}
120+
121+
return{
122+
__proto__: null,
123+
async*[SymbolAsyncIterator](){
124+
constiterator=source[SymbolAsyncIterator]();
125+
letcompleted=false;
126+
letaborted=false;
127+
128+
try{
129+
while(true){
130+
const{ done, value }=awaitabortableNext(iterator,signal);
131+
if(done){
132+
completed=true;
133+
return;
134+
}
135+
signal.throwIfAborted();
136+
yieldvalue;
137+
}
138+
}catch(error){
139+
aborted=signal.aborted;
140+
throwerror;
141+
}finally{
142+
if(!completed&&typeofiterator.return==='function'){
143+
constresult=iterator.return();
144+
if(aborted){
145+
markPromiseAsHandled(result);
146+
}else{
147+
awaitresult;
148+
}
149+
}
150+
}
151+
},
152+
};
153+
}
154+
72155
/**
73156
* Compute the minimum cursor across a set of consumers and count how many
74157
* consumers are at that cursor.
@@ -301,4 +384,5 @@ module.exports = {
301384
toUint8Array,
302385
validateBackpressure,
303386
wrapError,
387+
yieldAbortable,
304388
};

β€Žtest/parallel/test-stream-iter-consumers-bytes.jsβ€Ž

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const {
1414
arrayBufferSync,
1515
array,
1616
arraySync,
17+
toAsyncStreamable,
1718
}=require('stream/iter');
1819

1920
// =============================================================================
@@ -53,6 +54,55 @@ async function testBytesAsyncAbort() {
5354
);
5455
}
5556

57+
asyncfunctiontestAsyncConsumersAbortPendingNext(){
58+
constconsumers=[
59+
['bytes',bytes],
60+
['text',text],
61+
['arrayBuffer',arrayBuffer],
62+
['array',array],
63+
];
64+
65+
for(const[name,consumer]ofconsumers){
66+
constac=newAbortController();
67+
constreason=newError(`${name} boom`);
68+
69+
asyncfunction*never(){
70+
awaitnewPromise(()=>{});
71+
yield[];
72+
}
73+
74+
constpromise=consumer(never(),{__proto__: null,signal: ac.signal});
75+
ac.abort(reason);
76+
77+
awaitassert.rejects(promise,reason);
78+
}
79+
}
80+
81+
asyncfunctiontestAsyncConsumersAbortPendingNormalization(){
82+
constconsumers=[
83+
['bytes',bytes],
84+
['text',text],
85+
['arrayBuffer',arrayBuffer],
86+
['array',array],
87+
];
88+
89+
for(const[name,consumer]ofconsumers){
90+
constac=newAbortController();
91+
constreason=newError(`${name} normalization boom`);
92+
constsource={
93+
__proto__: null,
94+
[toAsyncStreamable](){
95+
returnnewPromise(()=>{});
96+
},
97+
};
98+
99+
constpromise=consumer(source,{__proto__: null,signal: ac.signal});
100+
ac.abort(reason);
101+
102+
awaitassert.rejects(promise,reason);
103+
}
104+
}
105+
56106
asyncfunctiontestBytesEmpty(){
57107
constdata=awaitbytes(from([]));
58108
assert.ok(datainstanceofUint8Array);
@@ -205,6 +255,8 @@ Promise.all([
205255
testBytesAsync(),
206256
testBytesAsyncLimit(),
207257
testBytesAsyncAbort(),
258+
testAsyncConsumersAbortPendingNext(),
259+
testAsyncConsumersAbortPendingNormalization(),
208260
testBytesEmpty(),
209261
testArrayBufferSyncBasic(),
210262
testArrayBufferAsync(),

0 commit comments

Comments
Β (0)