network: override addRequest in HttpAgent, not createSocket

cypress-io · Jun 4, 2019 · 768381b · 768381b
1 parent 5f678a2
commit 768381b
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/packages/network/lib/agent.ts b/packages/network/lib/agent.ts
@@ -138,6 +138,7 @@ export class CombinedAgent {
   }
 
   // called by Node.js whenever a new request is made internally
+  // TODO: need to support legacy invocation? https://github.com/nodejs/node/blob/cb68c04ce1bc4534b2d92bc7319c6ff6dda0180d/lib/_http_agent.js#L148-L155
   addRequest(req: http.ClientRequest, options: http.RequestOptions) {
     const isHttps = isRequestHttps(options)
 
@@ -182,22 +183,22 @@ class HttpAgent extends http.Agent {
     this.httpsAgent = new https.Agent({ keepAlive: true })
   }
 
-  createSocket (req: http.ClientRequest, options: http.RequestOptions, cb: http.SocketCallback) {
+  addRequest (req: http.ClientRequest, options: http.RequestOptions) {
     if (process.env.HTTP_PROXY) {
       const proxy = getProxyForUrl(options.href)
 
       if (proxy) {
         options.proxy = proxy
 
-        return this._createProxiedSocket(req, <RequestOptionsWithProxy>options, cb)
+        this._addProxiedRequest(req, <RequestOptionsWithProxy>options)
       }
     }
 
-    super.createSocket(req, options, cb)
+    super.addRequest(req, options)
   }
 
-  _createProxiedSocket (req: http.ClientRequest, options: RequestOptionsWithProxy, cb: http.SocketCallback) {
-    debug(`Creating proxied socket for ${options.href} through ${options.proxy}`)
+  _addProxiedRequest (req: http.ClientRequest, options: RequestOptionsWithProxy) {
+    debug(`Creating proxied request for ${options.href} through ${options.proxy}`)
 
     const proxy = url.parse(options.proxy)
 
@@ -228,7 +229,7 @@ class HttpAgent extends http.Agent {
       return this.httpsAgent.addRequest(req, options)
     }
 
-    super.createSocket(req, options, cb)
+    super.addRequest(req, options)
   }
 }