Commit 6c3516f

Browse files
shani-singh1aduh95
shani-singh1
authored and
aduh95
committed
http: fix keylog listener setup on existing agent sockets
`maybeEnableKeylog()` runs as the agent's `'newListener'` handler and attaches the agent's keylog handler to the sockets the agent already owns. `agent.sockets` maps a name to an array of sockets, but the loop treated those arrays as sockets and called `.on()` on them. Adding a `'keylog'` listener to an agent that already owned a socket therefore threw `TypeError: sockets[i].on is not a function` out of `agent.on('keylog', ...)`. Since the throw happened inside the `'newListener'` handler it propagated before the listener was stored, so the caller got an exception and no listener. Sockets parked in `agent.freeSockets` were never visited at all. Walk both maps the way `Agent.prototype.destroy()` does. Signed-off-by: Shani Singh <teamdeveloperworld@gmail.com> PR-URL: #65066 Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 613be79 commit 6c3516f

2 files changed

Lines changed: 82 additions & 4 deletions

File tree

‎lib/_http_agent.js‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ function maybeEnableKeylog(eventName) {
278278
this[kOnKeylog]=functiononkeylog(keylog){
279279
agent.emit('keylog',keylog,this);
280280
};
281-
// Existing sockets will start listening on keylog now.
282-
constsockets=ObjectValues(this.sockets);
283-
for(leti=0;i<sockets.length;i++){
284-
sockets[i].on('keylog',this[kOnKeylog]);
281+
// Existing sockets will start listening on keylog now. Both maps hold
282+
// arrays of sockets keyed by name, so each bucket has to be walked.
283+
constsets=[this.freeSockets,this.sockets];
284+
for(lets=0;s<sets.length;s++){
285+
constbuckets=ObjectValues(sets[s]);
286+
for(letb=0;b<buckets.length;b++){
287+
constsockets=buckets[b];
288+
for(letn=0;n<sockets.length;n++){
289+
sockets[n].on('keylog',this[kOnKeylog]);
290+
}
291+
}
285292
}
286293
}
287294
}

