Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/_http_client.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,8 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
const kError = Symbol('kError');
const kPath = Symbol('kPath');
const kAuthority = Symbol('kAuthority');
const kProxyRewrittenToAbsolute = Symbol('kProxyRewrittenToAbsolute');

const HTTP_CLIENT_TRACE_EVENT_NAME = 'http.client.request';

Expand DownExpand Up@@ -318,6 +320,7 @@ function rewriteForProxiedHttp(req, reqOptions, proxyAuthority, userHostHeader,
if (requestURL !== undefined) {
// Convert the path to absolute-form. The authority is built from options.
req.path = requestURL.href;
req[kProxyRewrittenToAbsolute] = true;
}
debug(`updated request for HTTP proxy ${href} with ${req.path} `, req[kOutHeaders]);
return true;
Expand DownExpand Up@@ -479,6 +482,7 @@ function ClientRequest(input, options, cb) {
this.reusedSocket = false;
this.host = host;
this.protocol = protocol;
this[kProxyRewrittenToAbsolute] = false;

if (this.agent) {
// If there is an agent we should default to Connection:keep-alive,
Expand DownExpand Up@@ -509,6 +513,9 @@ function ClientRequest(input, options, cb) {
if (port && +port !== defaultPort) {
hostHeaderFromOptions += ':' + port;
}
// Preserve the request authority (with the port when non-default) so that
// the perf_hooks entry can report a faithful URL.
this[kAuthority] = hostHeaderFromOptions;
const headersArray = ArrayIsArray(options.headers);
if (!headersArray) {
if (options.headers) {
Expand DownExpand Up@@ -627,7 +634,11 @@ ClientRequest.prototype._finish = function _finish() {
detail: {
req: {
method: this.method,
url: `${this.protocol}//${this.host}${this.path}`,
// If the path has been rewritten to absolute-form for proxying,
// it is already a full URL.
url: this[kProxyRewrittenToAbsolute] ?
this.path :
`${this.protocol}//${this[kAuthority]}${this.path}`,
headers: typeof this.getHeaders === 'function' ? this.getHeaders() : {},
},
},
Expand Down
63 changes: 63 additions & 0 deletions test/client-proxy/test-http-proxy-perf-hooks.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// This tests that when a request path is rewritten to absolute-form for
// proxying, the perf_hooks HTTP entries report it as the URL as-is, instead
// of appending it to the protocol and authority again.
// Refs: https://github.com/nodejs/node/issues/59625
import * as common from '../common/index.mjs';
import assert from 'node:assert';
import { once } from 'events';
import http from 'node:http';
import { PerformanceObserver } from 'node:perf_hooks';
import { createProxyServer } from '../common/proxy-server.js';

const entries = [];
const obs = new PerformanceObserver(common.mustCallAtLeast((items) => {
entries.push(...items.getEntries());
}));
obs.observe({ type: 'http' });

// Start a server to process the final request.
const server = http.createServer(common.mustCall((req, res) => {
res.end('Hello world');
}));
server.on('error', common.mustNotCall((err) => { console.error('Server error', err); }));
server.listen(0);
await once(server, 'listening');

// Start a minimal proxy server.
const { proxy, logs } = createProxyServer();
proxy.listen(0);
await once(proxy, 'listening');

const requestUrl = `http://localhost:${server.address().port}/test`;
const agent = new http.Agent({
proxyEnv: {
HTTP_PROXY: `http://localhost:${proxy.address().port}`,
},
});

const res = await new Promise((resolve, reject) => {
http.request(requestUrl, { agent }, resolve).on('error', reject).end();
});
res.resume();
await once(res, 'end');

// Verify that the request went through the proxy.
assert.strictEqual(logs.length, 1);
assert.strictEqual(logs[0].url, requestUrl);

proxy.close();
server.close();

process.on('exit', () => {
// Two HttpClient entries are expected: one for the proxied request, one for
// the request the proxy makes to forward it. Both should report the full
// URL, including the port.
const clientUrls = entries.filter((entry) => entry.name === 'HttpClient')
.map((entry) => entry.detail.req.url);
assert.deepStrictEqual(clientUrls, [requestUrl, requestUrl]);
// Two HttpRequest entries are expected: the proxy server receives the
// request target in absolute-form, the final server in origin-form.
const requestUrls = entries.filter((entry) => entry.name === 'HttpRequest')
.map((entry) => entry.detail.req.url).sort();
assert.deepStrictEqual(requestUrls, ['/test', requestUrl].sort());
});
17 changes: 11 additions & 6 deletions test/parallel/test-http-perf_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,16 +36,18 @@ const server = http.Server(common.mustCall((req, res) => {
}));
}, 2));

let port;
server.listen(0, common.mustCall(async () => {
port = server.address().port;
await Promise.all([
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
}),
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
Expand All@@ -63,14 +65,17 @@ process.on('exit', () => {
assert.strictEqual(typeof entry.duration, 'number');
if (entry.name === 'HttpClient') {
numberOfHttpClients++;
// The reported URL must include the port when it is non-default.
// Refs: https://github.com/nodejs/node/issues/59625
assert.strictEqual(entry.detail.req.url, `http://localhost:${port}/`);
} else if (entry.name === 'HttpRequest') {
numberOfHttpRequests++;
assert.strictEqual(entry.detail.req.url, '/');
}
assert.strictEqual(typeof entry.detail.req.method, 'string');
assert.strictEqual(typeof entry.detail.req.url, 'string');
assert.strictEqual(entry.detail.req.method, 'POST');
assert.strictEqual(typeof entry.detail.req.headers, 'object');
assert.strictEqual(typeof entry.detail.res.statusCode, 'number');
assert.strictEqual(typeof entry.detail.res.statusMessage, 'string');
assert.strictEqual(entry.detail.res.statusCode, 200);
assert.strictEqual(entry.detail.res.statusMessage, 'OK');
assert.strictEqual(typeof entry.detail.res.headers, 'object');
}
assert.strictEqual(numberOfHttpClients, 2);
Expand Down
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/_http_client.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,8 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
const kError = Symbol('kError');
const kPath = Symbol('kPath');
const kAuthority = Symbol('kAuthority');
const kProxyRewrittenToAbsolute = Symbol('kProxyRewrittenToAbsolute');

const HTTP_CLIENT_TRACE_EVENT_NAME = 'http.client.request';

Expand DownExpand Up@@ -318,6 +320,7 @@ function rewriteForProxiedHttp(req, reqOptions, proxyAuthority, userHostHeader,
if (requestURL !== undefined) {
// Convert the path to absolute-form. The authority is built from options.
req.path = requestURL.href;
req[kProxyRewrittenToAbsolute] = true;
}
debug(`updated request for HTTP proxy ${href} with ${req.path} `, req[kOutHeaders]);
return true;
Expand DownExpand Up@@ -479,6 +482,7 @@ function ClientRequest(input, options, cb) {
this.reusedSocket = false;
this.host = host;
this.protocol = protocol;
this[kProxyRewrittenToAbsolute] = false;

if (this.agent) {
// If there is an agent we should default to Connection:keep-alive,
Expand DownExpand Up@@ -509,6 +513,9 @@ function ClientRequest(input, options, cb) {
if (port && +port !== defaultPort) {
hostHeaderFromOptions += ':' + port;
}
// Preserve the request authority (with the port when non-default) so that
// the perf_hooks entry can report a faithful URL.
this[kAuthority] = hostHeaderFromOptions;
const headersArray = ArrayIsArray(options.headers);
if (!headersArray) {
if (options.headers) {
Expand DownExpand Up@@ -627,7 +634,11 @@ ClientRequest.prototype._finish = function _finish() {
detail: {
req: {
method: this.method,
url: `${this.protocol}//${this.host}${this.path}`,
// If the path has been rewritten to absolute-form for proxying,
// it is already a full URL.
url: this[kProxyRewrittenToAbsolute] ?
this.path :
`${this.protocol}//${this[kAuthority]}${this.path}`,
headers: typeof this.getHeaders === 'function' ? this.getHeaders() : {},
},
},
Expand Down
63 changes: 63 additions & 0 deletions test/client-proxy/test-http-proxy-perf-hooks.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// This tests that when a request path is rewritten to absolute-form for
// proxying, the perf_hooks HTTP entries report it as the URL as-is, instead
// of appending it to the protocol and authority again.
// Refs: https://github.com/nodejs/node/issues/59625
import * as common from '../common/index.mjs';
import assert from 'node:assert';
import { once } from 'events';
import http from 'node:http';
import { PerformanceObserver } from 'node:perf_hooks';
import { createProxyServer } from '../common/proxy-server.js';

const entries = [];
const obs = new PerformanceObserver(common.mustCallAtLeast((items) => {
entries.push(...items.getEntries());
}));
obs.observe({ type: 'http' });

// Start a server to process the final request.
const server = http.createServer(common.mustCall((req, res) => {
res.end('Hello world');
}));
server.on('error', common.mustNotCall((err) => { console.error('Server error', err); }));
server.listen(0);
await once(server, 'listening');

// Start a minimal proxy server.
const { proxy, logs } = createProxyServer();
proxy.listen(0);
await once(proxy, 'listening');

const requestUrl = `http://localhost:${server.address().port}/test`;
const agent = new http.Agent({
proxyEnv: {
HTTP_PROXY: `http://localhost:${proxy.address().port}`,
},
});

const res = await new Promise((resolve, reject) => {
http.request(requestUrl, { agent }, resolve).on('error', reject).end();
});
res.resume();
await once(res, 'end');

// Verify that the request went through the proxy.
assert.strictEqual(logs.length, 1);
assert.strictEqual(logs[0].url, requestUrl);

proxy.close();
server.close();

process.on('exit', () => {
// Two HttpClient entries are expected: one for the proxied request, one for
// the request the proxy makes to forward it. Both should report the full
// URL, including the port.
const clientUrls = entries.filter((entry) => entry.name === 'HttpClient')
.map((entry) => entry.detail.req.url);
assert.deepStrictEqual(clientUrls, [requestUrl, requestUrl]);
// Two HttpRequest entries are expected: the proxy server receives the
// request target in absolute-form, the final server in origin-form.
const requestUrls = entries.filter((entry) => entry.name === 'HttpRequest')
.map((entry) => entry.detail.req.url).sort();
assert.deepStrictEqual(requestUrls, ['/test', requestUrl].sort());
});
17 changes: 11 additions & 6 deletions test/parallel/test-http-perf_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,16 +36,18 @@ const server = http.Server(common.mustCall((req, res) => {
}));
}, 2));

let port;
server.listen(0, common.mustCall(async () => {
port = server.address().port;
await Promise.all([
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
}),
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
Expand All@@ -63,14 +65,17 @@ process.on('exit', () => {
assert.strictEqual(typeof entry.duration, 'number');
if (entry.name === 'HttpClient') {
numberOfHttpClients++;
// The reported URL must include the port when it is non-default.
// Refs: https://github.com/nodejs/node/issues/59625
assert.strictEqual(entry.detail.req.url, `http://localhost:${port}/`);
} else if (entry.name === 'HttpRequest') {
numberOfHttpRequests++;
assert.strictEqual(entry.detail.req.url, '/');
}
assert.strictEqual(typeof entry.detail.req.method, 'string');
assert.strictEqual(typeof entry.detail.req.url, 'string');
assert.strictEqual(entry.detail.req.method, 'POST');
assert.strictEqual(typeof entry.detail.req.headers, 'object');
assert.strictEqual(typeof entry.detail.res.statusCode, 'number');
assert.strictEqual(typeof entry.detail.res.statusMessage, 'string');
assert.strictEqual(entry.detail.res.statusCode, 200);
assert.strictEqual(entry.detail.res.statusMessage, 'OK');
assert.strictEqual(typeof entry.detail.res.headers, 'object');
}
assert.strictEqual(numberOfHttpClients, 2);
Expand Down
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/_http_client.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,8 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
const kError = Symbol('kError');
const kPath = Symbol('kPath');
const kAuthority = Symbol('kAuthority');
const kProxyRewrittenToAbsolute = Symbol('kProxyRewrittenToAbsolute');

const HTTP_CLIENT_TRACE_EVENT_NAME = 'http.client.request';

Expand DownExpand Up@@ -318,6 +320,7 @@ function rewriteForProxiedHttp(req, reqOptions, proxyAuthority, userHostHeader,
if (requestURL !== undefined) {
// Convert the path to absolute-form. The authority is built from options.
req.path = requestURL.href;
req[kProxyRewrittenToAbsolute] = true;
}
debug(`updated request for HTTP proxy ${href} with ${req.path} `, req[kOutHeaders]);
return true;
Expand DownExpand Up@@ -479,6 +482,7 @@ function ClientRequest(input, options, cb) {
this.reusedSocket = false;
this.host = host;
this.protocol = protocol;
this[kProxyRewrittenToAbsolute] = false;

if (this.agent) {
// If there is an agent we should default to Connection:keep-alive,
Expand DownExpand Up@@ -509,6 +513,9 @@ function ClientRequest(input, options, cb) {
if (port && +port !== defaultPort) {
hostHeaderFromOptions += ':' + port;
}
// Preserve the request authority (with the port when non-default) so that
// the perf_hooks entry can report a faithful URL.
this[kAuthority] = hostHeaderFromOptions;
const headersArray = ArrayIsArray(options.headers);
if (!headersArray) {
if (options.headers) {
Expand DownExpand Up@@ -627,7 +634,11 @@ ClientRequest.prototype._finish = function _finish() {
detail: {
req: {
method: this.method,
url: `${this.protocol}//${this.host}${this.path}`,
// If the path has been rewritten to absolute-form for proxying,
// it is already a full URL.
url: this[kProxyRewrittenToAbsolute] ?
this.path :
`${this.protocol}//${this[kAuthority]}${this.path}`,
headers: typeof this.getHeaders === 'function' ? this.getHeaders() : {},
},
},
Expand Down
63 changes: 63 additions & 0 deletions test/client-proxy/test-http-proxy-perf-hooks.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// This tests that when a request path is rewritten to absolute-form for
// proxying, the perf_hooks HTTP entries report it as the URL as-is, instead
// of appending it to the protocol and authority again.
// Refs: https://github.com/nodejs/node/issues/59625
import * as common from '../common/index.mjs';
import assert from 'node:assert';
import { once } from 'events';
import http from 'node:http';
import { PerformanceObserver } from 'node:perf_hooks';
import { createProxyServer } from '../common/proxy-server.js';

const entries = [];
const obs = new PerformanceObserver(common.mustCallAtLeast((items) => {
entries.push(...items.getEntries());
}));
obs.observe({ type: 'http' });

// Start a server to process the final request.
const server = http.createServer(common.mustCall((req, res) => {
res.end('Hello world');
}));
server.on('error', common.mustNotCall((err) => { console.error('Server error', err); }));
server.listen(0);
await once(server, 'listening');

// Start a minimal proxy server.
const { proxy, logs } = createProxyServer();
proxy.listen(0);
await once(proxy, 'listening');

const requestUrl = `http://localhost:${server.address().port}/test`;
const agent = new http.Agent({
proxyEnv: {
HTTP_PROXY: `http://localhost:${proxy.address().port}`,
},
});

const res = await new Promise((resolve, reject) => {
http.request(requestUrl, { agent }, resolve).on('error', reject).end();
});
res.resume();
await once(res, 'end');

// Verify that the request went through the proxy.
assert.strictEqual(logs.length, 1);
assert.strictEqual(logs[0].url, requestUrl);

proxy.close();
server.close();

process.on('exit', () => {
// Two HttpClient entries are expected: one for the proxied request, one for
// the request the proxy makes to forward it. Both should report the full
// URL, including the port.
const clientUrls = entries.filter((entry) => entry.name === 'HttpClient')
.map((entry) => entry.detail.req.url);
assert.deepStrictEqual(clientUrls, [requestUrl, requestUrl]);
// Two HttpRequest entries are expected: the proxy server receives the
// request target in absolute-form, the final server in origin-form.
const requestUrls = entries.filter((entry) => entry.name === 'HttpRequest')
.map((entry) => entry.detail.req.url).sort();
assert.deepStrictEqual(requestUrls, ['/test', requestUrl].sort());
});
17 changes: 11 additions & 6 deletions test/parallel/test-http-perf_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,16 +36,18 @@ const server = http.Server(common.mustCall((req, res) => {
}));
}, 2));

let port;
server.listen(0, common.mustCall(async () => {
port = server.address().port;
await Promise.all([
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
}),
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
Expand All@@ -63,14 +65,17 @@ process.on('exit', () => {
assert.strictEqual(typeof entry.duration, 'number');
if (entry.name === 'HttpClient') {
numberOfHttpClients++;
// The reported URL must include the port when it is non-default.
// Refs: https://github.com/nodejs/node/issues/59625
assert.strictEqual(entry.detail.req.url, `http://localhost:${port}/`);
} else if (entry.name === 'HttpRequest') {
numberOfHttpRequests++;
assert.strictEqual(entry.detail.req.url, '/');
}
assert.strictEqual(typeof entry.detail.req.method, 'string');
assert.strictEqual(typeof entry.detail.req.url, 'string');
assert.strictEqual(entry.detail.req.method, 'POST');
assert.strictEqual(typeof entry.detail.req.headers, 'object');
assert.strictEqual(typeof entry.detail.res.statusCode, 'number');
assert.strictEqual(typeof entry.detail.res.statusMessage, 'string');
assert.strictEqual(entry.detail.res.statusCode, 200);
assert.strictEqual(entry.detail.res.statusMessage, 'OK');
assert.strictEqual(typeof entry.detail.res.headers, 'object');
}
assert.strictEqual(numberOfHttpClients, 2);
Expand Down
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/_http_client.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,8 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
const kError = Symbol('kError');
const kPath = Symbol('kPath');
const kAuthority = Symbol('kAuthority');
const kProxyRewrittenToAbsolute = Symbol('kProxyRewrittenToAbsolute');

const HTTP_CLIENT_TRACE_EVENT_NAME = 'http.client.request';

Expand DownExpand Up@@ -318,6 +320,7 @@ function rewriteForProxiedHttp(req, reqOptions, proxyAuthority, userHostHeader,
if (requestURL !== undefined) {
// Convert the path to absolute-form. The authority is built from options.
req.path = requestURL.href;
req[kProxyRewrittenToAbsolute] = true;
}
debug(`updated request for HTTP proxy ${href} with ${req.path} `, req[kOutHeaders]);
return true;
Expand DownExpand Up@@ -479,6 +482,7 @@ function ClientRequest(input, options, cb) {
this.reusedSocket = false;
this.host = host;
this.protocol = protocol;
this[kProxyRewrittenToAbsolute] = false;

if (this.agent) {
// If there is an agent we should default to Connection:keep-alive,
Expand DownExpand Up@@ -509,6 +513,9 @@ function ClientRequest(input, options, cb) {
if (port && +port !== defaultPort) {
hostHeaderFromOptions += ':' + port;
}
// Preserve the request authority (with the port when non-default) so that
// the perf_hooks entry can report a faithful URL.
this[kAuthority] = hostHeaderFromOptions;
const headersArray = ArrayIsArray(options.headers);
if (!headersArray) {
if (options.headers) {
Expand DownExpand Up@@ -627,7 +634,11 @@ ClientRequest.prototype._finish = function _finish() {
detail: {
req: {
method: this.method,
url: `${this.protocol}//${this.host}${this.path}`,
// If the path has been rewritten to absolute-form for proxying,
// it is already a full URL.
url: this[kProxyRewrittenToAbsolute] ?
this.path :
`${this.protocol}//${this[kAuthority]}${this.path}`,
headers: typeof this.getHeaders === 'function' ? this.getHeaders() : {},
},
},
Expand Down
63 changes: 63 additions & 0 deletions test/client-proxy/test-http-proxy-perf-hooks.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// This tests that when a request path is rewritten to absolute-form for
// proxying, the perf_hooks HTTP entries report it as the URL as-is, instead
// of appending it to the protocol and authority again.
// Refs: https://github.com/nodejs/node/issues/59625
import * as common from '../common/index.mjs';
import assert from 'node:assert';
import { once } from 'events';
import http from 'node:http';
import { PerformanceObserver } from 'node:perf_hooks';
import { createProxyServer } from '../common/proxy-server.js';

const entries = [];
const obs = new PerformanceObserver(common.mustCallAtLeast((items) => {
entries.push(...items.getEntries());
}));
obs.observe({ type: 'http' });

// Start a server to process the final request.
const server = http.createServer(common.mustCall((req, res) => {
res.end('Hello world');
}));
server.on('error', common.mustNotCall((err) => { console.error('Server error', err); }));
server.listen(0);
await once(server, 'listening');

// Start a minimal proxy server.
const { proxy, logs } = createProxyServer();
proxy.listen(0);
await once(proxy, 'listening');

const requestUrl = `http://localhost:${server.address().port}/test`;
const agent = new http.Agent({
proxyEnv: {
HTTP_PROXY: `http://localhost:${proxy.address().port}`,
},
});

const res = await new Promise((resolve, reject) => {
http.request(requestUrl, { agent }, resolve).on('error', reject).end();
});
res.resume();
await once(res, 'end');

// Verify that the request went through the proxy.
assert.strictEqual(logs.length, 1);
assert.strictEqual(logs[0].url, requestUrl);

proxy.close();
server.close();

process.on('exit', () => {
// Two HttpClient entries are expected: one for the proxied request, one for
// the request the proxy makes to forward it. Both should report the full
// URL, including the port.
const clientUrls = entries.filter((entry) => entry.name === 'HttpClient')
.map((entry) => entry.detail.req.url);
assert.deepStrictEqual(clientUrls, [requestUrl, requestUrl]);
// Two HttpRequest entries are expected: the proxy server receives the
// request target in absolute-form, the final server in origin-form.
const requestUrls = entries.filter((entry) => entry.name === 'HttpRequest')
.map((entry) => entry.detail.req.url).sort();
assert.deepStrictEqual(requestUrls, ['/test', requestUrl].sort());
});
17 changes: 11 additions & 6 deletions test/parallel/test-http-perf_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,16 +36,18 @@ const server = http.Server(common.mustCall((req, res) => {
}));
}, 2));

let port;
server.listen(0, common.mustCall(async () => {
port = server.address().port;
await Promise.all([
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
}),
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
Expand All@@ -63,14 +65,17 @@ process.on('exit', () => {
assert.strictEqual(typeof entry.duration, 'number');
if (entry.name === 'HttpClient') {
numberOfHttpClients++;
// The reported URL must include the port when it is non-default.
// Refs: https://github.com/nodejs/node/issues/59625
assert.strictEqual(entry.detail.req.url, `http://localhost:${port}/`);
} else if (entry.name === 'HttpRequest') {
numberOfHttpRequests++;
assert.strictEqual(entry.detail.req.url, '/');
}
assert.strictEqual(typeof entry.detail.req.method, 'string');
assert.strictEqual(typeof entry.detail.req.url, 'string');
assert.strictEqual(entry.detail.req.method, 'POST');
assert.strictEqual(typeof entry.detail.req.headers, 'object');
assert.strictEqual(typeof entry.detail.res.statusCode, 'number');
assert.strictEqual(typeof entry.detail.res.statusMessage, 'string');
assert.strictEqual(entry.detail.res.statusCode, 200);
assert.strictEqual(entry.detail.res.statusMessage, 'OK');
assert.strictEqual(typeof entry.detail.res.headers, 'object');
}
assert.strictEqual(numberOfHttpClients, 2);
Expand Down
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/_http_client.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,8 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
const kError = Symbol('kError');
const kPath = Symbol('kPath');
const kAuthority = Symbol('kAuthority');
const kProxyRewrittenToAbsolute = Symbol('kProxyRewrittenToAbsolute');

const HTTP_CLIENT_TRACE_EVENT_NAME = 'http.client.request';

Expand DownExpand Up@@ -318,6 +320,7 @@ function rewriteForProxiedHttp(req, reqOptions, proxyAuthority, userHostHeader,
if (requestURL !== undefined) {
// Convert the path to absolute-form. The authority is built from options.
req.path = requestURL.href;
req[kProxyRewrittenToAbsolute] = true;
}
debug(`updated request for HTTP proxy ${href} with ${req.path} `, req[kOutHeaders]);
return true;
Expand DownExpand Up@@ -479,6 +482,7 @@ function ClientRequest(input, options, cb) {
this.reusedSocket = false;
this.host = host;
this.protocol = protocol;
this[kProxyRewrittenToAbsolute] = false;

if (this.agent) {
// If there is an agent we should default to Connection:keep-alive,
Expand DownExpand Up@@ -509,6 +513,9 @@ function ClientRequest(input, options, cb) {
if (port && +port !== defaultPort) {
hostHeaderFromOptions += ':' + port;
}
// Preserve the request authority (with the port when non-default) so that
// the perf_hooks entry can report a faithful URL.
this[kAuthority] = hostHeaderFromOptions;
const headersArray = ArrayIsArray(options.headers);
if (!headersArray) {
if (options.headers) {
Expand DownExpand Up@@ -627,7 +634,11 @@ ClientRequest.prototype._finish = function _finish() {
detail: {
req: {
method: this.method,
url: `${this.protocol}//${this.host}${this.path}`,
// If the path has been rewritten to absolute-form for proxying,
// it is already a full URL.
url: this[kProxyRewrittenToAbsolute] ?
this.path :
`${this.protocol}//${this[kAuthority]}${this.path}`,
headers: typeof this.getHeaders === 'function' ? this.getHeaders() : {},
},
},
Expand Down
63 changes: 63 additions & 0 deletions test/client-proxy/test-http-proxy-perf-hooks.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// This tests that when a request path is rewritten to absolute-form for
// proxying, the perf_hooks HTTP entries report it as the URL as-is, instead
// of appending it to the protocol and authority again.
// Refs: https://github.com/nodejs/node/issues/59625
import * as common from '../common/index.mjs';
import assert from 'node:assert';
import { once } from 'events';
import http from 'node:http';
import { PerformanceObserver } from 'node:perf_hooks';
import { createProxyServer } from '../common/proxy-server.js';

const entries = [];
const obs = new PerformanceObserver(common.mustCallAtLeast((items) => {
entries.push(...items.getEntries());
}));
obs.observe({ type: 'http' });

// Start a server to process the final request.
const server = http.createServer(common.mustCall((req, res) => {
res.end('Hello world');
}));
server.on('error', common.mustNotCall((err) => { console.error('Server error', err); }));
server.listen(0);
await once(server, 'listening');

// Start a minimal proxy server.
const { proxy, logs } = createProxyServer();
proxy.listen(0);
await once(proxy, 'listening');

const requestUrl = `http://localhost:${server.address().port}/test`;
const agent = new http.Agent({
proxyEnv: {
HTTP_PROXY: `http://localhost:${proxy.address().port}`,
},
});

const res = await new Promise((resolve, reject) => {
http.request(requestUrl, { agent }, resolve).on('error', reject).end();
});
res.resume();
await once(res, 'end');

// Verify that the request went through the proxy.
assert.strictEqual(logs.length, 1);
assert.strictEqual(logs[0].url, requestUrl);

proxy.close();
server.close();

process.on('exit', () => {
// Two HttpClient entries are expected: one for the proxied request, one for
// the request the proxy makes to forward it. Both should report the full
// URL, including the port.
const clientUrls = entries.filter((entry) => entry.name === 'HttpClient')
.map((entry) => entry.detail.req.url);
assert.deepStrictEqual(clientUrls, [requestUrl, requestUrl]);
// Two HttpRequest entries are expected: the proxy server receives the
// request target in absolute-form, the final server in origin-form.
const requestUrls = entries.filter((entry) => entry.name === 'HttpRequest')
.map((entry) => entry.detail.req.url).sort();
assert.deepStrictEqual(requestUrls, ['/test', requestUrl].sort());
});
17 changes: 11 additions & 6 deletions test/parallel/test-http-perf_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,16 +36,18 @@ const server = http.Server(common.mustCall((req, res) => {
}));
}, 2));

let port;
server.listen(0, common.mustCall(async () => {
port = server.address().port;
await Promise.all([
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
}),
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
Expand All@@ -63,14 +65,17 @@ process.on('exit', () => {
assert.strictEqual(typeof entry.duration, 'number');
if (entry.name === 'HttpClient') {
numberOfHttpClients++;
// The reported URL must include the port when it is non-default.
// Refs: https://github.com/nodejs/node/issues/59625
assert.strictEqual(entry.detail.req.url, `http://localhost:${port}/`);
} else if (entry.name === 'HttpRequest') {
numberOfHttpRequests++;
assert.strictEqual(entry.detail.req.url, '/');
}
assert.strictEqual(typeof entry.detail.req.method, 'string');
assert.strictEqual(typeof entry.detail.req.url, 'string');
assert.strictEqual(entry.detail.req.method, 'POST');
assert.strictEqual(typeof entry.detail.req.headers, 'object');
assert.strictEqual(typeof entry.detail.res.statusCode, 'number');
assert.strictEqual(typeof entry.detail.res.statusMessage, 'string');
assert.strictEqual(entry.detail.res.statusCode, 200);
assert.strictEqual(entry.detail.res.statusMessage, 'OK');
assert.strictEqual(typeof entry.detail.res.headers, 'object');
}
assert.strictEqual(numberOfHttpClients, 2);
Expand Down
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/_http_client.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,8 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
const kError = Symbol('kError');
const kPath = Symbol('kPath');
const kAuthority = Symbol('kAuthority');
const kProxyRewrittenToAbsolute = Symbol('kProxyRewrittenToAbsolute');

const HTTP_CLIENT_TRACE_EVENT_NAME = 'http.client.request';

Expand DownExpand Up@@ -318,6 +320,7 @@ function rewriteForProxiedHttp(req, reqOptions, proxyAuthority, userHostHeader,
if (requestURL !== undefined) {
// Convert the path to absolute-form. The authority is built from options.
req.path = requestURL.href;
req[kProxyRewrittenToAbsolute] = true;
}
debug(`updated request for HTTP proxy ${href} with ${req.path} `, req[kOutHeaders]);
return true;
Expand DownExpand Up@@ -479,6 +482,7 @@ function ClientRequest(input, options, cb) {
this.reusedSocket = false;
this.host = host;
this.protocol = protocol;
this[kProxyRewrittenToAbsolute] = false;

if (this.agent) {
// If there is an agent we should default to Connection:keep-alive,
Expand DownExpand Up@@ -509,6 +513,9 @@ function ClientRequest(input, options, cb) {
if (port && +port !== defaultPort) {
hostHeaderFromOptions += ':' + port;
}
// Preserve the request authority (with the port when non-default) so that
// the perf_hooks entry can report a faithful URL.
this[kAuthority] = hostHeaderFromOptions;
const headersArray = ArrayIsArray(options.headers);
if (!headersArray) {
if (options.headers) {
Expand DownExpand Up@@ -627,7 +634,11 @@ ClientRequest.prototype._finish = function _finish() {
detail: {
req: {
method: this.method,
url: `${this.protocol}//${this.host}${this.path}`,
// If the path has been rewritten to absolute-form for proxying,
// it is already a full URL.
url: this[kProxyRewrittenToAbsolute] ?
this.path :
`${this.protocol}//${this[kAuthority]}${this.path}`,
headers: typeof this.getHeaders === 'function' ? this.getHeaders() : {},
},
},
Expand Down
63 changes: 63 additions & 0 deletions test/client-proxy/test-http-proxy-perf-hooks.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// This tests that when a request path is rewritten to absolute-form for
// proxying, the perf_hooks HTTP entries report it as the URL as-is, instead
// of appending it to the protocol and authority again.
// Refs: https://github.com/nodejs/node/issues/59625
import * as common from '../common/index.mjs';
import assert from 'node:assert';
import { once } from 'events';
import http from 'node:http';
import { PerformanceObserver } from 'node:perf_hooks';
import { createProxyServer } from '../common/proxy-server.js';

const entries = [];
const obs = new PerformanceObserver(common.mustCallAtLeast((items) => {
entries.push(...items.getEntries());
}));
obs.observe({ type: 'http' });

// Start a server to process the final request.
const server = http.createServer(common.mustCall((req, res) => {
res.end('Hello world');
}));
server.on('error', common.mustNotCall((err) => { console.error('Server error', err); }));
server.listen(0);
await once(server, 'listening');

// Start a minimal proxy server.
const { proxy, logs } = createProxyServer();
proxy.listen(0);
await once(proxy, 'listening');

const requestUrl = `http://localhost:${server.address().port}/test`;
const agent = new http.Agent({
proxyEnv: {
HTTP_PROXY: `http://localhost:${proxy.address().port}`,
},
});

const res = await new Promise((resolve, reject) => {
http.request(requestUrl, { agent }, resolve).on('error', reject).end();
});
res.resume();
await once(res, 'end');

// Verify that the request went through the proxy.
assert.strictEqual(logs.length, 1);
assert.strictEqual(logs[0].url, requestUrl);

proxy.close();
server.close();

process.on('exit', () => {
// Two HttpClient entries are expected: one for the proxied request, one for
// the request the proxy makes to forward it. Both should report the full
// URL, including the port.
const clientUrls = entries.filter((entry) => entry.name === 'HttpClient')
.map((entry) => entry.detail.req.url);
assert.deepStrictEqual(clientUrls, [requestUrl, requestUrl]);
// Two HttpRequest entries are expected: the proxy server receives the
// request target in absolute-form, the final server in origin-form.
const requestUrls = entries.filter((entry) => entry.name === 'HttpRequest')
.map((entry) => entry.detail.req.url).sort();
assert.deepStrictEqual(requestUrls, ['/test', requestUrl].sort());
});
17 changes: 11 additions & 6 deletions test/parallel/test-http-perf_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,16 +36,18 @@ const server = http.Server(common.mustCall((req, res) => {
}));
}, 2));

let port;
server.listen(0, common.mustCall(async () => {
port = server.address().port;
await Promise.all([
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
}),
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
Expand All@@ -63,14 +65,17 @@ process.on('exit', () => {
assert.strictEqual(typeof entry.duration, 'number');
if (entry.name === 'HttpClient') {
numberOfHttpClients++;
// The reported URL must include the port when it is non-default.
// Refs: https://github.com/nodejs/node/issues/59625
assert.strictEqual(entry.detail.req.url, `http://localhost:${port}/`);
} else if (entry.name === 'HttpRequest') {
numberOfHttpRequests++;
assert.strictEqual(entry.detail.req.url, '/');
}
assert.strictEqual(typeof entry.detail.req.method, 'string');
assert.strictEqual(typeof entry.detail.req.url, 'string');
assert.strictEqual(entry.detail.req.method, 'POST');
assert.strictEqual(typeof entry.detail.req.headers, 'object');
assert.strictEqual(typeof entry.detail.res.statusCode, 'number');
assert.strictEqual(typeof entry.detail.res.statusMessage, 'string');
assert.strictEqual(entry.detail.res.statusCode, 200);
assert.strictEqual(entry.detail.res.statusMessage, 'OK');
assert.strictEqual(typeof entry.detail.res.headers, 'object');
}
assert.strictEqual(numberOfHttpClients, 2);
Expand Down
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/_http_client.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,8 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
const kError = Symbol('kError');
const kPath = Symbol('kPath');
const kAuthority = Symbol('kAuthority');
const kProxyRewrittenToAbsolute = Symbol('kProxyRewrittenToAbsolute');

const HTTP_CLIENT_TRACE_EVENT_NAME = 'http.client.request';

Expand DownExpand Up@@ -318,6 +320,7 @@ function rewriteForProxiedHttp(req, reqOptions, proxyAuthority, userHostHeader,
if (requestURL !== undefined) {
// Convert the path to absolute-form. The authority is built from options.
req.path = requestURL.href;
req[kProxyRewrittenToAbsolute] = true;
}
debug(`updated request for HTTP proxy ${href} with ${req.path} `, req[kOutHeaders]);
return true;
Expand DownExpand Up@@ -479,6 +482,7 @@ function ClientRequest(input, options, cb) {
this.reusedSocket = false;
this.host = host;
this.protocol = protocol;
this[kProxyRewrittenToAbsolute] = false;

if (this.agent) {
// If there is an agent we should default to Connection:keep-alive,
Expand DownExpand Up@@ -509,6 +513,9 @@ function ClientRequest(input, options, cb) {
if (port && +port !== defaultPort) {
hostHeaderFromOptions += ':' + port;
}
// Preserve the request authority (with the port when non-default) so that
// the perf_hooks entry can report a faithful URL.
this[kAuthority] = hostHeaderFromOptions;
const headersArray = ArrayIsArray(options.headers);
if (!headersArray) {
if (options.headers) {
Expand DownExpand Up@@ -627,7 +634,11 @@ ClientRequest.prototype._finish = function _finish() {
detail: {
req: {
method: this.method,
url: `${this.protocol}//${this.host}${this.path}`,
// If the path has been rewritten to absolute-form for proxying,
// it is already a full URL.
url: this[kProxyRewrittenToAbsolute] ?
this.path :
`${this.protocol}//${this[kAuthority]}${this.path}`,
headers: typeof this.getHeaders === 'function' ? this.getHeaders() : {},
},
},
Expand Down
63 changes: 63 additions & 0 deletions test/client-proxy/test-http-proxy-perf-hooks.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// This tests that when a request path is rewritten to absolute-form for
// proxying, the perf_hooks HTTP entries report it as the URL as-is, instead
// of appending it to the protocol and authority again.
// Refs: https://github.com/nodejs/node/issues/59625
import * as common from '../common/index.mjs';
import assert from 'node:assert';
import { once } from 'events';
import http from 'node:http';
import { PerformanceObserver } from 'node:perf_hooks';
import { createProxyServer } from '../common/proxy-server.js';

const entries = [];
const obs = new PerformanceObserver(common.mustCallAtLeast((items) => {
entries.push(...items.getEntries());
}));
obs.observe({ type: 'http' });

// Start a server to process the final request.
const server = http.createServer(common.mustCall((req, res) => {
res.end('Hello world');
}));
server.on('error', common.mustNotCall((err) => { console.error('Server error', err); }));
server.listen(0);
await once(server, 'listening');

// Start a minimal proxy server.
const { proxy, logs } = createProxyServer();
proxy.listen(0);
await once(proxy, 'listening');

const requestUrl = `http://localhost:${server.address().port}/test`;
const agent = new http.Agent({
proxyEnv: {
HTTP_PROXY: `http://localhost:${proxy.address().port}`,
},
});

const res = await new Promise((resolve, reject) => {
http.request(requestUrl, { agent }, resolve).on('error', reject).end();
});
res.resume();
await once(res, 'end');

// Verify that the request went through the proxy.
assert.strictEqual(logs.length, 1);
assert.strictEqual(logs[0].url, requestUrl);

proxy.close();
server.close();

process.on('exit', () => {
// Two HttpClient entries are expected: one for the proxied request, one for
// the request the proxy makes to forward it. Both should report the full
// URL, including the port.
const clientUrls = entries.filter((entry) => entry.name === 'HttpClient')
.map((entry) => entry.detail.req.url);
assert.deepStrictEqual(clientUrls, [requestUrl, requestUrl]);
// Two HttpRequest entries are expected: the proxy server receives the
// request target in absolute-form, the final server in origin-form.
const requestUrls = entries.filter((entry) => entry.name === 'HttpRequest')
.map((entry) => entry.detail.req.url).sort();
assert.deepStrictEqual(requestUrls, ['/test', requestUrl].sort());
});
17 changes: 11 additions & 6 deletions test/parallel/test-http-perf_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,16 +36,18 @@ const server = http.Server(common.mustCall((req, res) => {
}));
}, 2));

let port;
server.listen(0, common.mustCall(async () => {
port = server.address().port;
await Promise.all([
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
}),
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
Expand All@@ -63,14 +65,17 @@ process.on('exit', () => {
assert.strictEqual(typeof entry.duration, 'number');
if (entry.name === 'HttpClient') {
numberOfHttpClients++;
// The reported URL must include the port when it is non-default.
// Refs: https://github.com/nodejs/node/issues/59625
assert.strictEqual(entry.detail.req.url, `http://localhost:${port}/`);
} else if (entry.name === 'HttpRequest') {
numberOfHttpRequests++;
assert.strictEqual(entry.detail.req.url, '/');
}
assert.strictEqual(typeof entry.detail.req.method, 'string');
assert.strictEqual(typeof entry.detail.req.url, 'string');
assert.strictEqual(entry.detail.req.method, 'POST');
assert.strictEqual(typeof entry.detail.req.headers, 'object');
assert.strictEqual(typeof entry.detail.res.statusCode, 'number');
assert.strictEqual(typeof entry.detail.res.statusMessage, 'string');
assert.strictEqual(entry.detail.res.statusCode, 200);
assert.strictEqual(entry.detail.res.statusMessage, 'OK');
assert.strictEqual(typeof entry.detail.res.headers, 'object');
}
assert.strictEqual(numberOfHttpClients, 2);
Expand Down
Loading
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/_http_client.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,8 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
const kError = Symbol('kError');
const kPath = Symbol('kPath');
const kAuthority = Symbol('kAuthority');
const kProxyRewrittenToAbsolute = Symbol('kProxyRewrittenToAbsolute');

const HTTP_CLIENT_TRACE_EVENT_NAME = 'http.client.request';

Expand DownExpand Up@@ -318,6 +320,7 @@ function rewriteForProxiedHttp(req, reqOptions, proxyAuthority, userHostHeader,
if (requestURL !== undefined) {
// Convert the path to absolute-form. The authority is built from options.
req.path = requestURL.href;
req[kProxyRewrittenToAbsolute] = true;
}
debug(`updated request for HTTP proxy ${href} with ${req.path} `, req[kOutHeaders]);
return true;
Expand DownExpand Up@@ -479,6 +482,7 @@ function ClientRequest(input, options, cb) {
this.reusedSocket = false;
this.host = host;
this.protocol = protocol;
this[kProxyRewrittenToAbsolute] = false;

if (this.agent) {
// If there is an agent we should default to Connection:keep-alive,
Expand DownExpand Up@@ -509,6 +513,9 @@ function ClientRequest(input, options, cb) {
if (port && +port !== defaultPort) {
hostHeaderFromOptions += ':' + port;
}
// Preserve the request authority (with the port when non-default) so that
// the perf_hooks entry can report a faithful URL.
this[kAuthority] = hostHeaderFromOptions;
const headersArray = ArrayIsArray(options.headers);
if (!headersArray) {
if (options.headers) {
Expand DownExpand Up@@ -627,7 +634,11 @@ ClientRequest.prototype._finish = function _finish() {
detail: {
req: {
method: this.method,
url: `${this.protocol}//${this.host}${this.path}`,
// If the path has been rewritten to absolute-form for proxying,
// it is already a full URL.
url: this[kProxyRewrittenToAbsolute] ?
this.path :
`${this.protocol}//${this[kAuthority]}${this.path}`,
headers: typeof this.getHeaders === 'function' ? this.getHeaders() : {},
},
},
Expand Down
63 changes: 63 additions & 0 deletions test/client-proxy/test-http-proxy-perf-hooks.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// This tests that when a request path is rewritten to absolute-form for
// proxying, the perf_hooks HTTP entries report it as the URL as-is, instead
// of appending it to the protocol and authority again.
// Refs: https://github.com/nodejs/node/issues/59625
import * as common from '../common/index.mjs';
import assert from 'node:assert';
import { once } from 'events';
import http from 'node:http';
import { PerformanceObserver } from 'node:perf_hooks';
import { createProxyServer } from '../common/proxy-server.js';

const entries = [];
const obs = new PerformanceObserver(common.mustCallAtLeast((items) => {
entries.push(...items.getEntries());
}));
obs.observe({ type: 'http' });

// Start a server to process the final request.
const server = http.createServer(common.mustCall((req, res) => {
res.end('Hello world');
}));
server.on('error', common.mustNotCall((err) => { console.error('Server error', err); }));
server.listen(0);
await once(server, 'listening');

// Start a minimal proxy server.
const { proxy, logs } = createProxyServer();
proxy.listen(0);
await once(proxy, 'listening');

const requestUrl = `http://localhost:${server.address().port}/test`;
const agent = new http.Agent({
proxyEnv: {
HTTP_PROXY: `http://localhost:${proxy.address().port}`,
},
});

const res = await new Promise((resolve, reject) => {
http.request(requestUrl, { agent }, resolve).on('error', reject).end();
});
res.resume();
await once(res, 'end');

// Verify that the request went through the proxy.
assert.strictEqual(logs.length, 1);
assert.strictEqual(logs[0].url, requestUrl);

proxy.close();
server.close();

process.on('exit', () => {
// Two HttpClient entries are expected: one for the proxied request, one for
// the request the proxy makes to forward it. Both should report the full
// URL, including the port.
const clientUrls = entries.filter((entry) => entry.name === 'HttpClient')
.map((entry) => entry.detail.req.url);
assert.deepStrictEqual(clientUrls, [requestUrl, requestUrl]);
// Two HttpRequest entries are expected: the proxy server receives the
// request target in absolute-form, the final server in origin-form.
const requestUrls = entries.filter((entry) => entry.name === 'HttpRequest')
.map((entry) => entry.detail.req.url).sort();
assert.deepStrictEqual(requestUrls, ['/test', requestUrl].sort());
});
17 changes: 11 additions & 6 deletions test/parallel/test-http-perf_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,16 +36,18 @@ const server = http.Server(common.mustCall((req, res) => {
}));
}, 2));

let port;
server.listen(0, common.mustCall(async () => {
port = server.address().port;
await Promise.all([
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
}),
makeRequest({
port: server.address().port,
port,
path: '/',
method: 'POST',
data: expected
Expand All@@ -63,14 +65,17 @@ process.on('exit', () => {
assert.strictEqual(typeof entry.duration, 'number');
if (entry.name === 'HttpClient') {
numberOfHttpClients++;
// The reported URL must include the port when it is non-default.
// Refs: https://github.com/nodejs/node/issues/59625
assert.strictEqual(entry.detail.req.url, `http://localhost:${port}/`);
} else if (entry.name === 'HttpRequest') {
numberOfHttpRequests++;
assert.strictEqual(entry.detail.req.url, '/');
}
assert.strictEqual(typeof entry.detail.req.method, 'string');
assert.strictEqual(typeof entry.detail.req.url, 'string');
assert.strictEqual(entry.detail.req.method, 'POST');
assert.strictEqual(typeof entry.detail.req.headers, 'object');
assert.strictEqual(typeof entry.detail.res.statusCode, 'number');
assert.strictEqual(typeof entry.detail.res.statusMessage, 'string');
assert.strictEqual(entry.detail.res.statusCode, 200);
assert.strictEqual(entry.detail.res.statusMessage, 'OK');
assert.strictEqual(typeof entry.detail.res.headers, 'object');
}
assert.strictEqual(numberOfHttpClients, 2);
Expand Down
Loading