Merge pull request #658 from RushPL/master

Added proxyTimeout option and two tests for timeout

lib/http-proxy/passes/web-incoming.js

@@ -109,6 +109,14 @@ web_o = Object.keys(web_o).map(function(pass) {
       common.setupOutgoing(options.ssl || {}, options, req)
     );
 
+    // allow outgoing socket to timeout so that we could
+    // show an error page at the initial request
+    if(options.proxyTimeout) {
+      proxyReq.setTimeout(options.proxyTimeout, function() {
+         proxyReq.abort();
+      });
+    }
+
     // Ensure we abort proxy if request is aborted
     req.on('aborted', function () {
       proxyReq.abort();

test/lib-http-proxy-passes-web-incoming-test.js

@@ -128,6 +128,87 @@ describe('#createProxyServer.web() using own http server', function () {
     }, function() {}).end();
   });
 
+  it('should proxy the request and handle timeout error (proxyTimeout)', function(done) {
+    var proxy = httpProxy.createProxyServer({
+      target: 'http://127.0.0.1:45000',
+      proxyTimeout: 100
+    });
+
+    require('net').createServer().listen(45000);
+
+    var proxyServer = http.createServer(requestHandler);
+
+    var started = new Date().getTime();
+    function requestHandler(req, res) {
+      proxy.once('error', function (err, errReq, errRes) {
+        proxyServer.close();
+        expect(err).to.be.an(Error);
+        expect(errReq).to.be.equal(req);
+        expect(errRes).to.be.equal(res);
+        expect(new Date().getTime() - started).to.be.greaterThan(99);
+        expect(err.code).to.be('ECONNRESET');
+        done();
+      });
+
+      proxy.web(req, res);
+    }
+
+    proxyServer.listen('8084');
+
+    http.request({
+      hostname: '127.0.0.1',
+      port: '8084',
+      method: 'GET',
+    }, function() {}).end();
+  });
+
+  it('should proxy the request and handle timeout error', function(done) {
+    var proxy = httpProxy.createProxyServer({
+      target: 'http://127.0.0.1:45001',
+      timeout: 100
+    });
+
+    require('net').createServer().listen(45001);
+
+    var proxyServer = http.createServer(requestHandler);
+
+    var cnt = 0;
+    var doneOne = function() {
+      cnt += 1;
+      if(cnt === 2) done();
+    }
+
+    var started = new Date().getTime();
+    function requestHandler(req, res) {
+      proxy.once('error', function (err, errReq, errRes) {
+        proxyServer.close();
+        expect(err).to.be.an(Error);
+        expect(errReq).to.be.equal(req);
+        expect(errRes).to.be.equal(res);
+        expect(err.code).to.be('ECONNRESET');
+        doneOne();
+      });
+
+      proxy.web(req, res);
+    }
+
+    proxyServer.listen('8085');
+
+    var req = http.request({
+      hostname: '127.0.0.1',
+      port: '8085',
+      method: 'GET',
+    }, function() {});
+
+    req.on('error', function(err) {
+      expect(err).to.be.an(Error);
+      expect(err.code).to.be('ECONNRESET');
+      expect(new Date().getTime() - started).to.be.greaterThan(99);
+      doneOne();
+    });
+    req.end();
+  });
+
   it('should proxy the request and provide a proxyRes event with the request and response parameters', function(done) {
     var proxy = httpProxy.createProxyServer({
       target: 'http://127.0.0.1:8080'
@@ -151,8 +232,8 @@ describe('#createProxyServer.web() using own http server', function () {
       res.end('Response');
     });
 
-    proxyServer.listen('8084');
+    proxyServer.listen('8086');
     source.listen('8080');
-    http.request('http://127.0.0.1:8084', function() {}).end();
+    http.request('http://127.0.0.1:8086', function() {}).end();
   });
 });

test/lib-http-proxy-test.js

@@ -294,9 +294,11 @@ describe('lib/http-proxy.js', function() {
       var proxy = httpProxy.createProxyServer({
         target: 'ws://127.0.0.1:' + ports.source,
         ws: true
-      }),
-      proxyServer = proxy.listen(ports.proxy),
-      destiny = io.listen(ports.source, function () {
+      });
+      proxyServer = proxy.listen(ports.proxy);
+      var server = http.createServer();
+      destiny = io.listen(server);
+      function startSocketIo() {
         var client = ioClient.connect('ws://127.0.0.1:' + ports.proxy);
 
         client.on('connect', function () {
@@ -306,10 +308,12 @@ describe('lib/http-proxy.js', function() {
         client.on('outgoing', function (data) {
           expect(data).to.be('Hello over websockets');
           proxyServer._server.close();
-          destiny.server.close();
+          server.close();
           done();
         });
-      });
+      }
+      server.listen(ports.source);
+      server.on('listening', startSocketIo);
 
       destiny.sockets.on('connection', function (socket) {
         socket.on('incoming', function (msg) {