fix: define protocol and defaultPort

gajus · Apr 26, 2019 · 0c83983 · 0c83983
1 parent 398976b
commit 0c83983
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/classes/Agent.js b/src/classes/Agent.js
@@ -14,6 +14,8 @@ const log = Logger.child({
 });
 
 class Agent {
+  defaultPort: number;
+
   protocol: ProtocolType;
 
   fallbackAgent: AgentType;
@@ -22,8 +24,7 @@ class Agent {
 
   getUrlProxy: GetUrlProxyMethodType;
 
-  constructor (protocol: ProtocolType, mustUrlUseProxy: MustUrlUseProxyMethodType, getUrlProxy: GetUrlProxyMethodType, fallbackAgent: AgentType) {
-    this.protocol = protocol;
+  constructor (mustUrlUseProxy: MustUrlUseProxyMethodType, getUrlProxy: GetUrlProxyMethodType, fallbackAgent: AgentType) {
     this.fallbackAgent = fallbackAgent;
     this.mustUrlUseProxy = mustUrlUseProxy;
     this.getUrlProxy = getUrlProxy;
@@ -38,11 +39,13 @@ class Agent {
     });
 
     if (this.mustUrlUseProxy(requestUrl)) {
-      request.path = requestUrl;
+      if (this.protocol === 'http:') {
+        request.path = requestUrl;
+      }
 
       const proxy = this.getUrlProxy(requestUrl);
 
-      log.trace('proxying request to %s use %s proxy', requestUrl, 'http://' + proxy.hostname + ':' + proxy.port);
+      log.trace('proxying request to %s using %s proxy', requestUrl, 'http://' + proxy.hostname + ':' + proxy.port);
 
       request.shouldKeepAlive = false;
 

diff --git a/src/classes/HttpProxyAgent.js b/src/classes/HttpProxyAgent.js
@@ -8,6 +8,15 @@ import type {
 import Agent from './Agent';
 
 class HttpProxyAgent extends Agent {
+  // @see https://github.com/sindresorhus/eslint-plugin-unicorn/issues/169#issuecomment-486980290
+  // eslint-disable-next-line unicorn/prevent-abbreviations
+  constructor (...args: *) {
+    super(...args);
+
+    this.protocol = 'http:';
+    this.defaultPort = 80;
+  }
+
   createConnection (configuration: ConnectionConfigurationType, callback: ConnectionCallbackType) {
     const socket = net.connect(
       configuration.proxy.port,

diff --git a/src/classes/HttpsProxyAgent.js b/src/classes/HttpsProxyAgent.js
@@ -9,6 +9,14 @@ import type {
 import Agent from './Agent';
 
 class HttpsProxyAgent extends Agent {
+  // eslint-disable-next-line unicorn/prevent-abbreviations
+  constructor (...args: *) {
+    super(...args);
+
+    this.protocol = 'https:';
+    this.defaultPort = 443;
+  }
+
   createConnection (configuration: ConnectionConfigurationType, callback: ConnectionCallbackType) {
     const socket = net.connect(
       configuration.proxy.port,

diff --git a/src/routines/bootstrap.js b/src/routines/bootstrap.js
@@ -63,17 +63,15 @@ export default () => {
   // @see https://github.com/facebook/flow/issues/7670
   // $FlowFixMe
   http.globalAgent = new HttpProxyAgent(
-    'http:',
     mustUrlUseProxy,
     getUrlProxy,
     http.globalAgent
   );
 
   // $FlowFixMe
   https.globalAgent = new HttpsProxyAgent(
-    'https:',
     mustUrlUseProxy,
     getUrlProxy,
-    http.globalAgent
+    https.globalAgent
   );
 };