Commit 8a4a997

Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
stream: fix merge abort for pending sources
Wake the multi-source merge loop when its abort signal fires so a pending read rejects instead of waiting for another source to settle. When the primary error is the abort reason, do not await iterator cleanup because sources may already be stuck in pending next() calls. Fixes: #64012 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #64013 Backport-PR-URL: #64675Fixes: #64012 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ac5e5d5 commit 8a4a997

2 files changed

Lines changed: 57 additions & 3 deletions

File tree

‎lib/internal/streams/iter/consumers.js‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const {
3939
validateObject,
4040
}=require('internal/validators');
4141

42+
const{
43+
markPromiseAsHandled,
44+
}=internalBinding('util');
45+
4246
const{
4347
from,
4448
fromSync,
@@ -434,6 +438,20 @@ function merge(...args) {
434438
constready=[];
435439
letactiveCount=normalized.length;
436440
letwaitResolve=null;
441+
letonAbort;
442+
443+
if(signal){
444+
onAbort=()=>{
445+
if(waitResolve){
446+
waitResolve();
447+
waitResolve=null;
448+
}
449+
};
450+
signal.addEventListener('abort',onAbort,{
451+
__proto__: null,
452+
once: true,
453+
});
454+
}
437455

438456
// Called when a source's .next() settles. Pushes the result into
439457
// the ready queue and wakes the consumer if it's waiting.
@@ -498,27 +516,43 @@ function merge(...args) {
498516
if(activeCount>0){
499517
awaitnewPromise((resolve)=>{
500518
waitResolve=resolve;
519+
if(signal?.aborted){
520+
waitResolve=null;
521+
resolve();
522+
}
501523
});
502524
}
503525
}
504526
}catch(err){
505527
primaryError=err;
506528
}finally{
529+
if(onAbort!==undefined){
530+
signal.removeEventListener('abort',onAbort);
531+
}
507532
// Clean up: return all iterators. Cleanup errors are not
508533
// swallowed - a broken iterator.return() (e.g., failing to
509534
// release a resource) should be visible to the caller.
510-
awaitcleanupIterators(iterators,primaryError);
535+
awaitcleanupIterators(
536+
iterators,
537+
primaryError,
538+
signal?.aborted&&primaryError===signal.reason,
539+
);
511540
}
512541
},
513542
};
514543
}
515544