‎test/parallel/test-http-agent-keylog-existing-sockets.js‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
7+
// Adding a 'keylog' listener to an agent is wired up by maybeEnableKeylog(),
8+
// which attaches the agent's keylog handler to the sockets the agent already
9+
// owns. `agent.sockets` and `agent.freeSockets` map a name to an *array* of
10+
// sockets, so each bucket has to be walked. Treating the buckets themselves as
11+
// sockets threw a TypeError out of `agent.on('keylog', ...)`, which also meant
12+
// the listener was never registered.
13+
14+
// Two servers so the two sockets get different names, which keeps one parked
15+
// in freeSockets instead of being reused by the second request.
16+
constidleServer=http.createServer((req,res)=>res.end('idle'));
17+
constbusyServer=http.createServer((req,res)=>{
18+
setTimeout(()=>res.end('busy'),common.platformTimeout(200));
19+
});
20+
21+
functioncountSockets(agent){
22+
letfree=0;
23+
letactive=0;
24+
for(constbucketofObject.values(agent.freeSockets))free+=bucket.length;
25+
for(constbucketofObject.values(agent.sockets))active+=bucket.length;
26+
return{ free, active };
27+
}
28+
29+
idleServer.listen(0,common.mustCall(()=>{
30+
busyServer.listen(0,common.mustCall(()=>{
31+
constagent=newhttp.Agent({keepAlive: true,maxSockets: 4});
32+
33+
// First request finishes, so its socket is released into freeSockets.
34+
http.get({port: idleServer.address().port, agent },common.mustCall((res)=>{
35+
res.resume();
36+
res.on('end',common.mustCall(()=>{
37+
// Second request is still in flight, so its socket is in sockets.
38+
constreq=http.get({port: busyServer.address().port, agent },
39+
common.mustCall((res2)=>{
40+
res2.resume();
41+
res2.on('end',common.mustCall(()=>{
42+
agent.destroy();
43+
idleServer.close();
44+
busyServer.close();
45+
}));
46+
}));
47+
48+
req.on('socket',common.mustCall(()=>{
49+
setImmediate(common.mustCall(()=>{
50+
const{ free, active }=countSockets(agent);
51+
assert.strictEqual(free,1);
52+
assert.strictEqual(active,1);
53+
54+
// Used to throw `TypeError: sockets[i].on is not a function`.
55+
agent.on('keylog',common.mustNotCall());
56+
assert.strictEqual(agent.listenerCount('keylog'),1);
57+
58+
// Every existing socket, idle or in use, is now listening.
59+
for(constsetof[agent.freeSockets,agent.sockets]){
60+
for(constbucketofObject.values(set)){
61+
for(constsocketofbucket){
62+
assert.strictEqual(socket.listenerCount('keylog'),1);
63+
}
64+
}
65+
}
66+
}));
67+
}));
68+
}));
69+
}));
70+
}));
71+
}));

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 6c3516f
Browse files
shani-singh1aduh95
shani-singh1
authored and
aduh95
committed
http: fix keylog listener setup on existing agent sockets
`maybeEnableKeylog()` runs as the agent's `'newListener'` handler and
attaches the agent's keylog handler to the sockets the agent already
owns. `agent.sockets` maps a name to an array of sockets, but the loop
treated those arrays as sockets and called `.on()` on them.
Adding a `'keylog'` listener to an agent that already owned a socket
therefore threw `TypeError: sockets[i].on is not a function` out of
`agent.on('keylog', ...)`. Since the throw happened inside the
`'newListener'` handler it propagated before the listener was stored,
so the caller got an exception and no listener. Sockets parked in
`agent.freeSockets` were never visited at all.
Walk both maps the way `Agent.prototype.destroy()` does.
Signed-off-by: Shani Singh <teamdeveloperworld@gmail.com>
PR-URL: #65066
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 613be79 commit 6c3516f
2 files changed
Lines changed: 82 additions & 4 deletions
File tree
‎lib/_http_agent.js‎
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ function maybeEnableKeylog(eventName) {
278278
this[kOnKeylog]=functiononkeylog(keylog){
279279
agent.emit('keylog',keylog,this);
280280
};
281-
// Existing sockets will start listening on keylog now.
282-
constsockets=ObjectValues(this.sockets);
283-
for(leti=0;i<sockets.length;i++){
284-
sockets[i].on('keylog',this[kOnKeylog]);
281+
// Existing sockets will start listening on keylog now. Both maps hold
282+
// arrays of sockets keyed by name, so each bucket has to be walked.
283+
constsets=[this.freeSockets,this.sockets];
284+
for(lets=0;s<sets.length;s++){
285+
constbuckets=ObjectValues(sets[s]);
286+
for(letb=0;b<buckets.length;b++){
287+
constsockets=buckets[b];
288+
for(letn=0;n<sockets.length;n++){
289+
sockets[n].on('keylog',this[kOnKeylog]);
290+
}
291+
}
285292
}
286293
}
287294
}
‎test/parallel/test-http-agent-keylog-existing-sockets.js‎
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
7+
// Adding a 'keylog' listener to an agent is wired up by maybeEnableKeylog(),
8+
// which attaches the agent's keylog handler to the sockets the agent already
9+
// owns. `agent.sockets` and `agent.freeSockets` map a name to an *array* of
10+
// sockets, so each bucket has to be walked. Treating the buckets themselves as
11+
// sockets threw a TypeError out of `agent.on('keylog', ...)`, which also meant
12+
// the listener was never registered.
13+
14+
// Two servers so the two sockets get different names, which keeps one parked
15+
// in freeSockets instead of being reused by the second request.
16+
constidleServer=http.createServer((req,res)=>res.end('idle'));
17+
constbusyServer=http.createServer((req,res)=>{
18+
setTimeout(()=>res.end('busy'),common.platformTimeout(200));
19+
});
20+
21+
functioncountSockets(agent){
22+
letfree=0;
23+
letactive=0;
24+
for(constbucketofObject.values(agent.freeSockets))free+=bucket.length;
25+
for(constbucketofObject.values(agent.sockets))active+=bucket.length;
26+
return{ free, active };
27+
}
28+
29+
idleServer.listen(0,common.mustCall(()=>{
30+
busyServer.listen(0,common.mustCall(()=>{
31+
constagent=newhttp.Agent({keepAlive: true,maxSockets: 4});
32+
33+
// First request finishes, so its socket is released into freeSockets.
34+
http.get({port: idleServer.address().port, agent },common.mustCall((res)=>{
35+
res.resume();
36+
res.on('end',common.mustCall(()=>{
37+
// Second request is still in flight, so its socket is in sockets.
38+
constreq=http.get({port: busyServer.address().port, agent },
39+
common.mustCall((res2)=>{
40+
res2.resume();
41+
res2.on('end',common.mustCall(()=>{
42+
agent.destroy();
43+
idleServer.close();
44+
busyServer.close();
45+
}));
46+
}));
47+
48+
req.on('socket',common.mustCall(()=>{
49+
setImmediate(common.mustCall(()=>{
50+
const{ free, active }=countSockets(agent);
51+
assert.strictEqual(free,1);
52+
assert.strictEqual(active,1);
53+
54+
// Used to throw `TypeError: sockets[i].on is not a function`.
55+
agent.on('keylog',common.mustNotCall());
56+
assert.strictEqual(agent.listenerCount('keylog'),1);
57+
58+
// Every existing socket, idle or in use, is now listening.
59+
for(constsetof[agent.freeSockets,agent.sockets]){
60+
for(constbucketofObject.values(set)){
61+
for(constsocketofbucket){
62+
assert.strictEqual(socket.listenerCount('keylog'),1);
63+
}
64+
}
65+
}
66+
}));
67+
}));
68+
}));
69+
}));
70+
}));
71+
}));
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 6c3516f
Browse files
shani-singh1aduh95
shani-singh1
authored and
aduh95
committed
http: fix keylog listener setup on existing agent sockets
`maybeEnableKeylog()` runs as the agent's `'newListener'` handler and
attaches the agent's keylog handler to the sockets the agent already
owns. `agent.sockets` maps a name to an array of sockets, but the loop
treated those arrays as sockets and called `.on()` on them.
Adding a `'keylog'` listener to an agent that already owned a socket
therefore threw `TypeError: sockets[i].on is not a function` out of
`agent.on('keylog', ...)`. Since the throw happened inside the
`'newListener'` handler it propagated before the listener was stored,
so the caller got an exception and no listener. Sockets parked in
`agent.freeSockets` were never visited at all.
Walk both maps the way `Agent.prototype.destroy()` does.
Signed-off-by: Shani Singh <teamdeveloperworld@gmail.com>
PR-URL: #65066
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 613be79 commit 6c3516f
2 files changed
Lines changed: 82 additions & 4 deletions
File tree
‎lib/_http_agent.js‎
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ function maybeEnableKeylog(eventName) {
278278
this[kOnKeylog]=functiononkeylog(keylog){
279279
agent.emit('keylog',keylog,this);
280280
};
281-
// Existing sockets will start listening on keylog now.
282-
constsockets=ObjectValues(this.sockets);
283-
for(leti=0;i<sockets.length;i++){
284-
sockets[i].on('keylog',this[kOnKeylog]);
281+
// Existing sockets will start listening on keylog now. Both maps hold
282+
// arrays of sockets keyed by name, so each bucket has to be walked.
283+
constsets=[this.freeSockets,this.sockets];
284+
for(lets=0;s<sets.length;s++){
285+
constbuckets=ObjectValues(sets[s]);
286+
for(letb=0;b<buckets.length;b++){
287+
constsockets=buckets[b];
288+
for(letn=0;n<sockets.length;n++){
289+
sockets[n].on('keylog',this[kOnKeylog]);
290+
}
291+
}
285292
}
286293
}
287294
}
‎test/parallel/test-http-agent-keylog-existing-sockets.js‎
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
7+
// Adding a 'keylog' listener to an agent is wired up by maybeEnableKeylog(),
8+
// which attaches the agent's keylog handler to the sockets the agent already
9+
// owns. `agent.sockets` and `agent.freeSockets` map a name to an *array* of
10+
// sockets, so each bucket has to be walked. Treating the buckets themselves as
11+
// sockets threw a TypeError out of `agent.on('keylog', ...)`, which also meant
12+
// the listener was never registered.
13+
14+
// Two servers so the two sockets get different names, which keeps one parked
15+
// in freeSockets instead of being reused by the second request.
16+
constidleServer=http.createServer((req,res)=>res.end('idle'));
17+
constbusyServer=http.createServer((req,res)=>{
18+
setTimeout(()=>res.end('busy'),common.platformTimeout(200));
19+
});
20+
21+
functioncountSockets(agent){
22+
letfree=0;
23+
letactive=0;
24+
for(constbucketofObject.values(agent.freeSockets))free+=bucket.length;
25+
for(constbucketofObject.values(agent.sockets))active+=bucket.length;
26+
return{ free, active };
27+
}
28+
29+
idleServer.listen(0,common.mustCall(()=>{
30+
busyServer.listen(0,common.mustCall(()=>{
31+
constagent=newhttp.Agent({keepAlive: true,maxSockets: 4});
32+
33+
// First request finishes, so its socket is released into freeSockets.
34+
http.get({port: idleServer.address().port, agent },common.mustCall((res)=>{
35+
res.resume();
36+
res.on('end',common.mustCall(()=>{
37+
// Second request is still in flight, so its socket is in sockets.
38+
constreq=http.get({port: busyServer.address().port, agent },
39+
common.mustCall((res2)=>{
40+
res2.resume();
41+
res2.on('end',common.mustCall(()=>{
42+
agent.destroy();
43+
idleServer.close();
44+
busyServer.close();
45+
}));
46+
}));
47+
48+
req.on('socket',common.mustCall(()=>{
49+
setImmediate(common.mustCall(()=>{
50+
const{ free, active }=countSockets(agent);
51+
assert.strictEqual(free,1);
52+
assert.strictEqual(active,1);
53+
54+
// Used to throw `TypeError: sockets[i].on is not a function`.
55+
agent.on('keylog',common.mustNotCall());
56+
assert.strictEqual(agent.listenerCount('keylog'),1);
57+
58+
// Every existing socket, idle or in use, is now listening.
59+
for(constsetof[agent.freeSockets,agent.sockets]){
60+
for(constbucketofObject.values(set)){
61+
for(constsocketofbucket){
62+
assert.strictEqual(socket.listenerCount('keylog'),1);
63+
}
64+
}
65+
}
66+
}));
67+
}));
68+
}));
69+
}));
70+
}));
71+
}));
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 6c3516f
Browse files
shani-singh1aduh95
shani-singh1
authored and
aduh95
committed
http: fix keylog listener setup on existing agent sockets
`maybeEnableKeylog()` runs as the agent's `'newListener'` handler and
attaches the agent's keylog handler to the sockets the agent already
owns. `agent.sockets` maps a name to an array of sockets, but the loop
treated those arrays as sockets and called `.on()` on them.
Adding a `'keylog'` listener to an agent that already owned a socket
therefore threw `TypeError: sockets[i].on is not a function` out of
`agent.on('keylog', ...)`. Since the throw happened inside the
`'newListener'` handler it propagated before the listener was stored,
so the caller got an exception and no listener. Sockets parked in
`agent.freeSockets` were never visited at all.
Walk both maps the way `Agent.prototype.destroy()` does.
Signed-off-by: Shani Singh <teamdeveloperworld@gmail.com>
PR-URL: #65066
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 613be79 commit 6c3516f
2 files changed
Lines changed: 82 additions & 4 deletions
File tree
‎lib/_http_agent.js‎
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ function maybeEnableKeylog(eventName) {
278278
this[kOnKeylog]=functiononkeylog(keylog){
279279
agent.emit('keylog',keylog,this);
280280
};
281-
// Existing sockets will start listening on keylog now.
282-
constsockets=ObjectValues(this.sockets);
283-
for(leti=0;i<sockets.length;i++){
284-
sockets[i].on('keylog',this[kOnKeylog]);
281+
// Existing sockets will start listening on keylog now. Both maps hold
282+
// arrays of sockets keyed by name, so each bucket has to be walked.
283+
constsets=[this.freeSockets,this.sockets];
284+
for(lets=0;s<sets.length;s++){
285+
constbuckets=ObjectValues(sets[s]);
286+
for(letb=0;b<buckets.length;b++){
287+
constsockets=buckets[b];
288+
for(letn=0;n<sockets.length;n++){
289+
sockets[n].on('keylog',this[kOnKeylog]);
290+
}
291+
}
285292
}
286293
}
287294
}
‎test/parallel/test-http-agent-keylog-existing-sockets.js‎
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
7+
// Adding a 'keylog' listener to an agent is wired up by maybeEnableKeylog(),
8+
// which attaches the agent's keylog handler to the sockets the agent already
9+
// owns. `agent.sockets` and `agent.freeSockets` map a name to an *array* of
10+
// sockets, so each bucket has to be walked. Treating the buckets themselves as
11+
// sockets threw a TypeError out of `agent.on('keylog', ...)`, which also meant
12+
// the listener was never registered.
13+
14+
// Two servers so the two sockets get different names, which keeps one parked
15+
// in freeSockets instead of being reused by the second request.
16+
constidleServer=http.createServer((req,res)=>res.end('idle'));
17+
constbusyServer=http.createServer((req,res)=>{
18+
setTimeout(()=>res.end('busy'),common.platformTimeout(200));
19+
});
20+
21+
functioncountSockets(agent){
22+
letfree=0;
23+
letactive=0;
24+
for(constbucketofObject.values(agent.freeSockets))free+=bucket.length;
25+
for(constbucketofObject.values(agent.sockets))active+=bucket.length;
26+
return{ free, active };
27+
}
28+
29+
idleServer.listen(0,common.mustCall(()=>{
30+
busyServer.listen(0,common.mustCall(()=>{
31+
constagent=newhttp.Agent({keepAlive: true,maxSockets: 4});
32+
33+
// First request finishes, so its socket is released into freeSockets.
34+
http.get({port: idleServer.address().port, agent },common.mustCall((res)=>{
35+
res.resume();
36+
res.on('end',common.mustCall(()=>{
37+
// Second request is still in flight, so its socket is in sockets.
38+
constreq=http.get({port: busyServer.address().port, agent },
39+
common.mustCall((res2)=>{
40+
res2.resume();
41+
res2.on('end',common.mustCall(()=>{
42+
agent.destroy();
43+
idleServer.close();
44+
busyServer.close();
45+
}));
46+
}));
47+
48+
req.on('socket',common.mustCall(()=>{
49+
setImmediate(common.mustCall(()=>{
50+
const{ free, active }=countSockets(agent);
51+
assert.strictEqual(free,1);
52+
assert.strictEqual(active,1);
53+
54+
// Used to throw `TypeError: sockets[i].on is not a function`.
55+
agent.on('keylog',common.mustNotCall());
56+
assert.strictEqual(agent.listenerCount('keylog'),1);
57+
58+
// Every existing socket, idle or in use, is now listening.
59+
for(constsetof[agent.freeSockets,agent.sockets]){
60+
for(constbucketofObject.values(set)){
61+
for(constsocketofbucket){
62+
assert.strictEqual(socket.listenerCount('keylog'),1);
63+
}
64+
}
65+
}
66+
}));
67+
}));
68+
}));
69+
}));
70+
}));
71+
}));
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 6c3516f
Browse files
shani-singh1aduh95
shani-singh1
authored and
aduh95
committed
http: fix keylog listener setup on existing agent sockets
`maybeEnableKeylog()` runs as the agent's `'newListener'` handler and
attaches the agent's keylog handler to the sockets the agent already
owns. `agent.sockets` maps a name to an array of sockets, but the loop
treated those arrays as sockets and called `.on()` on them.
Adding a `'keylog'` listener to an agent that already owned a socket
therefore threw `TypeError: sockets[i].on is not a function` out of
`agent.on('keylog', ...)`. Since the throw happened inside the
`'newListener'` handler it propagated before the listener was stored,
so the caller got an exception and no listener. Sockets parked in
`agent.freeSockets` were never visited at all.
Walk both maps the way `Agent.prototype.destroy()` does.
Signed-off-by: Shani Singh <teamdeveloperworld@gmail.com>
PR-URL: #65066
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 613be79 commit 6c3516f
2 files changed
Lines changed: 82 additions & 4 deletions
File tree
‎lib/_http_agent.js‎
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ function maybeEnableKeylog(eventName) {
278278
this[kOnKeylog]=functiononkeylog(keylog){
279279
agent.emit('keylog',keylog,this);
280280
};
281-
// Existing sockets will start listening on keylog now.
282-
constsockets=ObjectValues(this.sockets);
283-
for(leti=0;i<sockets.length;i++){
284-
sockets[i].on('keylog',this[kOnKeylog]);
281+
// Existing sockets will start listening on keylog now. Both maps hold
282+
// arrays of sockets keyed by name, so each bucket has to be walked.
283+
constsets=[this.freeSockets,this.sockets];
284+
for(lets=0;s<sets.length;s++){
285+
constbuckets=ObjectValues(sets[s]);
286+
for(letb=0;b<buckets.length;b++){
287+
constsockets=buckets[b];
288+
for(letn=0;n<sockets.length;n++){
289+
sockets[n].on('keylog',this[kOnKeylog]);
290+
}
291+
}
285292
}
286293
}
287294
}
‎test/parallel/test-http-agent-keylog-existing-sockets.js‎
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
7+
// Adding a 'keylog' listener to an agent is wired up by maybeEnableKeylog(),
8+
// which attaches the agent's keylog handler to the sockets the agent already
9+
// owns. `agent.sockets` and `agent.freeSockets` map a name to an *array* of
10+
// sockets, so each bucket has to be walked. Treating the buckets themselves as
11+
// sockets threw a TypeError out of `agent.on('keylog', ...)`, which also meant
12+
// the listener was never registered.
13+
14+
// Two servers so the two sockets get different names, which keeps one parked
15+
// in freeSockets instead of being reused by the second request.
16+
constidleServer=http.createServer((req,res)=>res.end('idle'));
17+
constbusyServer=http.createServer((req,res)=>{
18+
setTimeout(()=>res.end('busy'),common.platformTimeout(200));
19+
});
20+
21+
functioncountSockets(agent){
22+
letfree=0;
23+
letactive=0;
24+
for(constbucketofObject.values(agent.freeSockets))free+=bucket.length;
25+
for(constbucketofObject.values(agent.sockets))active+=bucket.length;
26+
return{ free, active };
27+
}
28+
29+
idleServer.listen(0,common.mustCall(()=>{
30+
busyServer.listen(0,common.mustCall(()=>{
31+
constagent=newhttp.Agent({keepAlive: true,maxSockets: 4});
32+
33+
// First request finishes, so its socket is released into freeSockets.
34+
http.get({port: idleServer.address().port, agent },common.mustCall((res)=>{
35+
res.resume();
36+
res.on('end',common.mustCall(()=>{
37+
// Second request is still in flight, so its socket is in sockets.
38+
constreq=http.get({port: busyServer.address().port, agent },
39+
common.mustCall((res2)=>{
40+
res2.resume();
41+
res2.on('end',common.mustCall(()=>{
42+
agent.destroy();
43+
idleServer.close();
44+
busyServer.close();
45+
}));
46+
}));
47+
48+
req.on('socket',common.mustCall(()=>{
49+
setImmediate(common.mustCall(()=>{
50+
const{ free, active }=countSockets(agent);
51+
assert.strictEqual(free,1);
52+
assert.strictEqual(active,1);
53+
54+
// Used to throw `TypeError: sockets[i].on is not a function`.
55+
agent.on('keylog',common.mustNotCall());
56+
assert.strictEqual(agent.listenerCount('keylog'),1);
57+
58+
// Every existing socket, idle or in use, is now listening.
59+
for(constsetof[agent.freeSockets,agent.sockets]){
60+
for(constbucketofObject.values(set)){
61+
for(constsocketofbucket){
62+
assert.strictEqual(socket.listenerCount('keylog'),1);
63+
}
64+
}
65+
}
66+
}));
67+
}));
68+
}));
69+
}));
70+
}));
71+
}));
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 6c3516f
Browse files
shani-singh1aduh95
shani-singh1
authored and
aduh95
committed
http: fix keylog listener setup on existing agent sockets
`maybeEnableKeylog()` runs as the agent's `'newListener'` handler and
attaches the agent's keylog handler to the sockets the agent already
owns. `agent.sockets` maps a name to an array of sockets, but the loop
treated those arrays as sockets and called `.on()` on them.
Adding a `'keylog'` listener to an agent that already owned a socket
therefore threw `TypeError: sockets[i].on is not a function` out of
`agent.on('keylog', ...)`. Since the throw happened inside the
`'newListener'` handler it propagated before the listener was stored,
so the caller got an exception and no listener. Sockets parked in
`agent.freeSockets` were never visited at all.
Walk both maps the way `Agent.prototype.destroy()` does.
Signed-off-by: Shani Singh <teamdeveloperworld@gmail.com>
PR-URL: #65066
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 613be79 commit 6c3516f
2 files changed
Lines changed: 82 additions & 4 deletions
File tree
‎lib/_http_agent.js‎
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ function maybeEnableKeylog(eventName) {
278278
this[kOnKeylog]=functiononkeylog(keylog){
279279
agent.emit('keylog',keylog,this);
280280
};
281-
// Existing sockets will start listening on keylog now.
282-
constsockets=ObjectValues(this.sockets);
283-
for(leti=0;i<sockets.length;i++){
284-
sockets[i].on('keylog',this[kOnKeylog]);
281+
// Existing sockets will start listening on keylog now. Both maps hold
282+
// arrays of sockets keyed by name, so each bucket has to be walked.
283+
constsets=[this.freeSockets,this.sockets];
284+
for(lets=0;s<sets.length;s++){
285+
constbuckets=ObjectValues(sets[s]);
286+
for(letb=0;b<buckets.length;b++){
287+
constsockets=buckets[b];
288+
for(letn=0;n<sockets.length;n++){
289+
sockets[n].on('keylog',this[kOnKeylog]);
290+
}
291+
}
285292
}
286293
}
287294
}
‎test/parallel/test-http-agent-keylog-existing-sockets.js‎
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
7+
// Adding a 'keylog' listener to an agent is wired up by maybeEnableKeylog(),
8+
// which attaches the agent's keylog handler to the sockets the agent already
9+
// owns. `agent.sockets` and `agent.freeSockets` map a name to an *array* of
10+
// sockets, so each bucket has to be walked. Treating the buckets themselves as
11+
// sockets threw a TypeError out of `agent.on('keylog', ...)`, which also meant
12+
// the listener was never registered.
13+
14+
// Two servers so the two sockets get different names, which keeps one parked
15+
// in freeSockets instead of being reused by the second request.
16+
constidleServer=http.createServer((req,res)=>res.end('idle'));
17+
constbusyServer=http.createServer((req,res)=>{
18+
setTimeout(()=>res.end('busy'),common.platformTimeout(200));
19+
});
20+
21+
functioncountSockets(agent){
22+
letfree=0;
23+
letactive=0;
24+
for(constbucketofObject.values(agent.freeSockets))free+=bucket.length;
25+
for(constbucketofObject.values(agent.sockets))active+=bucket.length;
26+
return{ free, active };
27+
}
28+
29+
idleServer.listen(0,common.mustCall(()=>{
30+
busyServer.listen(0,common.mustCall(()=>{
31+
constagent=newhttp.Agent({keepAlive: true,maxSockets: 4});
32+
33+
// First request finishes, so its socket is released into freeSockets.
34+
http.get({port: idleServer.address().port, agent },common.mustCall((res)=>{
35+
res.resume();
36+
res.on('end',common.mustCall(()=>{
37+
// Second request is still in flight, so its socket is in sockets.
38+
constreq=http.get({port: busyServer.address().port, agent },
39+
common.mustCall((res2)=>{
40+
res2.resume();
41+
res2.on('end',common.mustCall(()=>{
42+
agent.destroy();
43+
idleServer.close();
44+
busyServer.close();
45+
}));
46+
}));
47+
48+
req.on('socket',common.mustCall(()=>{
49+
setImmediate(common.mustCall(()=>{
50+
const{ free, active }=countSockets(agent);
51+
assert.strictEqual(free,1);
52+
assert.strictEqual(active,1);
53+
54+
// Used to throw `TypeError: sockets[i].on is not a function`.
55+
agent.on('keylog',common.mustNotCall());
56+
assert.strictEqual(agent.listenerCount('keylog'),1);
57+
58+
// Every existing socket, idle or in use, is now listening.
59+
for(constsetof[agent.freeSockets,agent.sockets]){
60+
for(constbucketofObject.values(set)){
61+
for(constsocketofbucket){
62+
assert.strictEqual(socket.listenerCount('keylog'),1);
63+
}
64+
}
65+
}
66+
}));
67+
}));
68+
}));
69+
}));
70+
}));
71+
}));
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 6c3516f
Browse files
shani-singh1aduh95
shani-singh1
authored and
aduh95
committed
http: fix keylog listener setup on existing agent sockets
`maybeEnableKeylog()` runs as the agent's `'newListener'` handler and
attaches the agent's keylog handler to the sockets the agent already
owns. `agent.sockets` maps a name to an array of sockets, but the loop
treated those arrays as sockets and called `.on()` on them.
Adding a `'keylog'` listener to an agent that already owned a socket
therefore threw `TypeError: sockets[i].on is not a function` out of
`agent.on('keylog', ...)`. Since the throw happened inside the
`'newListener'` handler it propagated before the listener was stored,
so the caller got an exception and no listener. Sockets parked in
`agent.freeSockets` were never visited at all.
Walk both maps the way `Agent.prototype.destroy()` does.
Signed-off-by: Shani Singh <teamdeveloperworld@gmail.com>
PR-URL: #65066
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 613be79 commit 6c3516f
2 files changed
Lines changed: 82 additions & 4 deletions
File tree
‎lib/_http_agent.js‎
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ function maybeEnableKeylog(eventName) {
278278
this[kOnKeylog]=functiononkeylog(keylog){
279279
agent.emit('keylog',keylog,this);
280280
};
281-
// Existing sockets will start listening on keylog now.
282-
constsockets=ObjectValues(this.sockets);
283-
for(leti=0;i<sockets.length;i++){
284-
sockets[i].on('keylog',this[kOnKeylog]);
281+
// Existing sockets will start listening on keylog now. Both maps hold
282+
// arrays of sockets keyed by name, so each bucket has to be walked.
283+
constsets=[this.freeSockets,this.sockets];
284+
for(lets=0;s<sets.length;s++){
285+
constbuckets=ObjectValues(sets[s]);
286+
for(letb=0;b<buckets.length;b++){
287+
constsockets=buckets[b];
288+
for(letn=0;n<sockets.length;n++){
289+
sockets[n].on('keylog',this[kOnKeylog]);
290+
}
291+
}
285292
}
286293
}
287294
}
‎test/parallel/test-http-agent-keylog-existing-sockets.js‎
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
7+
// Adding a 'keylog' listener to an agent is wired up by maybeEnableKeylog(),
8+
// which attaches the agent's keylog handler to the sockets the agent already
9+
// owns. `agent.sockets` and `agent.freeSockets` map a name to an *array* of
10+
// sockets, so each bucket has to be walked. Treating the buckets themselves as
11+
// sockets threw a TypeError out of `agent.on('keylog', ...)`, which also meant
12+
// the listener was never registered.
13+
14+
// Two servers so the two sockets get different names, which keeps one parked
15+
// in freeSockets instead of being reused by the second request.
16+
constidleServer=http.createServer((req,res)=>res.end('idle'));
17+
constbusyServer=http.createServer((req,res)=>{
18+
setTimeout(()=>res.end('busy'),common.platformTimeout(200));
19+
});
20+
21+
functioncountSockets(agent){
22+
letfree=0;
23+
letactive=0;
24+
for(constbucketofObject.values(agent.freeSockets))free+=bucket.length;
25+
for(constbucketofObject.values(agent.sockets))active+=bucket.length;
26+
return{ free, active };
27+
}
28+
29+
idleServer.listen(0,common.mustCall(()=>{
30+
busyServer.listen(0,common.mustCall(()=>{
31+
constagent=newhttp.Agent({keepAlive: true,maxSockets: 4});
32+
33+
// First request finishes, so its socket is released into freeSockets.
34+
http.get({port: idleServer.address().port, agent },common.mustCall((res)=>{
35+
res.resume();
36+
res.on('end',common.mustCall(()=>{
37+
// Second request is still in flight, so its socket is in sockets.
38+
constreq=http.get({port: busyServer.address().port, agent },
39+
common.mustCall((res2)=>{
40+
res2.resume();
41+
res2.on('end',common.mustCall(()=>{
42+
agent.destroy();
43+
idleServer.close();
44+
busyServer.close();
45+
}));
46+
}));
47+
48+
req.on('socket',common.mustCall(()=>{
49+
setImmediate(common.mustCall(()=>{
50+
const{ free, active }=countSockets(agent);
51+
assert.strictEqual(free,1);
52+
assert.strictEqual(active,1);
53+
54+
// Used to throw `TypeError: sockets[i].on is not a function`.
55+
agent.on('keylog',common.mustNotCall());
56+
assert.strictEqual(agent.listenerCount('keylog'),1);
57+
58+
// Every existing socket, idle or in use, is now listening.
59+
for(constsetof[agent.freeSockets,agent.sockets]){
60+
for(constbucketofObject.values(set)){
61+
for(constsocketofbucket){
62+
assert.strictEqual(socket.listenerCount('keylog'),1);
63+
}
64+
}
65+
}
66+
}));
67+
}));
68+
}));
69+
}));
70+
}));
71+
}));
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 6c3516f
Browse files
shani-singh1aduh95
shani-singh1
authored and
aduh95
committed
http: fix keylog listener setup on existing agent sockets
`maybeEnableKeylog()` runs as the agent's `'newListener'` handler and
attaches the agent's keylog handler to the sockets the agent already
owns. `agent.sockets` maps a name to an array of sockets, but the loop
treated those arrays as sockets and called `.on()` on them.
Adding a `'keylog'` listener to an agent that already owned a socket
therefore threw `TypeError: sockets[i].on is not a function` out of
`agent.on('keylog', ...)`. Since the throw happened inside the
`'newListener'` handler it propagated before the listener was stored,
so the caller got an exception and no listener. Sockets parked in
`agent.freeSockets` were never visited at all.
Walk both maps the way `Agent.prototype.destroy()` does.
Signed-off-by: Shani Singh <teamdeveloperworld@gmail.com>
PR-URL: #65066
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 613be79 commit 6c3516f
2 files changed
Lines changed: 82 additions & 4 deletions
File tree
‎lib/_http_agent.js‎
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,17 @@ function maybeEnableKeylog(eventName) {
278278
this[kOnKeylog]=functiononkeylog(keylog){
279279
agent.emit('keylog',keylog,this);
280280
};
281-
// Existing sockets will start listening on keylog now.
282-
constsockets=ObjectValues(this.sockets);
283-
for(leti=0;i<sockets.length;i++){
284-
sockets[i].on('keylog',this[kOnKeylog]);
281+
// Existing sockets will start listening on keylog now. Both maps hold
282+
// arrays of sockets keyed by name, so each bucket has to be walked.
283+
constsets=[this.freeSockets,this.sockets];
284+
for(lets=0;s<sets.length;s++){
285+
constbuckets=ObjectValues(sets[s]);
286+
for(letb=0;b<buckets.length;b++){
287+
constsockets=buckets[b];
288+
for(letn=0;n<sockets.length;n++){
289+
sockets[n].on('keylog',this[kOnKeylog]);
290+
}
291+
}
285292
}
286293
}
287294
}
‎test/parallel/test-http-agent-keylog-existing-sockets.js‎
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
constassert=require('assert');
5+
consthttp=require('http');
6+
7+
// Adding a 'keylog' listener to an agent is wired up by maybeEnableKeylog(),
8+
// which attaches the agent's keylog handler to the sockets the agent already
9+
// owns. `agent.sockets` and `agent.freeSockets` map a name to an *array* of
10+
// sockets, so each bucket has to be walked. Treating the buckets themselves as
11+
// sockets threw a TypeError out of `agent.on('keylog', ...)`, which also meant
12+
// the listener was never registered.
13+
14+
// Two servers so the two sockets get different names, which keeps one parked
15+
// in freeSockets instead of being reused by the second request.
16+
constidleServer=http.createServer((req,res)=>res.end('idle'));
17+
constbusyServer=http.createServer((req,res)=>{
18+
setTimeout(()=>res.end('busy'),common.platformTimeout(200));
19+
});
20+
21+
functioncountSockets(agent){
22+
letfree=0;
23+
letactive=0;
24+
for(constbucketofObject.values(agent.freeSockets))free+=bucket.length;
25+
for(constbucketofObject.values(agent.sockets))active+=bucket.length;
26+
return{ free, active };
27+
}
28+
29+
idleServer.listen(0,common.mustCall(()=>{
30+
busyServer.listen(0,common.mustCall(()=>{
31+
constagent=newhttp.Agent({keepAlive: true,maxSockets: 4});
32+
33+
// First request finishes, so its socket is released into freeSockets.
34+
http.get({port: idleServer.address().port, agent },common.mustCall((res)=>{
35+
res.resume();
36+
res.on('end',common.mustCall(()=>{
37+
// Second request is still in flight, so its socket is in sockets.
38+
constreq=http.get({port: busyServer.address().port, agent },
39+
common.mustCall((res2)=>{
40+
res2.resume();
41+
res2.on('end',common.mustCall(()=>{
42+
agent.destroy();
43+
idleServer.close();
44+
busyServer.close();
45+
}));
46+
}));
47+
48+
req.on('socket',common.mustCall(()=>{
49+
setImmediate(common.mustCall(()=>{
50+
const{ free, active }=countSockets(agent);
51+
assert.strictEqual(free,1);
52+
assert.strictEqual(active,1);
53+
54+
// Used to throw `TypeError: sockets[i].on is not a function`.
55+
agent.on('keylog',common.mustNotCall());
56+
assert.strictEqual(agent.listenerCount('keylog'),1);
57+
58+
// Every existing socket, idle or in use, is now listening.
59+
for(constsetof[agent.freeSockets,agent.sockets]){
60+
for(constbucketofObject.values(set)){
61+
for(constsocketofbucket){
62+
assert.strictEqual(socket.listenerCount('keylog'),1);
63+
}
64+
}
65+
}
66+
}));
67+
}));
68+
}));
69+
}));
70+
}));
71+
}));
0 commit comments
Comments
 (0)