Commit 3bcba2a

Browse files
imatlopezrvagg
imatlopez
authored and
rvagg
committed
lib: noproxy support, match proxy detection to request
PR-URL: #1978 Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 345c70e commit 3bcba2a

5 files changed

Lines changed: 192 additions & 5 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
193193
| `--devdir=$path` | SDK download directory (default is OS cache directory)
194194
| `--ensure` | Don't reinstall headers if already present
195195
| `--dist-url=$url` | Download header tarball from custom URL
196-
| `--proxy=$url` | Set HTTP proxy for downloading header tarball
196+
| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
197+
| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
197198
| `--cafile=$cafile` | Override default CA chain (to download tarball)
198199
| `--nodedir=$path` | Set the path to the node source code
199200
| `--python=$path` | Set path to the Python binary

‎lib/install.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const request = require('request')
1111
constmkdir=require('mkdirp')
1212
constprocessRelease=require('./process-release')
1313
constwin=process.platform==='win32'
14+
constgetProxyFromURI=require('./proxy')
1415

1516
functioninstall(fs,gyp,argv,callback){
1617
varrelease=processRelease(argv,gyp,process.version,process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
410411
}
411412

412413
// basic support for a proxy server
413-
varproxyUrl=gyp.opts.proxy||
414-
env.http_proxy||
415-
env.HTTP_PROXY||
416-
env.npm_config_proxy
414+
varproxyUrl=getProxyFromURI(gyp,env,url)
417415
if(proxyUrl){
418416
if(/^https?:\/\//i.test(proxyUrl)){
419417
log.verbose('download','using proxy url: "%s"',proxyUrl)

‎lib/node-gyp.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ proto.configDefs = {
6767
ensure: Boolean,// 'install'
6868
solution: String,// 'build' (windows only)
6969
proxy: String,// 'install'
70+
noproxy: String,// 'install'
7071
devdir: String,// everywhere
7172
nodedir: String,// 'configure'
7273
loglevel: String,// everywhere

‎lib/proxy.js‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
'use strict'
2+
// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
3+
4+
consturl=require('url')
5+
6+
functionformatHostname(hostname){
7+
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
8+
returnhostname.replace(/^\.*/,'.').toLowerCase()
9+
}
10+
11+
functionparseNoProxyZone(zone){
12+
zone=zone.trim().toLowerCase()
13+
14+
varzoneParts=zone.split(':',2)
15+
varzoneHost=formatHostname(zoneParts[0])
16+
varzonePort=zoneParts[1]
17+
varhasPort=zone.indexOf(':')>-1
18+
19+
return{hostname: zoneHost,port: zonePort,hasPort: hasPort}
20+
}
21+
22+
functionuriInNoProxy(uri,noProxy){
23+
varport=uri.port||(uri.protocol==='https:' ? '443' : '80')
24+
varhostname=formatHostname(uri.hostname)
25+
varnoProxyList=noProxy.split(',')
26+
27+
// iterate through the noProxyList until it finds a match.
28+
returnnoProxyList.map(parseNoProxyZone).some(function(noProxyZone){
29+
varisMatchedAt=hostname.indexOf(noProxyZone.hostname)
30+
varhostnameMatched=(
31+
isMatchedAt>-1&&
32+
(isMatchedAt===hostname.length-noProxyZone.hostname.length)
33+
)
34+
35+
if(noProxyZone.hasPort){
36+
return(port===noProxyZone.port)&&hostnameMatched
37+
}
38+
39+
returnhostnameMatched
40+
})
41+
}
42+
43+
functiongetProxyFromURI(gyp,env,uri){
44+
// If a string URI/URL was given, parse it into a URL object
45+
if(typeofuri==='string'){
46+
// eslint-disable-next-line
47+
uri=url.parse(uri)
48+
}
49+
50+
// Decide the proper request proxy to use based on the request URI object and the
51+
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
52+
// respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
53+
54+
varnoProxy=gyp.opts.noproxy||env.NO_PROXY||env.no_proxy||env.npm_config_noproxy||''
55+
56+
// if the noProxy is a wildcard then return null
57+
58+
if(noProxy==='*'){
59+
returnnull
60+
}
61+
62+
// if the noProxy is not empty and the uri is found return null
63+
64+
if(noProxy!==''&&uriInNoProxy(uri,noProxy)){
65+
returnnull
66+
}
67+
68+
// Check for HTTP or HTTPS Proxy in environment Else default to null
69+
70+
if(uri.protocol==='http:'){
71+
returngyp.opts.proxy||
72+
env.HTTP_PROXY||
73+
env.http_proxy||
74+
env.npm_config_proxy||null
75+
}
76+
77+
if(uri.protocol==='https:'){
78+
returngyp.opts.proxy||
79+
env.HTTPS_PROXY||
80+
env.https_proxy||
81+
env.HTTP_PROXY||
82+
env.http_proxy||
83+
env.npm_config_proxy||null
84+
}
85+
86+
// if none of that works, return null
87+
// (What uri protocol are you using then?)
88+
89+
returnnull
90+
}
91+
92+
module.exports=getProxyFromURI

‎test/test-download.js‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,101 @@ test('download over https with custom ca', function (t) {
9090
})
9191
})
9292

93+
test('download over http with proxy',function(t){
94+
t.plan(2)
95+
96+
varserver=http.createServer(function(req,res){
97+
t.strictEqual(req.headers['user-agent'],
98+
'node-gyp v42 (node '+process.version+')')
99+
res.end('ok')
100+
pserver.close(function(){
101+
server.close()
102+
})
103+
})
104+
105+
varpserver=http.createServer(function(req,res){
106+
t.strictEqual(req.headers['user-agent'],
107+
'node-gyp v42 (node '+process.version+')')
108+
res.end('proxy ok')
109+
server.close(function(){
110+
pserver.close()
111+
})
112+
})
113+
114+
varhost='localhost'
115+
server.listen(0,host,function(){
116+
varport=this.address().port
117+
pserver.listen(port+1,host,function(){
118+
vargyp={
119+
opts: {
120+
proxy: 'http://'+host+':'+(port+1)
121+
},
122+
version: '42'
123+
}
124+
varurl='http://'+host+':'+port
125+
varreq=install.test.download(gyp,{},url)
126+
req.on('response',function(res){
127+
varbody=''
128+
res.setEncoding('utf8')
129+
res.on('data',function(data){
130+
body+=data
131+
})
132+
res.on('end',function(){
133+
t.strictEqual(body,'proxy ok')
134+
})
135+
})
136+
})
137+
})
138+
})
139+
140+
test('download over http with noproxy',function(t){
141+
t.plan(2)
142+
143+
varserver=http.createServer(function(req,res){
144+
t.strictEqual(req.headers['user-agent'],
145+
'node-gyp v42 (node '+process.version+')')
146+
res.end('ok')
147+
pserver.close(function(){
148+
server.close()
149+
})
150+
})
151+
152+
varpserver=http.createServer(function(req,res){
153+
t.strictEqual(req.headers['user-agent'],
154+
'node-gyp v42 (node '+process.version+')')
155+
res.end('proxy ok')
156+
server.close(function(){
157+
pserver.close()
158+
})
159+
})
160+
161+
varhost='localhost'
162+
server.listen(0,host,function(){
163+
varport=this.address().port
164+
pserver.listen(port+1,host,function(){
165+
vargyp={
166+
opts: {
167+
proxy: 'http://'+host+':'+(port+1),
168+
noproxy: 'localhost'
169+
},
170+
version: '42'
171+
}
172+
varurl='http://'+host+':'+port
173+
varreq=install.test.download(gyp,{},url)
174+
req.on('response',function(res){
175+
varbody=''
176+
res.setEncoding('utf8')
177+
res.on('data',function(data){
178+
body+=data
179+
})
180+
res.on('end',function(){
181+
t.strictEqual(body,'ok')
182+
})
183+
})
184+
})
185+
})
186+
})
187+
93188
test('download with missing cafile',function(t){
94189
t.plan(1)
95190
vargyp={

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 3bcba2a
Browse files
imatlopezrvagg
imatlopez
authored and
rvagg
committed
lib: noproxy support, match proxy detection to request
PR-URL: #1978
Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 345c70e commit 3bcba2a
5 files changed
Lines changed: 192 additions & 5 deletions
File tree
‎README.md‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
193193
| `--devdir=$path` | SDK download directory (default is OS cache directory)
194194
| `--ensure` | Don't reinstall headers if already present
195195
| `--dist-url=$url` | Download header tarball from custom URL
196-
| `--proxy=$url` | Set HTTP proxy for downloading header tarball
196+
| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
197+
| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
197198
| `--cafile=$cafile` | Override default CA chain (to download tarball)
198199
| `--nodedir=$path` | Set the path to the node source code
199200
| `--python=$path` | Set path to the Python binary
‎lib/install.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const request = require('request')
1111
constmkdir=require('mkdirp')
1212
constprocessRelease=require('./process-release')
1313
constwin=process.platform==='win32'
14+
constgetProxyFromURI=require('./proxy')
1415

1516
functioninstall(fs,gyp,argv,callback){
1617
varrelease=processRelease(argv,gyp,process.version,process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
410411
}
411412

412413
// basic support for a proxy server
413-
varproxyUrl=gyp.opts.proxy||
414-
env.http_proxy||
415-
env.HTTP_PROXY||
416-
env.npm_config_proxy
414+
varproxyUrl=getProxyFromURI(gyp,env,url)
417415
if(proxyUrl){
418416
if(/^https?:\/\//i.test(proxyUrl)){
419417
log.verbose('download','using proxy url: "%s"',proxyUrl)
‎lib/node-gyp.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ proto.configDefs = {
6767
ensure: Boolean,// 'install'
6868
solution: String,// 'build' (windows only)
6969
proxy: String,// 'install'
70+
noproxy: String,// 'install'
7071
devdir: String,// everywhere
7172
nodedir: String,// 'configure'
7273
loglevel: String,// everywhere
‎lib/proxy.js‎
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
'use strict'
2+
// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
3+
4+
consturl=require('url')
5+
6+
functionformatHostname(hostname){
7+
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
8+
returnhostname.replace(/^\.*/,'.').toLowerCase()
9+
}
10+
11+
functionparseNoProxyZone(zone){
12+
zone=zone.trim().toLowerCase()
13+
14+
varzoneParts=zone.split(':',2)
15+
varzoneHost=formatHostname(zoneParts[0])
16+
varzonePort=zoneParts[1]
17+
varhasPort=zone.indexOf(':')>-1
18+
19+
return{hostname: zoneHost,port: zonePort,hasPort: hasPort}
20+
}
21+
22+
functionuriInNoProxy(uri,noProxy){
23+
varport=uri.port||(uri.protocol==='https:' ? '443' : '80')
24+
varhostname=formatHostname(uri.hostname)
25+
varnoProxyList=noProxy.split(',')
26+
27+
// iterate through the noProxyList until it finds a match.
28+
returnnoProxyList.map(parseNoProxyZone).some(function(noProxyZone){
29+
varisMatchedAt=hostname.indexOf(noProxyZone.hostname)
30+
varhostnameMatched=(
31+
isMatchedAt>-1&&
32+
(isMatchedAt===hostname.length-noProxyZone.hostname.length)
33+
)
34+
35+
if(noProxyZone.hasPort){
36+
return(port===noProxyZone.port)&&hostnameMatched
37+
}
38+
39+
returnhostnameMatched
40+
})
41+
}
42+
43+
functiongetProxyFromURI(gyp,env,uri){
44+
// If a string URI/URL was given, parse it into a URL object
45+
if(typeofuri==='string'){
46+
// eslint-disable-next-line
47+
uri=url.parse(uri)
48+
}
49+
50+
// Decide the proper request proxy to use based on the request URI object and the
51+
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
52+
// respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
53+
54+
varnoProxy=gyp.opts.noproxy||env.NO_PROXY||env.no_proxy||env.npm_config_noproxy||''
55+
56+
// if the noProxy is a wildcard then return null
57+
58+
if(noProxy==='*'){
59+
returnnull
60+
}
61+
62+
// if the noProxy is not empty and the uri is found return null
63+
64+
if(noProxy!==''&&uriInNoProxy(uri,noProxy)){
65+
returnnull
66+
}
67+
68+
// Check for HTTP or HTTPS Proxy in environment Else default to null
69+
70+
if(uri.protocol==='http:'){
71+
returngyp.opts.proxy||
72+
env.HTTP_PROXY||
73+
env.http_proxy||
74+
env.npm_config_proxy||null
75+
}
76+
77+
if(uri.protocol==='https:'){
78+
returngyp.opts.proxy||
79+
env.HTTPS_PROXY||
80+
env.https_proxy||
81+
env.HTTP_PROXY||
82+
env.http_proxy||
83+
env.npm_config_proxy||null
84+
}
85+
86+
// if none of that works, return null
87+
// (What uri protocol are you using then?)
88+
89+
returnnull
90+
}
91+
92+
module.exports=getProxyFromURI
‎test/test-download.js‎
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,101 @@ test('download over https with custom ca', function (t) {
9090
})
9191
})
9292

93+
test('download over http with proxy',function(t){
94+
t.plan(2)
95+
96+
varserver=http.createServer(function(req,res){
97+
t.strictEqual(req.headers['user-agent'],
98+
'node-gyp v42 (node '+process.version+')')
99+
res.end('ok')
100+
pserver.close(function(){
101+
server.close()
102+
})
103+
})
104+
105+
varpserver=http.createServer(function(req,res){
106+
t.strictEqual(req.headers['user-agent'],
107+
'node-gyp v42 (node '+process.version+')')
108+
res.end('proxy ok')
109+
server.close(function(){
110+
pserver.close()
111+
})
112+
})
113+
114+
varhost='localhost'
115+
server.listen(0,host,function(){
116+
varport=this.address().port
117+
pserver.listen(port+1,host,function(){
118+
vargyp={
119+
opts: {
120+
proxy: 'http://'+host+':'+(port+1)
121+
},
122+
version: '42'
123+
}
124+
varurl='http://'+host+':'+port
125+
varreq=install.test.download(gyp,{},url)
126+
req.on('response',function(res){
127+
varbody=''
128+
res.setEncoding('utf8')
129+
res.on('data',function(data){
130+
body+=data
131+
})
132+
res.on('end',function(){
133+
t.strictEqual(body,'proxy ok')
134+
})
135+
})
136+
})
137+
})
138+
})
139+
140+
test('download over http with noproxy',function(t){
141+
t.plan(2)
142+
143+
varserver=http.createServer(function(req,res){
144+
t.strictEqual(req.headers['user-agent'],
145+
'node-gyp v42 (node '+process.version+')')
146+
res.end('ok')
147+
pserver.close(function(){
148+
server.close()
149+
})
150+
})
151+
152+
varpserver=http.createServer(function(req,res){
153+
t.strictEqual(req.headers['user-agent'],
154+
'node-gyp v42 (node '+process.version+')')
155+
res.end('proxy ok')
156+
server.close(function(){
157+
pserver.close()
158+
})
159+
})
160+
161+
varhost='localhost'
162+
server.listen(0,host,function(){
163+
varport=this.address().port
164+
pserver.listen(port+1,host,function(){
165+
vargyp={
166+
opts: {
167+
proxy: 'http://'+host+':'+(port+1),
168+
noproxy: 'localhost'
169+
},
170+
version: '42'
171+
}
172+
varurl='http://'+host+':'+port
173+
varreq=install.test.download(gyp,{},url)
174+
req.on('response',function(res){
175+
varbody=''
176+
res.setEncoding('utf8')
177+
res.on('data',function(data){
178+
body+=data
179+
})
180+
res.on('end',function(){
181+
t.strictEqual(body,'ok')
182+
})
183+
})
184+
})
185+
})
186+
})
187+
93188
test('download with missing cafile',function(t){
94189
t.plan(1)
95190
vargyp={
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 3bcba2a
Browse files
imatlopezrvagg
imatlopez
authored and
rvagg
committed
lib: noproxy support, match proxy detection to request
PR-URL: #1978
Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 345c70e commit 3bcba2a
5 files changed
Lines changed: 192 additions & 5 deletions
File tree
‎README.md‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
193193
| `--devdir=$path` | SDK download directory (default is OS cache directory)
194194
| `--ensure` | Don't reinstall headers if already present
195195
| `--dist-url=$url` | Download header tarball from custom URL
196-
| `--proxy=$url` | Set HTTP proxy for downloading header tarball
196+
| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
197+
| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
197198
| `--cafile=$cafile` | Override default CA chain (to download tarball)
198199
| `--nodedir=$path` | Set the path to the node source code
199200
| `--python=$path` | Set path to the Python binary
‎lib/install.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const request = require('request')
1111
constmkdir=require('mkdirp')
1212
constprocessRelease=require('./process-release')
1313
constwin=process.platform==='win32'
14+
constgetProxyFromURI=require('./proxy')
1415

1516
functioninstall(fs,gyp,argv,callback){
1617
varrelease=processRelease(argv,gyp,process.version,process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
410411
}
411412

412413
// basic support for a proxy server
413-
varproxyUrl=gyp.opts.proxy||
414-
env.http_proxy||
415-
env.HTTP_PROXY||
416-
env.npm_config_proxy
414+
varproxyUrl=getProxyFromURI(gyp,env,url)
417415
if(proxyUrl){
418416
if(/^https?:\/\//i.test(proxyUrl)){
419417
log.verbose('download','using proxy url: "%s"',proxyUrl)
‎lib/node-gyp.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ proto.configDefs = {
6767
ensure: Boolean,// 'install'
6868
solution: String,// 'build' (windows only)
6969
proxy: String,// 'install'
70+
noproxy: String,// 'install'
7071
devdir: String,// everywhere
7172
nodedir: String,// 'configure'
7273
loglevel: String,// everywhere
‎lib/proxy.js‎
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
'use strict'
2+
// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
3+
4+
consturl=require('url')
5+
6+
functionformatHostname(hostname){
7+
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
8+
returnhostname.replace(/^\.*/,'.').toLowerCase()
9+
}
10+
11+
functionparseNoProxyZone(zone){
12+
zone=zone.trim().toLowerCase()
13+
14+
varzoneParts=zone.split(':',2)
15+
varzoneHost=formatHostname(zoneParts[0])
16+
varzonePort=zoneParts[1]
17+
varhasPort=zone.indexOf(':')>-1
18+
19+
return{hostname: zoneHost,port: zonePort,hasPort: hasPort}
20+
}
21+
22+
functionuriInNoProxy(uri,noProxy){
23+
varport=uri.port||(uri.protocol==='https:' ? '443' : '80')
24+
varhostname=formatHostname(uri.hostname)
25+
varnoProxyList=noProxy.split(',')
26+
27+
// iterate through the noProxyList until it finds a match.
28+
returnnoProxyList.map(parseNoProxyZone).some(function(noProxyZone){
29+
varisMatchedAt=hostname.indexOf(noProxyZone.hostname)
30+
varhostnameMatched=(
31+
isMatchedAt>-1&&
32+
(isMatchedAt===hostname.length-noProxyZone.hostname.length)
33+
)
34+
35+
if(noProxyZone.hasPort){
36+
return(port===noProxyZone.port)&&hostnameMatched
37+
}
38+
39+
returnhostnameMatched
40+
})
41+
}
42+
43+
functiongetProxyFromURI(gyp,env,uri){
44+
// If a string URI/URL was given, parse it into a URL object
45+
if(typeofuri==='string'){
46+
// eslint-disable-next-line
47+
uri=url.parse(uri)
48+
}
49+
50+
// Decide the proper request proxy to use based on the request URI object and the
51+
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
52+
// respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
53+
54+
varnoProxy=gyp.opts.noproxy||env.NO_PROXY||env.no_proxy||env.npm_config_noproxy||''
55+
56+
// if the noProxy is a wildcard then return null
57+
58+
if(noProxy==='*'){
59+
returnnull
60+
}
61+
62+
// if the noProxy is not empty and the uri is found return null
63+
64+
if(noProxy!==''&&uriInNoProxy(uri,noProxy)){
65+
returnnull
66+
}
67+
68+
// Check for HTTP or HTTPS Proxy in environment Else default to null
69+
70+
if(uri.protocol==='http:'){
71+
returngyp.opts.proxy||
72+
env.HTTP_PROXY||
73+
env.http_proxy||
74+
env.npm_config_proxy||null
75+
}
76+
77+
if(uri.protocol==='https:'){
78+
returngyp.opts.proxy||
79+
env.HTTPS_PROXY||
80+
env.https_proxy||
81+
env.HTTP_PROXY||
82+
env.http_proxy||
83+
env.npm_config_proxy||null
84+
}
85+
86+
// if none of that works, return null
87+
// (What uri protocol are you using then?)
88+
89+
returnnull
90+
}
91+
92+
module.exports=getProxyFromURI
‎test/test-download.js‎
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,101 @@ test('download over https with custom ca', function (t) {
9090
})
9191
})
9292

93+
test('download over http with proxy',function(t){
94+
t.plan(2)
95+
96+
varserver=http.createServer(function(req,res){
97+
t.strictEqual(req.headers['user-agent'],
98+
'node-gyp v42 (node '+process.version+')')
99+
res.end('ok')
100+
pserver.close(function(){
101+
server.close()
102+
})
103+
})
104+
105+
varpserver=http.createServer(function(req,res){
106+
t.strictEqual(req.headers['user-agent'],
107+
'node-gyp v42 (node '+process.version+')')
108+
res.end('proxy ok')
109+
server.close(function(){
110+
pserver.close()
111+
})
112+
})
113+
114+
varhost='localhost'
115+
server.listen(0,host,function(){
116+
varport=this.address().port
117+
pserver.listen(port+1,host,function(){
118+
vargyp={
119+
opts: {
120+
proxy: 'http://'+host+':'+(port+1)
121+
},
122+
version: '42'
123+
}
124+
varurl='http://'+host+':'+port
125+
varreq=install.test.download(gyp,{},url)
126+
req.on('response',function(res){
127+
varbody=''
128+
res.setEncoding('utf8')
129+
res.on('data',function(data){
130+
body+=data
131+
})
132+
res.on('end',function(){
133+
t.strictEqual(body,'proxy ok')
134+
})
135+
})
136+
})
137+
})
138+
})
139+
140+
test('download over http with noproxy',function(t){
141+
t.plan(2)
142+
143+
varserver=http.createServer(function(req,res){
144+
t.strictEqual(req.headers['user-agent'],
145+
'node-gyp v42 (node '+process.version+')')
146+
res.end('ok')
147+
pserver.close(function(){
148+
server.close()
149+
})
150+
})
151+
152+
varpserver=http.createServer(function(req,res){
153+
t.strictEqual(req.headers['user-agent'],
154+
'node-gyp v42 (node '+process.version+')')
155+
res.end('proxy ok')
156+
server.close(function(){
157+
pserver.close()
158+
})
159+
})
160+
161+
varhost='localhost'
162+
server.listen(0,host,function(){
163+
varport=this.address().port
164+
pserver.listen(port+1,host,function(){
165+
vargyp={
166+
opts: {
167+
proxy: 'http://'+host+':'+(port+1),
168+
noproxy: 'localhost'
169+
},
170+
version: '42'
171+
}
172+
varurl='http://'+host+':'+port
173+
varreq=install.test.download(gyp,{},url)
174+
req.on('response',function(res){
175+
varbody=''
176+
res.setEncoding('utf8')
177+
res.on('data',function(data){
178+
body+=data
179+
})
180+
res.on('end',function(){
181+
t.strictEqual(body,'ok')
182+
})
183+
})
184+
})
185+
})
186+
})
187+
93188
test('download with missing cafile',function(t){
94189
t.plan(1)
95190
vargyp={
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 3bcba2a
Browse files
imatlopezrvagg
imatlopez
authored and
rvagg
committed
lib: noproxy support, match proxy detection to request
PR-URL: #1978
Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 345c70e commit 3bcba2a
5 files changed
Lines changed: 192 additions & 5 deletions
File tree
‎README.md‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
193193
| `--devdir=$path` | SDK download directory (default is OS cache directory)
194194
| `--ensure` | Don't reinstall headers if already present
195195
| `--dist-url=$url` | Download header tarball from custom URL
196-
| `--proxy=$url` | Set HTTP proxy for downloading header tarball
196+
| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
197+
| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
197198
| `--cafile=$cafile` | Override default CA chain (to download tarball)
198199
| `--nodedir=$path` | Set the path to the node source code
199200
| `--python=$path` | Set path to the Python binary
‎lib/install.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const request = require('request')
1111
constmkdir=require('mkdirp')
1212
constprocessRelease=require('./process-release')
1313
constwin=process.platform==='win32'
14+
constgetProxyFromURI=require('./proxy')
1415

1516
functioninstall(fs,gyp,argv,callback){
1617
varrelease=processRelease(argv,gyp,process.version,process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
410411
}
411412

412413
// basic support for a proxy server
413-
varproxyUrl=gyp.opts.proxy||
414-
env.http_proxy||
415-
env.HTTP_PROXY||
416-
env.npm_config_proxy
414+
varproxyUrl=getProxyFromURI(gyp,env,url)
417415
if(proxyUrl){
418416
if(/^https?:\/\//i.test(proxyUrl)){
419417
log.verbose('download','using proxy url: "%s"',proxyUrl)
‎lib/node-gyp.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ proto.configDefs = {
6767
ensure: Boolean,// 'install'
6868
solution: String,// 'build' (windows only)
6969
proxy: String,// 'install'
70+
noproxy: String,// 'install'
7071
devdir: String,// everywhere
7172
nodedir: String,// 'configure'
7273
loglevel: String,// everywhere
‎lib/proxy.js‎
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
'use strict'
2+
// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
3+
4+
consturl=require('url')
5+
6+
functionformatHostname(hostname){
7+
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
8+
returnhostname.replace(/^\.*/,'.').toLowerCase()
9+
}
10+
11+
functionparseNoProxyZone(zone){
12+
zone=zone.trim().toLowerCase()
13+
14+
varzoneParts=zone.split(':',2)
15+
varzoneHost=formatHostname(zoneParts[0])
16+
varzonePort=zoneParts[1]
17+
varhasPort=zone.indexOf(':')>-1
18+
19+
return{hostname: zoneHost,port: zonePort,hasPort: hasPort}
20+
}
21+
22+
functionuriInNoProxy(uri,noProxy){
23+
varport=uri.port||(uri.protocol==='https:' ? '443' : '80')
24+
varhostname=formatHostname(uri.hostname)
25+
varnoProxyList=noProxy.split(',')
26+
27+
// iterate through the noProxyList until it finds a match.
28+
returnnoProxyList.map(parseNoProxyZone).some(function(noProxyZone){
29+
varisMatchedAt=hostname.indexOf(noProxyZone.hostname)
30+
varhostnameMatched=(
31+
isMatchedAt>-1&&
32+
(isMatchedAt===hostname.length-noProxyZone.hostname.length)
33+
)
34+
35+
if(noProxyZone.hasPort){
36+
return(port===noProxyZone.port)&&hostnameMatched
37+
}
38+
39+
returnhostnameMatched
40+
})
41+
}
42+
43+
functiongetProxyFromURI(gyp,env,uri){
44+
// If a string URI/URL was given, parse it into a URL object
45+
if(typeofuri==='string'){
46+
// eslint-disable-next-line
47+
uri=url.parse(uri)
48+
}
49+
50+
// Decide the proper request proxy to use based on the request URI object and the
51+
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
52+
// respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
53+
54+
varnoProxy=gyp.opts.noproxy||env.NO_PROXY||env.no_proxy||env.npm_config_noproxy||''
55+
56+
// if the noProxy is a wildcard then return null
57+
58+
if(noProxy==='*'){
59+
returnnull
60+
}
61+
62+
// if the noProxy is not empty and the uri is found return null
63+
64+
if(noProxy!==''&&uriInNoProxy(uri,noProxy)){
65+
returnnull
66+
}
67+
68+
// Check for HTTP or HTTPS Proxy in environment Else default to null
69+
70+
if(uri.protocol==='http:'){
71+
returngyp.opts.proxy||
72+
env.HTTP_PROXY||
73+
env.http_proxy||
74+
env.npm_config_proxy||null
75+
}
76+
77+
if(uri.protocol==='https:'){
78+
returngyp.opts.proxy||
79+
env.HTTPS_PROXY||
80+
env.https_proxy||
81+
env.HTTP_PROXY||
82+
env.http_proxy||
83+
env.npm_config_proxy||null
84+
}
85+
86+
// if none of that works, return null
87+
// (What uri protocol are you using then?)
88+
89+
returnnull
90+
}
91+
92+
module.exports=getProxyFromURI
‎test/test-download.js‎
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,101 @@ test('download over https with custom ca', function (t) {
9090
})
9191
})
9292

93+
test('download over http with proxy',function(t){
94+
t.plan(2)
95+
96+
varserver=http.createServer(function(req,res){
97+
t.strictEqual(req.headers['user-agent'],
98+
'node-gyp v42 (node '+process.version+')')
99+
res.end('ok')
100+
pserver.close(function(){
101+
server.close()
102+
})
103+
})
104+
105+
varpserver=http.createServer(function(req,res){
106+
t.strictEqual(req.headers['user-agent'],
107+
'node-gyp v42 (node '+process.version+')')
108+
res.end('proxy ok')
109+
server.close(function(){
110+
pserver.close()
111+
})
112+
})
113+
114+
varhost='localhost'
115+
server.listen(0,host,function(){
116+
varport=this.address().port
117+
pserver.listen(port+1,host,function(){
118+
vargyp={
119+
opts: {
120+
proxy: 'http://'+host+':'+(port+1)
121+
},
122+
version: '42'
123+
}
124+
varurl='http://'+host+':'+port
125+
varreq=install.test.download(gyp,{},url)
126+
req.on('response',function(res){
127+
varbody=''
128+
res.setEncoding('utf8')
129+
res.on('data',function(data){
130+
body+=data
131+
})
132+
res.on('end',function(){
133+
t.strictEqual(body,'proxy ok')
134+
})
135+
})
136+
})
137+
})
138+
})
139+
140+
test('download over http with noproxy',function(t){
141+
t.plan(2)
142+
143+
varserver=http.createServer(function(req,res){
144+
t.strictEqual(req.headers['user-agent'],
145+
'node-gyp v42 (node '+process.version+')')
146+
res.end('ok')
147+
pserver.close(function(){
148+
server.close()
149+
})
150+
})
151+
152+
varpserver=http.createServer(function(req,res){
153+
t.strictEqual(req.headers['user-agent'],
154+
'node-gyp v42 (node '+process.version+')')
155+
res.end('proxy ok')
156+
server.close(function(){
157+
pserver.close()
158+
})
159+
})
160+
161+
varhost='localhost'
162+
server.listen(0,host,function(){
163+
varport=this.address().port
164+
pserver.listen(port+1,host,function(){
165+
vargyp={
166+
opts: {
167+
proxy: 'http://'+host+':'+(port+1),
168+
noproxy: 'localhost'
169+
},
170+
version: '42'
171+
}
172+
varurl='http://'+host+':'+port
173+
varreq=install.test.download(gyp,{},url)
174+
req.on('response',function(res){
175+
varbody=''
176+
res.setEncoding('utf8')
177+
res.on('data',function(data){
178+
body+=data
179+
})
180+
res.on('end',function(){
181+
t.strictEqual(body,'ok')
182+
})
183+
})
184+
})
185+
})
186+
})
187+
93188
test('download with missing cafile',function(t){
94189
t.plan(1)
95190
vargyp={
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 3bcba2a
Browse files
imatlopezrvagg
imatlopez
authored and
rvagg
committed
lib: noproxy support, match proxy detection to request
PR-URL: #1978
Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 345c70e commit 3bcba2a
5 files changed
Lines changed: 192 additions & 5 deletions
File tree
‎README.md‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
193193
| `--devdir=$path` | SDK download directory (default is OS cache directory)
194194
| `--ensure` | Don't reinstall headers if already present
195195
| `--dist-url=$url` | Download header tarball from custom URL
196-
| `--proxy=$url` | Set HTTP proxy for downloading header tarball
196+
| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
197+
| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
197198
| `--cafile=$cafile` | Override default CA chain (to download tarball)
198199
| `--nodedir=$path` | Set the path to the node source code
199200
| `--python=$path` | Set path to the Python binary
‎lib/install.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const request = require('request')
1111
constmkdir=require('mkdirp')
1212
constprocessRelease=require('./process-release')
1313
constwin=process.platform==='win32'
14+
constgetProxyFromURI=require('./proxy')
1415

1516
functioninstall(fs,gyp,argv,callback){
1617
varrelease=processRelease(argv,gyp,process.version,process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
410411
}
411412

412413
// basic support for a proxy server
413-
varproxyUrl=gyp.opts.proxy||
414-
env.http_proxy||
415-
env.HTTP_PROXY||
416-
env.npm_config_proxy
414+
varproxyUrl=getProxyFromURI(gyp,env,url)
417415
if(proxyUrl){
418416
if(/^https?:\/\//i.test(proxyUrl)){
419417
log.verbose('download','using proxy url: "%s"',proxyUrl)
‎lib/node-gyp.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ proto.configDefs = {
6767
ensure: Boolean,// 'install'
6868
solution: String,// 'build' (windows only)
6969
proxy: String,// 'install'
70+
noproxy: String,// 'install'
7071
devdir: String,// everywhere
7172
nodedir: String,// 'configure'
7273
loglevel: String,// everywhere
‎lib/proxy.js‎
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
'use strict'
2+
// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
3+
4+
consturl=require('url')
5+
6+
functionformatHostname(hostname){
7+
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
8+
returnhostname.replace(/^\.*/,'.').toLowerCase()
9+
}
10+
11+
functionparseNoProxyZone(zone){
12+
zone=zone.trim().toLowerCase()
13+
14+
varzoneParts=zone.split(':',2)
15+
varzoneHost=formatHostname(zoneParts[0])
16+
varzonePort=zoneParts[1]
17+
varhasPort=zone.indexOf(':')>-1
18+
19+
return{hostname: zoneHost,port: zonePort,hasPort: hasPort}
20+
}
21+
22+
functionuriInNoProxy(uri,noProxy){
23+
varport=uri.port||(uri.protocol==='https:' ? '443' : '80')
24+
varhostname=formatHostname(uri.hostname)
25+
varnoProxyList=noProxy.split(',')
26+
27+
// iterate through the noProxyList until it finds a match.
28+
returnnoProxyList.map(parseNoProxyZone).some(function(noProxyZone){
29+
varisMatchedAt=hostname.indexOf(noProxyZone.hostname)
30+
varhostnameMatched=(
31+
isMatchedAt>-1&&
32+
(isMatchedAt===hostname.length-noProxyZone.hostname.length)
33+
)
34+
35+
if(noProxyZone.hasPort){
36+
return(port===noProxyZone.port)&&hostnameMatched
37+
}
38+
39+
returnhostnameMatched
40+
})
41+
}
42+
43+
functiongetProxyFromURI(gyp,env,uri){
44+
// If a string URI/URL was given, parse it into a URL object
45+
if(typeofuri==='string'){
46+
// eslint-disable-next-line
47+
uri=url.parse(uri)
48+
}
49+
50+
// Decide the proper request proxy to use based on the request URI object and the
51+
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
52+
// respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
53+
54+
varnoProxy=gyp.opts.noproxy||env.NO_PROXY||env.no_proxy||env.npm_config_noproxy||''
55+
56+
// if the noProxy is a wildcard then return null
57+
58+
if(noProxy==='*'){
59+
returnnull
60+
}
61+
62+
// if the noProxy is not empty and the uri is found return null
63+
64+
if(noProxy!==''&&uriInNoProxy(uri,noProxy)){
65+
returnnull
66+
}
67+
68+
// Check for HTTP or HTTPS Proxy in environment Else default to null
69+
70+
if(uri.protocol==='http:'){
71+
returngyp.opts.proxy||
72+
env.HTTP_PROXY||
73+
env.http_proxy||
74+
env.npm_config_proxy||null
75+
}
76+
77+
if(uri.protocol==='https:'){
78+
returngyp.opts.proxy||
79+
env.HTTPS_PROXY||
80+
env.https_proxy||
81+
env.HTTP_PROXY||
82+
env.http_proxy||
83+
env.npm_config_proxy||null
84+
}
85+
86+
// if none of that works, return null
87+
// (What uri protocol are you using then?)
88+
89+
returnnull
90+
}
91+
92+
module.exports=getProxyFromURI
‎test/test-download.js‎
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,101 @@ test('download over https with custom ca', function (t) {
9090
})
9191
})
9292

93+
test('download over http with proxy',function(t){
94+
t.plan(2)
95+
96+
varserver=http.createServer(function(req,res){
97+
t.strictEqual(req.headers['user-agent'],
98+
'node-gyp v42 (node '+process.version+')')
99+
res.end('ok')
100+
pserver.close(function(){
101+
server.close()
102+
})
103+
})
104+
105+
varpserver=http.createServer(function(req,res){
106+
t.strictEqual(req.headers['user-agent'],
107+
'node-gyp v42 (node '+process.version+')')
108+
res.end('proxy ok')
109+
server.close(function(){
110+
pserver.close()
111+
})
112+
})
113+
114+
varhost='localhost'
115+
server.listen(0,host,function(){
116+
varport=this.address().port
117+
pserver.listen(port+1,host,function(){
118+
vargyp={
119+
opts: {
120+
proxy: 'http://'+host+':'+(port+1)
121+
},
122+
version: '42'
123+
}
124+
varurl='http://'+host+':'+port
125+
varreq=install.test.download(gyp,{},url)
126+
req.on('response',function(res){
127+
varbody=''
128+
res.setEncoding('utf8')
129+
res.on('data',function(data){
130+
body+=data
131+
})
132+
res.on('end',function(){
133+
t.strictEqual(body,'proxy ok')
134+
})
135+
})
136+
})
137+
})
138+
})
139+
140+
test('download over http with noproxy',function(t){
141+
t.plan(2)
142+
143+
varserver=http.createServer(function(req,res){
144+
t.strictEqual(req.headers['user-agent'],
145+
'node-gyp v42 (node '+process.version+')')
146+
res.end('ok')
147+
pserver.close(function(){
148+
server.close()
149+
})
150+
})
151+
152+
varpserver=http.createServer(function(req,res){
153+
t.strictEqual(req.headers['user-agent'],
154+
'node-gyp v42 (node '+process.version+')')
155+
res.end('proxy ok')
156+
server.close(function(){
157+
pserver.close()
158+
})
159+
})
160+
161+
varhost='localhost'
162+
server.listen(0,host,function(){
163+
varport=this.address().port
164+
pserver.listen(port+1,host,function(){
165+
vargyp={
166+
opts: {
167+
proxy: 'http://'+host+':'+(port+1),
168+
noproxy: 'localhost'
169+
},
170+
version: '42'
171+
}
172+
varurl='http://'+host+':'+port
173+
varreq=install.test.download(gyp,{},url)
174+
req.on('response',function(res){
175+
varbody=''
176+
res.setEncoding('utf8')
177+
res.on('data',function(data){
178+
body+=data
179+
})
180+
res.on('end',function(){
181+
t.strictEqual(body,'ok')
182+
})
183+
})
184+
})
185+
})
186+
})
187+
93188
test('download with missing cafile',function(t){
94189
t.plan(1)
95190
vargyp={
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 3bcba2a
Browse files
imatlopezrvagg
imatlopez
authored and
rvagg
committed
lib: noproxy support, match proxy detection to request
PR-URL: #1978
Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 345c70e commit 3bcba2a
5 files changed
Lines changed: 192 additions & 5 deletions
File tree
‎README.md‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
193193
| `--devdir=$path` | SDK download directory (default is OS cache directory)
194194
| `--ensure` | Don't reinstall headers if already present
195195
| `--dist-url=$url` | Download header tarball from custom URL
196-
| `--proxy=$url` | Set HTTP proxy for downloading header tarball
196+
| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
197+
| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
197198
| `--cafile=$cafile` | Override default CA chain (to download tarball)
198199
| `--nodedir=$path` | Set the path to the node source code
199200
| `--python=$path` | Set path to the Python binary
‎lib/install.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const request = require('request')
1111
constmkdir=require('mkdirp')
1212
constprocessRelease=require('./process-release')
1313
constwin=process.platform==='win32'
14+
constgetProxyFromURI=require('./proxy')
1415

1516
functioninstall(fs,gyp,argv,callback){
1617
varrelease=processRelease(argv,gyp,process.version,process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
410411
}
411412

412413
// basic support for a proxy server
413-
varproxyUrl=gyp.opts.proxy||
414-
env.http_proxy||
415-
env.HTTP_PROXY||
416-
env.npm_config_proxy
414+
varproxyUrl=getProxyFromURI(gyp,env,url)
417415
if(proxyUrl){
418416
if(/^https?:\/\//i.test(proxyUrl)){
419417
log.verbose('download','using proxy url: "%s"',proxyUrl)
‎lib/node-gyp.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ proto.configDefs = {
6767
ensure: Boolean,// 'install'
6868
solution: String,// 'build' (windows only)
6969
proxy: String,// 'install'
70+
noproxy: String,// 'install'
7071
devdir: String,// everywhere
7172
nodedir: String,// 'configure'
7273
loglevel: String,// everywhere
‎lib/proxy.js‎
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
'use strict'
2+
// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
3+
4+
consturl=require('url')
5+
6+
functionformatHostname(hostname){
7+
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
8+
returnhostname.replace(/^\.*/,'.').toLowerCase()
9+
}
10+
11+
functionparseNoProxyZone(zone){
12+
zone=zone.trim().toLowerCase()
13+
14+
varzoneParts=zone.split(':',2)
15+
varzoneHost=formatHostname(zoneParts[0])
16+
varzonePort=zoneParts[1]
17+
varhasPort=zone.indexOf(':')>-1
18+
19+
return{hostname: zoneHost,port: zonePort,hasPort: hasPort}
20+
}
21+
22+
functionuriInNoProxy(uri,noProxy){
23+
varport=uri.port||(uri.protocol==='https:' ? '443' : '80')
24+
varhostname=formatHostname(uri.hostname)
25+
varnoProxyList=noProxy.split(',')
26+
27+
// iterate through the noProxyList until it finds a match.
28+
returnnoProxyList.map(parseNoProxyZone).some(function(noProxyZone){
29+
varisMatchedAt=hostname.indexOf(noProxyZone.hostname)
30+
varhostnameMatched=(
31+
isMatchedAt>-1&&
32+
(isMatchedAt===hostname.length-noProxyZone.hostname.length)
33+
)
34+
35+
if(noProxyZone.hasPort){
36+
return(port===noProxyZone.port)&&hostnameMatched
37+
}
38+
39+
returnhostnameMatched
40+
})
41+
}
42+
43+
functiongetProxyFromURI(gyp,env,uri){
44+
// If a string URI/URL was given, parse it into a URL object
45+
if(typeofuri==='string'){
46+
// eslint-disable-next-line
47+
uri=url.parse(uri)
48+
}
49+
50+
// Decide the proper request proxy to use based on the request URI object and the
51+
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
52+
// respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
53+
54+
varnoProxy=gyp.opts.noproxy||env.NO_PROXY||env.no_proxy||env.npm_config_noproxy||''
55+
56+
// if the noProxy is a wildcard then return null
57+
58+
if(noProxy==='*'){
59+
returnnull
60+
}
61+
62+
// if the noProxy is not empty and the uri is found return null
63+
64+
if(noProxy!==''&&uriInNoProxy(uri,noProxy)){
65+
returnnull
66+
}
67+
68+
// Check for HTTP or HTTPS Proxy in environment Else default to null
69+
70+
if(uri.protocol==='http:'){
71+
returngyp.opts.proxy||
72+
env.HTTP_PROXY||
73+
env.http_proxy||
74+
env.npm_config_proxy||null
75+
}
76+
77+
if(uri.protocol==='https:'){
78+
returngyp.opts.proxy||
79+
env.HTTPS_PROXY||
80+
env.https_proxy||
81+
env.HTTP_PROXY||
82+
env.http_proxy||
83+
env.npm_config_proxy||null
84+
}
85+
86+
// if none of that works, return null
87+
// (What uri protocol are you using then?)
88+
89+
returnnull
90+
}
91+
92+
module.exports=getProxyFromURI
‎test/test-download.js‎
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,101 @@ test('download over https with custom ca', function (t) {
9090
})
9191
})
9292

93+
test('download over http with proxy',function(t){
94+
t.plan(2)
95+
96+
varserver=http.createServer(function(req,res){
97+
t.strictEqual(req.headers['user-agent'],
98+
'node-gyp v42 (node '+process.version+')')
99+
res.end('ok')
100+
pserver.close(function(){
101+
server.close()
102+
})
103+
})
104+
105+
varpserver=http.createServer(function(req,res){
106+
t.strictEqual(req.headers['user-agent'],
107+
'node-gyp v42 (node '+process.version+')')
108+
res.end('proxy ok')
109+
server.close(function(){
110+
pserver.close()
111+
})
112+
})
113+
114+
varhost='localhost'
115+
server.listen(0,host,function(){
116+
varport=this.address().port
117+
pserver.listen(port+1,host,function(){
118+
vargyp={
119+
opts: {
120+
proxy: 'http://'+host+':'+(port+1)
121+
},
122+
version: '42'
123+
}
124+
varurl='http://'+host+':'+port
125+
varreq=install.test.download(gyp,{},url)
126+
req.on('response',function(res){
127+
varbody=''
128+
res.setEncoding('utf8')
129+
res.on('data',function(data){
130+
body+=data
131+
})
132+
res.on('end',function(){
133+
t.strictEqual(body,'proxy ok')
134+
})
135+
})
136+
})
137+
})
138+
})
139+
140+
test('download over http with noproxy',function(t){
141+
t.plan(2)
142+
143+
varserver=http.createServer(function(req,res){
144+
t.strictEqual(req.headers['user-agent'],
145+
'node-gyp v42 (node '+process.version+')')
146+
res.end('ok')
147+
pserver.close(function(){
148+
server.close()
149+
})
150+
})
151+
152+
varpserver=http.createServer(function(req,res){
153+
t.strictEqual(req.headers['user-agent'],
154+
'node-gyp v42 (node '+process.version+')')
155+
res.end('proxy ok')
156+
server.close(function(){
157+
pserver.close()
158+
})
159+
})
160+
161+
varhost='localhost'
162+
server.listen(0,host,function(){
163+
varport=this.address().port
164+
pserver.listen(port+1,host,function(){
165+
vargyp={
166+
opts: {
167+
proxy: 'http://'+host+':'+(port+1),
168+
noproxy: 'localhost'
169+
},
170+
version: '42'
171+
}
172+
varurl='http://'+host+':'+port
173+
varreq=install.test.download(gyp,{},url)
174+
req.on('response',function(res){
175+
varbody=''
176+
res.setEncoding('utf8')
177+
res.on('data',function(data){
178+
body+=data
179+
})
180+
res.on('end',function(){
181+
t.strictEqual(body,'ok')
182+
})
183+
})
184+
})
185+
})
186+
})
187+
93188
test('download with missing cafile',function(t){
94189
t.plan(1)
95190
vargyp={
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 3bcba2a
Browse files
imatlopezrvagg
imatlopez
authored and
rvagg
committed
lib: noproxy support, match proxy detection to request
PR-URL: #1978
Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 345c70e commit 3bcba2a
5 files changed
Lines changed: 192 additions & 5 deletions
File tree
‎README.md‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
193193
| `--devdir=$path` | SDK download directory (default is OS cache directory)
194194
| `--ensure` | Don't reinstall headers if already present
195195
| `--dist-url=$url` | Download header tarball from custom URL
196-
| `--proxy=$url` | Set HTTP proxy for downloading header tarball
196+
| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
197+
| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
197198
| `--cafile=$cafile` | Override default CA chain (to download tarball)
198199
| `--nodedir=$path` | Set the path to the node source code
199200
| `--python=$path` | Set path to the Python binary
‎lib/install.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const request = require('request')
1111
constmkdir=require('mkdirp')
1212
constprocessRelease=require('./process-release')
1313
constwin=process.platform==='win32'
14+
constgetProxyFromURI=require('./proxy')
1415

1516
functioninstall(fs,gyp,argv,callback){
1617
varrelease=processRelease(argv,gyp,process.version,process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
410411
}
411412

412413
// basic support for a proxy server
413-
varproxyUrl=gyp.opts.proxy||
414-
env.http_proxy||
415-
env.HTTP_PROXY||
416-
env.npm_config_proxy
414+
varproxyUrl=getProxyFromURI(gyp,env,url)
417415
if(proxyUrl){
418416
if(/^https?:\/\//i.test(proxyUrl)){
419417
log.verbose('download','using proxy url: "%s"',proxyUrl)
‎lib/node-gyp.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ proto.configDefs = {
6767
ensure: Boolean,// 'install'
6868
solution: String,// 'build' (windows only)
6969
proxy: String,// 'install'
70+
noproxy: String,// 'install'
7071
devdir: String,// everywhere
7172
nodedir: String,// 'configure'
7273
loglevel: String,// everywhere
‎lib/proxy.js‎
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
'use strict'
2+
// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
3+
4+
consturl=require('url')
5+
6+
functionformatHostname(hostname){
7+
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
8+
returnhostname.replace(/^\.*/,'.').toLowerCase()
9+
}
10+
11+
functionparseNoProxyZone(zone){
12+
zone=zone.trim().toLowerCase()
13+
14+
varzoneParts=zone.split(':',2)
15+
varzoneHost=formatHostname(zoneParts[0])
16+
varzonePort=zoneParts[1]
17+
varhasPort=zone.indexOf(':')>-1
18+
19+
return{hostname: zoneHost,port: zonePort,hasPort: hasPort}
20+
}
21+
22+
functionuriInNoProxy(uri,noProxy){
23+
varport=uri.port||(uri.protocol==='https:' ? '443' : '80')
24+
varhostname=formatHostname(uri.hostname)
25+
varnoProxyList=noProxy.split(',')
26+
27+
// iterate through the noProxyList until it finds a match.
28+
returnnoProxyList.map(parseNoProxyZone).some(function(noProxyZone){
29+
varisMatchedAt=hostname.indexOf(noProxyZone.hostname)
30+
varhostnameMatched=(
31+
isMatchedAt>-1&&
32+
(isMatchedAt===hostname.length-noProxyZone.hostname.length)
33+
)
34+
35+
if(noProxyZone.hasPort){
36+
return(port===noProxyZone.port)&&hostnameMatched
37+
}
38+
39+
returnhostnameMatched
40+
})
41+
}
42+
43+
functiongetProxyFromURI(gyp,env,uri){
44+
// If a string URI/URL was given, parse it into a URL object
45+
if(typeofuri==='string'){
46+
// eslint-disable-next-line
47+
uri=url.parse(uri)
48+
}
49+
50+
// Decide the proper request proxy to use based on the request URI object and the
51+
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
52+
// respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
53+
54+
varnoProxy=gyp.opts.noproxy||env.NO_PROXY||env.no_proxy||env.npm_config_noproxy||''
55+
56+
// if the noProxy is a wildcard then return null
57+
58+
if(noProxy==='*'){
59+
returnnull
60+
}
61+
62+
// if the noProxy is not empty and the uri is found return null
63+
64+
if(noProxy!==''&&uriInNoProxy(uri,noProxy)){
65+
returnnull
66+
}
67+
68+
// Check for HTTP or HTTPS Proxy in environment Else default to null
69+
70+
if(uri.protocol==='http:'){
71+
returngyp.opts.proxy||
72+
env.HTTP_PROXY||
73+
env.http_proxy||
74+
env.npm_config_proxy||null
75+
}
76+
77+
if(uri.protocol==='https:'){
78+
returngyp.opts.proxy||
79+
env.HTTPS_PROXY||
80+
env.https_proxy||
81+
env.HTTP_PROXY||
82+
env.http_proxy||
83+
env.npm_config_proxy||null
84+
}
85+
86+
// if none of that works, return null
87+
// (What uri protocol are you using then?)
88+
89+
returnnull
90+
}
91+
92+
module.exports=getProxyFromURI
‎test/test-download.js‎
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,101 @@ test('download over https with custom ca', function (t) {
9090
})
9191
})
9292

93+
test('download over http with proxy',function(t){
94+
t.plan(2)
95+
96+
varserver=http.createServer(function(req,res){
97+
t.strictEqual(req.headers['user-agent'],
98+
'node-gyp v42 (node '+process.version+')')
99+
res.end('ok')
100+
pserver.close(function(){
101+
server.close()
102+
})
103+
})
104+
105+
varpserver=http.createServer(function(req,res){
106+
t.strictEqual(req.headers['user-agent'],
107+
'node-gyp v42 (node '+process.version+')')
108+
res.end('proxy ok')
109+
server.close(function(){
110+
pserver.close()
111+
})
112+
})
113+
114+
varhost='localhost'
115+
server.listen(0,host,function(){
116+
varport=this.address().port
117+
pserver.listen(port+1,host,function(){
118+
vargyp={
119+
opts: {
120+
proxy: 'http://'+host+':'+(port+1)
121+
},
122+
version: '42'
123+
}
124+
varurl='http://'+host+':'+port
125+
varreq=install.test.download(gyp,{},url)
126+
req.on('response',function(res){
127+
varbody=''
128+
res.setEncoding('utf8')
129+
res.on('data',function(data){
130+
body+=data
131+
})
132+
res.on('end',function(){
133+
t.strictEqual(body,'proxy ok')
134+
})
135+
})
136+
})
137+
})
138+
})
139+
140+
test('download over http with noproxy',function(t){
141+
t.plan(2)
142+
143+
varserver=http.createServer(function(req,res){
144+
t.strictEqual(req.headers['user-agent'],
145+
'node-gyp v42 (node '+process.version+')')
146+
res.end('ok')
147+
pserver.close(function(){
148+
server.close()
149+
})
150+
})
151+
152+
varpserver=http.createServer(function(req,res){
153+
t.strictEqual(req.headers['user-agent'],
154+
'node-gyp v42 (node '+process.version+')')
155+
res.end('proxy ok')
156+
server.close(function(){
157+
pserver.close()
158+
})
159+
})
160+
161+
varhost='localhost'
162+
server.listen(0,host,function(){
163+
varport=this.address().port
164+
pserver.listen(port+1,host,function(){
165+
vargyp={
166+
opts: {
167+
proxy: 'http://'+host+':'+(port+1),
168+
noproxy: 'localhost'
169+
},
170+
version: '42'
171+
}
172+
varurl='http://'+host+':'+port
173+
varreq=install.test.download(gyp,{},url)
174+
req.on('response',function(res){
175+
varbody=''
176+
res.setEncoding('utf8')
177+
res.on('data',function(data){
178+
body+=data
179+
})
180+
res.on('end',function(){
181+
t.strictEqual(body,'ok')
182+
})
183+
})
184+
})
185+
})
186+
})
187+
93188
test('download with missing cafile',function(t){
94189
t.plan(1)
95190
vargyp={
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 3bcba2a
Browse files
imatlopezrvagg
imatlopez
authored and
rvagg
committed
lib: noproxy support, match proxy detection to request
PR-URL: #1978
Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 345c70e commit 3bcba2a
5 files changed
Lines changed: 192 additions & 5 deletions
File tree
‎README.md‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
193193
| `--devdir=$path` | SDK download directory (default is OS cache directory)
194194
| `--ensure` | Don't reinstall headers if already present
195195
| `--dist-url=$url` | Download header tarball from custom URL
196-
| `--proxy=$url` | Set HTTP proxy for downloading header tarball
196+
| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
197+
| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
197198
| `--cafile=$cafile` | Override default CA chain (to download tarball)
198199
| `--nodedir=$path` | Set the path to the node source code
199200
| `--python=$path` | Set path to the Python binary
‎lib/install.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const request = require('request')
1111
constmkdir=require('mkdirp')
1212
constprocessRelease=require('./process-release')
1313
constwin=process.platform==='win32'
14+
constgetProxyFromURI=require('./proxy')
1415

1516
functioninstall(fs,gyp,argv,callback){
1617
varrelease=processRelease(argv,gyp,process.version,process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
410411
}
411412

412413
// basic support for a proxy server
413-
varproxyUrl=gyp.opts.proxy||
414-
env.http_proxy||
415-
env.HTTP_PROXY||
416-
env.npm_config_proxy
414+
varproxyUrl=getProxyFromURI(gyp,env,url)
417415
if(proxyUrl){
418416
if(/^https?:\/\//i.test(proxyUrl)){
419417
log.verbose('download','using proxy url: "%s"',proxyUrl)
‎lib/node-gyp.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ proto.configDefs = {
6767
ensure: Boolean,// 'install'
6868
solution: String,// 'build' (windows only)
6969
proxy: String,// 'install'
70+
noproxy: String,// 'install'
7071
devdir: String,// everywhere
7172
nodedir: String,// 'configure'
7273
loglevel: String,// everywhere
‎lib/proxy.js‎
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
'use strict'
2+
// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
3+
4+
consturl=require('url')
5+
6+
functionformatHostname(hostname){
7+
// canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
8+
returnhostname.replace(/^\.*/,'.').toLowerCase()
9+
}
10+
11+
functionparseNoProxyZone(zone){
12+
zone=zone.trim().toLowerCase()
13+
14+
varzoneParts=zone.split(':',2)
15+
varzoneHost=formatHostname(zoneParts[0])
16+
varzonePort=zoneParts[1]
17+
varhasPort=zone.indexOf(':')>-1
18+
19+
return{hostname: zoneHost,port: zonePort,hasPort: hasPort}
20+
}
21+
22+
functionuriInNoProxy(uri,noProxy){
23+
varport=uri.port||(uri.protocol==='https:' ? '443' : '80')
24+
varhostname=formatHostname(uri.hostname)
25+
varnoProxyList=noProxy.split(',')
26+
27+
// iterate through the noProxyList until it finds a match.
28+
returnnoProxyList.map(parseNoProxyZone).some(function(noProxyZone){
29+
varisMatchedAt=hostname.indexOf(noProxyZone.hostname)
30+
varhostnameMatched=(
31+
isMatchedAt>-1&&
32+
(isMatchedAt===hostname.length-noProxyZone.hostname.length)
33+
)
34+
35+
if(noProxyZone.hasPort){
36+
return(port===noProxyZone.port)&&hostnameMatched
37+
}
38+
39+
returnhostnameMatched
40+
})
41+
}
42+
43+
functiongetProxyFromURI(gyp,env,uri){
44+
// If a string URI/URL was given, parse it into a URL object
45+
if(typeofuri==='string'){
46+
// eslint-disable-next-line
47+
uri=url.parse(uri)
48+
}
49+
50+
// Decide the proper request proxy to use based on the request URI object and the
51+
// environmental variables (NO_PROXY, HTTP_PROXY, etc.)
52+
// respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
53+
54+
varnoProxy=gyp.opts.noproxy||env.NO_PROXY||env.no_proxy||env.npm_config_noproxy||''
55+
56+
// if the noProxy is a wildcard then return null
57+
58+
if(noProxy==='*'){
59+
returnnull
60+
}
61+
62+
// if the noProxy is not empty and the uri is found return null
63+
64+
if(noProxy!==''&&uriInNoProxy(uri,noProxy)){
65+
returnnull
66+
}
67+
68+
// Check for HTTP or HTTPS Proxy in environment Else default to null
69+
70+
if(uri.protocol==='http:'){
71+
returngyp.opts.proxy||
72+
env.HTTP_PROXY||
73+
env.http_proxy||
74+
env.npm_config_proxy||null
75+
}
76+
77+
if(uri.protocol==='https:'){
78+
returngyp.opts.proxy||
79+
env.HTTPS_PROXY||
80+
env.https_proxy||
81+
env.HTTP_PROXY||
82+
env.http_proxy||
83+
env.npm_config_proxy||null
84+
}
85+
86+
// if none of that works, return null
87+
// (What uri protocol are you using then?)
88+
89+
returnnull
90+
}
91+
92+
module.exports=getProxyFromURI
‎test/test-download.js‎
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,101 @@ test('download over https with custom ca', function (t) {
9090
})
9191
})
9292

93+
test('download over http with proxy',function(t){
94+
t.plan(2)
95+
96+
varserver=http.createServer(function(req,res){
97+
t.strictEqual(req.headers['user-agent'],
98+
'node-gyp v42 (node '+process.version+')')
99+
res.end('ok')
100+
pserver.close(function(){
101+
server.close()
102+
})
103+
})
104+
105+
varpserver=http.createServer(function(req,res){
106+
t.strictEqual(req.headers['user-agent'],
107+
'node-gyp v42 (node '+process.version+')')
108+
res.end('proxy ok')
109+
server.close(function(){
110+
pserver.close()
111+
})
112+
})
113+
114+
varhost='localhost'
115+
server.listen(0,host,function(){
116+
varport=this.address().port
117+
pserver.listen(port+1,host,function(){
118+
vargyp={
119+
opts: {
120+
proxy: 'http://'+host+':'+(port+1)
121+
},
122+
version: '42'
123+
}
124+
varurl='http://'+host+':'+port
125+
varreq=install.test.download(gyp,{},url)
126+
req.on('response',function(res){
127+
varbody=''
128+
res.setEncoding('utf8')
129+
res.on('data',function(data){
130+
body+=data
131+
})
132+
res.on('end',function(){
133+
t.strictEqual(body,'proxy ok')
134+
})
135+
})
136+
})
137+
})
138+
})
139+
140+
test('download over http with noproxy',function(t){
141+
t.plan(2)
142+
143+
varserver=http.createServer(function(req,res){
144+
t.strictEqual(req.headers['user-agent'],
145+
'node-gyp v42 (node '+process.version+')')
146+
res.end('ok')
147+
pserver.close(function(){
148+
server.close()
149+
})
150+
})
151+
152+
varpserver=http.createServer(function(req,res){
153+
t.strictEqual(req.headers['user-agent'],
154+
'node-gyp v42 (node '+process.version+')')
155+
res.end('proxy ok')
156+
server.close(function(){
157+
pserver.close()
158+
})
159+
})
160+
161+
varhost='localhost'
162+
server.listen(0,host,function(){
163+
varport=this.address().port
164+
pserver.listen(port+1,host,function(){
165+
vargyp={
166+
opts: {
167+
proxy: 'http://'+host+':'+(port+1),
168+
noproxy: 'localhost'
169+
},
170+
version: '42'
171+
}
172+
varurl='http://'+host+':'+port
173+
varreq=install.test.download(gyp,{},url)
174+
req.on('response',function(res){
175+
varbody=''
176+
res.setEncoding('utf8')
177+
res.on('data',function(data){
178+
body+=data
179+
})
180+
res.on('end',function(){
181+
t.strictEqual(body,'ok')
182+
})
183+
})
184+
})
185+
})
186+
})
187+
93188
test('download with missing cafile',function(t){
94189
t.plan(1)
95190
vargyp={
0 commit comments
Comments
 (0)