rename to proxyTunnel to match CURL

Author: caitp

lib/dispatcher/proxy-agent.js

@@ -93,7 +93,7 @@ class ProxyAgent extends DispatcherBase {
       throw new InvalidArgumentError('Proxy opts.clientFactory must be a function.')
     }
 
-    const { tunnelProxy = true } = opts
+    const { proxyTunnel = true } = opts
 
     super()
 
@@ -116,7 +116,7 @@ class ProxyAgent extends DispatcherBase {
       this[kProxyHeaders]['proxy-authorization'] = `Basic ${Buffer.from(`${decodeURIComponent(username)}:${decodeURIComponent(password)}`).toString('base64')}`
     }
 
-    const factory = (!tunnelProxy && protocol === 'http:')
+    const factory = (!proxyTunnel && protocol === 'http:')
       ? (origin, options) => {
           if (origin.protocol === 'http:') {
             return new ProxyClient(origin, options)
@@ -128,7 +128,7 @@ class ProxyAgent extends DispatcherBase {
     const connect = buildConnector({ ...opts.proxyTls })
     this[kConnectEndpoint] = buildConnector({ ...opts.requestTls })
     this[kClient] = clientFactory(url, { connect, factory })
-    this[kTunnelProxy] = tunnelProxy
+    this[kTunnelProxy] = proxyTunnel
     this[kAgent] = new Agent({
       ...opts,
       connect: async (opts, callback) => {

test/proxy-agent.js

@@ -800,7 +800,7 @@ test('Proxy via HTTP to HTTP endpoint with tunneling disabled', async (t) => {
 
   const serverUrl = `http://localhost:${server.address().port}`
   const proxyUrl = `http://localhost:${proxy.address().port}`
-  const proxyAgent = new ProxyAgent({ uri: proxyUrl, tunnelProxy: false })
+  const proxyAgent = new ProxyAgent({ uri: proxyUrl, proxyTunnel: false })
 
   server.on('request', function (req, res) {
     t.ok(!req.connection.encrypted)
@@ -817,7 +817,7 @@ test('Proxy via HTTP to HTTP endpoint with tunneling disabled', async (t) => {
   })
 
   proxy.on('connect', () => {
-    t.fail(true, 'connect to proxy should unreachable if tunnelProxy is false')
+    t.fail(true, 'connect to proxy should unreachable if proxyTunnel is false')
   })
 
   proxy.on('request', function (req) {

types/proxy-agent.d.ts

@@ -24,6 +24,6 @@ declare namespace ProxyAgent {
     requestTls?: buildConnector.BuildOptions;
     proxyTls?: buildConnector.BuildOptions;
     clientFactory?(origin: URL, opts: object): Dispatcher;
-    tunnelProxy?: boolean;
+    proxyTunnel?: boolean;
   }
 }