516-
asyncfunctioncleanupIterators(iterators,primaryError){
545+
asyncfunctioncleanupIterators(iterators,primaryError,skipAwaitCleanup){
517546
letcleanupError;
518547
awaitSafePromiseAllReturnVoid(iterators,async(iterator)=>{
519548
if(iterator.return){
520549
try{
521-
awaititerator.return();
550+
constresult=iterator.return();
551+
if(skipAwaitCleanup){
552+
markPromiseAsHandled(result);
553+
}else{
554+
awaitresult;
555+
}
522556
}catch(err){
523557
// Keep the first cleanup error encountered.
524558
cleanupError??=err;

‎test/parallel/test-stream-iter-consumers-merge.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ async function testMergeSignalMidIteration() {
154154
awaitassert.rejects(()=>iter.next(),{name: 'AbortError'});
155155
}
156156

157+
asyncfunctiontestMergeSignalDuringPendingMultiSourceRead(){
158+
constac=newAbortController();
159+
160+
asyncfunction*pending(){
161+
awaitnewPromise(()=>{});
162+
yield[];
163+
}
164+
165+
constiter=merge(pending(),pending(),{
166+
__proto__: null,
167+
signal: ac.signal,
168+
})[Symbol.asyncIterator]();
169+
170+
constnext=iter.next();
171+
ac.abort();
172+
173+
awaitassert.rejects(next,{name: 'AbortError'});
174+
}
175+
157176
// merge() accepts string sources (normalized via from())
158177
asyncfunctiontestMergeStringSources(){
159178
constbatches=[];
@@ -289,6 +308,7 @@ Promise.all([
289308
testMergeSourceError(),
290309
testMergeConsumerBreak(),
291310
testMergeSignalMidIteration(),
311+
testMergeSignalDuringPendingMultiSourceRead(),
292312
testMergeStringSources(),
293313
testMergeObjectLikeSources(),
294314
testMergeCleanupErrorOnly(),

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 8a4a997
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
stream: fix merge abort for pending sources
Wake the multi-source merge loop when its abort signal fires so a
pending read rejects instead of waiting for another source to settle.
When the primary error is the abort reason, do not await iterator
cleanup because sources may already be stuck in pending next() calls.
Fixes: #64012
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: openai:gpt-5.5
PR-URL: #64013
Backport-PR-URL: #64675Fixes: #64012
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ac5e5d5 commit 8a4a997
2 files changed
Lines changed: 57 additions & 3 deletions
File tree
‎lib/internal/streams/iter/consumers.js‎
Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const {
3939
 validateObject,
4040
}=require('internal/validators');
4141

42+
const{
43+
 markPromiseAsHandled,
44+
}=internalBinding('util');
45+
4246
const{
4347
 from,
4448
 fromSync,
@@ -434,6 +438,20 @@ function merge(...args) {
434438
constready=[];
435439
letactiveCount=normalized.length;
436440
letwaitResolve=null;
441+
letonAbort;
442+
443+
if(signal){
444+
onAbort=()=>{
445+
if(waitResolve){
446+
waitResolve();
447+
waitResolve=null;
448+
}
449+
};
450+
signal.addEventListener('abort',onAbort,{
451+
__proto__: null,
452+
once: true,
453+
});
454+
}
437455

438456
// Called when a source's .next() settles. Pushes the result into
439457
// the ready queue and wakes the consumer if it's waiting.
@@ -498,27 +516,43 @@ function merge(...args) {
498516
if(activeCount>0){
499517
awaitnewPromise((resolve)=>{
500518
waitResolve=resolve;
519+
if(signal?.aborted){
520+
waitResolve=null;
521+
resolve();
522+
}
501523
});
502524
}
503525
}
504526
}catch(err){
505527
primaryError=err;
506528
}finally{
529+
if(onAbort!==undefined){
530+
signal.removeEventListener('abort',onAbort);
531+
}
507532
// Clean up: return all iterators. Cleanup errors are not
508533
// swallowed - a broken iterator.return() (e.g., failing to
509534
// release a resource) should be visible to the caller.
510-
awaitcleanupIterators(iterators,primaryError);
535+
awaitcleanupIterators(
536+
iterators,
537+
primaryError,
538+
signal?.aborted&&primaryError===signal.reason,
539+
);
511540
}
512541
},
513542
};
514543
}
515544

516-
asyncfunctioncleanupIterators(iterators,primaryError){
545+
asyncfunctioncleanupIterators(iterators,primaryError,skipAwaitCleanup){
517546
letcleanupError;
518547
awaitSafePromiseAllReturnVoid(iterators,async(iterator)=>{
519548
if(iterator.return){
520549
try{
521-
awaititerator.return();
550+
constresult=iterator.return();
551+
if(skipAwaitCleanup){
552+
markPromiseAsHandled(result);
553+
}else{
554+
awaitresult;
555+
}
522556
}catch(err){
523557
// Keep the first cleanup error encountered.
524558
cleanupError??=err;
‎test/parallel/test-stream-iter-consumers-merge.js‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ async function testMergeSignalMidIteration() {
154154
awaitassert.rejects(()=>iter.next(),{name: 'AbortError'});
155155
}
156156

157+
asyncfunctiontestMergeSignalDuringPendingMultiSourceRead(){
158+
constac=newAbortController();
159+
160+
asyncfunction*pending(){
161+
awaitnewPromise(()=>{});
162+
yield[];
163+
}
164+
165+
constiter=merge(pending(),pending(),{
166+
__proto__: null,
167+
signal: ac.signal,
168+
})[Symbol.asyncIterator]();
169+
170+
constnext=iter.next();
171+
ac.abort();
172+
173+
awaitassert.rejects(next,{name: 'AbortError'});
174+
}
175+
157176
// merge() accepts string sources (normalized via from())
158177
asyncfunctiontestMergeStringSources(){
159178
constbatches=[];
@@ -289,6 +308,7 @@ Promise.all([
289308
testMergeSourceError(),
290309
testMergeConsumerBreak(),
291310
testMergeSignalMidIteration(),
311+
testMergeSignalDuringPendingMultiSourceRead(),
292312
testMergeStringSources(),
293313
testMergeObjectLikeSources(),
294314
testMergeCleanupErrorOnly(),
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 8a4a997
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
stream: fix merge abort for pending sources
Wake the multi-source merge loop when its abort signal fires so a
pending read rejects instead of waiting for another source to settle.
When the primary error is the abort reason, do not await iterator
cleanup because sources may already be stuck in pending next() calls.
Fixes: #64012
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: openai:gpt-5.5
PR-URL: #64013
Backport-PR-URL: #64675Fixes: #64012
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ac5e5d5 commit 8a4a997
2 files changed
Lines changed: 57 additions & 3 deletions
File tree
‎lib/internal/streams/iter/consumers.js‎
Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const {
3939
 validateObject,
4040
}=require('internal/validators');
4141

42+
const{
43+
 markPromiseAsHandled,
44+
}=internalBinding('util');
45+
4246
const{
4347
 from,
4448
 fromSync,
@@ -434,6 +438,20 @@ function merge(...args) {
434438
constready=[];
435439
letactiveCount=normalized.length;
436440
letwaitResolve=null;
441+
letonAbort;
442+
443+
if(signal){
444+
onAbort=()=>{
445+
if(waitResolve){
446+
waitResolve();
447+
waitResolve=null;
448+
}
449+
};
450+
signal.addEventListener('abort',onAbort,{
451+
__proto__: null,
452+
once: true,
453+
});
454+
}
437455

438456
// Called when a source's .next() settles. Pushes the result into
439457
// the ready queue and wakes the consumer if it's waiting.
@@ -498,27 +516,43 @@ function merge(...args) {
498516
if(activeCount>0){
499517
awaitnewPromise((resolve)=>{
500518
waitResolve=resolve;
519+
if(signal?.aborted){
520+
waitResolve=null;
521+
resolve();
522+
}
501523
});
502524
}
503525
}
504526
}catch(err){
505527
primaryError=err;
506528
}finally{
529+
if(onAbort!==undefined){
530+
signal.removeEventListener('abort',onAbort);
531+
}
507532
// Clean up: return all iterators. Cleanup errors are not
508533
// swallowed - a broken iterator.return() (e.g., failing to
509534
// release a resource) should be visible to the caller.
510-
awaitcleanupIterators(iterators,primaryError);
535+
awaitcleanupIterators(
536+
iterators,
537+
primaryError,
538+
signal?.aborted&&primaryError===signal.reason,
539+
);
511540
}
512541
},
513542
};
514543
}
515544

516-
asyncfunctioncleanupIterators(iterators,primaryError){
545+
asyncfunctioncleanupIterators(iterators,primaryError,skipAwaitCleanup){
517546
letcleanupError;
518547
awaitSafePromiseAllReturnVoid(iterators,async(iterator)=>{
519548
if(iterator.return){
520549
try{
521-
awaititerator.return();
550+
constresult=iterator.return();
551+
if(skipAwaitCleanup){
552+
markPromiseAsHandled(result);
553+
}else{
554+
awaitresult;
555+
}
522556
}catch(err){
523557
// Keep the first cleanup error encountered.
524558
cleanupError??=err;
‎test/parallel/test-stream-iter-consumers-merge.js‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ async function testMergeSignalMidIteration() {
154154
awaitassert.rejects(()=>iter.next(),{name: 'AbortError'});
155155
}
156156

157+
asyncfunctiontestMergeSignalDuringPendingMultiSourceRead(){
158+
constac=newAbortController();
159+
160+
asyncfunction*pending(){
161+
awaitnewPromise(()=>{});
162+
yield[];
163+
}
164+
165+
constiter=merge(pending(),pending(),{
166+
__proto__: null,
167+
signal: ac.signal,
168+
})[Symbol.asyncIterator]();
169+
170+
constnext=iter.next();
171+
ac.abort();
172+
173+
awaitassert.rejects(next,{name: 'AbortError'});
174+
}
175+
157176
// merge() accepts string sources (normalized via from())
158177
asyncfunctiontestMergeStringSources(){
159178
constbatches=[];
@@ -289,6 +308,7 @@ Promise.all([
289308
testMergeSourceError(),
290309
testMergeConsumerBreak(),
291310
testMergeSignalMidIteration(),
311+
testMergeSignalDuringPendingMultiSourceRead(),
292312
testMergeStringSources(),
293313
testMergeObjectLikeSources(),
294314
testMergeCleanupErrorOnly(),
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 8a4a997
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
stream: fix merge abort for pending sources
Wake the multi-source merge loop when its abort signal fires so a
pending read rejects instead of waiting for another source to settle.
When the primary error is the abort reason, do not await iterator
cleanup because sources may already be stuck in pending next() calls.
Fixes: #64012
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: openai:gpt-5.5
PR-URL: #64013
Backport-PR-URL: #64675Fixes: #64012
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ac5e5d5 commit 8a4a997
2 files changed
Lines changed: 57 additions & 3 deletions
File tree
‎lib/internal/streams/iter/consumers.js‎
Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const {
3939
 validateObject,
4040
}=require('internal/validators');
4141

42+
const{
43+
 markPromiseAsHandled,
44+
}=internalBinding('util');
45+
4246
const{
4347
 from,
4448
 fromSync,
@@ -434,6 +438,20 @@ function merge(...args) {
434438
constready=[];
435439
letactiveCount=normalized.length;
436440
letwaitResolve=null;
441+
letonAbort;
442+
443+
if(signal){
444+
onAbort=()=>{
445+
if(waitResolve){
446+
waitResolve();
447+
waitResolve=null;
448+
}
449+
};
450+
signal.addEventListener('abort',onAbort,{
451+
__proto__: null,
452+
once: true,
453+
});
454+
}
437455

438456
// Called when a source's .next() settles. Pushes the result into
439457
// the ready queue and wakes the consumer if it's waiting.
@@ -498,27 +516,43 @@ function merge(...args) {
498516
if(activeCount>0){
499517
awaitnewPromise((resolve)=>{
500518
waitResolve=resolve;
519+
if(signal?.aborted){
520+
waitResolve=null;
521+
resolve();
522+
}
501523
});
502524
}
503525
}
504526
}catch(err){
505527
primaryError=err;
506528
}finally{
529+
if(onAbort!==undefined){
530+
signal.removeEventListener('abort',onAbort);
531+
}
507532
// Clean up: return all iterators. Cleanup errors are not
508533
// swallowed - a broken iterator.return() (e.g., failing to
509534
// release a resource) should be visible to the caller.
510-
awaitcleanupIterators(iterators,primaryError);
535+
awaitcleanupIterators(
536+
iterators,
537+
primaryError,
538+
signal?.aborted&&primaryError===signal.reason,
539+
);
511540
}
512541
},
513542
};
514543
}
515544

516-
asyncfunctioncleanupIterators(iterators,primaryError){
545+
asyncfunctioncleanupIterators(iterators,primaryError,skipAwaitCleanup){
517546
letcleanupError;
518547
awaitSafePromiseAllReturnVoid(iterators,async(iterator)=>{
519548
if(iterator.return){
520549
try{
521-
awaititerator.return();
550+
constresult=iterator.return();
551+
if(skipAwaitCleanup){
552+
markPromiseAsHandled(result);
553+
}else{
554+
awaitresult;
555+
}
522556
}catch(err){
523557
// Keep the first cleanup error encountered.
524558
cleanupError??=err;
‎test/parallel/test-stream-iter-consumers-merge.js‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ async function testMergeSignalMidIteration() {
154154
awaitassert.rejects(()=>iter.next(),{name: 'AbortError'});
155155
}
156156

157+
asyncfunctiontestMergeSignalDuringPendingMultiSourceRead(){
158+
constac=newAbortController();
159+
160+
asyncfunction*pending(){
161+
awaitnewPromise(()=>{});
162+
yield[];
163+
}
164+
165+
constiter=merge(pending(),pending(),{
166+
__proto__: null,
167+
signal: ac.signal,
168+
})[Symbol.asyncIterator]();
169+
170+
constnext=iter.next();
171+
ac.abort();
172+
173+
awaitassert.rejects(next,{name: 'AbortError'});
174+
}
175+
157176
// merge() accepts string sources (normalized via from())
158177
asyncfunctiontestMergeStringSources(){
159178
constbatches=[];
@@ -289,6 +308,7 @@ Promise.all([
289308
testMergeSourceError(),
290309
testMergeConsumerBreak(),
291310
testMergeSignalMidIteration(),
311+
testMergeSignalDuringPendingMultiSourceRead(),
292312
testMergeStringSources(),
293313
testMergeObjectLikeSources(),
294314
testMergeCleanupErrorOnly(),
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 8a4a997
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
stream: fix merge abort for pending sources
Wake the multi-source merge loop when its abort signal fires so a
pending read rejects instead of waiting for another source to settle.
When the primary error is the abort reason, do not await iterator
cleanup because sources may already be stuck in pending next() calls.
Fixes: #64012
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: openai:gpt-5.5
PR-URL: #64013
Backport-PR-URL: #64675Fixes: #64012
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ac5e5d5 commit 8a4a997
2 files changed
Lines changed: 57 additions & 3 deletions
File tree
‎lib/internal/streams/iter/consumers.js‎
Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const {
3939
 validateObject,
4040
}=require('internal/validators');
4141

42+
const{
43+
 markPromiseAsHandled,
44+
}=internalBinding('util');
45+
4246
const{
4347
 from,
4448
 fromSync,
@@ -434,6 +438,20 @@ function merge(...args) {
434438
constready=[];
435439
letactiveCount=normalized.length;
436440
letwaitResolve=null;
441+
letonAbort;
442+
443+
if(signal){
444+
onAbort=()=>{
445+
if(waitResolve){
446+
waitResolve();
447+
waitResolve=null;
448+
}
449+
};
450+
signal.addEventListener('abort',onAbort,{
451+
__proto__: null,
452+
once: true,
453+
});
454+
}
437455

438456
// Called when a source's .next() settles. Pushes the result into
439457
// the ready queue and wakes the consumer if it's waiting.
@@ -498,27 +516,43 @@ function merge(...args) {
498516
if(activeCount>0){
499517
awaitnewPromise((resolve)=>{
500518
waitResolve=resolve;
519+
if(signal?.aborted){
520+
waitResolve=null;
521+
resolve();
522+
}
501523
});
502524
}
503525
}
504526
}catch(err){
505527
primaryError=err;
506528
}finally{
529+
if(onAbort!==undefined){
530+
signal.removeEventListener('abort',onAbort);
531+
}
507532
// Clean up: return all iterators. Cleanup errors are not
508533
// swallowed - a broken iterator.return() (e.g., failing to
509534
// release a resource) should be visible to the caller.
510-
awaitcleanupIterators(iterators,primaryError);
535+
awaitcleanupIterators(
536+
iterators,
537+
primaryError,
538+
signal?.aborted&&primaryError===signal.reason,
539+
);
511540
}
512541
},
513542
};
514543
}
515544

516-
asyncfunctioncleanupIterators(iterators,primaryError){
545+
asyncfunctioncleanupIterators(iterators,primaryError,skipAwaitCleanup){
517546
letcleanupError;
518547
awaitSafePromiseAllReturnVoid(iterators,async(iterator)=>{
519548
if(iterator.return){
520549
try{
521-
awaititerator.return();
550+
constresult=iterator.return();
551+
if(skipAwaitCleanup){
552+
markPromiseAsHandled(result);
553+
}else{
554+
awaitresult;
555+
}
522556
}catch(err){
523557
// Keep the first cleanup error encountered.
524558
cleanupError??=err;
‎test/parallel/test-stream-iter-consumers-merge.js‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ async function testMergeSignalMidIteration() {
154154
awaitassert.rejects(()=>iter.next(),{name: 'AbortError'});
155155
}
156156

157+
asyncfunctiontestMergeSignalDuringPendingMultiSourceRead(){
158+
constac=newAbortController();
159+
160+
asyncfunction*pending(){
161+
awaitnewPromise(()=>{});
162+
yield[];
163+
}
164+
165+
constiter=merge(pending(),pending(),{
166+
__proto__: null,
167+
signal: ac.signal,
168+
})[Symbol.asyncIterator]();
169+
170+
constnext=iter.next();
171+
ac.abort();
172+
173+
awaitassert.rejects(next,{name: 'AbortError'});
174+
}
175+
157176
// merge() accepts string sources (normalized via from())
158177
asyncfunctiontestMergeStringSources(){
159178
constbatches=[];
@@ -289,6 +308,7 @@ Promise.all([
289308
testMergeSourceError(),
290309
testMergeConsumerBreak(),
291310
testMergeSignalMidIteration(),
311+
testMergeSignalDuringPendingMultiSourceRead(),
292312
testMergeStringSources(),
293313
testMergeObjectLikeSources(),
294314
testMergeCleanupErrorOnly(),
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 8a4a997
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
stream: fix merge abort for pending sources
Wake the multi-source merge loop when its abort signal fires so a
pending read rejects instead of waiting for another source to settle.
When the primary error is the abort reason, do not await iterator
cleanup because sources may already be stuck in pending next() calls.
Fixes: #64012
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: openai:gpt-5.5
PR-URL: #64013
Backport-PR-URL: #64675Fixes: #64012
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ac5e5d5 commit 8a4a997
2 files changed
Lines changed: 57 additions & 3 deletions
File tree
‎lib/internal/streams/iter/consumers.js‎
Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const {
3939
 validateObject,
4040
}=require('internal/validators');
4141

42+
const{
43+
 markPromiseAsHandled,
44+
}=internalBinding('util');
45+
4246
const{
4347
 from,
4448
 fromSync,
@@ -434,6 +438,20 @@ function merge(...args) {
434438
constready=[];
435439
letactiveCount=normalized.length;
436440
letwaitResolve=null;
441+
letonAbort;
442+
443+
if(signal){
444+
onAbort=()=>{
445+
if(waitResolve){
446+
waitResolve();
447+
waitResolve=null;
448+
}
449+
};
450+
signal.addEventListener('abort',onAbort,{
451+
__proto__: null,
452+
once: true,
453+
});
454+
}
437455

438456
// Called when a source's .next() settles. Pushes the result into
439457
// the ready queue and wakes the consumer if it's waiting.
@@ -498,27 +516,43 @@ function merge(...args) {
498516
if(activeCount>0){
499517
awaitnewPromise((resolve)=>{
500518
waitResolve=resolve;
519+
if(signal?.aborted){
520+
waitResolve=null;
521+
resolve();
522+
}
501523
});
502524
}
503525
}
504526
}catch(err){
505527
primaryError=err;
506528
}finally{
529+
if(onAbort!==undefined){
530+
signal.removeEventListener('abort',onAbort);
531+
}
507532
// Clean up: return all iterators. Cleanup errors are not
508533
// swallowed - a broken iterator.return() (e.g., failing to
509534
// release a resource) should be visible to the caller.
510-
awaitcleanupIterators(iterators,primaryError);
535+
awaitcleanupIterators(
536+
iterators,
537+
primaryError,
538+
signal?.aborted&&primaryError===signal.reason,
539+
);
511540
}
512541
},
513542
};
514543
}
515544

516-
asyncfunctioncleanupIterators(iterators,primaryError){
545+
asyncfunctioncleanupIterators(iterators,primaryError,skipAwaitCleanup){
517546
letcleanupError;
518547
awaitSafePromiseAllReturnVoid(iterators,async(iterator)=>{
519548
if(iterator.return){
520549
try{
521-
awaititerator.return();
550+
constresult=iterator.return();
551+
if(skipAwaitCleanup){
552+
markPromiseAsHandled(result);
553+
}else{
554+
awaitresult;
555+
}
522556
}catch(err){
523557
// Keep the first cleanup error encountered.
524558
cleanupError??=err;
‎test/parallel/test-stream-iter-consumers-merge.js‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ async function testMergeSignalMidIteration() {
154154
awaitassert.rejects(()=>iter.next(),{name: 'AbortError'});
155155
}
156156

157+
asyncfunctiontestMergeSignalDuringPendingMultiSourceRead(){
158+
constac=newAbortController();
159+
160+
asyncfunction*pending(){
161+
awaitnewPromise(()=>{});
162+
yield[];
163+
}
164+
165+
constiter=merge(pending(),pending(),{
166+
__proto__: null,
167+
signal: ac.signal,
168+
})[Symbol.asyncIterator]();
169+
170+
constnext=iter.next();
171+
ac.abort();
172+
173+
awaitassert.rejects(next,{name: 'AbortError'});
174+
}
175+
157176
// merge() accepts string sources (normalized via from())
158177
asyncfunctiontestMergeStringSources(){
159178
constbatches=[];
@@ -289,6 +308,7 @@ Promise.all([
289308
testMergeSourceError(),
290309
testMergeConsumerBreak(),
291310
testMergeSignalMidIteration(),
311+
testMergeSignalDuringPendingMultiSourceRead(),
292312
testMergeStringSources(),
293313
testMergeObjectLikeSources(),
294314
testMergeCleanupErrorOnly(),
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 8a4a997
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
stream: fix merge abort for pending sources
Wake the multi-source merge loop when its abort signal fires so a
pending read rejects instead of waiting for another source to settle.
When the primary error is the abort reason, do not await iterator
cleanup because sources may already be stuck in pending next() calls.
Fixes: #64012
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: openai:gpt-5.5
PR-URL: #64013
Backport-PR-URL: #64675Fixes: #64012
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ac5e5d5 commit 8a4a997
2 files changed
Lines changed: 57 additions & 3 deletions
File tree
‎lib/internal/streams/iter/consumers.js‎
Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const {
3939
 validateObject,
4040
}=require('internal/validators');
4141

42+
const{
43+
 markPromiseAsHandled,
44+
}=internalBinding('util');
45+
4246
const{
4347
 from,
4448
 fromSync,
@@ -434,6 +438,20 @@ function merge(...args) {
434438
constready=[];
435439
letactiveCount=normalized.length;
436440
letwaitResolve=null;
441+
letonAbort;
442+
443+
if(signal){
444+
onAbort=()=>{
445+
if(waitResolve){
446+
waitResolve();
447+
waitResolve=null;
448+
}
449+
};
450+
signal.addEventListener('abort',onAbort,{
451+
__proto__: null,
452+
once: true,
453+
});
454+
}
437455

438456
// Called when a source's .next() settles. Pushes the result into
439457
// the ready queue and wakes the consumer if it's waiting.
@@ -498,27 +516,43 @@ function merge(...args) {
498516
if(activeCount>0){
499517
awaitnewPromise((resolve)=>{
500518
waitResolve=resolve;
519+
if(signal?.aborted){
520+
waitResolve=null;
521+
resolve();
522+
}
501523
});
502524
}
503525
}
504526
}catch(err){
505527
primaryError=err;
506528
}finally{
529+
if(onAbort!==undefined){
530+
signal.removeEventListener('abort',onAbort);
531+
}
507532
// Clean up: return all iterators. Cleanup errors are not
508533
// swallowed - a broken iterator.return() (e.g., failing to
509534
// release a resource) should be visible to the caller.
510-
awaitcleanupIterators(iterators,primaryError);
535+
awaitcleanupIterators(
536+
iterators,
537+
primaryError,
538+
signal?.aborted&&primaryError===signal.reason,
539+
);
511540
}
512541
},
513542
};
514543
}
515544

516-
asyncfunctioncleanupIterators(iterators,primaryError){
545+
asyncfunctioncleanupIterators(iterators,primaryError,skipAwaitCleanup){
517546
letcleanupError;
518547
awaitSafePromiseAllReturnVoid(iterators,async(iterator)=>{
519548
if(iterator.return){
520549
try{
521-
awaititerator.return();
550+
constresult=iterator.return();
551+
if(skipAwaitCleanup){
552+
markPromiseAsHandled(result);
553+
}else{
554+
awaitresult;
555+
}
522556
}catch(err){
523557
// Keep the first cleanup error encountered.
524558
cleanupError??=err;
‎test/parallel/test-stream-iter-consumers-merge.js‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ async function testMergeSignalMidIteration() {
154154
awaitassert.rejects(()=>iter.next(),{name: 'AbortError'});
155155
}
156156

157+
asyncfunctiontestMergeSignalDuringPendingMultiSourceRead(){
158+
constac=newAbortController();
159+
160+
asyncfunction*pending(){
161+
awaitnewPromise(()=>{});
162+
yield[];
163+
}
164+
165+
constiter=merge(pending(),pending(),{
166+
__proto__: null,
167+
signal: ac.signal,
168+
})[Symbol.asyncIterator]();
169+
170+
constnext=iter.next();
171+
ac.abort();
172+
173+
awaitassert.rejects(next,{name: 'AbortError'});
174+
}
175+
157176
// merge() accepts string sources (normalized via from())
158177
asyncfunctiontestMergeStringSources(){
159178
constbatches=[];
@@ -289,6 +308,7 @@ Promise.all([
289308
testMergeSourceError(),
290309
testMergeConsumerBreak(),
291310
testMergeSignalMidIteration(),
311+
testMergeSignalDuringPendingMultiSourceRead(),
292312
testMergeStringSources(),
293313
testMergeObjectLikeSources(),
294314
testMergeCleanupErrorOnly(),
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 8a4a997
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
stream: fix merge abort for pending sources
Wake the multi-source merge loop when its abort signal fires so a
pending read rejects instead of waiting for another source to settle.
When the primary error is the abort reason, do not await iterator
cleanup because sources may already be stuck in pending next() calls.
Fixes: #64012
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: openai:gpt-5.5
PR-URL: #64013
Backport-PR-URL: #64675Fixes: #64012
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ac5e5d5 commit 8a4a997
2 files changed
Lines changed: 57 additions & 3 deletions
File tree
‎lib/internal/streams/iter/consumers.js‎
Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const {
3939
 validateObject,
4040
}=require('internal/validators');
4141

42+
const{
43+
 markPromiseAsHandled,
44+
}=internalBinding('util');
45+
4246
const{
4347
 from,
4448
 fromSync,
@@ -434,6 +438,20 @@ function merge(...args) {
434438
constready=[];
435439
letactiveCount=normalized.length;
436440
letwaitResolve=null;
441+
letonAbort;
442+
443+
if(signal){
444+
onAbort=()=>{
445+
if(waitResolve){
446+
waitResolve();
447+
waitResolve=null;
448+
}
449+
};
450+
signal.addEventListener('abort',onAbort,{
451+
__proto__: null,
452+
once: true,
453+
});
454+
}
437455

438456
// Called when a source's .next() settles. Pushes the result into
439457
// the ready queue and wakes the consumer if it's waiting.
@@ -498,27 +516,43 @@ function merge(...args) {
498516
if(activeCount>0){
499517
awaitnewPromise((resolve)=>{
500518
waitResolve=resolve;
519+
if(signal?.aborted){
520+
waitResolve=null;
521+
resolve();
522+
}
501523
});
502524
}
503525
}
504526
}catch(err){
505527
primaryError=err;
506528
}finally{
529+
if(onAbort!==undefined){
530+
signal.removeEventListener('abort',onAbort);
531+
}
507532
// Clean up: return all iterators. Cleanup errors are not
508533
// swallowed - a broken iterator.return() (e.g., failing to
509534
// release a resource) should be visible to the caller.
510-
awaitcleanupIterators(iterators,primaryError);
535+
awaitcleanupIterators(
536+
iterators,
537+
primaryError,
538+
signal?.aborted&&primaryError===signal.reason,
539+
);
511540
}
512541
},
513542
};
514543
}
515544

516-
asyncfunctioncleanupIterators(iterators,primaryError){
545+
asyncfunctioncleanupIterators(iterators,primaryError,skipAwaitCleanup){
517546
letcleanupError;
518547
awaitSafePromiseAllReturnVoid(iterators,async(iterator)=>{
519548
if(iterator.return){
520549
try{
521-
awaititerator.return();
550+
constresult=iterator.return();
551+
if(skipAwaitCleanup){
552+
markPromiseAsHandled(result);
553+
}else{
554+
awaitresult;
555+
}
522556
}catch(err){
523557
// Keep the first cleanup error encountered.
524558
cleanupError??=err;
‎test/parallel/test-stream-iter-consumers-merge.js‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ async function testMergeSignalMidIteration() {
154154
awaitassert.rejects(()=>iter.next(),{name: 'AbortError'});
155155
}
156156

157+
asyncfunctiontestMergeSignalDuringPendingMultiSourceRead(){
158+
constac=newAbortController();
159+
160+
asyncfunction*pending(){
161+
awaitnewPromise(()=>{});
162+
yield[];
163+
}
164+
165+
constiter=merge(pending(),pending(),{
166+
__proto__: null,
167+
signal: ac.signal,
168+
})[Symbol.asyncIterator]();
169+
170+
constnext=iter.next();
171+
ac.abort();
172+
173+
awaitassert.rejects(next,{name: 'AbortError'});
174+
}
175+
157176
// merge() accepts string sources (normalized via from())
158177
asyncfunctiontestMergeStringSources(){
159178
constbatches=[];
@@ -289,6 +308,7 @@ Promise.all([
289308
testMergeSourceError(),
290309
testMergeConsumerBreak(),
291310
testMergeSignalMidIteration(),
311+
testMergeSignalDuringPendingMultiSourceRead(),
292312
testMergeStringSources(),
293313
testMergeObjectLikeSources(),
294314
testMergeCleanupErrorOnly(),
0 commit comments
Comments
 (0)