Merge 15590a7 into c22c297

lib/middleware/proxy.js

@@ -1,4 +1,6 @@
 const url = require('url')
+const { Agent: httpAgent } = require('http')
+const { Agent: httpsAgent } = require('https')
 const httpProxy = require('http-proxy')
 const _ = require('lodash')
 
@@ -42,11 +44,14 @@ function parseProxyConfig (proxies, config) {
       port = config.port
     }
     const changeOrigin = proxyConfiguration.changeOrigin || false
+    const Agent = https ? httpsAgent : httpAgent
+    const keepAliveAgent = new Agent({ keepAlive: true })
     const proxy = httpProxy.createProxyServer({
       target: { host: hostname, port, https, protocol },
       xfwd: true,
       changeOrigin: changeOrigin,
-      secure: config.proxyValidateSSL
+      secure: config.proxyValidateSSL,
+      agent: keepAliveAgent
     })
 
     ;['proxyReq', 'proxyRes'].forEach(function (name) {

test/unit/middleware/proxy.spec.js

@@ -352,4 +352,24 @@ describe('middleware.proxy', () => {
   it('should handle empty proxy config', () => {
     expect(m.parseProxyConfig({})).to.deep.equal([])
   })
+
+  it('should use http agent with keepAlive=true', () => {
+    const proxy = { '/base': 'http://localhost:8000/proxy' }
+    const parsedProxyConfig = m.parseProxyConfig(proxy, {})
+    expect(parsedProxyConfig).to.have.length(1)
+    expect(parsedProxyConfig[0].proxy.options.agent).to.containSubset({
+      keepAlive: true,
+      protocol: 'http:'
+    })
+  })
+
+  it('should use https agent with keepAlive=true', () => {
+    const proxy = { '/base': 'https://localhost:8000/proxy' }
+    const parsedProxyConfig = m.parseProxyConfig(proxy, {})
+    expect(parsedProxyConfig).to.have.length(1)
+    expect(parsedProxyConfig[0].proxy.options.agent).to.containSubset({
+      keepAlive: true,
+      protocol: 'https:'
+    })
+  })
 })