Fixed conflict in the PR#3 by thibauts

punitx · punitx · commit 8adbb4ad82cb · 2016-09-25T13:12:38.000+05:30
diff --git a/README.md b/README.md
@@ -104,6 +104,7 @@ The `opts` argument may either be a string URI of the proxy server to use, or an
   * `host` - String - Proxy host to connect to (may use `hostname` as well). Required.
   * `port` - Number - Proxy port to connect to. Required.
   * `secureProxy` - Boolean - If `true`, then use TLS to connect to the proxy. Defaults to `false`.
+  * `timeout` - Number - Proxy response timeout in milliseconds.
   * `headers` - Object - Additional HTTP headers to be sent on the HTTP CONNECT method.
   * Any other options given are passed to the `net.connect()`/`tls.connect()` functions.
 
diff --git a/https-proxy-agent.js b/https-proxy-agent.js
@@ -40,6 +40,10 @@ function HttpsProxyAgent (opts) {
   proxy.host = proxy.hostname || proxy.host;
   proxy.port = +proxy.port || (this.secureProxy ? 443 : 80);
 
+  if(opts.timeout) {
+    this.timeout = opts.timeout;
+  }
+
   if (proxy.host && proxy.path) {
     // if both a `host` and `path` are specified then it's most likely the
     // result of a `url.parse()` call... we need to remove the `path` portion so
@@ -70,6 +74,10 @@ function connect (req, opts, fn) {
     socket = net.connect(proxy);
   }
 
+  if(this.timeout) {
+    socket.setTimeout(this.timeout);
+  }
+
   // we need to buffer any HTTP traffic that happens with the proxy before we get
   // the CONNECT response, so that if the response is anything other than an "200"
   // response code, then we can re-play the "data" events on the socket once the
@@ -89,12 +97,22 @@ function connect (req, opts, fn) {
     socket.removeListener('error', onerror);
     socket.removeListener('close', onclose);
     socket.removeListener('readable', read);
+    socket.removeListener('timeout', ontimeout);
   }
 
   function onclose (err) {
     debug('onclose had error %o', err);
   }
 
+  function ontimeout () {
+    var err = new Error('Proxy connection timed out');
+    err.code = 'ETIMEOUT';
+    cleanup();
+    // prevent unhandled `error` events
+    socket.destroy();
+    fn(err);
+  }
+
   function onend () {
     debug('onend');
   }
@@ -182,6 +200,7 @@ function connect (req, opts, fn) {
   socket.on('error', onerror);
   socket.on('close', onclose);
   socket.on('end', onend);
+  socket.on('timeout', ontimeout);
 
   if (socket.read) {
     read();
diff --git a/test/test.js b/test/test.js
@@ -223,7 +223,26 @@ describe('HttpsProxyAgent', function () {
         done();
       });
     });
+    it('should emit an "error" event on the `http.ClientRequest` if the proxy times out', function(done) {
+      // ensure we timeout after the "error" event had a chance to trigger
+      this.timeout(1000);
+
+      var agent = new HttpsProxyAgent({
+        host: '255.0.0.1', // unsassigned address, should timeout
+        port: 8080,
+        timeout: 500
+      });
 
+      var opts = url.parse('http://nodejs.org');
+      opts.agent = agent;
+
+      var req = http.get(opts);
+      req.once('error', function(err) {
+        assert.equal('ETIMEOUT', err.code);
+        req.abort();
+        done();
+      });
+    });
     it('should allow custom proxy "headers"', function (done) {
       server.once('connect', function (req, socket, head) {
         assert.equal('CONNECT', req.method);
