Commit ddacb3f

Browse files
semimikohaduh95
semimikoh
authored and
aduh95
committed
buffer: fix Blob.stream() leaking source buffer
Blob.prototype.stream() registered a wakeup callback on the underlying source's start() and never released it. The strong Reader::wakeup_ handle kept the reader -- and through it the blob's DataQueue and backing store -- reachable as a GC root, so the source buffer leaked on every stream() call. On Node 26+, streaming a 1 MiB blob 300 times retained ~300 MiB in process.memoryUsage().arrayBuffers while the V8 heap stayed small. Register the wakeup lazily in pull() and clear it on every terminal or idle path (EOS, error, cancel, backpressure), mirroring the cleanup already done by the async iterator path. The strong handle now only lives while a pull is in flight, so the reader and its backing store become collectable once the stream finishes, errors, is cancelled, or goes idle under backpressure. Fixes: #63574 Signed-off-by: semimikoh <ejffjeosms@gmail.com> PR-URL: #63577Fixes: #63574 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 271c745 commit ddacb3f

2 files changed

Lines changed: 73 additions & 4 deletions

File tree

‎lib/internal/blob.js‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,30 +467,40 @@ function createBlobReaderStream(reader) {
467467
// There really should only be one read at a time so using an
468468
// array here is purely defensive.
469469
this.pendingPulls=[];
470-
// Register a wakeup callback that the C++ side can invoke
470+
// Lazily register a wakeup callback that the C++ side can invoke
471471
// when new data is available after a STATUS_BLOCK.
472-
reader.setWakeup(()=>{
472+
this.wakeup=()=>{
473473
if(this.pendingPulls.length>0){
474474
this.readNext(c);
475475
}
476-
});
476+
};
477477
},
478478
pull(c){
479479
const{ promise, resolve, reject }=PromiseWithResolvers();
480+
if(this.pendingPulls.length===0){
481+
reader.setWakeup(this.wakeup);
482+
}
480483
this.pendingPulls.push({ resolve, reject });
481484
this.readNext(c);
482485
returnpromise;
483486
},
487+
clearWakeupIfIdle(){
488+
if(this.pendingPulls.length===0){
489+
reader.setWakeup(undefined);
490+
}
491+
},
484492
readNext(c){
485493
reader.pull((status,buffer)=>{
486494
// If pendingPulls is empty here, the stream had to have
487495
// been canceled, and we don't really care about the result.
488496
// We can simply exit.
489497
if(this.pendingPulls.length===0){
498+
reader.setWakeup(undefined);
490499
return;
491500
}
492501
if(status===0){
493502
// EOS
503+
reader.setWakeup(undefined);
494504
c.close();
495505
// This is to signal the end for byob readers
496506
// see https://streams.spec.whatwg.org/#example-rbs-pull
@@ -502,6 +512,7 @@ function createBlobReaderStream(reader) {
502512
// The read could fail for many different reasons when reading
503513
// from a non-memory resident blob part (e.g. file-backed blob).
504514
// The error details the system error code.
515+
reader.setWakeup(undefined);
505516
consterror=
506517
lazyDOMException('The blob could not be read',
507518
'NotReadableError');
@@ -511,7 +522,7 @@ function createBlobReaderStream(reader) {
511522
return;
512523
}elseif(status===2){
513524
// STATUS_BLOCK: No data available yet. The wakeup callback
514-
// registered in start() will re-invoke readNext when data
525+
// registered in pull() will re-invoke readNext when data
515526
// arrives.
516527
return;
517528
}
@@ -531,6 +542,7 @@ function createBlobReaderStream(reader) {
531542
if(this.pendingPulls.length!==0){
532543
constpending=this.pendingPulls.shift();
533544
pending.resolve();
545+
this.clearWakeupIfIdle();
534546
}
535547
return;
536548
}
@@ -539,6 +551,7 @@ function createBlobReaderStream(reader) {
539551
});
540552
},
541553
cancel(reason){
554+
reader.setWakeup(undefined);
542555
// Reject any currently pending pulls here.
543556
for(constpendingofthis.pendingPulls){
544557
pending.reject(reason);

‎test/parallel/test-blob-stream-gc.js‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Flags: --expose-gc --no-concurrent-array-buffer-sweeping
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
constassert=require('assert');
6+
const{setImmediate: setImmediatePromise}=require('timers/promises');
7+
8+
constMiB=1024*1024;
9+
constiterations=64;
10+
constmaxRetained=16*MiB;
11+
12+
asyncfunctioncollectArrayBuffers(){
13+
for(leti=0;i<3;i++){
14+
global.gc();
15+
awaitsetImmediatePromise();
16+
}
17+
}
18+
19+
asyncfunctionassertNoBlobStreamRetention(name,fn){
20+
constbuffer=Buffer.alloc(MiB);
21+
22+
awaitcollectArrayBuffers();
23+
constbefore=process.memoryUsage().arrayBuffers;
24+
25+
for(leti=0;i<iterations;i++){
26+
awaitfn(buffer);
27+
}
28+
29+
awaitcollectArrayBuffers();
30+
constretained=process.memoryUsage().arrayBuffers-before;
31+
32+
assert(
33+
retained<maxRetained,
34+
`${name} retained ${retained} bytes in arrayBuffers`,
35+
);
36+
}
37+
38+
(async()=>{
39+
awaitassertNoBlobStreamRetention('unused Blob streams',
40+
common.mustCall(async(buffer)=>{
41+
newBlob([buffer]).stream();
42+
},iterations));
43+
44+
awaitassertNoBlobStreamRetention('cancelled Blob streams',
45+
common.mustCall(async(buffer)=>{
46+
awaitnewBlob([buffer]).stream()
47+
.cancel();
48+
},iterations));
49+
50+
awaitassertNoBlobStreamRetention('drained Blob streams',
51+
common.mustCall(async(buffer)=>{
52+
awaitnewResponse(
53+
newBlob([buffer]).stream(),
54+
).arrayBuffer();
55+
},iterations));
56+
})().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 ddacb3f
Browse files
semimikohaduh95
semimikoh
authored and
aduh95
committed
buffer: fix Blob.stream() leaking source buffer
Blob.prototype.stream() registered a wakeup callback on the
underlying source's start() and never released it. The strong
Reader::wakeup_ handle kept the reader -- and through it the
blob's DataQueue and backing store -- reachable as a GC root, so
the source buffer leaked on every stream() call. On Node 26+,
streaming a 1 MiB blob 300 times retained ~300 MiB in
process.memoryUsage().arrayBuffers while the V8 heap stayed small.
Register the wakeup lazily in pull() and clear it on every terminal
or idle path (EOS, error, cancel, backpressure), mirroring the
cleanup already done by the async iterator path. The strong handle
now only lives while a pull is in flight, so the reader and its
backing store become collectable once the stream finishes, errors,
is cancelled, or goes idle under backpressure.
Fixes: #63574
Signed-off-by: semimikoh <ejffjeosms@gmail.com>
PR-URL: #63577Fixes: #63574
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 271c745 commit ddacb3f
2 files changed
Lines changed: 73 additions & 4 deletions
File tree
‎lib/internal/blob.js‎
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,30 +467,40 @@ function createBlobReaderStream(reader) {
467467
// There really should only be one read at a time so using an
468468
// array here is purely defensive.
469469
this.pendingPulls=[];
470-
// Register a wakeup callback that the C++ side can invoke
470+
// Lazily register a wakeup callback that the C++ side can invoke
471471
// when new data is available after a STATUS_BLOCK.
472-
reader.setWakeup(()=>{
472+
this.wakeup=()=>{
473473
if(this.pendingPulls.length>0){
474474
this.readNext(c);
475475
}
476-
});
476+
};
477477
},
478478
pull(c){
479479
const{ promise, resolve, reject }=PromiseWithResolvers();
480+
if(this.pendingPulls.length===0){
481+
reader.setWakeup(this.wakeup);
482+
}
480483
this.pendingPulls.push({ resolve, reject });
481484
this.readNext(c);
482485
returnpromise;
483486
},
487+
clearWakeupIfIdle(){
488+
if(this.pendingPulls.length===0){
489+
reader.setWakeup(undefined);
490+
}
491+
},
484492
readNext(c){
485493
reader.pull((status,buffer)=>{
486494
// If pendingPulls is empty here, the stream had to have
487495
// been canceled, and we don't really care about the result.
488496
// We can simply exit.
489497
if(this.pendingPulls.length===0){
498+
reader.setWakeup(undefined);
490499
return;
491500
}
492501
if(status===0){
493502
// EOS
503+
reader.setWakeup(undefined);
494504
c.close();
495505
// This is to signal the end for byob readers
496506
// see https://streams.spec.whatwg.org/#example-rbs-pull
@@ -502,6 +512,7 @@ function createBlobReaderStream(reader) {
502512
// The read could fail for many different reasons when reading
503513
// from a non-memory resident blob part (e.g. file-backed blob).
504514
// The error details the system error code.
515+
reader.setWakeup(undefined);
505516
consterror=
506517
lazyDOMException('The blob could not be read',
507518
'NotReadableError');
@@ -511,7 +522,7 @@ function createBlobReaderStream(reader) {
511522
return;
512523
}elseif(status===2){
513524
// STATUS_BLOCK: No data available yet. The wakeup callback
514-
// registered in start() will re-invoke readNext when data
525+
// registered in pull() will re-invoke readNext when data
515526
// arrives.
516527
return;
517528
}
@@ -531,6 +542,7 @@ function createBlobReaderStream(reader) {
531542
if(this.pendingPulls.length!==0){
532543
constpending=this.pendingPulls.shift();
533544
pending.resolve();
545+
this.clearWakeupIfIdle();
534546
}
535547
return;
536548
}
@@ -539,6 +551,7 @@ function createBlobReaderStream(reader) {
539551
});
540552
},
541553
cancel(reason){
554+
reader.setWakeup(undefined);
542555
// Reject any currently pending pulls here.
543556
for(constpendingofthis.pendingPulls){
544557
pending.reject(reason);
‎test/parallel/test-blob-stream-gc.js‎
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Flags: --expose-gc --no-concurrent-array-buffer-sweeping
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
constassert=require('assert');
6+
const{setImmediate: setImmediatePromise}=require('timers/promises');
7+
8+
constMiB=1024*1024;
9+
constiterations=64;
10+
constmaxRetained=16*MiB;
11+
12+
asyncfunctioncollectArrayBuffers(){
13+
for(leti=0;i<3;i++){
14+
global.gc();
15+
awaitsetImmediatePromise();
16+
}
17+
}
18+
19+
asyncfunctionassertNoBlobStreamRetention(name,fn){
20+
constbuffer=Buffer.alloc(MiB);
21+
22+
awaitcollectArrayBuffers();
23+
constbefore=process.memoryUsage().arrayBuffers;
24+
25+
for(leti=0;i<iterations;i++){
26+
awaitfn(buffer);
27+
}
28+
29+
awaitcollectArrayBuffers();
30+
constretained=process.memoryUsage().arrayBuffers-before;
31+
32+
assert(
33+
retained<maxRetained,
34+
`${name} retained ${retained} bytes in arrayBuffers`,
35+
);
36+
}
37+
38+
(async()=>{
39+
awaitassertNoBlobStreamRetention('unused Blob streams',
40+
common.mustCall(async(buffer)=>{
41+
newBlob([buffer]).stream();
42+
},iterations));
43+
44+
awaitassertNoBlobStreamRetention('cancelled Blob streams',
45+
common.mustCall(async(buffer)=>{
46+
awaitnewBlob([buffer]).stream()
47+
.cancel();
48+
},iterations));
49+
50+
awaitassertNoBlobStreamRetention('drained Blob streams',
51+
common.mustCall(async(buffer)=>{
52+
awaitnewResponse(
53+
newBlob([buffer]).stream(),
54+
).arrayBuffer();
55+
},iterations));
56+
})().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 ddacb3f
Browse files
semimikohaduh95
semimikoh
authored and
aduh95
committed
buffer: fix Blob.stream() leaking source buffer
Blob.prototype.stream() registered a wakeup callback on the
underlying source's start() and never released it. The strong
Reader::wakeup_ handle kept the reader -- and through it the
blob's DataQueue and backing store -- reachable as a GC root, so
the source buffer leaked on every stream() call. On Node 26+,
streaming a 1 MiB blob 300 times retained ~300 MiB in
process.memoryUsage().arrayBuffers while the V8 heap stayed small.
Register the wakeup lazily in pull() and clear it on every terminal
or idle path (EOS, error, cancel, backpressure), mirroring the
cleanup already done by the async iterator path. The strong handle
now only lives while a pull is in flight, so the reader and its
backing store become collectable once the stream finishes, errors,
is cancelled, or goes idle under backpressure.
Fixes: #63574
Signed-off-by: semimikoh <ejffjeosms@gmail.com>
PR-URL: #63577Fixes: #63574
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 271c745 commit ddacb3f
2 files changed
Lines changed: 73 additions & 4 deletions
File tree
‎lib/internal/blob.js‎
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,30 +467,40 @@ function createBlobReaderStream(reader) {
467467
// There really should only be one read at a time so using an
468468
// array here is purely defensive.
469469
this.pendingPulls=[];
470-
// Register a wakeup callback that the C++ side can invoke
470+
// Lazily register a wakeup callback that the C++ side can invoke
471471
// when new data is available after a STATUS_BLOCK.
472-
reader.setWakeup(()=>{
472+
this.wakeup=()=>{
473473
if(this.pendingPulls.length>0){
474474
this.readNext(c);
475475
}
476-
});
476+
};
477477
},
478478
pull(c){
479479
const{ promise, resolve, reject }=PromiseWithResolvers();
480+
if(this.pendingPulls.length===0){
481+
reader.setWakeup(this.wakeup);
482+
}
480483
this.pendingPulls.push({ resolve, reject });
481484
this.readNext(c);
482485
returnpromise;
483486
},
487+
clearWakeupIfIdle(){
488+
if(this.pendingPulls.length===0){
489+
reader.setWakeup(undefined);
490+
}
491+
},
484492
readNext(c){
485493
reader.pull((status,buffer)=>{
486494
// If pendingPulls is empty here, the stream had to have
487495
// been canceled, and we don't really care about the result.
488496
// We can simply exit.
489497
if(this.pendingPulls.length===0){
498+
reader.setWakeup(undefined);
490499
return;
491500
}
492501
if(status===0){
493502
// EOS
503+
reader.setWakeup(undefined);
494504
c.close();
495505
// This is to signal the end for byob readers
496506
// see https://streams.spec.whatwg.org/#example-rbs-pull
@@ -502,6 +512,7 @@ function createBlobReaderStream(reader) {
502512
// The read could fail for many different reasons when reading
503513
// from a non-memory resident blob part (e.g. file-backed blob).
504514
// The error details the system error code.
515+
reader.setWakeup(undefined);
505516
consterror=
506517
lazyDOMException('The blob could not be read',
507518
'NotReadableError');
@@ -511,7 +522,7 @@ function createBlobReaderStream(reader) {
511522
return;
512523
}elseif(status===2){
513524
// STATUS_BLOCK: No data available yet. The wakeup callback
514-
// registered in start() will re-invoke readNext when data
525+
// registered in pull() will re-invoke readNext when data
515526
// arrives.
516527
return;
517528
}
@@ -531,6 +542,7 @@ function createBlobReaderStream(reader) {
531542
if(this.pendingPulls.length!==0){
532543
constpending=this.pendingPulls.shift();
533544
pending.resolve();
545+
this.clearWakeupIfIdle();
534546
}
535547
return;
536548
}
@@ -539,6 +551,7 @@ function createBlobReaderStream(reader) {
539551
});
540552
},
541553
cancel(reason){
554+
reader.setWakeup(undefined);
542555
// Reject any currently pending pulls here.
543556
for(constpendingofthis.pendingPulls){
544557
pending.reject(reason);
‎test/parallel/test-blob-stream-gc.js‎
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Flags: --expose-gc --no-concurrent-array-buffer-sweeping
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
constassert=require('assert');
6+
const{setImmediate: setImmediatePromise}=require('timers/promises');
7+
8+
constMiB=1024*1024;
9+
constiterations=64;
10+
constmaxRetained=16*MiB;
11+
12+
asyncfunctioncollectArrayBuffers(){
13+
for(leti=0;i<3;i++){
14+
global.gc();
15+
awaitsetImmediatePromise();
16+
}
17+
}
18+
19+
asyncfunctionassertNoBlobStreamRetention(name,fn){
20+
constbuffer=Buffer.alloc(MiB);
21+
22+
awaitcollectArrayBuffers();
23+
constbefore=process.memoryUsage().arrayBuffers;
24+
25+
for(leti=0;i<iterations;i++){
26+
awaitfn(buffer);
27+
}
28+
29+
awaitcollectArrayBuffers();
30+
constretained=process.memoryUsage().arrayBuffers-before;
31+
32+
assert(
33+
retained<maxRetained,
34+
`${name} retained ${retained} bytes in arrayBuffers`,
35+
);
36+
}
37+
38+
(async()=>{
39+
awaitassertNoBlobStreamRetention('unused Blob streams',
40+
common.mustCall(async(buffer)=>{
41+
newBlob([buffer]).stream();
42+
},iterations));
43+
44+
awaitassertNoBlobStreamRetention('cancelled Blob streams',
45+
common.mustCall(async(buffer)=>{
46+
awaitnewBlob([buffer]).stream()
47+
.cancel();
48+
},iterations));
49+
50+
awaitassertNoBlobStreamRetention('drained Blob streams',
51+
common.mustCall(async(buffer)=>{
52+
awaitnewResponse(
53+
newBlob([buffer]).stream(),
54+
).arrayBuffer();
55+
},iterations));
56+
})().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 ddacb3f
Browse files
semimikohaduh95
semimikoh
authored and
aduh95
committed
buffer: fix Blob.stream() leaking source buffer
Blob.prototype.stream() registered a wakeup callback on the
underlying source's start() and never released it. The strong
Reader::wakeup_ handle kept the reader -- and through it the
blob's DataQueue and backing store -- reachable as a GC root, so
the source buffer leaked on every stream() call. On Node 26+,
streaming a 1 MiB blob 300 times retained ~300 MiB in
process.memoryUsage().arrayBuffers while the V8 heap stayed small.
Register the wakeup lazily in pull() and clear it on every terminal
or idle path (EOS, error, cancel, backpressure), mirroring the
cleanup already done by the async iterator path. The strong handle
now only lives while a pull is in flight, so the reader and its
backing store become collectable once the stream finishes, errors,
is cancelled, or goes idle under backpressure.
Fixes: #63574
Signed-off-by: semimikoh <ejffjeosms@gmail.com>
PR-URL: #63577Fixes: #63574
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 271c745 commit ddacb3f
2 files changed
Lines changed: 73 additions & 4 deletions
File tree
‎lib/internal/blob.js‎
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,30 +467,40 @@ function createBlobReaderStream(reader) {
467467
// There really should only be one read at a time so using an
468468
// array here is purely defensive.
469469
this.pendingPulls=[];
470-
// Register a wakeup callback that the C++ side can invoke
470+
// Lazily register a wakeup callback that the C++ side can invoke
471471
// when new data is available after a STATUS_BLOCK.
472-
reader.setWakeup(()=>{
472+
this.wakeup=()=>{
473473
if(this.pendingPulls.length>0){
474474
this.readNext(c);
475475
}
476-
});
476+
};
477477
},
478478
pull(c){
479479
const{ promise, resolve, reject }=PromiseWithResolvers();
480+
if(this.pendingPulls.length===0){
481+
reader.setWakeup(this.wakeup);
482+
}
480483
this.pendingPulls.push({ resolve, reject });
481484
this.readNext(c);
482485
returnpromise;
483486
},
487+
clearWakeupIfIdle(){
488+
if(this.pendingPulls.length===0){
489+
reader.setWakeup(undefined);
490+
}
491+
},
484492
readNext(c){
485493
reader.pull((status,buffer)=>{
486494
// If pendingPulls is empty here, the stream had to have
487495
// been canceled, and we don't really care about the result.
488496
// We can simply exit.
489497
if(this.pendingPulls.length===0){
498+
reader.setWakeup(undefined);
490499
return;
491500
}
492501
if(status===0){
493502
// EOS
503+
reader.setWakeup(undefined);
494504
c.close();
495505
// This is to signal the end for byob readers
496506
// see https://streams.spec.whatwg.org/#example-rbs-pull
@@ -502,6 +512,7 @@ function createBlobReaderStream(reader) {
502512
// The read could fail for many different reasons when reading
503513
// from a non-memory resident blob part (e.g. file-backed blob).
504514
// The error details the system error code.
515+
reader.setWakeup(undefined);
505516
consterror=
506517
lazyDOMException('The blob could not be read',
507518
'NotReadableError');
@@ -511,7 +522,7 @@ function createBlobReaderStream(reader) {
511522
return;
512523
}elseif(status===2){
513524
// STATUS_BLOCK: No data available yet. The wakeup callback
514-
// registered in start() will re-invoke readNext when data
525+
// registered in pull() will re-invoke readNext when data
515526
// arrives.
516527
return;
517528
}
@@ -531,6 +542,7 @@ function createBlobReaderStream(reader) {
531542
if(this.pendingPulls.length!==0){
532543
constpending=this.pendingPulls.shift();
533544
pending.resolve();
545+
this.clearWakeupIfIdle();
534546
}
535547
return;
536548
}
@@ -539,6 +551,7 @@ function createBlobReaderStream(reader) {
539551
});
540552
},
541553
cancel(reason){
554+
reader.setWakeup(undefined);
542555
// Reject any currently pending pulls here.
543556
for(constpendingofthis.pendingPulls){
544557
pending.reject(reason);
‎test/parallel/test-blob-stream-gc.js‎
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Flags: --expose-gc --no-concurrent-array-buffer-sweeping
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
constassert=require('assert');
6+
const{setImmediate: setImmediatePromise}=require('timers/promises');
7+
8+
constMiB=1024*1024;
9+
constiterations=64;
10+
constmaxRetained=16*MiB;
11+
12+
asyncfunctioncollectArrayBuffers(){
13+
for(leti=0;i<3;i++){
14+
global.gc();
15+
awaitsetImmediatePromise();
16+
}
17+
}
18+
19+
asyncfunctionassertNoBlobStreamRetention(name,fn){
20+
constbuffer=Buffer.alloc(MiB);
21+
22+
awaitcollectArrayBuffers();
23+
constbefore=process.memoryUsage().arrayBuffers;
24+
25+
for(leti=0;i<iterations;i++){
26+
awaitfn(buffer);
27+
}
28+
29+
awaitcollectArrayBuffers();
30+
constretained=process.memoryUsage().arrayBuffers-before;
31+
32+
assert(
33+
retained<maxRetained,
34+
`${name} retained ${retained} bytes in arrayBuffers`,
35+
);
36+
}
37+
38+
(async()=>{
39+
awaitassertNoBlobStreamRetention('unused Blob streams',
40+
common.mustCall(async(buffer)=>{
41+
newBlob([buffer]).stream();
42+
},iterations));
43+
44+
awaitassertNoBlobStreamRetention('cancelled Blob streams',
45+
common.mustCall(async(buffer)=>{
46+
awaitnewBlob([buffer]).stream()
47+
.cancel();
48+
},iterations));
49+
50+
awaitassertNoBlobStreamRetention('drained Blob streams',
51+
common.mustCall(async(buffer)=>{
52+
awaitnewResponse(
53+
newBlob([buffer]).stream(),
54+
).arrayBuffer();
55+
},iterations));
56+
})().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 ddacb3f
Browse files
semimikohaduh95
semimikoh
authored and
aduh95
committed
buffer: fix Blob.stream() leaking source buffer
Blob.prototype.stream() registered a wakeup callback on the
underlying source's start() and never released it. The strong
Reader::wakeup_ handle kept the reader -- and through it the
blob's DataQueue and backing store -- reachable as a GC root, so
the source buffer leaked on every stream() call. On Node 26+,
streaming a 1 MiB blob 300 times retained ~300 MiB in
process.memoryUsage().arrayBuffers while the V8 heap stayed small.
Register the wakeup lazily in pull() and clear it on every terminal
or idle path (EOS, error, cancel, backpressure), mirroring the
cleanup already done by the async iterator path. The strong handle
now only lives while a pull is in flight, so the reader and its
backing store become collectable once the stream finishes, errors,
is cancelled, or goes idle under backpressure.
Fixes: #63574
Signed-off-by: semimikoh <ejffjeosms@gmail.com>
PR-URL: #63577Fixes: #63574
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 271c745 commit ddacb3f
2 files changed
Lines changed: 73 additions & 4 deletions
File tree
‎lib/internal/blob.js‎
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,30 +467,40 @@ function createBlobReaderStream(reader) {
467467
// There really should only be one read at a time so using an
468468
// array here is purely defensive.
469469
this.pendingPulls=[];
470-
// Register a wakeup callback that the C++ side can invoke
470+
// Lazily register a wakeup callback that the C++ side can invoke
471471
// when new data is available after a STATUS_BLOCK.
472-
reader.setWakeup(()=>{
472+
this.wakeup=()=>{
473473
if(this.pendingPulls.length>0){
474474
this.readNext(c);
475475
}
476-
});
476+
};
477477
},
478478
pull(c){
479479
const{ promise, resolve, reject }=PromiseWithResolvers();
480+
if(this.pendingPulls.length===0){
481+
reader.setWakeup(this.wakeup);
482+
}
480483
this.pendingPulls.push({ resolve, reject });
481484
this.readNext(c);
482485
returnpromise;
483486
},
487+
clearWakeupIfIdle(){
488+
if(this.pendingPulls.length===0){
489+
reader.setWakeup(undefined);
490+
}
491+
},
484492
readNext(c){
485493
reader.pull((status,buffer)=>{
486494
// If pendingPulls is empty here, the stream had to have
487495
// been canceled, and we don't really care about the result.
488496
// We can simply exit.
489497
if(this.pendingPulls.length===0){
498+
reader.setWakeup(undefined);
490499
return;
491500
}
492501
if(status===0){
493502
// EOS
503+
reader.setWakeup(undefined);
494504
c.close();
495505
// This is to signal the end for byob readers
496506
// see https://streams.spec.whatwg.org/#example-rbs-pull
@@ -502,6 +512,7 @@ function createBlobReaderStream(reader) {
502512
// The read could fail for many different reasons when reading
503513
// from a non-memory resident blob part (e.g. file-backed blob).
504514
// The error details the system error code.
515+
reader.setWakeup(undefined);
505516
consterror=
506517
lazyDOMException('The blob could not be read',
507518
'NotReadableError');
@@ -511,7 +522,7 @@ function createBlobReaderStream(reader) {
511522
return;
512523
}elseif(status===2){
513524
// STATUS_BLOCK: No data available yet. The wakeup callback
514-
// registered in start() will re-invoke readNext when data
525+
// registered in pull() will re-invoke readNext when data
515526
// arrives.
516527
return;
517528
}
@@ -531,6 +542,7 @@ function createBlobReaderStream(reader) {
531542
if(this.pendingPulls.length!==0){
532543
constpending=this.pendingPulls.shift();
533544
pending.resolve();
545+
this.clearWakeupIfIdle();
534546
}
535547
return;
536548
}
@@ -539,6 +551,7 @@ function createBlobReaderStream(reader) {
539551
});
540552
},
541553
cancel(reason){
554+
reader.setWakeup(undefined);
542555
// Reject any currently pending pulls here.
543556
for(constpendingofthis.pendingPulls){
544557
pending.reject(reason);
‎test/parallel/test-blob-stream-gc.js‎
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Flags: --expose-gc --no-concurrent-array-buffer-sweeping
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
constassert=require('assert');
6+
const{setImmediate: setImmediatePromise}=require('timers/promises');
7+
8+
constMiB=1024*1024;
9+
constiterations=64;
10+
constmaxRetained=16*MiB;
11+
12+
asyncfunctioncollectArrayBuffers(){
13+
for(leti=0;i<3;i++){
14+
global.gc();
15+
awaitsetImmediatePromise();
16+
}
17+
}
18+
19+
asyncfunctionassertNoBlobStreamRetention(name,fn){
20+
constbuffer=Buffer.alloc(MiB);
21+
22+
awaitcollectArrayBuffers();
23+
constbefore=process.memoryUsage().arrayBuffers;
24+
25+
for(leti=0;i<iterations;i++){
26+
awaitfn(buffer);
27+
}
28+
29+
awaitcollectArrayBuffers();
30+
constretained=process.memoryUsage().arrayBuffers-before;
31+
32+
assert(
33+
retained<maxRetained,
34+
`${name} retained ${retained} bytes in arrayBuffers`,
35+
);
36+
}
37+
38+
(async()=>{
39+
awaitassertNoBlobStreamRetention('unused Blob streams',
40+
common.mustCall(async(buffer)=>{
41+
newBlob([buffer]).stream();
42+
},iterations));
43+
44+
awaitassertNoBlobStreamRetention('cancelled Blob streams',
45+
common.mustCall(async(buffer)=>{
46+
awaitnewBlob([buffer]).stream()
47+
.cancel();
48+
},iterations));
49+
50+
awaitassertNoBlobStreamRetention('drained Blob streams',
51+
common.mustCall(async(buffer)=>{
52+
awaitnewResponse(
53+
newBlob([buffer]).stream(),
54+
).arrayBuffer();
55+
},iterations));
56+
})().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 ddacb3f
Browse files
semimikohaduh95
semimikoh
authored and
aduh95
committed
buffer: fix Blob.stream() leaking source buffer
Blob.prototype.stream() registered a wakeup callback on the
underlying source's start() and never released it. The strong
Reader::wakeup_ handle kept the reader -- and through it the
blob's DataQueue and backing store -- reachable as a GC root, so
the source buffer leaked on every stream() call. On Node 26+,
streaming a 1 MiB blob 300 times retained ~300 MiB in
process.memoryUsage().arrayBuffers while the V8 heap stayed small.
Register the wakeup lazily in pull() and clear it on every terminal
or idle path (EOS, error, cancel, backpressure), mirroring the
cleanup already done by the async iterator path. The strong handle
now only lives while a pull is in flight, so the reader and its
backing store become collectable once the stream finishes, errors,
is cancelled, or goes idle under backpressure.
Fixes: #63574
Signed-off-by: semimikoh <ejffjeosms@gmail.com>
PR-URL: #63577Fixes: #63574
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 271c745 commit ddacb3f
2 files changed
Lines changed: 73 additions & 4 deletions
File tree
‎lib/internal/blob.js‎
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,30 +467,40 @@ function createBlobReaderStream(reader) {
467467
// There really should only be one read at a time so using an
468468
// array here is purely defensive.
469469
this.pendingPulls=[];
470-
// Register a wakeup callback that the C++ side can invoke
470+
// Lazily register a wakeup callback that the C++ side can invoke
471471
// when new data is available after a STATUS_BLOCK.
472-
reader.setWakeup(()=>{
472+
this.wakeup=()=>{
473473
if(this.pendingPulls.length>0){
474474
this.readNext(c);
475475
}
476-
});
476+
};
477477
},
478478
pull(c){
479479
const{ promise, resolve, reject }=PromiseWithResolvers();
480+
if(this.pendingPulls.length===0){
481+
reader.setWakeup(this.wakeup);
482+
}
480483
this.pendingPulls.push({ resolve, reject });
481484
this.readNext(c);
482485
returnpromise;
483486
},
487+
clearWakeupIfIdle(){
488+
if(this.pendingPulls.length===0){
489+
reader.setWakeup(undefined);
490+
}
491+
},
484492
readNext(c){
485493
reader.pull((status,buffer)=>{
486494
// If pendingPulls is empty here, the stream had to have
487495
// been canceled, and we don't really care about the result.
488496
// We can simply exit.
489497
if(this.pendingPulls.length===0){
498+
reader.setWakeup(undefined);
490499
return;
491500
}
492501
if(status===0){
493502
// EOS
503+
reader.setWakeup(undefined);
494504
c.close();
495505
// This is to signal the end for byob readers
496506
// see https://streams.spec.whatwg.org/#example-rbs-pull
@@ -502,6 +512,7 @@ function createBlobReaderStream(reader) {
502512
// The read could fail for many different reasons when reading
503513
// from a non-memory resident blob part (e.g. file-backed blob).
504514
// The error details the system error code.
515+
reader.setWakeup(undefined);
505516
consterror=
506517
lazyDOMException('The blob could not be read',
507518
'NotReadableError');
@@ -511,7 +522,7 @@ function createBlobReaderStream(reader) {
511522
return;
512523
}elseif(status===2){
513524
// STATUS_BLOCK: No data available yet. The wakeup callback
514-
// registered in start() will re-invoke readNext when data
525+
// registered in pull() will re-invoke readNext when data
515526
// arrives.
516527
return;
517528
}
@@ -531,6 +542,7 @@ function createBlobReaderStream(reader) {
531542
if(this.pendingPulls.length!==0){
532543
constpending=this.pendingPulls.shift();
533544
pending.resolve();
545+
this.clearWakeupIfIdle();
534546
}
535547
return;
536548
}
@@ -539,6 +551,7 @@ function createBlobReaderStream(reader) {
539551
});
540552
},
541553
cancel(reason){
554+
reader.setWakeup(undefined);
542555
// Reject any currently pending pulls here.
543556
for(constpendingofthis.pendingPulls){
544557
pending.reject(reason);
‎test/parallel/test-blob-stream-gc.js‎
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Flags: --expose-gc --no-concurrent-array-buffer-sweeping
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
constassert=require('assert');
6+
const{setImmediate: setImmediatePromise}=require('timers/promises');
7+
8+
constMiB=1024*1024;
9+
constiterations=64;
10+
constmaxRetained=16*MiB;
11+
12+
asyncfunctioncollectArrayBuffers(){
13+
for(leti=0;i<3;i++){
14+
global.gc();
15+
awaitsetImmediatePromise();
16+
}
17+
}
18+
19+
asyncfunctionassertNoBlobStreamRetention(name,fn){
20+
constbuffer=Buffer.alloc(MiB);
21+
22+
awaitcollectArrayBuffers();
23+
constbefore=process.memoryUsage().arrayBuffers;
24+
25+
for(leti=0;i<iterations;i++){
26+
awaitfn(buffer);
27+
}
28+
29+
awaitcollectArrayBuffers();
30+
constretained=process.memoryUsage().arrayBuffers-before;
31+
32+
assert(
33+
retained<maxRetained,
34+
`${name} retained ${retained} bytes in arrayBuffers`,
35+
);
36+
}
37+
38+
(async()=>{
39+
awaitassertNoBlobStreamRetention('unused Blob streams',
40+
common.mustCall(async(buffer)=>{
41+
newBlob([buffer]).stream();
42+
},iterations));
43+
44+
awaitassertNoBlobStreamRetention('cancelled Blob streams',
45+
common.mustCall(async(buffer)=>{
46+
awaitnewBlob([buffer]).stream()
47+
.cancel();
48+
},iterations));
49+
50+
awaitassertNoBlobStreamRetention('drained Blob streams',
51+
common.mustCall(async(buffer)=>{
52+
awaitnewResponse(
53+
newBlob([buffer]).stream(),
54+
).arrayBuffer();
55+
},iterations));
56+
})().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 ddacb3f
Browse files
semimikohaduh95
semimikoh
authored and
aduh95
committed
buffer: fix Blob.stream() leaking source buffer
Blob.prototype.stream() registered a wakeup callback on the
underlying source's start() and never released it. The strong
Reader::wakeup_ handle kept the reader -- and through it the
blob's DataQueue and backing store -- reachable as a GC root, so
the source buffer leaked on every stream() call. On Node 26+,
streaming a 1 MiB blob 300 times retained ~300 MiB in
process.memoryUsage().arrayBuffers while the V8 heap stayed small.
Register the wakeup lazily in pull() and clear it on every terminal
or idle path (EOS, error, cancel, backpressure), mirroring the
cleanup already done by the async iterator path. The strong handle
now only lives while a pull is in flight, so the reader and its
backing store become collectable once the stream finishes, errors,
is cancelled, or goes idle under backpressure.
Fixes: #63574
Signed-off-by: semimikoh <ejffjeosms@gmail.com>
PR-URL: #63577Fixes: #63574
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 271c745 commit ddacb3f
2 files changed
Lines changed: 73 additions & 4 deletions
File tree
‎lib/internal/blob.js‎
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,30 +467,40 @@ function createBlobReaderStream(reader) {
467467
// There really should only be one read at a time so using an
468468
// array here is purely defensive.
469469
this.pendingPulls=[];
470-
// Register a wakeup callback that the C++ side can invoke
470+
// Lazily register a wakeup callback that the C++ side can invoke
471471
// when new data is available after a STATUS_BLOCK.
472-
reader.setWakeup(()=>{
472+
this.wakeup=()=>{
473473
if(this.pendingPulls.length>0){
474474
this.readNext(c);
475475
}
476-
});
476+
};
477477
},
478478
pull(c){
479479
const{ promise, resolve, reject }=PromiseWithResolvers();
480+
if(this.pendingPulls.length===0){
481+
reader.setWakeup(this.wakeup);
482+
}
480483
this.pendingPulls.push({ resolve, reject });
481484
this.readNext(c);
482485
returnpromise;
483486
},
487+
clearWakeupIfIdle(){
488+
if(this.pendingPulls.length===0){
489+
reader.setWakeup(undefined);
490+
}
491+
},
484492
readNext(c){
485493
reader.pull((status,buffer)=>{
486494
// If pendingPulls is empty here, the stream had to have
487495
// been canceled, and we don't really care about the result.
488496
// We can simply exit.
489497
if(this.pendingPulls.length===0){
498+
reader.setWakeup(undefined);
490499
return;
491500
}
492501
if(status===0){
493502
// EOS
503+
reader.setWakeup(undefined);
494504
c.close();
495505
// This is to signal the end for byob readers
496506
// see https://streams.spec.whatwg.org/#example-rbs-pull
@@ -502,6 +512,7 @@ function createBlobReaderStream(reader) {
502512
// The read could fail for many different reasons when reading
503513
// from a non-memory resident blob part (e.g. file-backed blob).
504514
// The error details the system error code.
515+
reader.setWakeup(undefined);
505516
consterror=
506517
lazyDOMException('The blob could not be read',
507518
'NotReadableError');
@@ -511,7 +522,7 @@ function createBlobReaderStream(reader) {
511522
return;
512523
}elseif(status===2){
513524
// STATUS_BLOCK: No data available yet. The wakeup callback
514-
// registered in start() will re-invoke readNext when data
525+
// registered in pull() will re-invoke readNext when data
515526
// arrives.
516527
return;
517528
}
@@ -531,6 +542,7 @@ function createBlobReaderStream(reader) {
531542
if(this.pendingPulls.length!==0){
532543
constpending=this.pendingPulls.shift();
533544
pending.resolve();
545+
this.clearWakeupIfIdle();
534546
}
535547
return;
536548
}
@@ -539,6 +551,7 @@ function createBlobReaderStream(reader) {
539551
});
540552
},
541553
cancel(reason){
554+
reader.setWakeup(undefined);
542555
// Reject any currently pending pulls here.
543556
for(constpendingofthis.pendingPulls){
544557
pending.reject(reason);
‎test/parallel/test-blob-stream-gc.js‎
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Flags: --expose-gc --no-concurrent-array-buffer-sweeping
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
constassert=require('assert');
6+
const{setImmediate: setImmediatePromise}=require('timers/promises');
7+
8+
constMiB=1024*1024;
9+
constiterations=64;
10+
constmaxRetained=16*MiB;
11+
12+
asyncfunctioncollectArrayBuffers(){
13+
for(leti=0;i<3;i++){
14+
global.gc();
15+
awaitsetImmediatePromise();
16+
}
17+
}
18+
19+
asyncfunctionassertNoBlobStreamRetention(name,fn){
20+
constbuffer=Buffer.alloc(MiB);
21+
22+
awaitcollectArrayBuffers();
23+
constbefore=process.memoryUsage().arrayBuffers;
24+
25+
for(leti=0;i<iterations;i++){
26+
awaitfn(buffer);
27+
}
28+
29+
awaitcollectArrayBuffers();
30+
constretained=process.memoryUsage().arrayBuffers-before;
31+
32+
assert(
33+
retained<maxRetained,
34+
`${name} retained ${retained} bytes in arrayBuffers`,
35+
);
36+
}
37+
38+
(async()=>{
39+
awaitassertNoBlobStreamRetention('unused Blob streams',
40+
common.mustCall(async(buffer)=>{
41+
newBlob([buffer]).stream();
42+
},iterations));
43+
44+
awaitassertNoBlobStreamRetention('cancelled Blob streams',
45+
common.mustCall(async(buffer)=>{
46+
awaitnewBlob([buffer]).stream()
47+
.cancel();
48+
},iterations));
49+
50+
awaitassertNoBlobStreamRetention('drained Blob streams',
51+
common.mustCall(async(buffer)=>{
52+
awaitnewResponse(
53+
newBlob([buffer]).stream(),
54+
).arrayBuffer();
55+
},iterations));
56+
})().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 ddacb3f
Browse files
semimikohaduh95
semimikoh
authored and
aduh95
committed
buffer: fix Blob.stream() leaking source buffer
Blob.prototype.stream() registered a wakeup callback on the
underlying source's start() and never released it. The strong
Reader::wakeup_ handle kept the reader -- and through it the
blob's DataQueue and backing store -- reachable as a GC root, so
the source buffer leaked on every stream() call. On Node 26+,
streaming a 1 MiB blob 300 times retained ~300 MiB in
process.memoryUsage().arrayBuffers while the V8 heap stayed small.
Register the wakeup lazily in pull() and clear it on every terminal
or idle path (EOS, error, cancel, backpressure), mirroring the
cleanup already done by the async iterator path. The strong handle
now only lives while a pull is in flight, so the reader and its
backing store become collectable once the stream finishes, errors,
is cancelled, or goes idle under backpressure.
Fixes: #63574
Signed-off-by: semimikoh <ejffjeosms@gmail.com>
PR-URL: #63577Fixes: #63574
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 271c745 commit ddacb3f
2 files changed
Lines changed: 73 additions & 4 deletions
File tree
‎lib/internal/blob.js‎
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,30 +467,40 @@ function createBlobReaderStream(reader) {
467467
// There really should only be one read at a time so using an
468468
// array here is purely defensive.
469469
this.pendingPulls=[];
470-
// Register a wakeup callback that the C++ side can invoke
470+
// Lazily register a wakeup callback that the C++ side can invoke
471471
// when new data is available after a STATUS_BLOCK.
472-
reader.setWakeup(()=>{
472+
this.wakeup=()=>{
473473
if(this.pendingPulls.length>0){
474474
this.readNext(c);
475475
}
476-
});
476+
};
477477
},
478478
pull(c){
479479
const{ promise, resolve, reject }=PromiseWithResolvers();
480+
if(this.pendingPulls.length===0){
481+
reader.setWakeup(this.wakeup);
482+
}
480483
this.pendingPulls.push({ resolve, reject });
481484
this.readNext(c);
482485
returnpromise;
483486
},
487+
clearWakeupIfIdle(){
488+
if(this.pendingPulls.length===0){
489+
reader.setWakeup(undefined);
490+
}
491+
},
484492
readNext(c){
485493
reader.pull((status,buffer)=>{
486494
// If pendingPulls is empty here, the stream had to have
487495
// been canceled, and we don't really care about the result.
488496
// We can simply exit.
489497
if(this.pendingPulls.length===0){
498+
reader.setWakeup(undefined);
490499
return;
491500
}
492501
if(status===0){
493502
// EOS
503+
reader.setWakeup(undefined);
494504
c.close();
495505
// This is to signal the end for byob readers
496506
// see https://streams.spec.whatwg.org/#example-rbs-pull
@@ -502,6 +512,7 @@ function createBlobReaderStream(reader) {
502512
// The read could fail for many different reasons when reading
503513
// from a non-memory resident blob part (e.g. file-backed blob).
504514
// The error details the system error code.
515+
reader.setWakeup(undefined);
505516
consterror=
506517
lazyDOMException('The blob could not be read',
507518
'NotReadableError');
@@ -511,7 +522,7 @@ function createBlobReaderStream(reader) {
511522
return;
512523
}elseif(status===2){
513524
// STATUS_BLOCK: No data available yet. The wakeup callback
514-
// registered in start() will re-invoke readNext when data
525+
// registered in pull() will re-invoke readNext when data
515526
// arrives.
516527
return;
517528
}
@@ -531,6 +542,7 @@ function createBlobReaderStream(reader) {
531542
if(this.pendingPulls.length!==0){
532543
constpending=this.pendingPulls.shift();
533544
pending.resolve();
545+
this.clearWakeupIfIdle();
534546
}
535547
return;
536548
}
@@ -539,6 +551,7 @@ function createBlobReaderStream(reader) {
539551
});
540552
},
541553
cancel(reason){
554+
reader.setWakeup(undefined);
542555
// Reject any currently pending pulls here.
543556
for(constpendingofthis.pendingPulls){
544557
pending.reject(reason);
‎test/parallel/test-blob-stream-gc.js‎
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Flags: --expose-gc --no-concurrent-array-buffer-sweeping
2+
'use strict';
3+
4+
constcommon=require('../common');
5+
constassert=require('assert');
6+
const{setImmediate: setImmediatePromise}=require('timers/promises');
7+
8+
constMiB=1024*1024;
9+
constiterations=64;
10+
constmaxRetained=16*MiB;
11+
12+
asyncfunctioncollectArrayBuffers(){
13+
for(leti=0;i<3;i++){
14+
global.gc();
15+
awaitsetImmediatePromise();
16+
}
17+
}
18+
19+
asyncfunctionassertNoBlobStreamRetention(name,fn){
20+
constbuffer=Buffer.alloc(MiB);
21+
22+
awaitcollectArrayBuffers();
23+
constbefore=process.memoryUsage().arrayBuffers;
24+
25+
for(leti=0;i<iterations;i++){
26+
awaitfn(buffer);
27+
}
28+
29+
awaitcollectArrayBuffers();
30+
constretained=process.memoryUsage().arrayBuffers-before;
31+
32+
assert(
33+
retained<maxRetained,
34+
`${name} retained ${retained} bytes in arrayBuffers`,
35+
);
36+
}
37+
38+
(async()=>{
39+
awaitassertNoBlobStreamRetention('unused Blob streams',
40+
common.mustCall(async(buffer)=>{
41+
newBlob([buffer]).stream();
42+
},iterations));
43+
44+
awaitassertNoBlobStreamRetention('cancelled Blob streams',
45+
common.mustCall(async(buffer)=>{
46+
awaitnewBlob([buffer]).stream()
47+
.cancel();
48+
},iterations));
49+
50+
awaitassertNoBlobStreamRetention('drained Blob streams',
51+
common.mustCall(async(buffer)=>{
52+
awaitnewResponse(
53+
newBlob([buffer]).stream(),
54+
).arrayBuffer();
55+
},iterations));
56+
})().then(common.mustCall());
0 commit comments
Comments
 (0)