Commit f24177c

Browse files
trivenayaduh95
authored andcommitted
http: propagate highWaterMark to ClientRequest OutgoingMessage
`http.request({ highWaterMark })` passes the value to the TCP socket via createConnection() but does not set it on the OutgoingMessage internal kHighWaterMark. OutgoingMessage._writeRaw() has two mutually exclusive write paths: Path A (socket connected): conn.write() β€” uses socket HWM βœ“ Path B (no socket yet): outputSize < this[kHighWaterMark] β€” uses OutgoingMessage own default (64 KB) βœ— Because the OutgoingMessage constructor already accepts options.highWaterMark, the fix is to set kHighWaterMark from the user options after they are parsed in the ClientRequest constructor. This resolves two symptoms: 1. write() returning the wrong boolean for pre-socket writes (the user highWaterMark was silently ignored on all Node versions). 2. A deadlock on Node >= 24.16.0 where the incorrect false return sets kNeedDrain, but drain never fires because the socket was never backpressured (introduced by the stricter drain gate in #62936). Signed-off-by: Naman Trivedi <trivenay@amazon.com> Fixes: #64645 Refs: #62936 PR-URL: #64653 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent f912692 commit f24177c

2 files changed

Lines changed: 90 additions & 0 deletions

File tree

β€Žlib/_http_client.jsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151
kSkipPendingData,
5252
}=require('_http_common');
5353
const{
54+
kHighWaterMark,
5455
kUniqueHeaders,
5556
parseUniqueHeadersOption,
5657
OutgoingMessage,
@@ -348,6 +349,14 @@ function ClientRequest(input, options, cb) {
348349
options=ObjectAssign({__proto__: null},input,options);
349350
}
350351

352+
// Propagate the user's highWaterMark to OutgoingMessage so that
353+
// _writeRaw() uses the correct threshold for writes buffered before
354+
// the socket connects (Path B). Without this, the OutgoingMessage
355+
// defaults to 64 KB regardless of what the caller requested.
356+
if(options.highWaterMark!=null){
357+
this[kHighWaterMark]=options.highWaterMark;
358+
}
359+
351360
letagent=options.agent;
352361
constdefaultAgent=options._defaultAgent||Agent.globalAgent;
353362
if(agent===false){
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Flags: --expose-internals
2+
'use strict';
3+
4+
// Regression test: http.request({ highWaterMark }) must propagate the value
5+
// to OutgoingMessage's kHighWaterMark so that _writeRaw() Path B (buffering
6+
// before socket connects) uses the correct threshold.
7+
//
8+
// Without the fix:
9+
// - write() returns the wrong boolean (compares against default 64KB)
10+
// - On Node >= 24.16.0 (post #62936), this causes a deadlock when
11+
// the user awaits 'drain' after write() incorrectly returns false.
12+
//
13+
// Fixes: https://github.com/nodejs/node/issues/64645
14+
15+
constcommon=require('../common');
16+
constassert=require('assert');
17+
consthttp=require('http');
18+
const{ kHighWaterMark }=require('_http_outgoing');
19+
const{ getDefaultHighWaterMark }=require('internal/streams/state');
20+
21+
constserver=http.createServer(common.mustCall((req,res)=>{
22+
req.resume();
23+
req.on('end',()=>res.end('ok'));
24+
},3));
25+
26+
server.listen(0,common.mustCall(()=>{
27+
constport=server.address().port;
28+
letcompleted=0;
29+
30+
functiondone(){
31+
if(++completed===3)server.close();
32+
}
33+
34+
// Test 1: kHighWaterMark is set to user value on the ClientRequest.
35+
{
36+
consthwm=getDefaultHighWaterMark()*2;
37+
constreq=http.request({ port,method: 'POST',highWaterMark: hwm});
38+
assert.strictEqual(req[kHighWaterMark],hwm);
39+
req.end();
40+
req.on('response',(res)=>{res.resume();res.on('end',done);});
41+
}
42+
43+
// Test 2: Large HWM β€” write below threshold returns true before socket connects.
44+
{
45+
constreq=http.request({
46+
port,
47+
method: 'POST',
48+
highWaterMark: 100_000,
49+
},common.mustCall((res)=>{
50+
res.resume();
51+
res.on('end',done);
52+
}));
53+
54+
// 64KB write in the same tick β€” socket not yet connected (Path B).
55+
// With HWM=100KB, write() must return true.
56+
constresult=req.write(Buffer.alloc(64*1024));
57+
assert.strictEqual(result,true);
58+
req.end();
59+
}
60+
61+
// Test 3: Small HWM β€” write above threshold returns false, drain fires.
62+
{
63+
constreq=http.request({
64+
port,
65+
method: 'POST',
66+
highWaterMark: 512,
67+
},common.mustCall((res)=>{
68+
res.resume();
69+
res.on('end',done);
70+
}));
71+
72+
// 2KB write in the same tick β€” exceeds HWM of 512 bytes.
73+
constresult=req.write(Buffer.alloc(2*1024));
74+
assert.strictEqual(result,false);
75+
76+
// Drain must fire (no deadlock) so we can complete the request.
77+
req.on('drain',common.mustCall(()=>{
78+
req.end();
79+
}));
80+
}
81+
}));

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 f24177c

Browse files
trivenayaduh95
authored andcommitted
http: propagate highWaterMark to ClientRequest OutgoingMessage
`http.request({ highWaterMark })` passes the value to the TCP socket via createConnection() but does not set it on the OutgoingMessage internal kHighWaterMark. OutgoingMessage._writeRaw() has two mutually exclusive write paths: Path A (socket connected): conn.write() β€” uses socket HWM βœ“ Path B (no socket yet): outputSize < this[kHighWaterMark] β€” uses OutgoingMessage own default (64 KB) βœ— Because the OutgoingMessage constructor already accepts options.highWaterMark, the fix is to set kHighWaterMark from the user options after they are parsed in the ClientRequest constructor. This resolves two symptoms: 1. write() returning the wrong boolean for pre-socket writes (the user highWaterMark was silently ignored on all Node versions). 2. A deadlock on Node >= 24.16.0 where the incorrect false return sets kNeedDrain, but drain never fires because the socket was never backpressured (introduced by the stricter drain gate in #62936). Signed-off-by: Naman Trivedi <trivenay@amazon.com> Fixes: #64645 Refs: #62936 PR-URL: #64653 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent f912692 commit f24177c

2 files changed

Lines changed: 90 additions & 0 deletions

File tree

β€Žlib/_http_client.jsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151
kSkipPendingData,
5252
}=require('_http_common');
5353
const{
54+
kHighWaterMark,
5455
kUniqueHeaders,
5556
parseUniqueHeadersOption,
5657
OutgoingMessage,
@@ -348,6 +349,14 @@ function ClientRequest(input, options, cb) {
348349
options=ObjectAssign({__proto__: null},input,options);
349350
}
350351

352+
// Propagate the user's highWaterMark to OutgoingMessage so that
353+
// _writeRaw() uses the correct threshold for writes buffered before
354+
// the socket connects (Path B). Without this, the OutgoingMessage
355+
// defaults to 64 KB regardless of what the caller requested.
356+
if(options.highWaterMark!=null){
357+
this[kHighWaterMark]=options.highWaterMark;
358+
}
359+
351360
letagent=options.agent;
352361
constdefaultAgent=options._defaultAgent||Agent.globalAgent;
353362
if(agent===false){
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Flags: --expose-internals
2+
'use strict';
3+
4+
// Regression test: http.request({ highWaterMark }) must propagate the value
5+
// to OutgoingMessage's kHighWaterMark so that _writeRaw() Path B (buffering
6+
// before socket connects) uses the correct threshold.
7+
//
8+
// Without the fix:
9+
// - write() returns the wrong boolean (compares against default 64KB)
10+
// - On Node >= 24.16.0 (post #62936), this causes a deadlock when
11+
// the user awaits 'drain' after write() incorrectly returns false.
12+
//
13+
// Fixes: https://github.com/nodejs/node/issues/64645
14+
15+
constcommon=require('../common');
16+
constassert=require('assert');
17+
consthttp=require('http');
18+
const{ kHighWaterMark }=require('_http_outgoing');
19+
const{ getDefaultHighWaterMark }=require('internal/streams/state');
20+
21+
constserver=http.createServer(common.mustCall((req,res)=>{
22+
req.resume();
23+
req.on('end',()=>res.end('ok'));
24+
},3));
25+
26+
server.listen(0,common.mustCall(()=>{
27+
constport=server.address().port;
28+
letcompleted=0;
29+
30+
functiondone(){
31+
if(++completed===3)server.close();
32+
}
33+
34+
// Test 1: kHighWaterMark is set to user value on the ClientRequest.
35+
{
36+
consthwm=getDefaultHighWaterMark()*2;
37+
constreq=http.request({ port,method: 'POST',highWaterMark: hwm});
38+
assert.strictEqual(req[kHighWaterMark],hwm);
39+
req.end();
40+
req.on('response',(res)=>{res.resume();res.on('end',done);});
41+
}
42+
43+
// Test 2: Large HWM β€” write below threshold returns true before socket connects.
44+
{
45+
constreq=http.request({
46+
port,
47+
method: 'POST',
48+
highWaterMark: 100_000,
49+
},common.mustCall((res)=>{
50+
res.resume();
51+
res.on('end',done);
52+
}));
53+
54+
// 64KB write in the same tick β€” socket not yet connected (Path B).
55+
// With HWM=100KB, write() must return true.
56+
constresult=req.write(Buffer.alloc(64*1024));
57+
assert.strictEqual(result,true);
58+
req.end();
59+
}
60+
61+
// Test 3: Small HWM β€” write above threshold returns false, drain fires.
62+
{
63+
constreq=http.request({
64+
port,
65+
method: 'POST',
66+
highWaterMark: 512,
67+
},common.mustCall((res)=>{
68+
res.resume();
69+
res.on('end',done);
70+
}));
71+
72+
// 2KB write in the same tick β€” exceeds HWM of 512 bytes.
73+
constresult=req.write(Buffer.alloc(2*1024));
74+
assert.strictEqual(result,false);
75+
76+
// Drain must fire (no deadlock) so we can complete the request.
77+
req.on('drain',common.mustCall(()=>{
78+
req.end();
79+
}));
80+
}
81+
}));

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 f24177c

Browse files
trivenayaduh95
authored andcommitted
http: propagate highWaterMark to ClientRequest OutgoingMessage
`http.request({ highWaterMark })` passes the value to the TCP socket via createConnection() but does not set it on the OutgoingMessage internal kHighWaterMark. OutgoingMessage._writeRaw() has two mutually exclusive write paths: Path A (socket connected): conn.write() β€” uses socket HWM βœ“ Path B (no socket yet): outputSize < this[kHighWaterMark] β€” uses OutgoingMessage own default (64 KB) βœ— Because the OutgoingMessage constructor already accepts options.highWaterMark, the fix is to set kHighWaterMark from the user options after they are parsed in the ClientRequest constructor. This resolves two symptoms: 1. write() returning the wrong boolean for pre-socket writes (the user highWaterMark was silently ignored on all Node versions). 2. A deadlock on Node >= 24.16.0 where the incorrect false return sets kNeedDrain, but drain never fires because the socket was never backpressured (introduced by the stricter drain gate in #62936). Signed-off-by: Naman Trivedi <trivenay@amazon.com> Fixes: #64645 Refs: #62936 PR-URL: #64653 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent f912692 commit f24177c

2 files changed

Lines changed: 90 additions & 0 deletions

File tree

β€Žlib/_http_client.jsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151
kSkipPendingData,
5252
}=require('_http_common');
5353
const{
54+
kHighWaterMark,
5455
kUniqueHeaders,
5556
parseUniqueHeadersOption,
5657
OutgoingMessage,
@@ -348,6 +349,14 @@ function ClientRequest(input, options, cb) {
348349
options=ObjectAssign({__proto__: null},input,options);
349350
}
350351

352+
// Propagate the user's highWaterMark to OutgoingMessage so that
353+
// _writeRaw() uses the correct threshold for writes buffered before
354+
// the socket connects (Path B). Without this, the OutgoingMessage
355+
// defaults to 64 KB regardless of what the caller requested.
356+
if(options.highWaterMark!=null){
357+
this[kHighWaterMark]=options.highWaterMark;
358+
}
359+
351360
letagent=options.agent;
352361
constdefaultAgent=options._defaultAgent||Agent.globalAgent;
353362
if(agent===false){
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Flags: --expose-internals
2+
'use strict';
3+
4+
// Regression test: http.request({ highWaterMark }) must propagate the value
5+
// to OutgoingMessage's kHighWaterMark so that _writeRaw() Path B (buffering
6+
// before socket connects) uses the correct threshold.
7+
//
8+
// Without the fix:
9+
// - write() returns the wrong boolean (compares against default 64KB)
10+
// - On Node >= 24.16.0 (post #62936), this causes a deadlock when
11+
// the user awaits 'drain' after write() incorrectly returns false.
12+
//
13+
// Fixes: https://github.com/nodejs/node/issues/64645
14+
15+
constcommon=require('../common');
16+
constassert=require('assert');
17+
consthttp=require('http');
18+
const{ kHighWaterMark }=require('_http_outgoing');
19+
const{ getDefaultHighWaterMark }=require('internal/streams/state');
20+
21+
constserver=http.createServer(common.mustCall((req,res)=>{
22+
req.resume();
23+
req.on('end',()=>res.end('ok'));
24+
},3));
25+
26+
server.listen(0,common.mustCall(()=>{
27+
constport=server.address().port;
28+
letcompleted=0;
29+
30+
functiondone(){
31+
if(++completed===3)server.close();
32+
}
33+
34+
// Test 1: kHighWaterMark is set to user value on the ClientRequest.
35+
{
36+
consthwm=getDefaultHighWaterMark()*2;
37+
constreq=http.request({ port,method: 'POST',highWaterMark: hwm});
38+
assert.strictEqual(req[kHighWaterMark],hwm);
39+
req.end();
40+
req.on('response',(res)=>{res.resume();res.on('end',done);});
41+
}
42+
43+
// Test 2: Large HWM β€” write below threshold returns true before socket connects.
44+
{
45+
constreq=http.request({
46+
port,
47+
method: 'POST',
48+
highWaterMark: 100_000,
49+
},common.mustCall((res)=>{
50+
res.resume();
51+
res.on('end',done);
52+
}));
53+
54+
// 64KB write in the same tick β€” socket not yet connected (Path B).
55+
// With HWM=100KB, write() must return true.
56+
constresult=req.write(Buffer.alloc(64*1024));
57+
assert.strictEqual(result,true);
58+
req.end();
59+
}
60+
61+
// Test 3: Small HWM β€” write above threshold returns false, drain fires.
62+
{
63+
constreq=http.request({
64+
port,
65+
method: 'POST',
66+
highWaterMark: 512,
67+
},common.mustCall((res)=>{
68+
res.resume();
69+
res.on('end',done);
70+
}));
71+
72+
// 2KB write in the same tick β€” exceeds HWM of 512 bytes.
73+
constresult=req.write(Buffer.alloc(2*1024));
74+
assert.strictEqual(result,false);
75+
76+
// Drain must fire (no deadlock) so we can complete the request.
77+
req.on('drain',common.mustCall(()=>{
78+
req.end();
79+
}));
80+
}
81+
}));

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 f24177c

Browse files
trivenayaduh95
authored andcommitted
http: propagate highWaterMark to ClientRequest OutgoingMessage
`http.request({ highWaterMark })` passes the value to the TCP socket via createConnection() but does not set it on the OutgoingMessage internal kHighWaterMark. OutgoingMessage._writeRaw() has two mutually exclusive write paths: Path A (socket connected): conn.write() β€” uses socket HWM βœ“ Path B (no socket yet): outputSize < this[kHighWaterMark] β€” uses OutgoingMessage own default (64 KB) βœ— Because the OutgoingMessage constructor already accepts options.highWaterMark, the fix is to set kHighWaterMark from the user options after they are parsed in the ClientRequest constructor. This resolves two symptoms: 1. write() returning the wrong boolean for pre-socket writes (the user highWaterMark was silently ignored on all Node versions). 2. A deadlock on Node >= 24.16.0 where the incorrect false return sets kNeedDrain, but drain never fires because the socket was never backpressured (introduced by the stricter drain gate in #62936). Signed-off-by: Naman Trivedi <trivenay@amazon.com> Fixes: #64645 Refs: #62936 PR-URL: #64653 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent f912692 commit f24177c

2 files changed

Lines changed: 90 additions & 0 deletions

File tree

β€Žlib/_http_client.jsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151
kSkipPendingData,
5252
}=require('_http_common');
5353
const{
54+
kHighWaterMark,
5455
kUniqueHeaders,
5556
parseUniqueHeadersOption,
5657
OutgoingMessage,
@@ -348,6 +349,14 @@ function ClientRequest(input, options, cb) {
348349
options=ObjectAssign({__proto__: null},input,options);
349350
}
350351

352+
// Propagate the user's highWaterMark to OutgoingMessage so that
353+
// _writeRaw() uses the correct threshold for writes buffered before
354+
// the socket connects (Path B). Without this, the OutgoingMessage
355+
// defaults to 64 KB regardless of what the caller requested.
356+
if(options.highWaterMark!=null){
357+
this[kHighWaterMark]=options.highWaterMark;
358+
}
359+
351360
letagent=options.agent;
352361
constdefaultAgent=options._defaultAgent||Agent.globalAgent;
353362
if(agent===false){
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Flags: --expose-internals
2+
'use strict';
3+
4+
// Regression test: http.request({ highWaterMark }) must propagate the value
5+
// to OutgoingMessage's kHighWaterMark so that _writeRaw() Path B (buffering
6+
// before socket connects) uses the correct threshold.
7+
//
8+
// Without the fix:
9+
// - write() returns the wrong boolean (compares against default 64KB)
10+
// - On Node >= 24.16.0 (post #62936), this causes a deadlock when
11+
// the user awaits 'drain' after write() incorrectly returns false.
12+
//
13+
// Fixes: https://github.com/nodejs/node/issues/64645
14+
15+
constcommon=require('../common');
16+
constassert=require('assert');
17+
consthttp=require('http');
18+
const{ kHighWaterMark }=require('_http_outgoing');
19+
const{ getDefaultHighWaterMark }=require('internal/streams/state');
20+
21+
constserver=http.createServer(common.mustCall((req,res)=>{
22+
req.resume();
23+
req.on('end',()=>res.end('ok'));
24+
},3));
25+
26+
server.listen(0,common.mustCall(()=>{
27+
constport=server.address().port;
28+
letcompleted=0;
29+
30+
functiondone(){
31+
if(++completed===3)server.close();
32+
}
33+
34+
// Test 1: kHighWaterMark is set to user value on the ClientRequest.
35+
{
36+
consthwm=getDefaultHighWaterMark()*2;
37+
constreq=http.request({ port,method: 'POST',highWaterMark: hwm});
38+
assert.strictEqual(req[kHighWaterMark],hwm);
39+
req.end();
40+
req.on('response',(res)=>{res.resume();res.on('end',done);});
41+
}
42+
43+
// Test 2: Large HWM β€” write below threshold returns true before socket connects.
44+
{
45+
constreq=http.request({
46+
port,
47+
method: 'POST',
48+
highWaterMark: 100_000,
49+
},common.mustCall((res)=>{
50+
res.resume();
51+
res.on('end',done);
52+
}));
53+
54+
// 64KB write in the same tick β€” socket not yet connected (Path B).
55+
// With HWM=100KB, write() must return true.
56+
constresult=req.write(Buffer.alloc(64*1024));
57+
assert.strictEqual(result,true);
58+
req.end();
59+
}
60+
61+
// Test 3: Small HWM β€” write above threshold returns false, drain fires.
62+
{
63+
constreq=http.request({
64+
port,
65+
method: 'POST',
66+
highWaterMark: 512,
67+
},common.mustCall((res)=>{
68+
res.resume();
69+
res.on('end',done);
70+
}));
71+
72+
// 2KB write in the same tick β€” exceeds HWM of 512 bytes.
73+
constresult=req.write(Buffer.alloc(2*1024));
74+
assert.strictEqual(result,false);
75+
76+
// Drain must fire (no deadlock) so we can complete the request.
77+
req.on('drain',common.mustCall(()=>{
78+
req.end();
79+
}));
80+
}
81+
}));

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 f24177c

Browse files
trivenayaduh95
authored andcommitted
http: propagate highWaterMark to ClientRequest OutgoingMessage
`http.request({ highWaterMark })` passes the value to the TCP socket via createConnection() but does not set it on the OutgoingMessage internal kHighWaterMark. OutgoingMessage._writeRaw() has two mutually exclusive write paths: Path A (socket connected): conn.write() β€” uses socket HWM βœ“ Path B (no socket yet): outputSize < this[kHighWaterMark] β€” uses OutgoingMessage own default (64 KB) βœ— Because the OutgoingMessage constructor already accepts options.highWaterMark, the fix is to set kHighWaterMark from the user options after they are parsed in the ClientRequest constructor. This resolves two symptoms: 1. write() returning the wrong boolean for pre-socket writes (the user highWaterMark was silently ignored on all Node versions). 2. A deadlock on Node >= 24.16.0 where the incorrect false return sets kNeedDrain, but drain never fires because the socket was never backpressured (introduced by the stricter drain gate in #62936). Signed-off-by: Naman Trivedi <trivenay@amazon.com> Fixes: #64645 Refs: #62936 PR-URL: #64653 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent f912692 commit f24177c

2 files changed

Lines changed: 90 additions & 0 deletions

File tree

β€Žlib/_http_client.jsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151
kSkipPendingData,
5252
}=require('_http_common');
5353
const{
54+
kHighWaterMark,
5455
kUniqueHeaders,
5556
parseUniqueHeadersOption,
5657
OutgoingMessage,
@@ -348,6 +349,14 @@ function ClientRequest(input, options, cb) {
348349
options=ObjectAssign({__proto__: null},input,options);
349350
}
350351

352+
// Propagate the user's highWaterMark to OutgoingMessage so that
353+
// _writeRaw() uses the correct threshold for writes buffered before
354+
// the socket connects (Path B). Without this, the OutgoingMessage
355+
// defaults to 64 KB regardless of what the caller requested.
356+
if(options.highWaterMark!=null){
357+
this[kHighWaterMark]=options.highWaterMark;
358+
}
359+
351360
letagent=options.agent;
352361
constdefaultAgent=options._defaultAgent||Agent.globalAgent;
353362
if(agent===false){
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Flags: --expose-internals
2+
'use strict';
3+
4+
// Regression test: http.request({ highWaterMark }) must propagate the value
5+
// to OutgoingMessage's kHighWaterMark so that _writeRaw() Path B (buffering
6+
// before socket connects) uses the correct threshold.
7+
//
8+
// Without the fix:
9+
// - write() returns the wrong boolean (compares against default 64KB)
10+
// - On Node >= 24.16.0 (post #62936), this causes a deadlock when
11+
// the user awaits 'drain' after write() incorrectly returns false.
12+
//
13+
// Fixes: https://github.com/nodejs/node/issues/64645
14+
15+
constcommon=require('../common');
16+
constassert=require('assert');
17+
consthttp=require('http');
18+
const{ kHighWaterMark }=require('_http_outgoing');
19+
const{ getDefaultHighWaterMark }=require('internal/streams/state');
20+
21+
constserver=http.createServer(common.mustCall((req,res)=>{
22+
req.resume();
23+
req.on('end',()=>res.end('ok'));
24+
},3));
25+
26+
server.listen(0,common.mustCall(()=>{
27+
constport=server.address().port;
28+
letcompleted=0;
29+
30+
functiondone(){
31+
if(++completed===3)server.close();
32+
}
33+
34+
// Test 1: kHighWaterMark is set to user value on the ClientRequest.
35+
{
36+
consthwm=getDefaultHighWaterMark()*2;
37+
constreq=http.request({ port,method: 'POST',highWaterMark: hwm});
38+
assert.strictEqual(req[kHighWaterMark],hwm);
39+
req.end();
40+
req.on('response',(res)=>{res.resume();res.on('end',done);});
41+
}
42+
43+
// Test 2: Large HWM β€” write below threshold returns true before socket connects.
44+
{
45+
constreq=http.request({
46+
port,
47+
method: 'POST',
48+
highWaterMark: 100_000,
49+
},common.mustCall((res)=>{
50+
res.resume();
51+
res.on('end',done);
52+
}));
53+
54+
// 64KB write in the same tick β€” socket not yet connected (Path B).
55+
// With HWM=100KB, write() must return true.
56+
constresult=req.write(Buffer.alloc(64*1024));
57+
assert.strictEqual(result,true);
58+
req.end();
59+
}
60+
61+
// Test 3: Small HWM β€” write above threshold returns false, drain fires.
62+
{
63+
constreq=http.request({
64+
port,
65+
method: 'POST',
66+
highWaterMark: 512,
67+
},common.mustCall((res)=>{
68+
res.resume();
69+
res.on('end',done);
70+
}));
71+
72+
// 2KB write in the same tick β€” exceeds HWM of 512 bytes.
73+
constresult=req.write(Buffer.alloc(2*1024));
74+
assert.strictEqual(result,false);
75+
76+
// Drain must fire (no deadlock) so we can complete the request.
77+
req.on('drain',common.mustCall(()=>{
78+
req.end();
79+
}));
80+
}
81+
}));

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 f24177c

Browse files
trivenayaduh95
authored andcommitted
http: propagate highWaterMark to ClientRequest OutgoingMessage
`http.request({ highWaterMark })` passes the value to the TCP socket via createConnection() but does not set it on the OutgoingMessage internal kHighWaterMark. OutgoingMessage._writeRaw() has two mutually exclusive write paths: Path A (socket connected): conn.write() β€” uses socket HWM βœ“ Path B (no socket yet): outputSize < this[kHighWaterMark] β€” uses OutgoingMessage own default (64 KB) βœ— Because the OutgoingMessage constructor already accepts options.highWaterMark, the fix is to set kHighWaterMark from the user options after they are parsed in the ClientRequest constructor. This resolves two symptoms: 1. write() returning the wrong boolean for pre-socket writes (the user highWaterMark was silently ignored on all Node versions). 2. A deadlock on Node >= 24.16.0 where the incorrect false return sets kNeedDrain, but drain never fires because the socket was never backpressured (introduced by the stricter drain gate in #62936). Signed-off-by: Naman Trivedi <trivenay@amazon.com> Fixes: #64645 Refs: #62936 PR-URL: #64653 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent f912692 commit f24177c

2 files changed

Lines changed: 90 additions & 0 deletions

File tree

β€Žlib/_http_client.jsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151
kSkipPendingData,
5252
}=require('_http_common');
5353
const{
54+
kHighWaterMark,
5455
kUniqueHeaders,
5556
parseUniqueHeadersOption,
5657
OutgoingMessage,
@@ -348,6 +349,14 @@ function ClientRequest(input, options, cb) {
348349
options=ObjectAssign({__proto__: null},input,options);
349350
}
350351

352+
// Propagate the user's highWaterMark to OutgoingMessage so that
353+
// _writeRaw() uses the correct threshold for writes buffered before
354+
// the socket connects (Path B). Without this, the OutgoingMessage
355+
// defaults to 64 KB regardless of what the caller requested.
356+
if(options.highWaterMark!=null){
357+
this[kHighWaterMark]=options.highWaterMark;
358+
}
359+
351360
letagent=options.agent;
352361
constdefaultAgent=options._defaultAgent||Agent.globalAgent;
353362
if(agent===false){
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Flags: --expose-internals
2+
'use strict';
3+
4+
// Regression test: http.request({ highWaterMark }) must propagate the value
5+
// to OutgoingMessage's kHighWaterMark so that _writeRaw() Path B (buffering
6+
// before socket connects) uses the correct threshold.
7+
//
8+
// Without the fix:
9+
// - write() returns the wrong boolean (compares against default 64KB)
10+
// - On Node >= 24.16.0 (post #62936), this causes a deadlock when
11+
// the user awaits 'drain' after write() incorrectly returns false.
12+
//
13+
// Fixes: https://github.com/nodejs/node/issues/64645
14+
15+
constcommon=require('../common');
16+
constassert=require('assert');
17+
consthttp=require('http');
18+
const{ kHighWaterMark }=require('_http_outgoing');
19+
const{ getDefaultHighWaterMark }=require('internal/streams/state');
20+
21+
constserver=http.createServer(common.mustCall((req,res)=>{
22+
req.resume();
23+
req.on('end',()=>res.end('ok'));
24+
},3));
25+
26+
server.listen(0,common.mustCall(()=>{
27+
constport=server.address().port;
28+
letcompleted=0;
29+
30+
functiondone(){
31+
if(++completed===3)server.close();
32+
}
33+
34+
// Test 1: kHighWaterMark is set to user value on the ClientRequest.
35+
{
36+
consthwm=getDefaultHighWaterMark()*2;
37+
constreq=http.request({ port,method: 'POST',highWaterMark: hwm});
38+
assert.strictEqual(req[kHighWaterMark],hwm);
39+
req.end();
40+
req.on('response',(res)=>{res.resume();res.on('end',done);});
41+
}
42+
43+
// Test 2: Large HWM β€” write below threshold returns true before socket connects.
44+
{
45+
constreq=http.request({
46+
port,
47+
method: 'POST',
48+
highWaterMark: 100_000,
49+
},common.mustCall((res)=>{
50+
res.resume();
51+
res.on('end',done);
52+
}));
53+
54+
// 64KB write in the same tick β€” socket not yet connected (Path B).
55+
// With HWM=100KB, write() must return true.
56+
constresult=req.write(Buffer.alloc(64*1024));
57+
assert.strictEqual(result,true);
58+
req.end();
59+
}
60+
61+
// Test 3: Small HWM β€” write above threshold returns false, drain fires.
62+
{
63+
constreq=http.request({
64+
port,
65+
method: 'POST',
66+
highWaterMark: 512,
67+
},common.mustCall((res)=>{
68+
res.resume();
69+
res.on('end',done);
70+
}));
71+
72+
// 2KB write in the same tick β€” exceeds HWM of 512 bytes.
73+
constresult=req.write(Buffer.alloc(2*1024));
74+
assert.strictEqual(result,false);
75+
76+
// Drain must fire (no deadlock) so we can complete the request.
77+
req.on('drain',common.mustCall(()=>{
78+
req.end();
79+
}));
80+
}
81+
}));

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 f24177c

Browse files
trivenayaduh95
authored andcommitted
http: propagate highWaterMark to ClientRequest OutgoingMessage
`http.request({ highWaterMark })` passes the value to the TCP socket via createConnection() but does not set it on the OutgoingMessage internal kHighWaterMark. OutgoingMessage._writeRaw() has two mutually exclusive write paths: Path A (socket connected): conn.write() β€” uses socket HWM βœ“ Path B (no socket yet): outputSize < this[kHighWaterMark] β€” uses OutgoingMessage own default (64 KB) βœ— Because the OutgoingMessage constructor already accepts options.highWaterMark, the fix is to set kHighWaterMark from the user options after they are parsed in the ClientRequest constructor. This resolves two symptoms: 1. write() returning the wrong boolean for pre-socket writes (the user highWaterMark was silently ignored on all Node versions). 2. A deadlock on Node >= 24.16.0 where the incorrect false return sets kNeedDrain, but drain never fires because the socket was never backpressured (introduced by the stricter drain gate in #62936). Signed-off-by: Naman Trivedi <trivenay@amazon.com> Fixes: #64645 Refs: #62936 PR-URL: #64653 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent f912692 commit f24177c

2 files changed

Lines changed: 90 additions & 0 deletions

File tree

β€Žlib/_http_client.jsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151
kSkipPendingData,
5252
}=require('_http_common');
5353
const{
54+
kHighWaterMark,
5455
kUniqueHeaders,
5556
parseUniqueHeadersOption,
5657
OutgoingMessage,
@@ -348,6 +349,14 @@ function ClientRequest(input, options, cb) {
348349
options=ObjectAssign({__proto__: null},input,options);
349350
}
350351

352+
// Propagate the user's highWaterMark to OutgoingMessage so that
353+
// _writeRaw() uses the correct threshold for writes buffered before
354+
// the socket connects (Path B). Without this, the OutgoingMessage
355+
// defaults to 64 KB regardless of what the caller requested.
356+
if(options.highWaterMark!=null){
357+
this[kHighWaterMark]=options.highWaterMark;
358+
}
359+
351360
letagent=options.agent;
352361
constdefaultAgent=options._defaultAgent||Agent.globalAgent;
353362
if(agent===false){
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Flags: --expose-internals
2+
'use strict';
3+
4+
// Regression test: http.request({ highWaterMark }) must propagate the value
5+
// to OutgoingMessage's kHighWaterMark so that _writeRaw() Path B (buffering
6+
// before socket connects) uses the correct threshold.
7+
//
8+
// Without the fix:
9+
// - write() returns the wrong boolean (compares against default 64KB)
10+
// - On Node >= 24.16.0 (post #62936), this causes a deadlock when
11+
// the user awaits 'drain' after write() incorrectly returns false.
12+
//
13+
// Fixes: https://github.com/nodejs/node/issues/64645
14+
15+
constcommon=require('../common');
16+
constassert=require('assert');
17+
consthttp=require('http');
18+
const{ kHighWaterMark }=require('_http_outgoing');
19+
const{ getDefaultHighWaterMark }=require('internal/streams/state');
20+
21+
constserver=http.createServer(common.mustCall((req,res)=>{
22+
req.resume();
23+
req.on('end',()=>res.end('ok'));
24+
},3));
25+
26+
server.listen(0,common.mustCall(()=>{
27+
constport=server.address().port;
28+
letcompleted=0;
29+
30+
functiondone(){
31+
if(++completed===3)server.close();
32+
}
33+
34+
// Test 1: kHighWaterMark is set to user value on the ClientRequest.
35+
{
36+
consthwm=getDefaultHighWaterMark()*2;
37+
constreq=http.request({ port,method: 'POST',highWaterMark: hwm});
38+
assert.strictEqual(req[kHighWaterMark],hwm);
39+
req.end();
40+
req.on('response',(res)=>{res.resume();res.on('end',done);});
41+
}
42+
43+
// Test 2: Large HWM β€” write below threshold returns true before socket connects.
44+
{
45+
constreq=http.request({
46+
port,
47+
method: 'POST',
48+
highWaterMark: 100_000,
49+
},common.mustCall((res)=>{
50+
res.resume();
51+
res.on('end',done);
52+
}));
53+
54+
// 64KB write in the same tick β€” socket not yet connected (Path B).
55+
// With HWM=100KB, write() must return true.
56+
constresult=req.write(Buffer.alloc(64*1024));
57+
assert.strictEqual(result,true);
58+
req.end();
59+
}
60+
61+
// Test 3: Small HWM β€” write above threshold returns false, drain fires.
62+
{
63+
constreq=http.request({
64+
port,
65+
method: 'POST',
66+
highWaterMark: 512,
67+
},common.mustCall((res)=>{
68+
res.resume();
69+
res.on('end',done);
70+
}));
71+
72+
// 2KB write in the same tick β€” exceeds HWM of 512 bytes.
73+
constresult=req.write(Buffer.alloc(2*1024));
74+
assert.strictEqual(result,false);
75+
76+
// Drain must fire (no deadlock) so we can complete the request.
77+
req.on('drain',common.mustCall(()=>{
78+
req.end();
79+
}));
80+
}
81+
}));

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 f24177c

Browse files
trivenayaduh95
authored andcommitted
http: propagate highWaterMark to ClientRequest OutgoingMessage
`http.request({ highWaterMark })` passes the value to the TCP socket via createConnection() but does not set it on the OutgoingMessage internal kHighWaterMark. OutgoingMessage._writeRaw() has two mutually exclusive write paths: Path A (socket connected): conn.write() β€” uses socket HWM βœ“ Path B (no socket yet): outputSize < this[kHighWaterMark] β€” uses OutgoingMessage own default (64 KB) βœ— Because the OutgoingMessage constructor already accepts options.highWaterMark, the fix is to set kHighWaterMark from the user options after they are parsed in the ClientRequest constructor. This resolves two symptoms: 1. write() returning the wrong boolean for pre-socket writes (the user highWaterMark was silently ignored on all Node versions). 2. A deadlock on Node >= 24.16.0 where the incorrect false return sets kNeedDrain, but drain never fires because the socket was never backpressured (introduced by the stricter drain gate in #62936). Signed-off-by: Naman Trivedi <trivenay@amazon.com> Fixes: #64645 Refs: #62936 PR-URL: #64653 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent f912692 commit f24177c

2 files changed

Lines changed: 90 additions & 0 deletions

File tree

β€Žlib/_http_client.jsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151
kSkipPendingData,
5252
}=require('_http_common');
5353
const{
54+
kHighWaterMark,
5455
kUniqueHeaders,
5556
parseUniqueHeadersOption,
5657
OutgoingMessage,
@@ -348,6 +349,14 @@ function ClientRequest(input, options, cb) {
348349
options=ObjectAssign({__proto__: null},input,options);
349350
}
350351

352+
// Propagate the user's highWaterMark to OutgoingMessage so that
353+
// _writeRaw() uses the correct threshold for writes buffered before
354+
// the socket connects (Path B). Without this, the OutgoingMessage
355+
// defaults to 64 KB regardless of what the caller requested.
356+
if(options.highWaterMark!=null){
357+
this[kHighWaterMark]=options.highWaterMark;
358+
}
359+
351360
letagent=options.agent;
352361
constdefaultAgent=options._defaultAgent||Agent.globalAgent;
353362
if(agent===false){
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// Flags: --expose-internals
2+
'use strict';
3+
4+
// Regression test: http.request({ highWaterMark }) must propagate the value
5+
// to OutgoingMessage's kHighWaterMark so that _writeRaw() Path B (buffering
6+
// before socket connects) uses the correct threshold.
7+
//
8+
// Without the fix:
9+
// - write() returns the wrong boolean (compares against default 64KB)
10+
// - On Node >= 24.16.0 (post #62936), this causes a deadlock when
11+
// the user awaits 'drain' after write() incorrectly returns false.
12+
//
13+
// Fixes: https://github.com/nodejs/node/issues/64645
14+
15+
constcommon=require('../common');
16+
constassert=require('assert');
17+
consthttp=require('http');
18+
const{ kHighWaterMark }=require('_http_outgoing');
19+
const{ getDefaultHighWaterMark }=require('internal/streams/state');
20+
21+
constserver=http.createServer(common.mustCall((req,res)=>{
22+
req.resume();
23+
req.on('end',()=>res.end('ok'));
24+
},3));
25+
26+
server.listen(0,common.mustCall(()=>{
27+
constport=server.address().port;
28+
letcompleted=0;
29+
30+
functiondone(){
31+
if(++completed===3)server.close();
32+
}
33+
34+
// Test 1: kHighWaterMark is set to user value on the ClientRequest.
35+
{
36+
consthwm=getDefaultHighWaterMark()*2;
37+
constreq=http.request({ port,method: 'POST',highWaterMark: hwm});
38+
assert.strictEqual(req[kHighWaterMark],hwm);
39+
req.end();
40+
req.on('response',(res)=>{res.resume();res.on('end',done);});
41+
}
42+
43+
// Test 2: Large HWM β€” write below threshold returns true before socket connects.
44+
{
45+
constreq=http.request({
46+
port,
47+
method: 'POST',
48+
highWaterMark: 100_000,
49+
},common.mustCall((res)=>{
50+
res.resume();
51+
res.on('end',done);
52+
}));
53+
54+
// 64KB write in the same tick β€” socket not yet connected (Path B).
55+
// With HWM=100KB, write() must return true.
56+
constresult=req.write(Buffer.alloc(64*1024));
57+
assert.strictEqual(result,true);
58+
req.end();
59+
}
60+
61+
// Test 3: Small HWM β€” write above threshold returns false, drain fires.
62+
{
63+
constreq=http.request({
64+
port,
65+
method: 'POST',
66+
highWaterMark: 512,
67+
},common.mustCall((res)=>{
68+
res.resume();
69+
res.on('end',done);
70+
}));
71+
72+
// 2KB write in the same tick β€” exceeds HWM of 512 bytes.
73+
constresult=req.write(Buffer.alloc(2*1024));
74+
assert.strictEqual(result,false);
75+
76+
// Drain must fire (no deadlock) so we can complete the request.
77+
req.on('drain',common.mustCall(()=>{
78+
req.end();
79+
}));
80+
}
81+
}));

0 commit comments

Comments
Β (0)