Commit 568dcc2

Browse files
trivikraduh95
authored andcommitted
stream: serialize concurrent share consumer reads
Ensure overlapping next() calls on a single share() consumer resolve in the same order they were requested. Fixes: #63477 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63478 Backport-PR-URL: #64675Fixes: #63477 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 5e2b4c4 commit 568dcc2

2 files changed

Lines changed: 78 additions & 48 deletions

File tree

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

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class ShareImpl {
113113
resolve: null,
114114
reject: null,
115115
detached: false,
116+
pendingNext: PromiseResolve(),
116117
};
117118

118119
this.#consumers.add(state);
@@ -129,62 +130,72 @@ class ShareImpl {
129130
return{
130131
__proto__: null,
131132
[SymbolAsyncIterator](){
132-
return{
133-
__proto__: null,
134-
asyncnext(){
135-
if(self.#sourceError){
136-
state.detached=true;
137-
self.#consumers.delete(state);
138-
throwself.#sourceError;
133+
constgetNext=async()=>{
134+
if(self.#sourceError){
135+
state.detached=true;
136+
self.#consumers.delete(state);
137+
throwself.#sourceError;
138+
}
139+
140+
// Loop until we get data, source is exhausted, or
141+
// consumer is detached. Multiple consumers may be woken
142+
// after a single pull - those that find no data at their
143+
// cursor must re-pull rather than terminating prematurely.
144+
for(;;){
145+
if(state.detached){
146+
if(self.#sourceError)throwself.#sourceError;
147+
return{__proto__: null,done: true,value: undefined};
139148
}
140149

141-
// Loop until we get data, source is exhausted, or
142-
// consumer is detached. Multiple consumers may be woken
143-
// after a single pull - those that find no data at their
144-
// cursor must re-pull rather than terminating prematurely.
145-
for(;;){
146-
if(state.detached){
147-
if(self.#sourceError)throwself.#sourceError;
148-
return{__proto__: null,done: true,value: undefined};
149-
}
150+
if(self.#cancelled){
151+
state.detached=true;
152+
self.#deleteConsumer(state);
153+
return{__proto__: null,done: true,value: undefined};
154+
}
150155

151-
if(self.#cancelled){
152-
state.detached=true;
153-
self.#deleteConsumer(state);
154-
return{__proto__: null,done: true,value: undefined};
156+
// Check if data is available in buffer
157+
constbufferIndex=state.cursor-self.#bufferStart;
158+
if(bufferIndex<self.#buffer.length){
159+
constchunk=self.#buffer.get(bufferIndex);
160+
constcursor=state.cursor;
161+
state.cursor++;
162+
if(cursor===self.#cachedMinCursor &&
163+
--self.#cachedMinCursorConsumers ===0){
164+
self.#tryTrimBuffer();
155165
}
166+
return{__proto__: null,done: false,value: chunk};
167+
}
156168

157-
// Check if data is available in buffer
158-
constbufferIndex=state.cursor-self.#bufferStart;
159-
if(bufferIndex<self.#buffer.length){
160-
constchunk=self.#buffer.get(bufferIndex);
161-
constcursor=state.cursor;
162-
state.cursor++;
163-
if(cursor===self.#cachedMinCursor &&
164-
--self.#cachedMinCursorConsumers ===0){
165-
self.#tryTrimBuffer();
166-
}
167-
return{__proto__: null,done: false,value: chunk};
168-
}
169+
if(self.#sourceExhausted){
170+
state.detached=true;
171+
self.#deleteConsumer(state);
172+
if(self.#sourceError)throwself.#sourceError;
173+
return{__proto__: null,done: true,value: undefined};
174+
}
169175

170-
if(self.#sourceExhausted){
171-
state.detached=true;
172-
self.#deleteConsumer(state);
173-
if(self.#sourceError)throwself.#sourceError;
174-
return{__proto__: null,done: true,value: undefined};
175-
}
176+
// Need to pull from source - check buffer limit
177+
constcanPull=awaitself.#waitForBufferSpace();
178+
if(!canPull){
179+
state.detached=true;
180+
self.#deleteConsumer(state);
181+
if(self.#sourceError)throwself.#sourceError;
182+
return{__proto__: null,done: true,value: undefined};
183+
}
176184

177-
// Need to pull from source - check buffer limit
178-
constcanPull=awaitself.#waitForBufferSpace();
179-
if(!canPull){
180-
state.detached=true;
181-
self.#deleteConsumer(state);
182-
if(self.#sourceError)throwself.#sourceError;
183-
return{__proto__: null,done: true,value: undefined};
184-
}
185+
awaitself.#pullFromSource();
186+
}
187+
};
185188

186-
awaitself.#pullFromSource();
187-
}
189+
return{
190+
__proto__: null,
191+
next(){
192+
constnext=PromisePrototypeThen(
193+
state.pendingNext,
194+
getNext,
195+
getNext);
196+
state.pendingNext=
197+
PromisePrototypeThen(next,undefined,()=>{});
198+
returnnext;
188199
},
189200

190201
asyncreturn(){

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,24 @@ async function testShareMultipleConsumersConcurrentPull() {
309309
assert.strictEqual(t3,expected);
310310
}
311311

312+
asyncfunctiontestShareConsumerConcurrentNextCalls(){
313+
asyncfunction*source(){
314+
constenc=newTextEncoder();
315+
yield[enc.encode('first')];
316+
yield[enc.encode('second')];
317+
}
318+
319+
constshared=share(source());
320+
constit=shared.pull()[Symbol.asyncIterator]();
321+
constfirst=it.next();
322+
constsecond=it.next();
323+
324+
const[r1,r2]=awaitPromise.all([first,second]);
325+
constdec=newTextDecoder();
326+
assert.strictEqual(dec.decode(r1.value[0]),'first');
327+
assert.strictEqual(dec.decode(r2.value[0]),'second');
328+
}
329+
312330
// share() accepts string source directly (normalized via from())
313331
asyncfunctiontestShareStringSource(){
314332
constshared=share('hello-share');
@@ -330,5 +348,6 @@ Promise.all([
330348
testShareLateJoiningConsumer(),
331349
testShareConsumerBreak(),
332350
testShareMultipleConsumersConcurrentPull(),
351+
testShareConsumerConcurrentNextCalls(),
333352
testShareStringSource(),
334353
]).then(common.mustCall());

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 568dcc2

Browse files
trivikraduh95
authored andcommitted
stream: serialize concurrent share consumer reads
Ensure overlapping next() calls on a single share() consumer resolve in the same order they were requested. Fixes: #63477 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63478 Backport-PR-URL: #64675Fixes: #63477 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 5e2b4c4 commit 568dcc2

2 files changed

Lines changed: 78 additions & 48 deletions

File tree

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

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class ShareImpl {
113113
resolve: null,
114114
reject: null,
115115
detached: false,
116+
pendingNext: PromiseResolve(),
116117
};
117118

118119
this.#consumers.add(state);
@@ -129,62 +130,72 @@ class ShareImpl {
129130
return{
130131
__proto__: null,
131132
[SymbolAsyncIterator](){
132-
return{
133-
__proto__: null,
134-
asyncnext(){
135-
if(self.#sourceError){
136-
state.detached=true;
137-
self.#consumers.delete(state);
138-
throwself.#sourceError;
133+
constgetNext=async()=>{
134+
if(self.#sourceError){
135+
state.detached=true;
136+
self.#consumers.delete(state);
137+
throwself.#sourceError;
138+
}
139+
140+
// Loop until we get data, source is exhausted, or
141+
// consumer is detached. Multiple consumers may be woken
142+
// after a single pull - those that find no data at their
143+
// cursor must re-pull rather than terminating prematurely.
144+
for(;;){
145+
if(state.detached){
146+
if(self.#sourceError)throwself.#sourceError;
147+
return{__proto__: null,done: true,value: undefined};
139148
}
140149

141-
// Loop until we get data, source is exhausted, or
142-
// consumer is detached. Multiple consumers may be woken
143-
// after a single pull - those that find no data at their
144-
// cursor must re-pull rather than terminating prematurely.
145-
for(;;){
146-
if(state.detached){
147-
if(self.#sourceError)throwself.#sourceError;
148-
return{__proto__: null,done: true,value: undefined};
149-
}
150+
if(self.#cancelled){
151+
state.detached=true;
152+
self.#deleteConsumer(state);
153+
return{__proto__: null,done: true,value: undefined};
154+
}
150155

151-
if(self.#cancelled){
152-
state.detached=true;
153-
self.#deleteConsumer(state);
154-
return{__proto__: null,done: true,value: undefined};
156+
// Check if data is available in buffer
157+
constbufferIndex=state.cursor-self.#bufferStart;
158+
if(bufferIndex<self.#buffer.length){
159+
constchunk=self.#buffer.get(bufferIndex);
160+
constcursor=state.cursor;
161+
state.cursor++;
162+
if(cursor===self.#cachedMinCursor &&
163+
--self.#cachedMinCursorConsumers ===0){
164+
self.#tryTrimBuffer();
155165
}
166+
return{__proto__: null,done: false,value: chunk};
167+
}
156168

157-
// Check if data is available in buffer
158-
constbufferIndex=state.cursor-self.#bufferStart;
159-
if(bufferIndex<self.#buffer.length){
160-
constchunk=self.#buffer.get(bufferIndex);
161-
constcursor=state.cursor;
162-
state.cursor++;
163-
if(cursor===self.#cachedMinCursor &&
164-
--self.#cachedMinCursorConsumers ===0){
165-
self.#tryTrimBuffer();
166-
}
167-
return{__proto__: null,done: false,value: chunk};
168-
}
169+
if(self.#sourceExhausted){
170+
state.detached=true;
171+
self.#deleteConsumer(state);
172+
if(self.#sourceError)throwself.#sourceError;
173+
return{__proto__: null,done: true,value: undefined};
174+
}
169175

170-
if(self.#sourceExhausted){
171-
state.detached=true;
172-
self.#deleteConsumer(state);
173-
if(self.#sourceError)throwself.#sourceError;
174-
return{__proto__: null,done: true,value: undefined};
175-
}
176+
// Need to pull from source - check buffer limit
177+
constcanPull=awaitself.#waitForBufferSpace();
178+
if(!canPull){
179+
state.detached=true;
180+
self.#deleteConsumer(state);
181+
if(self.#sourceError)throwself.#sourceError;
182+
return{__proto__: null,done: true,value: undefined};
183+
}
176184

177-
// Need to pull from source - check buffer limit
178-
constcanPull=awaitself.#waitForBufferSpace();
179-
if(!canPull){
180-
state.detached=true;
181-
self.#deleteConsumer(state);
182-
if(self.#sourceError)throwself.#sourceError;
183-
return{__proto__: null,done: true,value: undefined};
184-
}
185+
awaitself.#pullFromSource();
186+
}
187+
};
185188

186-
awaitself.#pullFromSource();
187-
}
189+
return{
190+
__proto__: null,
191+
next(){
192+
constnext=PromisePrototypeThen(
193+
state.pendingNext,
194+
getNext,
195+
getNext);
196+
state.pendingNext=
197+
PromisePrototypeThen(next,undefined,()=>{});
198+
returnnext;
188199
},
189200

190201
asyncreturn(){

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,24 @@ async function testShareMultipleConsumersConcurrentPull() {
309309
assert.strictEqual(t3,expected);
310310
}
311311

312+
asyncfunctiontestShareConsumerConcurrentNextCalls(){
313+
asyncfunction*source(){
314+
constenc=newTextEncoder();
315+
yield[enc.encode('first')];
316+
yield[enc.encode('second')];
317+
}
318+
319+
constshared=share(source());
320+
constit=shared.pull()[Symbol.asyncIterator]();
321+
constfirst=it.next();
322+
constsecond=it.next();
323+
324+
const[r1,r2]=awaitPromise.all([first,second]);
325+
constdec=newTextDecoder();
326+
assert.strictEqual(dec.decode(r1.value[0]),'first');
327+
assert.strictEqual(dec.decode(r2.value[0]),'second');
328+
}
329+
312330
// share() accepts string source directly (normalized via from())
313331
asyncfunctiontestShareStringSource(){
314332
constshared=share('hello-share');
@@ -330,5 +348,6 @@ Promise.all([
330348
testShareLateJoiningConsumer(),
331349
testShareConsumerBreak(),
332350
testShareMultipleConsumersConcurrentPull(),
351+
testShareConsumerConcurrentNextCalls(),
333352
testShareStringSource(),
334353
]).then(common.mustCall());

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 568dcc2

Browse files
trivikraduh95
authored andcommitted
stream: serialize concurrent share consumer reads
Ensure overlapping next() calls on a single share() consumer resolve in the same order they were requested. Fixes: #63477 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63478 Backport-PR-URL: #64675Fixes: #63477 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 5e2b4c4 commit 568dcc2

2 files changed

Lines changed: 78 additions & 48 deletions

File tree

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

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class ShareImpl {
113113
resolve: null,
114114
reject: null,
115115
detached: false,
116+
pendingNext: PromiseResolve(),
116117
};
117118

118119
this.#consumers.add(state);
@@ -129,62 +130,72 @@ class ShareImpl {
129130
return{
130131
__proto__: null,
131132
[SymbolAsyncIterator](){
132-
return{
133-
__proto__: null,
134-
asyncnext(){
135-
if(self.#sourceError){
136-
state.detached=true;
137-
self.#consumers.delete(state);
138-
throwself.#sourceError;
133+
constgetNext=async()=>{
134+
if(self.#sourceError){
135+
state.detached=true;
136+
self.#consumers.delete(state);
137+
throwself.#sourceError;
138+
}
139+
140+
// Loop until we get data, source is exhausted, or
141+
// consumer is detached. Multiple consumers may be woken
142+
// after a single pull - those that find no data at their
143+
// cursor must re-pull rather than terminating prematurely.
144+
for(;;){
145+
if(state.detached){
146+
if(self.#sourceError)throwself.#sourceError;
147+
return{__proto__: null,done: true,value: undefined};
139148
}
140149

141-
// Loop until we get data, source is exhausted, or
142-
// consumer is detached. Multiple consumers may be woken
143-
// after a single pull - those that find no data at their
144-
// cursor must re-pull rather than terminating prematurely.
145-
for(;;){
146-
if(state.detached){
147-
if(self.#sourceError)throwself.#sourceError;
148-
return{__proto__: null,done: true,value: undefined};
149-
}
150+
if(self.#cancelled){
151+
state.detached=true;
152+
self.#deleteConsumer(state);
153+
return{__proto__: null,done: true,value: undefined};
154+
}
150155

151-
if(self.#cancelled){
152-
state.detached=true;
153-
self.#deleteConsumer(state);
154-
return{__proto__: null,done: true,value: undefined};
156+
// Check if data is available in buffer
157+
constbufferIndex=state.cursor-self.#bufferStart;
158+
if(bufferIndex<self.#buffer.length){
159+
constchunk=self.#buffer.get(bufferIndex);
160+
constcursor=state.cursor;
161+
state.cursor++;
162+
if(cursor===self.#cachedMinCursor &&
163+
--self.#cachedMinCursorConsumers ===0){
164+
self.#tryTrimBuffer();
155165
}
166+
return{__proto__: null,done: false,value: chunk};
167+
}
156168

157-
// Check if data is available in buffer
158-
constbufferIndex=state.cursor-self.#bufferStart;
159-
if(bufferIndex<self.#buffer.length){
160-
constchunk=self.#buffer.get(bufferIndex);
161-
constcursor=state.cursor;
162-
state.cursor++;
163-
if(cursor===self.#cachedMinCursor &&
164-
--self.#cachedMinCursorConsumers ===0){
165-
self.#tryTrimBuffer();
166-
}
167-
return{__proto__: null,done: false,value: chunk};
168-
}
169+
if(self.#sourceExhausted){
170+
state.detached=true;
171+
self.#deleteConsumer(state);
172+
if(self.#sourceError)throwself.#sourceError;
173+
return{__proto__: null,done: true,value: undefined};
174+
}
169175

170-
if(self.#sourceExhausted){
171-
state.detached=true;
172-
self.#deleteConsumer(state);
173-
if(self.#sourceError)throwself.#sourceError;
174-
return{__proto__: null,done: true,value: undefined};
175-
}
176+
// Need to pull from source - check buffer limit
177+
constcanPull=awaitself.#waitForBufferSpace();
178+
if(!canPull){
179+
state.detached=true;
180+
self.#deleteConsumer(state);
181+
if(self.#sourceError)throwself.#sourceError;
182+
return{__proto__: null,done: true,value: undefined};
183+
}
176184

177-
// Need to pull from source - check buffer limit
178-
constcanPull=awaitself.#waitForBufferSpace();
179-
if(!canPull){
180-
state.detached=true;
181-
self.#deleteConsumer(state);
182-
if(self.#sourceError)throwself.#sourceError;
183-
return{__proto__: null,done: true,value: undefined};
184-
}
185+
awaitself.#pullFromSource();
186+
}
187+
};
185188

186-
awaitself.#pullFromSource();
187-
}
189+
return{
190+
__proto__: null,
191+
next(){
192+
constnext=PromisePrototypeThen(
193+
state.pendingNext,
194+
getNext,
195+
getNext);
196+
state.pendingNext=
197+
PromisePrototypeThen(next,undefined,()=>{});
198+
returnnext;
188199
},
189200

190201
asyncreturn(){

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,24 @@ async function testShareMultipleConsumersConcurrentPull() {
309309
assert.strictEqual(t3,expected);
310310
}
311311

312+
asyncfunctiontestShareConsumerConcurrentNextCalls(){
313+
asyncfunction*source(){
314+
constenc=newTextEncoder();
315+
yield[enc.encode('first')];
316+
yield[enc.encode('second')];
317+
}
318+
319+
constshared=share(source());
320+
constit=shared.pull()[Symbol.asyncIterator]();
321+
constfirst=it.next();
322+
constsecond=it.next();
323+
324+
const[r1,r2]=awaitPromise.all([first,second]);
325+
constdec=newTextDecoder();
326+
assert.strictEqual(dec.decode(r1.value[0]),'first');
327+
assert.strictEqual(dec.decode(r2.value[0]),'second');
328+
}
329+
312330
// share() accepts string source directly (normalized via from())
313331
asyncfunctiontestShareStringSource(){
314332
constshared=share('hello-share');
@@ -330,5 +348,6 @@ Promise.all([
330348
testShareLateJoiningConsumer(),
331349
testShareConsumerBreak(),
332350
testShareMultipleConsumersConcurrentPull(),
351+
testShareConsumerConcurrentNextCalls(),
333352
testShareStringSource(),
334353
]).then(common.mustCall());

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 568dcc2

Browse files
trivikraduh95
authored andcommitted
stream: serialize concurrent share consumer reads
Ensure overlapping next() calls on a single share() consumer resolve in the same order they were requested. Fixes: #63477 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63478 Backport-PR-URL: #64675Fixes: #63477 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 5e2b4c4 commit 568dcc2

2 files changed

Lines changed: 78 additions & 48 deletions

File tree

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

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class ShareImpl {
113113
resolve: null,
114114
reject: null,
115115
detached: false,
116+
pendingNext: PromiseResolve(),
116117
};
117118

118119
this.#consumers.add(state);
@@ -129,62 +130,72 @@ class ShareImpl {
129130
return{
130131
__proto__: null,
131132
[SymbolAsyncIterator](){
132-
return{
133-
__proto__: null,
134-
asyncnext(){
135-
if(self.#sourceError){
136-
state.detached=true;
137-
self.#consumers.delete(state);
138-
throwself.#sourceError;
133+
constgetNext=async()=>{
134+
if(self.#sourceError){
135+
state.detached=true;
136+
self.#consumers.delete(state);
137+
throwself.#sourceError;
138+
}
139+
140+
// Loop until we get data, source is exhausted, or
141+
// consumer is detached. Multiple consumers may be woken
142+
// after a single pull - those that find no data at their
143+
// cursor must re-pull rather than terminating prematurely.
144+
for(;;){
145+
if(state.detached){
146+
if(self.#sourceError)throwself.#sourceError;
147+
return{__proto__: null,done: true,value: undefined};
139148
}
140149

141-
// Loop until we get data, source is exhausted, or
142-
// consumer is detached. Multiple consumers may be woken
143-
// after a single pull - those that find no data at their
144-
// cursor must re-pull rather than terminating prematurely.
145-
for(;;){
146-
if(state.detached){
147-
if(self.#sourceError)throwself.#sourceError;
148-
return{__proto__: null,done: true,value: undefined};
149-
}
150+
if(self.#cancelled){
151+
state.detached=true;
152+
self.#deleteConsumer(state);
153+
return{__proto__: null,done: true,value: undefined};
154+
}
150155

151-
if(self.#cancelled){
152-
state.detached=true;
153-
self.#deleteConsumer(state);
154-
return{__proto__: null,done: true,value: undefined};
156+
// Check if data is available in buffer
157+
constbufferIndex=state.cursor-self.#bufferStart;
158+
if(bufferIndex<self.#buffer.length){
159+
constchunk=self.#buffer.get(bufferIndex);
160+
constcursor=state.cursor;
161+
state.cursor++;
162+
if(cursor===self.#cachedMinCursor &&
163+
--self.#cachedMinCursorConsumers ===0){
164+
self.#tryTrimBuffer();
155165
}
166+
return{__proto__: null,done: false,value: chunk};
167+
}
156168

157-
// Check if data is available in buffer
158-
constbufferIndex=state.cursor-self.#bufferStart;
159-
if(bufferIndex<self.#buffer.length){
160-
constchunk=self.#buffer.get(bufferIndex);
161-
constcursor=state.cursor;
162-
state.cursor++;
163-
if(cursor===self.#cachedMinCursor &&
164-
--self.#cachedMinCursorConsumers ===0){
165-
self.#tryTrimBuffer();
166-
}
167-
return{__proto__: null,done: false,value: chunk};
168-
}
169+
if(self.#sourceExhausted){
170+
state.detached=true;
171+
self.#deleteConsumer(state);
172+
if(self.#sourceError)throwself.#sourceError;
173+
return{__proto__: null,done: true,value: undefined};
174+
}
169175

170-
if(self.#sourceExhausted){
171-
state.detached=true;
172-
self.#deleteConsumer(state);
173-
if(self.#sourceError)throwself.#sourceError;
174-
return{__proto__: null,done: true,value: undefined};
175-
}
176+
// Need to pull from source - check buffer limit
177+
constcanPull=awaitself.#waitForBufferSpace();
178+
if(!canPull){
179+
state.detached=true;
180+
self.#deleteConsumer(state);
181+
if(self.#sourceError)throwself.#sourceError;
182+
return{__proto__: null,done: true,value: undefined};
183+
}
176184

177-
// Need to pull from source - check buffer limit
178-
constcanPull=awaitself.#waitForBufferSpace();
179-
if(!canPull){
180-
state.detached=true;
181-
self.#deleteConsumer(state);
182-
if(self.#sourceError)throwself.#sourceError;
183-
return{__proto__: null,done: true,value: undefined};
184-
}
185+
awaitself.#pullFromSource();
186+
}
187+
};
185188

186-
awaitself.#pullFromSource();
187-
}
189+
return{
190+
__proto__: null,
191+
next(){
192+
constnext=PromisePrototypeThen(
193+
state.pendingNext,
194+
getNext,
195+
getNext);
196+
state.pendingNext=
197+
PromisePrototypeThen(next,undefined,()=>{});
198+
returnnext;
188199
},
189200

190201
asyncreturn(){

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,24 @@ async function testShareMultipleConsumersConcurrentPull() {
309309
assert.strictEqual(t3,expected);
310310
}
311311

312+
asyncfunctiontestShareConsumerConcurrentNextCalls(){
313+
asyncfunction*source(){
314+
constenc=newTextEncoder();
315+
yield[enc.encode('first')];
316+
yield[enc.encode('second')];
317+
}
318+
319+
constshared=share(source());
320+
constit=shared.pull()[Symbol.asyncIterator]();
321+
constfirst=it.next();
322+
constsecond=it.next();
323+
324+
const[r1,r2]=awaitPromise.all([first,second]);
325+
constdec=newTextDecoder();
326+
assert.strictEqual(dec.decode(r1.value[0]),'first');
327+
assert.strictEqual(dec.decode(r2.value[0]),'second');
328+
}
329+
312330
// share() accepts string source directly (normalized via from())
313331
asyncfunctiontestShareStringSource(){
314332
constshared=share('hello-share');
@@ -330,5 +348,6 @@ Promise.all([
330348
testShareLateJoiningConsumer(),
331349
testShareConsumerBreak(),
332350
testShareMultipleConsumersConcurrentPull(),
351+
testShareConsumerConcurrentNextCalls(),
333352
testShareStringSource(),
334353
]).then(common.mustCall());

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 568dcc2

Browse files
trivikraduh95
authored andcommitted
stream: serialize concurrent share consumer reads
Ensure overlapping next() calls on a single share() consumer resolve in the same order they were requested. Fixes: #63477 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63478 Backport-PR-URL: #64675Fixes: #63477 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 5e2b4c4 commit 568dcc2

2 files changed

Lines changed: 78 additions & 48 deletions

File tree

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

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class ShareImpl {
113113
resolve: null,
114114
reject: null,
115115
detached: false,
116+
pendingNext: PromiseResolve(),
116117
};
117118

118119
this.#consumers.add(state);
@@ -129,62 +130,72 @@ class ShareImpl {
129130
return{
130131
__proto__: null,
131132
[SymbolAsyncIterator](){
132-
return{
133-
__proto__: null,
134-
asyncnext(){
135-
if(self.#sourceError){
136-
state.detached=true;
137-
self.#consumers.delete(state);
138-
throwself.#sourceError;
133+
constgetNext=async()=>{
134+
if(self.#sourceError){
135+
state.detached=true;
136+
self.#consumers.delete(state);
137+
throwself.#sourceError;
138+
}
139+
140+
// Loop until we get data, source is exhausted, or
141+
// consumer is detached. Multiple consumers may be woken
142+
// after a single pull - those that find no data at their
143+
// cursor must re-pull rather than terminating prematurely.
144+
for(;;){
145+
if(state.detached){
146+
if(self.#sourceError)throwself.#sourceError;
147+
return{__proto__: null,done: true,value: undefined};
139148
}
140149

141-
// Loop until we get data, source is exhausted, or
142-
// consumer is detached. Multiple consumers may be woken
143-
// after a single pull - those that find no data at their
144-
// cursor must re-pull rather than terminating prematurely.
145-
for(;;){
146-
if(state.detached){
147-
if(self.#sourceError)throwself.#sourceError;
148-
return{__proto__: null,done: true,value: undefined};
149-
}
150+
if(self.#cancelled){
151+
state.detached=true;
152+
self.#deleteConsumer(state);
153+
return{__proto__: null,done: true,value: undefined};
154+
}
150155

151-
if(self.#cancelled){
152-
state.detached=true;
153-
self.#deleteConsumer(state);
154-
return{__proto__: null,done: true,value: undefined};
156+
// Check if data is available in buffer
157+
constbufferIndex=state.cursor-self.#bufferStart;
158+
if(bufferIndex<self.#buffer.length){
159+
constchunk=self.#buffer.get(bufferIndex);
160+
constcursor=state.cursor;
161+
state.cursor++;
162+
if(cursor===self.#cachedMinCursor &&
163+
--self.#cachedMinCursorConsumers ===0){
164+
self.#tryTrimBuffer();
155165
}
166+
return{__proto__: null,done: false,value: chunk};
167+
}
156168

157-
// Check if data is available in buffer
158-
constbufferIndex=state.cursor-self.#bufferStart;
159-
if(bufferIndex<self.#buffer.length){
160-
constchunk=self.#buffer.get(bufferIndex);
161-
constcursor=state.cursor;
162-
state.cursor++;
163-
if(cursor===self.#cachedMinCursor &&
164-
--self.#cachedMinCursorConsumers ===0){
165-
self.#tryTrimBuffer();
166-
}
167-
return{__proto__: null,done: false,value: chunk};
168-
}
169+
if(self.#sourceExhausted){
170+
state.detached=true;
171+
self.#deleteConsumer(state);
172+
if(self.#sourceError)throwself.#sourceError;
173+
return{__proto__: null,done: true,value: undefined};
174+
}
169175

170-
if(self.#sourceExhausted){
171-
state.detached=true;
172-
self.#deleteConsumer(state);
173-
if(self.#sourceError)throwself.#sourceError;
174-
return{__proto__: null,done: true,value: undefined};
175-
}
176+
// Need to pull from source - check buffer limit
177+
constcanPull=awaitself.#waitForBufferSpace();
178+
if(!canPull){
179+
state.detached=true;
180+
self.#deleteConsumer(state);
181+
if(self.#sourceError)throwself.#sourceError;
182+
return{__proto__: null,done: true,value: undefined};
183+
}
176184

177-
// Need to pull from source - check buffer limit
178-
constcanPull=awaitself.#waitForBufferSpace();
179-
if(!canPull){
180-
state.detached=true;
181-
self.#deleteConsumer(state);
182-
if(self.#sourceError)throwself.#sourceError;
183-
return{__proto__: null,done: true,value: undefined};
184-
}
185+
awaitself.#pullFromSource();
186+
}
187+
};
185188

186-
awaitself.#pullFromSource();
187-
}
189+
return{
190+
__proto__: null,
191+
next(){
192+
constnext=PromisePrototypeThen(
193+
state.pendingNext,
194+
getNext,
195+
getNext);
196+
state.pendingNext=
197+
PromisePrototypeThen(next,undefined,()=>{});
198+
returnnext;
188199
},
189200

190201
asyncreturn(){

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,24 @@ async function testShareMultipleConsumersConcurrentPull() {
309309
assert.strictEqual(t3,expected);
310310
}
311311

312+
asyncfunctiontestShareConsumerConcurrentNextCalls(){
313+
asyncfunction*source(){
314+
constenc=newTextEncoder();
315+
yield[enc.encode('first')];
316+
yield[enc.encode('second')];
317+
}
318+
319+
constshared=share(source());
320+
constit=shared.pull()[Symbol.asyncIterator]();
321+
constfirst=it.next();
322+
constsecond=it.next();
323+
324+
const[r1,r2]=awaitPromise.all([first,second]);
325+
constdec=newTextDecoder();
326+
assert.strictEqual(dec.decode(r1.value[0]),'first');
327+
assert.strictEqual(dec.decode(r2.value[0]),'second');
328+
}
329+
312330
// share() accepts string source directly (normalized via from())
313331
asyncfunctiontestShareStringSource(){
314332
constshared=share('hello-share');
@@ -330,5 +348,6 @@ Promise.all([
330348
testShareLateJoiningConsumer(),
331349
testShareConsumerBreak(),
332350
testShareMultipleConsumersConcurrentPull(),
351+
testShareConsumerConcurrentNextCalls(),
333352
testShareStringSource(),
334353
]).then(common.mustCall());

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 568dcc2

Browse files
trivikraduh95
authored andcommitted
stream: serialize concurrent share consumer reads
Ensure overlapping next() calls on a single share() consumer resolve in the same order they were requested. Fixes: #63477 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63478 Backport-PR-URL: #64675Fixes: #63477 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 5e2b4c4 commit 568dcc2

2 files changed

Lines changed: 78 additions & 48 deletions

File tree

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

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class ShareImpl {
113113
resolve: null,
114114
reject: null,
115115
detached: false,
116+
pendingNext: PromiseResolve(),
116117
};
117118

118119
this.#consumers.add(state);
@@ -129,62 +130,72 @@ class ShareImpl {
129130
return{
130131
__proto__: null,
131132
[SymbolAsyncIterator](){
132-
return{
133-
__proto__: null,
134-
asyncnext(){
135-
if(self.#sourceError){
136-
state.detached=true;
137-
self.#consumers.delete(state);
138-
throwself.#sourceError;
133+
constgetNext=async()=>{
134+
if(self.#sourceError){
135+
state.detached=true;
136+
self.#consumers.delete(state);
137+
throwself.#sourceError;
138+
}
139+
140+
// Loop until we get data, source is exhausted, or
141+
// consumer is detached. Multiple consumers may be woken
142+
// after a single pull - those that find no data at their
143+
// cursor must re-pull rather than terminating prematurely.
144+
for(;;){
145+
if(state.detached){
146+
if(self.#sourceError)throwself.#sourceError;
147+
return{__proto__: null,done: true,value: undefined};
139148
}
140149

141-
// Loop until we get data, source is exhausted, or
142-
// consumer is detached. Multiple consumers may be woken
143-
// after a single pull - those that find no data at their
144-
// cursor must re-pull rather than terminating prematurely.
145-
for(;;){
146-
if(state.detached){
147-
if(self.#sourceError)throwself.#sourceError;
148-
return{__proto__: null,done: true,value: undefined};
149-
}
150+
if(self.#cancelled){
151+
state.detached=true;
152+
self.#deleteConsumer(state);
153+
return{__proto__: null,done: true,value: undefined};
154+
}
150155

151-
if(self.#cancelled){
152-
state.detached=true;
153-
self.#deleteConsumer(state);
154-
return{__proto__: null,done: true,value: undefined};
156+
// Check if data is available in buffer
157+
constbufferIndex=state.cursor-self.#bufferStart;
158+
if(bufferIndex<self.#buffer.length){
159+
constchunk=self.#buffer.get(bufferIndex);
160+
constcursor=state.cursor;
161+
state.cursor++;
162+
if(cursor===self.#cachedMinCursor &&
163+
--self.#cachedMinCursorConsumers ===0){
164+
self.#tryTrimBuffer();
155165
}
166+
return{__proto__: null,done: false,value: chunk};
167+
}
156168

157-
// Check if data is available in buffer
158-
constbufferIndex=state.cursor-self.#bufferStart;
159-
if(bufferIndex<self.#buffer.length){
160-
constchunk=self.#buffer.get(bufferIndex);
161-
constcursor=state.cursor;
162-
state.cursor++;
163-
if(cursor===self.#cachedMinCursor &&
164-
--self.#cachedMinCursorConsumers ===0){
165-
self.#tryTrimBuffer();
166-
}
167-
return{__proto__: null,done: false,value: chunk};
168-
}
169+
if(self.#sourceExhausted){
170+
state.detached=true;
171+
self.#deleteConsumer(state);
172+
if(self.#sourceError)throwself.#sourceError;
173+
return{__proto__: null,done: true,value: undefined};
174+
}
169175

170-
if(self.#sourceExhausted){
171-
state.detached=true;
172-
self.#deleteConsumer(state);
173-
if(self.#sourceError)throwself.#sourceError;
174-
return{__proto__: null,done: true,value: undefined};
175-
}
176+
// Need to pull from source - check buffer limit
177+
constcanPull=awaitself.#waitForBufferSpace();
178+
if(!canPull){
179+
state.detached=true;
180+
self.#deleteConsumer(state);
181+
if(self.#sourceError)throwself.#sourceError;
182+
return{__proto__: null,done: true,value: undefined};
183+
}
176184

177-
// Need to pull from source - check buffer limit
178-
constcanPull=awaitself.#waitForBufferSpace();
179-
if(!canPull){
180-
state.detached=true;
181-
self.#deleteConsumer(state);
182-
if(self.#sourceError)throwself.#sourceError;
183-
return{__proto__: null,done: true,value: undefined};
184-
}
185+
awaitself.#pullFromSource();
186+
}
187+
};
185188

186-
awaitself.#pullFromSource();
187-
}
189+
return{
190+
__proto__: null,
191+
next(){
192+
constnext=PromisePrototypeThen(
193+
state.pendingNext,
194+
getNext,
195+
getNext);
196+
state.pendingNext=
197+
PromisePrototypeThen(next,undefined,()=>{});
198+
returnnext;
188199
},
189200

190201
asyncreturn(){

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,24 @@ async function testShareMultipleConsumersConcurrentPull() {
309309
assert.strictEqual(t3,expected);
310310
}
311311

312+
asyncfunctiontestShareConsumerConcurrentNextCalls(){
313+
asyncfunction*source(){
314+
constenc=newTextEncoder();
315+
yield[enc.encode('first')];
316+
yield[enc.encode('second')];
317+
}
318+
319+
constshared=share(source());
320+
constit=shared.pull()[Symbol.asyncIterator]();
321+
constfirst=it.next();
322+
constsecond=it.next();
323+
324+
const[r1,r2]=awaitPromise.all([first,second]);
325+
constdec=newTextDecoder();
326+
assert.strictEqual(dec.decode(r1.value[0]),'first');
327+
assert.strictEqual(dec.decode(r2.value[0]),'second');
328+
}
329+
312330
// share() accepts string source directly (normalized via from())
313331
asyncfunctiontestShareStringSource(){
314332
constshared=share('hello-share');
@@ -330,5 +348,6 @@ Promise.all([
330348
testShareLateJoiningConsumer(),
331349
testShareConsumerBreak(),
332350
testShareMultipleConsumersConcurrentPull(),
351+
testShareConsumerConcurrentNextCalls(),
333352
testShareStringSource(),
334353
]).then(common.mustCall());

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 568dcc2

Browse files
trivikraduh95
authored andcommitted
stream: serialize concurrent share consumer reads
Ensure overlapping next() calls on a single share() consumer resolve in the same order they were requested. Fixes: #63477 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63478 Backport-PR-URL: #64675Fixes: #63477 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 5e2b4c4 commit 568dcc2

2 files changed

Lines changed: 78 additions & 48 deletions

File tree

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

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class ShareImpl {
113113
resolve: null,
114114
reject: null,
115115
detached: false,
116+
pendingNext: PromiseResolve(),
116117
};
117118

118119
this.#consumers.add(state);
@@ -129,62 +130,72 @@ class ShareImpl {
129130
return{
130131
__proto__: null,
131132
[SymbolAsyncIterator](){
132-
return{
133-
__proto__: null,
134-
asyncnext(){
135-
if(self.#sourceError){
136-
state.detached=true;
137-
self.#consumers.delete(state);
138-
throwself.#sourceError;
133+
constgetNext=async()=>{
134+
if(self.#sourceError){
135+
state.detached=true;
136+
self.#consumers.delete(state);
137+
throwself.#sourceError;
138+
}
139+
140+
// Loop until we get data, source is exhausted, or
141+
// consumer is detached. Multiple consumers may be woken
142+
// after a single pull - those that find no data at their
143+
// cursor must re-pull rather than terminating prematurely.
144+
for(;;){
145+
if(state.detached){
146+
if(self.#sourceError)throwself.#sourceError;
147+
return{__proto__: null,done: true,value: undefined};
139148
}
140149

141-
// Loop until we get data, source is exhausted, or
142-
// consumer is detached. Multiple consumers may be woken
143-
// after a single pull - those that find no data at their
144-
// cursor must re-pull rather than terminating prematurely.
145-
for(;;){
146-
if(state.detached){
147-
if(self.#sourceError)throwself.#sourceError;
148-
return{__proto__: null,done: true,value: undefined};
149-
}
150+
if(self.#cancelled){
151+
state.detached=true;
152+
self.#deleteConsumer(state);
153+
return{__proto__: null,done: true,value: undefined};
154+
}
150155

151-
if(self.#cancelled){
152-
state.detached=true;
153-
self.#deleteConsumer(state);
154-
return{__proto__: null,done: true,value: undefined};
156+
// Check if data is available in buffer
157+
constbufferIndex=state.cursor-self.#bufferStart;
158+
if(bufferIndex<self.#buffer.length){
159+
constchunk=self.#buffer.get(bufferIndex);
160+
constcursor=state.cursor;
161+
state.cursor++;
162+
if(cursor===self.#cachedMinCursor &&
163+
--self.#cachedMinCursorConsumers ===0){
164+
self.#tryTrimBuffer();
155165
}
166+
return{__proto__: null,done: false,value: chunk};
167+
}
156168

157-
// Check if data is available in buffer
158-
constbufferIndex=state.cursor-self.#bufferStart;
159-
if(bufferIndex<self.#buffer.length){
160-
constchunk=self.#buffer.get(bufferIndex);
161-
constcursor=state.cursor;
162-
state.cursor++;
163-
if(cursor===self.#cachedMinCursor &&
164-
--self.#cachedMinCursorConsumers ===0){
165-
self.#tryTrimBuffer();
166-
}
167-
return{__proto__: null,done: false,value: chunk};
168-
}
169+
if(self.#sourceExhausted){
170+
state.detached=true;
171+
self.#deleteConsumer(state);
172+
if(self.#sourceError)throwself.#sourceError;
173+
return{__proto__: null,done: true,value: undefined};
174+
}
169175

170-
if(self.#sourceExhausted){
171-
state.detached=true;
172-
self.#deleteConsumer(state);
173-
if(self.#sourceError)throwself.#sourceError;
174-
return{__proto__: null,done: true,value: undefined};
175-
}
176+
// Need to pull from source - check buffer limit
177+
constcanPull=awaitself.#waitForBufferSpace();
178+
if(!canPull){
179+
state.detached=true;
180+
self.#deleteConsumer(state);
181+
if(self.#sourceError)throwself.#sourceError;
182+
return{__proto__: null,done: true,value: undefined};
183+
}
176184

177-
// Need to pull from source - check buffer limit
178-
constcanPull=awaitself.#waitForBufferSpace();
179-
if(!canPull){
180-
state.detached=true;
181-
self.#deleteConsumer(state);
182-
if(self.#sourceError)throwself.#sourceError;
183-
return{__proto__: null,done: true,value: undefined};
184-
}
185+
awaitself.#pullFromSource();
186+
}
187+
};
185188

186-
awaitself.#pullFromSource();
187-
}
189+
return{
190+
__proto__: null,
191+
next(){
192+
constnext=PromisePrototypeThen(
193+
state.pendingNext,
194+
getNext,
195+
getNext);
196+
state.pendingNext=
197+
PromisePrototypeThen(next,undefined,()=>{});
198+
returnnext;
188199
},
189200

190201
asyncreturn(){

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,24 @@ async function testShareMultipleConsumersConcurrentPull() {
309309
assert.strictEqual(t3,expected);
310310
}
311311

312+
asyncfunctiontestShareConsumerConcurrentNextCalls(){
313+
asyncfunction*source(){
314+
constenc=newTextEncoder();
315+
yield[enc.encode('first')];
316+
yield[enc.encode('second')];
317+
}
318+
319+
constshared=share(source());
320+
constit=shared.pull()[Symbol.asyncIterator]();
321+
constfirst=it.next();
322+
constsecond=it.next();
323+
324+
const[r1,r2]=awaitPromise.all([first,second]);
325+
constdec=newTextDecoder();
326+
assert.strictEqual(dec.decode(r1.value[0]),'first');
327+
assert.strictEqual(dec.decode(r2.value[0]),'second');
328+
}
329+
312330
// share() accepts string source directly (normalized via from())
313331
asyncfunctiontestShareStringSource(){
314332
constshared=share('hello-share');
@@ -330,5 +348,6 @@ Promise.all([
330348
testShareLateJoiningConsumer(),
331349
testShareConsumerBreak(),
332350
testShareMultipleConsumersConcurrentPull(),
351+
testShareConsumerConcurrentNextCalls(),
333352
testShareStringSource(),
334353
]).then(common.mustCall());

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 568dcc2

Browse files
trivikraduh95
authored andcommitted
stream: serialize concurrent share consumer reads
Ensure overlapping next() calls on a single share() consumer resolve in the same order they were requested. Fixes: #63477 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63478 Backport-PR-URL: #64675Fixes: #63477 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 5e2b4c4 commit 568dcc2

2 files changed

Lines changed: 78 additions & 48 deletions

File tree

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

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class ShareImpl {
113113
resolve: null,
114114
reject: null,
115115
detached: false,
116+
pendingNext: PromiseResolve(),
116117
};
117118

118119
this.#consumers.add(state);
@@ -129,62 +130,72 @@ class ShareImpl {
129130
return{
130131
__proto__: null,
131132
[SymbolAsyncIterator](){
132-
return{
133-
__proto__: null,
134-
asyncnext(){
135-
if(self.#sourceError){
136-
state.detached=true;
137-
self.#consumers.delete(state);
138-
throwself.#sourceError;
133+
constgetNext=async()=>{
134+
if(self.#sourceError){
135+
state.detached=true;
136+
self.#consumers.delete(state);
137+
throwself.#sourceError;
138+
}
139+
140+
// Loop until we get data, source is exhausted, or
141+
// consumer is detached. Multiple consumers may be woken
142+
// after a single pull - those that find no data at their
143+
// cursor must re-pull rather than terminating prematurely.
144+
for(;;){
145+
if(state.detached){
146+
if(self.#sourceError)throwself.#sourceError;
147+
return{__proto__: null,done: true,value: undefined};
139148
}
140149

141-
// Loop until we get data, source is exhausted, or
142-
// consumer is detached. Multiple consumers may be woken
143-
// after a single pull - those that find no data at their
144-
// cursor must re-pull rather than terminating prematurely.
145-
for(;;){
146-
if(state.detached){
147-
if(self.#sourceError)throwself.#sourceError;
148-
return{__proto__: null,done: true,value: undefined};
149-
}
150+
if(self.#cancelled){
151+
state.detached=true;
152+
self.#deleteConsumer(state);
153+
return{__proto__: null,done: true,value: undefined};
154+
}
150155

151-
if(self.#cancelled){
152-
state.detached=true;
153-
self.#deleteConsumer(state);
154-
return{__proto__: null,done: true,value: undefined};
156+
// Check if data is available in buffer
157+
constbufferIndex=state.cursor-self.#bufferStart;
158+
if(bufferIndex<self.#buffer.length){
159+
constchunk=self.#buffer.get(bufferIndex);
160+
constcursor=state.cursor;
161+
state.cursor++;
162+
if(cursor===self.#cachedMinCursor &&
163+
--self.#cachedMinCursorConsumers ===0){
164+
self.#tryTrimBuffer();
155165
}
166+
return{__proto__: null,done: false,value: chunk};
167+
}
156168

157-
// Check if data is available in buffer
158-
constbufferIndex=state.cursor-self.#bufferStart;
159-
if(bufferIndex<self.#buffer.length){
160-
constchunk=self.#buffer.get(bufferIndex);
161-
constcursor=state.cursor;
162-
state.cursor++;
163-
if(cursor===self.#cachedMinCursor &&
164-
--self.#cachedMinCursorConsumers ===0){
165-
self.#tryTrimBuffer();
166-
}
167-
return{__proto__: null,done: false,value: chunk};
168-
}
169+
if(self.#sourceExhausted){
170+
state.detached=true;
171+
self.#deleteConsumer(state);
172+
if(self.#sourceError)throwself.#sourceError;
173+
return{__proto__: null,done: true,value: undefined};
174+
}
169175

170-
if(self.#sourceExhausted){
171-
state.detached=true;
172-
self.#deleteConsumer(state);
173-
if(self.#sourceError)throwself.#sourceError;
174-
return{__proto__: null,done: true,value: undefined};
175-
}
176+
// Need to pull from source - check buffer limit
177+
constcanPull=awaitself.#waitForBufferSpace();
178+
if(!canPull){
179+
state.detached=true;
180+
self.#deleteConsumer(state);
181+
if(self.#sourceError)throwself.#sourceError;
182+
return{__proto__: null,done: true,value: undefined};
183+
}
176184

177-
// Need to pull from source - check buffer limit
178-
constcanPull=awaitself.#waitForBufferSpace();
179-
if(!canPull){
180-
state.detached=true;
181-
self.#deleteConsumer(state);
182-
if(self.#sourceError)throwself.#sourceError;
183-
return{__proto__: null,done: true,value: undefined};
184-
}
185+
awaitself.#pullFromSource();
186+
}
187+
};
185188

186-
awaitself.#pullFromSource();
187-
}
189+
return{
190+
__proto__: null,
191+
next(){
192+
constnext=PromisePrototypeThen(
193+
state.pendingNext,
194+
getNext,
195+
getNext);
196+
state.pendingNext=
197+
PromisePrototypeThen(next,undefined,()=>{});
198+
returnnext;
188199
},
189200

190201
asyncreturn(){

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,24 @@ async function testShareMultipleConsumersConcurrentPull() {
309309
assert.strictEqual(t3,expected);
310310
}
311311

312+
asyncfunctiontestShareConsumerConcurrentNextCalls(){
313+
asyncfunction*source(){
314+
constenc=newTextEncoder();
315+
yield[enc.encode('first')];
316+
yield[enc.encode('second')];
317+
}
318+
319+
constshared=share(source());
320+
constit=shared.pull()[Symbol.asyncIterator]();
321+
constfirst=it.next();
322+
constsecond=it.next();
323+
324+
const[r1,r2]=awaitPromise.all([first,second]);
325+
constdec=newTextDecoder();
326+
assert.strictEqual(dec.decode(r1.value[0]),'first');
327+
assert.strictEqual(dec.decode(r2.value[0]),'second');
328+
}
329+
312330
// share() accepts string source directly (normalized via from())
313331
asyncfunctiontestShareStringSource(){
314332
constshared=share('hello-share');
@@ -330,5 +348,6 @@ Promise.all([
330348
testShareLateJoiningConsumer(),
331349
testShareConsumerBreak(),
332350
testShareMultipleConsumersConcurrentPull(),
351+
testShareConsumerConcurrentNextCalls(),
333352
testShareStringSource(),
334353
]).then(common.mustCall());

0 commit comments

Comments
Β (0)