Commit 815424d

Browse files
trivikraduh95
authored andcommitted
stream: avoid leaking consumers on signal failure
Validate Broadcast.push() and Share.pull() signals before registering raw consumers. Return a rejecting iterable for pre-aborted signals without adding a cursor. This prevents failed subscriptions from leaving unreachable cursors that inflate consumerCount and can permanently impose backpressure. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65299Fixes: #65298 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>
1 parent e6bfec9 commit 815424d

5 files changed

Lines changed: 81 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,32 @@ class BroadcastImpl {
116116

117117
push(...args){
118118
const{ transforms, options }=parsePullArgs(args);
119+
constsignal=options?.signal;
120+
validateAbortSignal(signal,'options.signal');
121+
122+
// Avoid registering a consumer that the pre-aborted pipeline will never
123+
// read or detach.
124+
if(signal?.aborted){
125+
return{
126+
__proto__: null,
127+
// eslint-disable-next-line require-yield
128+
async*[SymbolAsyncIterator](){
129+
throwsignal.reason;
130+
},
131+
};
132+
}
133+
119134
constrawConsumer=this.#createRawConsumer();
120135

121136
// When transforms are present, delegate to pull() which creates its
122137
// own internal AbortController that follows the external signal.
123138
// When no transforms, return rawConsumer directly (controller elided
124139
// per PULL-02 optimization -- no transforms means no signal recipient).
125-
if(transforms.length>0||options?.signal){
140+
if(transforms.length>0||signal){
126141
constpullArgs=[...transforms];
127-
if(options?.signal){
142+
if(signal){
128143
ArrayPrototypePush(pullArgs,
129-
{__proto__: null,signal: options.signal});
144+
{__proto__: null, signal });
130145
}
131146
returnpullWithTransforms(rawConsumer, ...pullArgs);
132147
}

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,29 @@ class ShareImpl {
9393

9494
pull(...args){
9595
const{ transforms, options }=parsePullArgs(args);
96+
constsignal=options?.signal;
97+
validateAbortSignal(signal,'options.signal');
98+
99+
// Avoid registering a consumer that the pre-aborted pipeline will never
100+
// read or detach.
101+
if(signal?.aborted){
102+
return{
103+
__proto__: null,
104+
// eslint-disable-next-line require-yield
105+
async*[SymbolAsyncIterator](){
106+
throwsignal.reason;
107+
},
108+
};
109+
}
110+
96111
constrawConsumer=this.#createRawConsumer();
97112

98-
if(transforms.length>0||options?.signal){
99-
if(options){
100-
returnpullWithTransforms(rawConsumer, ...transforms,options);
113+
if(transforms.length>0||signal){
114+
if(signal){
115+
returnpullWithTransforms(
116+
rawConsumer,
117+
...transforms,
118+
{__proto__: null, signal });
101119
}
102120
returnpullWithTransforms(rawConsumer, ...transforms);
103121
}

β€Žtest/parallel/test-stream-iter-broadcast-basic.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,17 @@ async function testPushAbortSignalRejectsPendingNext() {
203203
awaitrejected;
204204
}
205205

206+
asyncfunctiontestPushPreAbortedSignalDoesNotAddConsumer(){
207+
constreason=newError('already aborted');
208+
constsignal=AbortSignal.abort(reason);
209+
const{broadcast: bc}=broadcast();
210+
constiter=bc.push({ signal })[Symbol.asyncIterator]();
211+
212+
assert.strictEqual(bc.consumerCount,0);
213+
awaitassert.rejects(iter.next(),(error)=>error===reason);
214+
assert.strictEqual(bc.consumerCount,0);
215+
}
216+
206217
// =============================================================================
207218
// Writer fail detaches consumers
208219
// =============================================================================
@@ -331,6 +342,7 @@ Promise.all([
331342
testCancelWithFalsyReason(),
332343
testPendingNextSettlesAfterReturn(),
333344
testPushAbortSignalRejectsPendingNext(),
345+
testPushPreAbortedSignalDoesNotAddConsumer(),
334346
testFailDetachesConsumers(),
335347
testWriterFailIdempotent(),
336348
testLateJoinerSeesBufferedData(),

β€Žtest/parallel/test-stream-iter-share-async.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@ async function testSharePullAbortSignalRejectsPendingNext() {
226226
shared.cancel();
227227
}
228228

229+
asyncfunctiontestSharePullPreAbortedSignalDoesNotAddConsumer(){
230+
constreason=newError('already aborted');
231+
constsignal=AbortSignal.abort(reason);
232+
constshared=share(from('data'));
233+
constiter=shared.pull({ signal })[Symbol.asyncIterator]();
234+
235+
assert.strictEqual(shared.consumerCount,0);
236+
awaitassert.rejects(iter.next(),(error)=>error===reason);
237+
assert.strictEqual(shared.consumerCount,0);
238+
}
239+
229240
asyncfunctiontestShareAlreadyAborted(){
230241
constshared=share(from('data'),{signal: AbortSignal.abort()});
231242
constconsumer=shared.pull();
@@ -372,6 +383,7 @@ Promise.all([
372383
testShareAbortSignal(),
373384
testShareAbortSignalWhileSourcePullPending(),
374385
testSharePullAbortSignalRejectsPendingNext(),
386+
testSharePullPreAbortedSignalDoesNotAddConsumer(),
375387
testShareAlreadyAborted(),
376388
testShareSourceError(),
377389
testShareLateJoiningConsumer(),

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ assert.throws(() => broadcast({ budget: 16383 }), { code: 'ERR_OUT_OF_RANGE' });
156156
assert.throws(()=>broadcast({signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
157157
assert.throws(()=>broadcast({backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
158158

159+
// Broadcast consumer options.signal must be AbortSignal and validation must
160+
// not leave a consumer registered.
161+
{
162+
const{broadcast: bc}=broadcast();
163+
assert.throws(()=>bc.push({signal: {}}),
164+
{code: 'ERR_INVALID_ARG_TYPE'});
165+
assert.strictEqual(bc.consumerCount,0);
166+
}
167+
159168
// BroadcastWriter options.signal must be AbortSignal
160169
{
161170
const{ writer }=broadcast();
@@ -212,6 +221,15 @@ assert.throws(() => share(from('a'), { budget: Number.MAX_SAFE_INTEGER + 1 }),
212221
assert.throws(()=>share(from('a'),{signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
213222
assert.throws(()=>share(from('a'),{backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
214223

224+
// Share consumer options.signal must be AbortSignal and validation must not
225+
// leave a consumer registered.
226+
{
227+
constshared=share(from('a'));
228+
assert.throws(()=>shared.pull({signal: {}}),
229+
{code: 'ERR_INVALID_ARG_TYPE'});
230+
assert.strictEqual(shared.consumerCount,0);
231+
}
232+
215233
// share() values < 16384 are rejected
216234
assert.throws(()=>share(from('a'),{budget: 0}),{code: 'ERR_OUT_OF_RANGE'});
217235
assert.throws(()=>share(from('a'),{budget: -1}),{code: 'ERR_OUT_OF_RANGE'});

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 815424d

Browse files
trivikraduh95
authored andcommitted
stream: avoid leaking consumers on signal failure
Validate Broadcast.push() and Share.pull() signals before registering raw consumers. Return a rejecting iterable for pre-aborted signals without adding a cursor. This prevents failed subscriptions from leaving unreachable cursors that inflate consumerCount and can permanently impose backpressure. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65299Fixes: #65298 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>
1 parent e6bfec9 commit 815424d

5 files changed

Lines changed: 81 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,32 @@ class BroadcastImpl {
116116

117117
push(...args){
118118
const{ transforms, options }=parsePullArgs(args);
119+
constsignal=options?.signal;
120+
validateAbortSignal(signal,'options.signal');
121+
122+
// Avoid registering a consumer that the pre-aborted pipeline will never
123+
// read or detach.
124+
if(signal?.aborted){
125+
return{
126+
__proto__: null,
127+
// eslint-disable-next-line require-yield
128+
async*[SymbolAsyncIterator](){
129+
throwsignal.reason;
130+
},
131+
};
132+
}
133+
119134
constrawConsumer=this.#createRawConsumer();
120135

121136
// When transforms are present, delegate to pull() which creates its
122137
// own internal AbortController that follows the external signal.
123138
// When no transforms, return rawConsumer directly (controller elided
124139
// per PULL-02 optimization -- no transforms means no signal recipient).
125-
if(transforms.length>0||options?.signal){
140+
if(transforms.length>0||signal){
126141
constpullArgs=[...transforms];
127-
if(options?.signal){
142+
if(signal){
128143
ArrayPrototypePush(pullArgs,
129-
{__proto__: null,signal: options.signal});
144+
{__proto__: null, signal });
130145
}
131146
returnpullWithTransforms(rawConsumer, ...pullArgs);
132147
}

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,29 @@ class ShareImpl {
9393

9494
pull(...args){
9595
const{ transforms, options }=parsePullArgs(args);
96+
constsignal=options?.signal;
97+
validateAbortSignal(signal,'options.signal');
98+
99+
// Avoid registering a consumer that the pre-aborted pipeline will never
100+
// read or detach.
101+
if(signal?.aborted){
102+
return{
103+
__proto__: null,
104+
// eslint-disable-next-line require-yield
105+
async*[SymbolAsyncIterator](){
106+
throwsignal.reason;
107+
},
108+
};
109+
}
110+
96111
constrawConsumer=this.#createRawConsumer();
97112

98-
if(transforms.length>0||options?.signal){
99-
if(options){
100-
returnpullWithTransforms(rawConsumer, ...transforms,options);
113+
if(transforms.length>0||signal){
114+
if(signal){
115+
returnpullWithTransforms(
116+
rawConsumer,
117+
...transforms,
118+
{__proto__: null, signal });
101119
}
102120
returnpullWithTransforms(rawConsumer, ...transforms);
103121
}

β€Žtest/parallel/test-stream-iter-broadcast-basic.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,17 @@ async function testPushAbortSignalRejectsPendingNext() {
203203
awaitrejected;
204204
}
205205

206+
asyncfunctiontestPushPreAbortedSignalDoesNotAddConsumer(){
207+
constreason=newError('already aborted');
208+
constsignal=AbortSignal.abort(reason);
209+
const{broadcast: bc}=broadcast();
210+
constiter=bc.push({ signal })[Symbol.asyncIterator]();
211+
212+
assert.strictEqual(bc.consumerCount,0);
213+
awaitassert.rejects(iter.next(),(error)=>error===reason);
214+
assert.strictEqual(bc.consumerCount,0);
215+
}
216+
206217
// =============================================================================
207218
// Writer fail detaches consumers
208219
// =============================================================================
@@ -331,6 +342,7 @@ Promise.all([
331342
testCancelWithFalsyReason(),
332343
testPendingNextSettlesAfterReturn(),
333344
testPushAbortSignalRejectsPendingNext(),
345+
testPushPreAbortedSignalDoesNotAddConsumer(),
334346
testFailDetachesConsumers(),
335347
testWriterFailIdempotent(),
336348
testLateJoinerSeesBufferedData(),

β€Žtest/parallel/test-stream-iter-share-async.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@ async function testSharePullAbortSignalRejectsPendingNext() {
226226
shared.cancel();
227227
}
228228

229+
asyncfunctiontestSharePullPreAbortedSignalDoesNotAddConsumer(){
230+
constreason=newError('already aborted');
231+
constsignal=AbortSignal.abort(reason);
232+
constshared=share(from('data'));
233+
constiter=shared.pull({ signal })[Symbol.asyncIterator]();
234+
235+
assert.strictEqual(shared.consumerCount,0);
236+
awaitassert.rejects(iter.next(),(error)=>error===reason);
237+
assert.strictEqual(shared.consumerCount,0);
238+
}
239+
229240
asyncfunctiontestShareAlreadyAborted(){
230241
constshared=share(from('data'),{signal: AbortSignal.abort()});
231242
constconsumer=shared.pull();
@@ -372,6 +383,7 @@ Promise.all([
372383
testShareAbortSignal(),
373384
testShareAbortSignalWhileSourcePullPending(),
374385
testSharePullAbortSignalRejectsPendingNext(),
386+
testSharePullPreAbortedSignalDoesNotAddConsumer(),
375387
testShareAlreadyAborted(),
376388
testShareSourceError(),
377389
testShareLateJoiningConsumer(),

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ assert.throws(() => broadcast({ budget: 16383 }), { code: 'ERR_OUT_OF_RANGE' });
156156
assert.throws(()=>broadcast({signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
157157
assert.throws(()=>broadcast({backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
158158

159+
// Broadcast consumer options.signal must be AbortSignal and validation must
160+
// not leave a consumer registered.
161+
{
162+
const{broadcast: bc}=broadcast();
163+
assert.throws(()=>bc.push({signal: {}}),
164+
{code: 'ERR_INVALID_ARG_TYPE'});
165+
assert.strictEqual(bc.consumerCount,0);
166+
}
167+
159168
// BroadcastWriter options.signal must be AbortSignal
160169
{
161170
const{ writer }=broadcast();
@@ -212,6 +221,15 @@ assert.throws(() => share(from('a'), { budget: Number.MAX_SAFE_INTEGER + 1 }),
212221
assert.throws(()=>share(from('a'),{signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
213222
assert.throws(()=>share(from('a'),{backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
214223

224+
// Share consumer options.signal must be AbortSignal and validation must not
225+
// leave a consumer registered.
226+
{
227+
constshared=share(from('a'));
228+
assert.throws(()=>shared.pull({signal: {}}),
229+
{code: 'ERR_INVALID_ARG_TYPE'});
230+
assert.strictEqual(shared.consumerCount,0);
231+
}
232+
215233
// share() values < 16384 are rejected
216234
assert.throws(()=>share(from('a'),{budget: 0}),{code: 'ERR_OUT_OF_RANGE'});
217235
assert.throws(()=>share(from('a'),{budget: -1}),{code: 'ERR_OUT_OF_RANGE'});

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 815424d

Browse files
trivikraduh95
authored andcommitted
stream: avoid leaking consumers on signal failure
Validate Broadcast.push() and Share.pull() signals before registering raw consumers. Return a rejecting iterable for pre-aborted signals without adding a cursor. This prevents failed subscriptions from leaving unreachable cursors that inflate consumerCount and can permanently impose backpressure. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65299Fixes: #65298 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>
1 parent e6bfec9 commit 815424d

5 files changed

Lines changed: 81 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,32 @@ class BroadcastImpl {
116116

117117
push(...args){
118118
const{ transforms, options }=parsePullArgs(args);
119+
constsignal=options?.signal;
120+
validateAbortSignal(signal,'options.signal');
121+
122+
// Avoid registering a consumer that the pre-aborted pipeline will never
123+
// read or detach.
124+
if(signal?.aborted){
125+
return{
126+
__proto__: null,
127+
// eslint-disable-next-line require-yield
128+
async*[SymbolAsyncIterator](){
129+
throwsignal.reason;
130+
},
131+
};
132+
}
133+
119134
constrawConsumer=this.#createRawConsumer();
120135

121136
// When transforms are present, delegate to pull() which creates its
122137
// own internal AbortController that follows the external signal.
123138
// When no transforms, return rawConsumer directly (controller elided
124139
// per PULL-02 optimization -- no transforms means no signal recipient).
125-
if(transforms.length>0||options?.signal){
140+
if(transforms.length>0||signal){
126141
constpullArgs=[...transforms];
127-
if(options?.signal){
142+
if(signal){
128143
ArrayPrototypePush(pullArgs,
129-
{__proto__: null,signal: options.signal});
144+
{__proto__: null, signal });
130145
}
131146
returnpullWithTransforms(rawConsumer, ...pullArgs);
132147
}

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,29 @@ class ShareImpl {
9393

9494
pull(...args){
9595
const{ transforms, options }=parsePullArgs(args);
96+
constsignal=options?.signal;
97+
validateAbortSignal(signal,'options.signal');
98+
99+
// Avoid registering a consumer that the pre-aborted pipeline will never
100+
// read or detach.
101+
if(signal?.aborted){
102+
return{
103+
__proto__: null,
104+
// eslint-disable-next-line require-yield
105+
async*[SymbolAsyncIterator](){
106+
throwsignal.reason;
107+
},
108+
};
109+
}
110+
96111
constrawConsumer=this.#createRawConsumer();
97112

98-
if(transforms.length>0||options?.signal){
99-
if(options){
100-
returnpullWithTransforms(rawConsumer, ...transforms,options);
113+
if(transforms.length>0||signal){
114+
if(signal){
115+
returnpullWithTransforms(
116+
rawConsumer,
117+
...transforms,
118+
{__proto__: null, signal });
101119
}
102120
returnpullWithTransforms(rawConsumer, ...transforms);
103121
}

β€Žtest/parallel/test-stream-iter-broadcast-basic.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,17 @@ async function testPushAbortSignalRejectsPendingNext() {
203203
awaitrejected;
204204
}
205205

206+
asyncfunctiontestPushPreAbortedSignalDoesNotAddConsumer(){
207+
constreason=newError('already aborted');
208+
constsignal=AbortSignal.abort(reason);
209+
const{broadcast: bc}=broadcast();
210+
constiter=bc.push({ signal })[Symbol.asyncIterator]();
211+
212+
assert.strictEqual(bc.consumerCount,0);
213+
awaitassert.rejects(iter.next(),(error)=>error===reason);
214+
assert.strictEqual(bc.consumerCount,0);
215+
}
216+
206217
// =============================================================================
207218
// Writer fail detaches consumers
208219
// =============================================================================
@@ -331,6 +342,7 @@ Promise.all([
331342
testCancelWithFalsyReason(),
332343
testPendingNextSettlesAfterReturn(),
333344
testPushAbortSignalRejectsPendingNext(),
345+
testPushPreAbortedSignalDoesNotAddConsumer(),
334346
testFailDetachesConsumers(),
335347
testWriterFailIdempotent(),
336348
testLateJoinerSeesBufferedData(),

β€Žtest/parallel/test-stream-iter-share-async.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@ async function testSharePullAbortSignalRejectsPendingNext() {
226226
shared.cancel();
227227
}
228228

229+
asyncfunctiontestSharePullPreAbortedSignalDoesNotAddConsumer(){
230+
constreason=newError('already aborted');
231+
constsignal=AbortSignal.abort(reason);
232+
constshared=share(from('data'));
233+
constiter=shared.pull({ signal })[Symbol.asyncIterator]();
234+
235+
assert.strictEqual(shared.consumerCount,0);
236+
awaitassert.rejects(iter.next(),(error)=>error===reason);
237+
assert.strictEqual(shared.consumerCount,0);
238+
}
239+
229240
asyncfunctiontestShareAlreadyAborted(){
230241
constshared=share(from('data'),{signal: AbortSignal.abort()});
231242
constconsumer=shared.pull();
@@ -372,6 +383,7 @@ Promise.all([
372383
testShareAbortSignal(),
373384
testShareAbortSignalWhileSourcePullPending(),
374385
testSharePullAbortSignalRejectsPendingNext(),
386+
testSharePullPreAbortedSignalDoesNotAddConsumer(),
375387
testShareAlreadyAborted(),
376388
testShareSourceError(),
377389
testShareLateJoiningConsumer(),

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ assert.throws(() => broadcast({ budget: 16383 }), { code: 'ERR_OUT_OF_RANGE' });
156156
assert.throws(()=>broadcast({signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
157157
assert.throws(()=>broadcast({backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
158158

159+
// Broadcast consumer options.signal must be AbortSignal and validation must
160+
// not leave a consumer registered.
161+
{
162+
const{broadcast: bc}=broadcast();
163+
assert.throws(()=>bc.push({signal: {}}),
164+
{code: 'ERR_INVALID_ARG_TYPE'});
165+
assert.strictEqual(bc.consumerCount,0);
166+
}
167+
159168
// BroadcastWriter options.signal must be AbortSignal
160169
{
161170
const{ writer }=broadcast();
@@ -212,6 +221,15 @@ assert.throws(() => share(from('a'), { budget: Number.MAX_SAFE_INTEGER + 1 }),
212221
assert.throws(()=>share(from('a'),{signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
213222
assert.throws(()=>share(from('a'),{backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
214223

224+
// Share consumer options.signal must be AbortSignal and validation must not
225+
// leave a consumer registered.
226+
{
227+
constshared=share(from('a'));
228+
assert.throws(()=>shared.pull({signal: {}}),
229+
{code: 'ERR_INVALID_ARG_TYPE'});
230+
assert.strictEqual(shared.consumerCount,0);
231+
}
232+
215233
// share() values < 16384 are rejected
216234
assert.throws(()=>share(from('a'),{budget: 0}),{code: 'ERR_OUT_OF_RANGE'});
217235
assert.throws(()=>share(from('a'),{budget: -1}),{code: 'ERR_OUT_OF_RANGE'});

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 815424d

Browse files
trivikraduh95
authored andcommitted
stream: avoid leaking consumers on signal failure
Validate Broadcast.push() and Share.pull() signals before registering raw consumers. Return a rejecting iterable for pre-aborted signals without adding a cursor. This prevents failed subscriptions from leaving unreachable cursors that inflate consumerCount and can permanently impose backpressure. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65299Fixes: #65298 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>
1 parent e6bfec9 commit 815424d

5 files changed

Lines changed: 81 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,32 @@ class BroadcastImpl {
116116

117117
push(...args){
118118
const{ transforms, options }=parsePullArgs(args);
119+
constsignal=options?.signal;
120+
validateAbortSignal(signal,'options.signal');
121+
122+
// Avoid registering a consumer that the pre-aborted pipeline will never
123+
// read or detach.
124+
if(signal?.aborted){
125+
return{
126+
__proto__: null,
127+
// eslint-disable-next-line require-yield
128+
async*[SymbolAsyncIterator](){
129+
throwsignal.reason;
130+
},
131+
};
132+
}
133+
119134
constrawConsumer=this.#createRawConsumer();
120135

121136
// When transforms are present, delegate to pull() which creates its
122137
// own internal AbortController that follows the external signal.
123138
// When no transforms, return rawConsumer directly (controller elided
124139
// per PULL-02 optimization -- no transforms means no signal recipient).
125-
if(transforms.length>0||options?.signal){
140+
if(transforms.length>0||signal){
126141
constpullArgs=[...transforms];
127-
if(options?.signal){
142+
if(signal){
128143
ArrayPrototypePush(pullArgs,
129-
{__proto__: null,signal: options.signal});
144+
{__proto__: null, signal });
130145
}
131146
returnpullWithTransforms(rawConsumer, ...pullArgs);
132147
}

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,29 @@ class ShareImpl {
9393

9494
pull(...args){
9595
const{ transforms, options }=parsePullArgs(args);
96+
constsignal=options?.signal;
97+
validateAbortSignal(signal,'options.signal');
98+
99+
// Avoid registering a consumer that the pre-aborted pipeline will never
100+
// read or detach.
101+
if(signal?.aborted){
102+
return{
103+
__proto__: null,
104+
// eslint-disable-next-line require-yield
105+
async*[SymbolAsyncIterator](){
106+
throwsignal.reason;
107+
},
108+
};
109+
}
110+
96111
constrawConsumer=this.#createRawConsumer();
97112

98-
if(transforms.length>0||options?.signal){
99-
if(options){
100-
returnpullWithTransforms(rawConsumer, ...transforms,options);
113+
if(transforms.length>0||signal){
114+
if(signal){
115+
returnpullWithTransforms(
116+
rawConsumer,
117+
...transforms,
118+
{__proto__: null, signal });
101119
}
102120
returnpullWithTransforms(rawConsumer, ...transforms);
103121
}

β€Žtest/parallel/test-stream-iter-broadcast-basic.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,17 @@ async function testPushAbortSignalRejectsPendingNext() {
203203
awaitrejected;
204204
}
205205

206+
asyncfunctiontestPushPreAbortedSignalDoesNotAddConsumer(){
207+
constreason=newError('already aborted');
208+
constsignal=AbortSignal.abort(reason);
209+
const{broadcast: bc}=broadcast();
210+
constiter=bc.push({ signal })[Symbol.asyncIterator]();
211+
212+
assert.strictEqual(bc.consumerCount,0);
213+
awaitassert.rejects(iter.next(),(error)=>error===reason);
214+
assert.strictEqual(bc.consumerCount,0);
215+
}
216+
206217
// =============================================================================
207218
// Writer fail detaches consumers
208219
// =============================================================================
@@ -331,6 +342,7 @@ Promise.all([
331342
testCancelWithFalsyReason(),
332343
testPendingNextSettlesAfterReturn(),
333344
testPushAbortSignalRejectsPendingNext(),
345+
testPushPreAbortedSignalDoesNotAddConsumer(),
334346
testFailDetachesConsumers(),
335347
testWriterFailIdempotent(),
336348
testLateJoinerSeesBufferedData(),

β€Žtest/parallel/test-stream-iter-share-async.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@ async function testSharePullAbortSignalRejectsPendingNext() {
226226
shared.cancel();
227227
}
228228

229+
asyncfunctiontestSharePullPreAbortedSignalDoesNotAddConsumer(){
230+
constreason=newError('already aborted');
231+
constsignal=AbortSignal.abort(reason);
232+
constshared=share(from('data'));
233+
constiter=shared.pull({ signal })[Symbol.asyncIterator]();
234+
235+
assert.strictEqual(shared.consumerCount,0);
236+
awaitassert.rejects(iter.next(),(error)=>error===reason);
237+
assert.strictEqual(shared.consumerCount,0);
238+
}
239+
229240
asyncfunctiontestShareAlreadyAborted(){
230241
constshared=share(from('data'),{signal: AbortSignal.abort()});
231242
constconsumer=shared.pull();
@@ -372,6 +383,7 @@ Promise.all([
372383
testShareAbortSignal(),
373384
testShareAbortSignalWhileSourcePullPending(),
374385
testSharePullAbortSignalRejectsPendingNext(),
386+
testSharePullPreAbortedSignalDoesNotAddConsumer(),
375387
testShareAlreadyAborted(),
376388
testShareSourceError(),
377389
testShareLateJoiningConsumer(),

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ assert.throws(() => broadcast({ budget: 16383 }), { code: 'ERR_OUT_OF_RANGE' });
156156
assert.throws(()=>broadcast({signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
157157
assert.throws(()=>broadcast({backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
158158

159+
// Broadcast consumer options.signal must be AbortSignal and validation must
160+
// not leave a consumer registered.
161+
{
162+
const{broadcast: bc}=broadcast();
163+
assert.throws(()=>bc.push({signal: {}}),
164+
{code: 'ERR_INVALID_ARG_TYPE'});
165+
assert.strictEqual(bc.consumerCount,0);
166+
}
167+
159168
// BroadcastWriter options.signal must be AbortSignal
160169
{
161170
const{ writer }=broadcast();
@@ -212,6 +221,15 @@ assert.throws(() => share(from('a'), { budget: Number.MAX_SAFE_INTEGER + 1 }),
212221
assert.throws(()=>share(from('a'),{signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
213222
assert.throws(()=>share(from('a'),{backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
214223

224+
// Share consumer options.signal must be AbortSignal and validation must not
225+
// leave a consumer registered.
226+
{
227+
constshared=share(from('a'));
228+
assert.throws(()=>shared.pull({signal: {}}),
229+
{code: 'ERR_INVALID_ARG_TYPE'});
230+
assert.strictEqual(shared.consumerCount,0);
231+
}
232+
215233
// share() values < 16384 are rejected
216234
assert.throws(()=>share(from('a'),{budget: 0}),{code: 'ERR_OUT_OF_RANGE'});
217235
assert.throws(()=>share(from('a'),{budget: -1}),{code: 'ERR_OUT_OF_RANGE'});

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 815424d

Browse files
trivikraduh95
authored andcommitted
stream: avoid leaking consumers on signal failure
Validate Broadcast.push() and Share.pull() signals before registering raw consumers. Return a rejecting iterable for pre-aborted signals without adding a cursor. This prevents failed subscriptions from leaving unreachable cursors that inflate consumerCount and can permanently impose backpressure. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65299Fixes: #65298 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>
1 parent e6bfec9 commit 815424d

5 files changed

Lines changed: 81 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,32 @@ class BroadcastImpl {
116116

117117
push(...args){
118118
const{ transforms, options }=parsePullArgs(args);
119+
constsignal=options?.signal;
120+
validateAbortSignal(signal,'options.signal');
121+
122+
// Avoid registering a consumer that the pre-aborted pipeline will never
123+
// read or detach.
124+
if(signal?.aborted){
125+
return{
126+
__proto__: null,
127+
// eslint-disable-next-line require-yield
128+
async*[SymbolAsyncIterator](){
129+
throwsignal.reason;
130+
},
131+
};
132+
}
133+
119134
constrawConsumer=this.#createRawConsumer();
120135

121136
// When transforms are present, delegate to pull() which creates its
122137
// own internal AbortController that follows the external signal.
123138
// When no transforms, return rawConsumer directly (controller elided
124139
// per PULL-02 optimization -- no transforms means no signal recipient).
125-
if(transforms.length>0||options?.signal){
140+
if(transforms.length>0||signal){
126141
constpullArgs=[...transforms];
127-
if(options?.signal){
142+
if(signal){
128143
ArrayPrototypePush(pullArgs,
129-
{__proto__: null,signal: options.signal});
144+
{__proto__: null, signal });
130145
}
131146
returnpullWithTransforms(rawConsumer, ...pullArgs);
132147
}

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,29 @@ class ShareImpl {
9393

9494
pull(...args){
9595
const{ transforms, options }=parsePullArgs(args);
96+
constsignal=options?.signal;
97+
validateAbortSignal(signal,'options.signal');
98+
99+
// Avoid registering a consumer that the pre-aborted pipeline will never
100+
// read or detach.
101+
if(signal?.aborted){
102+
return{
103+
__proto__: null,
104+
// eslint-disable-next-line require-yield
105+
async*[SymbolAsyncIterator](){
106+
throwsignal.reason;
107+
},
108+
};
109+
}
110+
96111
constrawConsumer=this.#createRawConsumer();
97112

98-
if(transforms.length>0||options?.signal){
99-
if(options){
100-
returnpullWithTransforms(rawConsumer, ...transforms,options);
113+
if(transforms.length>0||signal){
114+
if(signal){
115+
returnpullWithTransforms(
116+
rawConsumer,
117+
...transforms,
118+
{__proto__: null, signal });
101119
}
102120
returnpullWithTransforms(rawConsumer, ...transforms);
103121
}

β€Žtest/parallel/test-stream-iter-broadcast-basic.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,17 @@ async function testPushAbortSignalRejectsPendingNext() {
203203
awaitrejected;
204204
}
205205

206+
asyncfunctiontestPushPreAbortedSignalDoesNotAddConsumer(){
207+
constreason=newError('already aborted');
208+
constsignal=AbortSignal.abort(reason);
209+
const{broadcast: bc}=broadcast();
210+
constiter=bc.push({ signal })[Symbol.asyncIterator]();
211+
212+
assert.strictEqual(bc.consumerCount,0);
213+
awaitassert.rejects(iter.next(),(error)=>error===reason);
214+
assert.strictEqual(bc.consumerCount,0);
215+
}
216+
206217
// =============================================================================
207218
// Writer fail detaches consumers
208219
// =============================================================================
@@ -331,6 +342,7 @@ Promise.all([
331342
testCancelWithFalsyReason(),
332343
testPendingNextSettlesAfterReturn(),
333344
testPushAbortSignalRejectsPendingNext(),
345+
testPushPreAbortedSignalDoesNotAddConsumer(),
334346
testFailDetachesConsumers(),
335347
testWriterFailIdempotent(),
336348
testLateJoinerSeesBufferedData(),

β€Žtest/parallel/test-stream-iter-share-async.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@ async function testSharePullAbortSignalRejectsPendingNext() {
226226
shared.cancel();
227227
}
228228

229+
asyncfunctiontestSharePullPreAbortedSignalDoesNotAddConsumer(){
230+
constreason=newError('already aborted');
231+
constsignal=AbortSignal.abort(reason);
232+
constshared=share(from('data'));
233+
constiter=shared.pull({ signal })[Symbol.asyncIterator]();
234+
235+
assert.strictEqual(shared.consumerCount,0);
236+
awaitassert.rejects(iter.next(),(error)=>error===reason);
237+
assert.strictEqual(shared.consumerCount,0);
238+
}
239+
229240
asyncfunctiontestShareAlreadyAborted(){
230241
constshared=share(from('data'),{signal: AbortSignal.abort()});
231242
constconsumer=shared.pull();
@@ -372,6 +383,7 @@ Promise.all([
372383
testShareAbortSignal(),
373384
testShareAbortSignalWhileSourcePullPending(),
374385
testSharePullAbortSignalRejectsPendingNext(),
386+
testSharePullPreAbortedSignalDoesNotAddConsumer(),
375387
testShareAlreadyAborted(),
376388
testShareSourceError(),
377389
testShareLateJoiningConsumer(),

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ assert.throws(() => broadcast({ budget: 16383 }), { code: 'ERR_OUT_OF_RANGE' });
156156
assert.throws(()=>broadcast({signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
157157
assert.throws(()=>broadcast({backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
158158

159+
// Broadcast consumer options.signal must be AbortSignal and validation must
160+
// not leave a consumer registered.
161+
{
162+
const{broadcast: bc}=broadcast();
163+
assert.throws(()=>bc.push({signal: {}}),
164+
{code: 'ERR_INVALID_ARG_TYPE'});
165+
assert.strictEqual(bc.consumerCount,0);
166+
}
167+
159168
// BroadcastWriter options.signal must be AbortSignal
160169
{
161170
const{ writer }=broadcast();
@@ -212,6 +221,15 @@ assert.throws(() => share(from('a'), { budget: Number.MAX_SAFE_INTEGER + 1 }),
212221
assert.throws(()=>share(from('a'),{signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
213222
assert.throws(()=>share(from('a'),{backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
214223

224+
// Share consumer options.signal must be AbortSignal and validation must not
225+
// leave a consumer registered.
226+
{
227+
constshared=share(from('a'));
228+
assert.throws(()=>shared.pull({signal: {}}),
229+
{code: 'ERR_INVALID_ARG_TYPE'});
230+
assert.strictEqual(shared.consumerCount,0);
231+
}
232+
215233
// share() values < 16384 are rejected
216234
assert.throws(()=>share(from('a'),{budget: 0}),{code: 'ERR_OUT_OF_RANGE'});
217235
assert.throws(()=>share(from('a'),{budget: -1}),{code: 'ERR_OUT_OF_RANGE'});

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 815424d

Browse files
trivikraduh95
authored andcommitted
stream: avoid leaking consumers on signal failure
Validate Broadcast.push() and Share.pull() signals before registering raw consumers. Return a rejecting iterable for pre-aborted signals without adding a cursor. This prevents failed subscriptions from leaving unreachable cursors that inflate consumerCount and can permanently impose backpressure. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65299Fixes: #65298 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>
1 parent e6bfec9 commit 815424d

5 files changed

Lines changed: 81 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,32 @@ class BroadcastImpl {
116116

117117
push(...args){
118118
const{ transforms, options }=parsePullArgs(args);
119+
constsignal=options?.signal;
120+
validateAbortSignal(signal,'options.signal');
121+
122+
// Avoid registering a consumer that the pre-aborted pipeline will never
123+
// read or detach.
124+
if(signal?.aborted){
125+
return{
126+
__proto__: null,
127+
// eslint-disable-next-line require-yield
128+
async*[SymbolAsyncIterator](){
129+
throwsignal.reason;
130+
},
131+
};
132+
}
133+
119134
constrawConsumer=this.#createRawConsumer();
120135

121136
// When transforms are present, delegate to pull() which creates its
122137
// own internal AbortController that follows the external signal.
123138
// When no transforms, return rawConsumer directly (controller elided
124139
// per PULL-02 optimization -- no transforms means no signal recipient).
125-
if(transforms.length>0||options?.signal){
140+
if(transforms.length>0||signal){
126141
constpullArgs=[...transforms];
127-
if(options?.signal){
142+
if(signal){
128143
ArrayPrototypePush(pullArgs,
129-
{__proto__: null,signal: options.signal});
144+
{__proto__: null, signal });
130145
}
131146
returnpullWithTransforms(rawConsumer, ...pullArgs);
132147
}

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,29 @@ class ShareImpl {
9393

9494
pull(...args){
9595
const{ transforms, options }=parsePullArgs(args);
96+
constsignal=options?.signal;
97+
validateAbortSignal(signal,'options.signal');
98+
99+
// Avoid registering a consumer that the pre-aborted pipeline will never
100+
// read or detach.
101+
if(signal?.aborted){
102+
return{
103+
__proto__: null,
104+
// eslint-disable-next-line require-yield
105+
async*[SymbolAsyncIterator](){
106+
throwsignal.reason;
107+
},
108+
};
109+
}
110+
96111
constrawConsumer=this.#createRawConsumer();
97112

98-
if(transforms.length>0||options?.signal){
99-
if(options){
100-
returnpullWithTransforms(rawConsumer, ...transforms,options);
113+
if(transforms.length>0||signal){
114+
if(signal){
115+
returnpullWithTransforms(
116+
rawConsumer,
117+
...transforms,
118+
{__proto__: null, signal });
101119
}
102120
returnpullWithTransforms(rawConsumer, ...transforms);
103121
}

β€Žtest/parallel/test-stream-iter-broadcast-basic.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,17 @@ async function testPushAbortSignalRejectsPendingNext() {
203203
awaitrejected;
204204
}
205205

206+
asyncfunctiontestPushPreAbortedSignalDoesNotAddConsumer(){
207+
constreason=newError('already aborted');
208+
constsignal=AbortSignal.abort(reason);
209+
const{broadcast: bc}=broadcast();
210+
constiter=bc.push({ signal })[Symbol.asyncIterator]();
211+
212+
assert.strictEqual(bc.consumerCount,0);
213+
awaitassert.rejects(iter.next(),(error)=>error===reason);
214+
assert.strictEqual(bc.consumerCount,0);
215+
}
216+
206217
// =============================================================================
207218
// Writer fail detaches consumers
208219
// =============================================================================
@@ -331,6 +342,7 @@ Promise.all([
331342
testCancelWithFalsyReason(),
332343
testPendingNextSettlesAfterReturn(),
333344
testPushAbortSignalRejectsPendingNext(),
345+
testPushPreAbortedSignalDoesNotAddConsumer(),
334346
testFailDetachesConsumers(),
335347
testWriterFailIdempotent(),
336348
testLateJoinerSeesBufferedData(),

β€Žtest/parallel/test-stream-iter-share-async.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@ async function testSharePullAbortSignalRejectsPendingNext() {
226226
shared.cancel();
227227
}
228228

229+
asyncfunctiontestSharePullPreAbortedSignalDoesNotAddConsumer(){
230+
constreason=newError('already aborted');
231+
constsignal=AbortSignal.abort(reason);
232+
constshared=share(from('data'));
233+
constiter=shared.pull({ signal })[Symbol.asyncIterator]();
234+
235+
assert.strictEqual(shared.consumerCount,0);
236+
awaitassert.rejects(iter.next(),(error)=>error===reason);
237+
assert.strictEqual(shared.consumerCount,0);
238+
}
239+
229240
asyncfunctiontestShareAlreadyAborted(){
230241
constshared=share(from('data'),{signal: AbortSignal.abort()});
231242
constconsumer=shared.pull();
@@ -372,6 +383,7 @@ Promise.all([
372383
testShareAbortSignal(),
373384
testShareAbortSignalWhileSourcePullPending(),
374385
testSharePullAbortSignalRejectsPendingNext(),
386+
testSharePullPreAbortedSignalDoesNotAddConsumer(),
375387
testShareAlreadyAborted(),
376388
testShareSourceError(),
377389
testShareLateJoiningConsumer(),

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ assert.throws(() => broadcast({ budget: 16383 }), { code: 'ERR_OUT_OF_RANGE' });
156156
assert.throws(()=>broadcast({signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
157157
assert.throws(()=>broadcast({backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
158158

159+
// Broadcast consumer options.signal must be AbortSignal and validation must
160+
// not leave a consumer registered.
161+
{
162+
const{broadcast: bc}=broadcast();
163+
assert.throws(()=>bc.push({signal: {}}),
164+
{code: 'ERR_INVALID_ARG_TYPE'});
165+
assert.strictEqual(bc.consumerCount,0);
166+
}
167+
159168
// BroadcastWriter options.signal must be AbortSignal
160169
{
161170
const{ writer }=broadcast();
@@ -212,6 +221,15 @@ assert.throws(() => share(from('a'), { budget: Number.MAX_SAFE_INTEGER + 1 }),
212221
assert.throws(()=>share(from('a'),{signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
213222
assert.throws(()=>share(from('a'),{backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
214223

224+
// Share consumer options.signal must be AbortSignal and validation must not
225+
// leave a consumer registered.
226+
{
227+
constshared=share(from('a'));
228+
assert.throws(()=>shared.pull({signal: {}}),
229+
{code: 'ERR_INVALID_ARG_TYPE'});
230+
assert.strictEqual(shared.consumerCount,0);
231+
}
232+
215233
// share() values < 16384 are rejected
216234
assert.throws(()=>share(from('a'),{budget: 0}),{code: 'ERR_OUT_OF_RANGE'});
217235
assert.throws(()=>share(from('a'),{budget: -1}),{code: 'ERR_OUT_OF_RANGE'});

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 815424d

Browse files
trivikraduh95
authored andcommitted
stream: avoid leaking consumers on signal failure
Validate Broadcast.push() and Share.pull() signals before registering raw consumers. Return a rejecting iterable for pre-aborted signals without adding a cursor. This prevents failed subscriptions from leaving unreachable cursors that inflate consumerCount and can permanently impose backpressure. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65299Fixes: #65298 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>
1 parent e6bfec9 commit 815424d

5 files changed

Lines changed: 81 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,32 @@ class BroadcastImpl {
116116

117117
push(...args){
118118
const{ transforms, options }=parsePullArgs(args);
119+
constsignal=options?.signal;
120+
validateAbortSignal(signal,'options.signal');
121+
122+
// Avoid registering a consumer that the pre-aborted pipeline will never
123+
// read or detach.
124+
if(signal?.aborted){
125+
return{
126+
__proto__: null,
127+
// eslint-disable-next-line require-yield
128+
async*[SymbolAsyncIterator](){
129+
throwsignal.reason;
130+
},
131+
};
132+
}
133+
119134
constrawConsumer=this.#createRawConsumer();
120135

121136
// When transforms are present, delegate to pull() which creates its
122137
// own internal AbortController that follows the external signal.
123138
// When no transforms, return rawConsumer directly (controller elided
124139
// per PULL-02 optimization -- no transforms means no signal recipient).
125-
if(transforms.length>0||options?.signal){
140+
if(transforms.length>0||signal){
126141
constpullArgs=[...transforms];
127-
if(options?.signal){
142+
if(signal){
128143
ArrayPrototypePush(pullArgs,
129-
{__proto__: null,signal: options.signal});
144+
{__proto__: null, signal });
130145
}
131146
returnpullWithTransforms(rawConsumer, ...pullArgs);
132147
}

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,29 @@ class ShareImpl {
9393

9494
pull(...args){
9595
const{ transforms, options }=parsePullArgs(args);
96+
constsignal=options?.signal;
97+
validateAbortSignal(signal,'options.signal');
98+
99+
// Avoid registering a consumer that the pre-aborted pipeline will never
100+
// read or detach.
101+
if(signal?.aborted){
102+
return{
103+
__proto__: null,
104+
// eslint-disable-next-line require-yield
105+
async*[SymbolAsyncIterator](){
106+
throwsignal.reason;
107+
},
108+
};
109+
}
110+
96111
constrawConsumer=this.#createRawConsumer();
97112

98-
if(transforms.length>0||options?.signal){
99-
if(options){
100-
returnpullWithTransforms(rawConsumer, ...transforms,options);
113+
if(transforms.length>0||signal){
114+
if(signal){
115+
returnpullWithTransforms(
116+
rawConsumer,
117+
...transforms,
118+
{__proto__: null, signal });
101119
}
102120
returnpullWithTransforms(rawConsumer, ...transforms);
103121
}

β€Žtest/parallel/test-stream-iter-broadcast-basic.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,17 @@ async function testPushAbortSignalRejectsPendingNext() {
203203
awaitrejected;
204204
}
205205

206+
asyncfunctiontestPushPreAbortedSignalDoesNotAddConsumer(){
207+
constreason=newError('already aborted');
208+
constsignal=AbortSignal.abort(reason);
209+
const{broadcast: bc}=broadcast();
210+
constiter=bc.push({ signal })[Symbol.asyncIterator]();
211+
212+
assert.strictEqual(bc.consumerCount,0);
213+
awaitassert.rejects(iter.next(),(error)=>error===reason);
214+
assert.strictEqual(bc.consumerCount,0);
215+
}
216+
206217
// =============================================================================
207218
// Writer fail detaches consumers
208219
// =============================================================================
@@ -331,6 +342,7 @@ Promise.all([
331342
testCancelWithFalsyReason(),
332343
testPendingNextSettlesAfterReturn(),
333344
testPushAbortSignalRejectsPendingNext(),
345+
testPushPreAbortedSignalDoesNotAddConsumer(),
334346
testFailDetachesConsumers(),
335347
testWriterFailIdempotent(),
336348
testLateJoinerSeesBufferedData(),

β€Žtest/parallel/test-stream-iter-share-async.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@ async function testSharePullAbortSignalRejectsPendingNext() {
226226
shared.cancel();
227227
}
228228

229+
asyncfunctiontestSharePullPreAbortedSignalDoesNotAddConsumer(){
230+
constreason=newError('already aborted');
231+
constsignal=AbortSignal.abort(reason);
232+
constshared=share(from('data'));
233+
constiter=shared.pull({ signal })[Symbol.asyncIterator]();
234+
235+
assert.strictEqual(shared.consumerCount,0);
236+
awaitassert.rejects(iter.next(),(error)=>error===reason);
237+
assert.strictEqual(shared.consumerCount,0);
238+
}
239+
229240
asyncfunctiontestShareAlreadyAborted(){
230241
constshared=share(from('data'),{signal: AbortSignal.abort()});
231242
constconsumer=shared.pull();
@@ -372,6 +383,7 @@ Promise.all([
372383
testShareAbortSignal(),
373384
testShareAbortSignalWhileSourcePullPending(),
374385
testSharePullAbortSignalRejectsPendingNext(),
386+
testSharePullPreAbortedSignalDoesNotAddConsumer(),
375387
testShareAlreadyAborted(),
376388
testShareSourceError(),
377389
testShareLateJoiningConsumer(),

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ assert.throws(() => broadcast({ budget: 16383 }), { code: 'ERR_OUT_OF_RANGE' });
156156
assert.throws(()=>broadcast({signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
157157
assert.throws(()=>broadcast({backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
158158

159+
// Broadcast consumer options.signal must be AbortSignal and validation must
160+
// not leave a consumer registered.
161+
{
162+
const{broadcast: bc}=broadcast();
163+
assert.throws(()=>bc.push({signal: {}}),
164+
{code: 'ERR_INVALID_ARG_TYPE'});
165+
assert.strictEqual(bc.consumerCount,0);
166+
}
167+
159168
// BroadcastWriter options.signal must be AbortSignal
160169
{
161170
const{ writer }=broadcast();
@@ -212,6 +221,15 @@ assert.throws(() => share(from('a'), { budget: Number.MAX_SAFE_INTEGER + 1 }),
212221
assert.throws(()=>share(from('a'),{signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
213222
assert.throws(()=>share(from('a'),{backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
214223

224+
// Share consumer options.signal must be AbortSignal and validation must not
225+
// leave a consumer registered.
226+
{
227+
constshared=share(from('a'));
228+
assert.throws(()=>shared.pull({signal: {}}),
229+
{code: 'ERR_INVALID_ARG_TYPE'});
230+
assert.strictEqual(shared.consumerCount,0);
231+
}
232+
215233
// share() values < 16384 are rejected
216234
assert.throws(()=>share(from('a'),{budget: 0}),{code: 'ERR_OUT_OF_RANGE'});
217235
assert.throws(()=>share(from('a'),{budget: -1}),{code: 'ERR_OUT_OF_RANGE'});

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 815424d

Browse files
trivikraduh95
authored andcommitted
stream: avoid leaking consumers on signal failure
Validate Broadcast.push() and Share.pull() signals before registering raw consumers. Return a rejecting iterable for pre-aborted signals without adding a cursor. This prevents failed subscriptions from leaving unreachable cursors that inflate consumerCount and can permanently impose backpressure. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #65299Fixes: #65298 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>
1 parent e6bfec9 commit 815424d

5 files changed

Lines changed: 81 additions & 6 deletions

File tree

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,32 @@ class BroadcastImpl {
116116

117117
push(...args){
118118
const{ transforms, options }=parsePullArgs(args);
119+
constsignal=options?.signal;
120+
validateAbortSignal(signal,'options.signal');
121+
122+
// Avoid registering a consumer that the pre-aborted pipeline will never
123+
// read or detach.
124+
if(signal?.aborted){
125+
return{
126+
__proto__: null,
127+
// eslint-disable-next-line require-yield
128+
async*[SymbolAsyncIterator](){
129+
throwsignal.reason;
130+
},
131+
};
132+
}
133+
119134
constrawConsumer=this.#createRawConsumer();
120135

121136
// When transforms are present, delegate to pull() which creates its
122137
// own internal AbortController that follows the external signal.
123138
// When no transforms, return rawConsumer directly (controller elided
124139
// per PULL-02 optimization -- no transforms means no signal recipient).
125-
if(transforms.length>0||options?.signal){
140+
if(transforms.length>0||signal){
126141
constpullArgs=[...transforms];
127-
if(options?.signal){
142+
if(signal){
128143
ArrayPrototypePush(pullArgs,
129-
{__proto__: null,signal: options.signal});
144+
{__proto__: null, signal });
130145
}
131146
returnpullWithTransforms(rawConsumer, ...pullArgs);
132147
}

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,29 @@ class ShareImpl {
9393

9494
pull(...args){
9595
const{ transforms, options }=parsePullArgs(args);
96+
constsignal=options?.signal;
97+
validateAbortSignal(signal,'options.signal');
98+
99+
// Avoid registering a consumer that the pre-aborted pipeline will never
100+
// read or detach.
101+
if(signal?.aborted){
102+
return{
103+
__proto__: null,
104+
// eslint-disable-next-line require-yield
105+
async*[SymbolAsyncIterator](){
106+
throwsignal.reason;
107+
},
108+
};
109+
}
110+
96111
constrawConsumer=this.#createRawConsumer();
97112

98-
if(transforms.length>0||options?.signal){
99-
if(options){
100-
returnpullWithTransforms(rawConsumer, ...transforms,options);
113+
if(transforms.length>0||signal){
114+
if(signal){
115+
returnpullWithTransforms(
116+
rawConsumer,
117+
...transforms,
118+
{__proto__: null, signal });
101119
}
102120
returnpullWithTransforms(rawConsumer, ...transforms);
103121
}

β€Žtest/parallel/test-stream-iter-broadcast-basic.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,17 @@ async function testPushAbortSignalRejectsPendingNext() {
203203
awaitrejected;
204204
}
205205

206+
asyncfunctiontestPushPreAbortedSignalDoesNotAddConsumer(){
207+
constreason=newError('already aborted');
208+
constsignal=AbortSignal.abort(reason);
209+
const{broadcast: bc}=broadcast();
210+
constiter=bc.push({ signal })[Symbol.asyncIterator]();
211+
212+
assert.strictEqual(bc.consumerCount,0);
213+
awaitassert.rejects(iter.next(),(error)=>error===reason);
214+
assert.strictEqual(bc.consumerCount,0);
215+
}
216+
206217
// =============================================================================
207218
// Writer fail detaches consumers
208219
// =============================================================================
@@ -331,6 +342,7 @@ Promise.all([
331342
testCancelWithFalsyReason(),
332343
testPendingNextSettlesAfterReturn(),
333344
testPushAbortSignalRejectsPendingNext(),
345+
testPushPreAbortedSignalDoesNotAddConsumer(),
334346
testFailDetachesConsumers(),
335347
testWriterFailIdempotent(),
336348
testLateJoinerSeesBufferedData(),

β€Žtest/parallel/test-stream-iter-share-async.jsβ€Ž

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,17 @@ async function testSharePullAbortSignalRejectsPendingNext() {
226226
shared.cancel();
227227
}
228228

229+
asyncfunctiontestSharePullPreAbortedSignalDoesNotAddConsumer(){
230+
constreason=newError('already aborted');
231+
constsignal=AbortSignal.abort(reason);
232+
constshared=share(from('data'));
233+
constiter=shared.pull({ signal })[Symbol.asyncIterator]();
234+
235+
assert.strictEqual(shared.consumerCount,0);
236+
awaitassert.rejects(iter.next(),(error)=>error===reason);
237+
assert.strictEqual(shared.consumerCount,0);
238+
}
239+
229240
asyncfunctiontestShareAlreadyAborted(){
230241
constshared=share(from('data'),{signal: AbortSignal.abort()});
231242
constconsumer=shared.pull();
@@ -372,6 +383,7 @@ Promise.all([
372383
testShareAbortSignal(),
373384
testShareAbortSignalWhileSourcePullPending(),
374385
testSharePullAbortSignalRejectsPendingNext(),
386+
testSharePullPreAbortedSignalDoesNotAddConsumer(),
375387
testShareAlreadyAborted(),
376388
testShareSourceError(),
377389
testShareLateJoiningConsumer(),

β€Žtest/parallel/test-stream-iter-validation.jsβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,15 @@ assert.throws(() => broadcast({ budget: 16383 }), { code: 'ERR_OUT_OF_RANGE' });
156156
assert.throws(()=>broadcast({signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
157157
assert.throws(()=>broadcast({backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
158158

159+
// Broadcast consumer options.signal must be AbortSignal and validation must
160+
// not leave a consumer registered.
161+
{
162+
const{broadcast: bc}=broadcast();
163+
assert.throws(()=>bc.push({signal: {}}),
164+
{code: 'ERR_INVALID_ARG_TYPE'});
165+
assert.strictEqual(bc.consumerCount,0);
166+
}
167+
159168
// BroadcastWriter options.signal must be AbortSignal
160169
{
161170
const{ writer }=broadcast();
@@ -212,6 +221,15 @@ assert.throws(() => share(from('a'), { budget: Number.MAX_SAFE_INTEGER + 1 }),
212221
assert.throws(()=>share(from('a'),{signal: {}}),{code: 'ERR_INVALID_ARG_TYPE'});
213222
assert.throws(()=>share(from('a'),{backpressure: 'bad'}),{code: 'ERR_INVALID_ARG_VALUE'});
214223

224+
// Share consumer options.signal must be AbortSignal and validation must not
225+
// leave a consumer registered.
226+
{
227+
constshared=share(from('a'));
228+
assert.throws(()=>shared.pull({signal: {}}),
229+
{code: 'ERR_INVALID_ARG_TYPE'});
230+
assert.strictEqual(shared.consumerCount,0);
231+
}
232+
215233
// share() values < 16384 are rejected
216234
assert.throws(()=>share(from('a'),{budget: 0}),{code: 'ERR_OUT_OF_RANGE'});
217235
assert.throws(()=>share(from('a'),{budget: -1}),{code: 'ERR_OUT_OF_RANGE'});

0 commit comments

Comments
Β (0)