feat: add-connect-timeout-support

README.md

@@ -37,7 +37,9 @@ const agent = new HttpProxyAgent({
   keepAliveMsecs: 1000,
   maxSockets: 256,
   maxFreeSockets: 256,
-  proxy: 'http://localhost:8080'
+  proxy: 'http://localhost:8080',
+  // proxy connect timeout in milliseconds 
+  timeout: 1000,
 })
 
 http.get('http://localhost:9200', { agent })

index.js

@@ -21,7 +21,8 @@ class HttpProxyAgent extends http.Agent {
       path: `${options.host}:${options.port}`,
       setHost: false,
       headers: { connection: this.keepAlive ? 'keep-alive' : 'close', host: `${options.host}:${options.port}` },
-      agent: false
+      agent: false,
+      timeout: options.timeout,
     }
 
     if (this.proxy.username || this.proxy.password) {
@@ -40,6 +41,12 @@ class HttpProxyAgent extends http.Agent {
       }
     })
 
+    request.once('timeout', () => {
+      const e = new Error(`connect proxy ${this.proxy.toString()} timeout`)
+      e.code = 'EPROXYTIMEOUT'
+      request.destroy(e);
+    })
+
     request.once('error', err => {
       request.removeAllListeners()
       callback(err, null)
@@ -66,7 +73,8 @@ class HttpsProxyAgent extends https.Agent {
       path: `${options.host}:${options.port}`,
       setHost: false,
       headers: { connection: this.keepAlive ? 'keep-alive' : 'close', host: `${options.host}:${options.port}` },
-      agent: false
+      agent: false,
+      timeout: options.timeout,
     }
 
     if (this.proxy.username || this.proxy.password) {
@@ -86,6 +94,12 @@ class HttpsProxyAgent extends https.Agent {
       }
     })
 
+    request.once('timeout', () => {
+      const e = new Error(`connect proxy ${this.proxy.toString()} timeout`)
+      e.code = 'EPROXYTIMEOUT'
+      request.destroy(e);
+    })
+
     request.once('error', err => {
       request.removeAllListeners()
       callback(err, null)

test/got.test.js

@@ -109,3 +109,28 @@ test('https to https', async t => {
   server.close()
   proxy.close()
 })
+
+test('timeout', async t => {
+  const server = await createSecureServer()
+  server.on('request', (req, res) => res.end('ok'))
+
+  try {
+    await got(`https://${server.address().address}:${server.address().port}`, {
+      agent: {
+        https: new HttpsProxyAgent({
+          keepAlive: true,
+          keepAliveMsecs: 1000,
+          maxSockets: 256,
+          maxFreeSockets: 256,
+          scheduling: 'lifo',
+          proxy: `http://1.1.1.1:1111`,
+          timeout: 100,
+        })
+      }
+    })
+  } catch (e) {
+    t.is(e.code, 'EPROXYTIMEOUT')
+  }
+
+  server.close()
+})