Add timeout support (#66)

delvedor · May 2, 2022 · be60918 · be60918
1 parent a9bf98d
commit be60918
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 2 deletions.
diff --git a/index.js b/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 || 0
     }
 
     if (this.proxy.username || this.proxy.password) {
@@ -44,6 +45,10 @@ class HttpProxyAgent extends http.Agent {
       }
     })
 
+    request.once('timeout', () => {
+      request.destroy(new Error('Proxy timeout'))
+    })
+
     request.once('error', err => {
       request.removeAllListeners()
       callback(err, null)
@@ -70,7 +75,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 || 0
     }
 
     if (this.proxy.username || this.proxy.password) {
@@ -95,6 +101,10 @@ class HttpsProxyAgent extends https.Agent {
       }
     })
 
+    request.once('timeout', () => {
+      request.destroy(new Error('Proxy timeout'))
+    })
+
     request.once('error', err => {
       request.removeAllListeners()
       callback(err, null)

diff --git a/test/http-http.test.js b/test/http-http.test.js
@@ -349,3 +349,33 @@ test('Test Host Header', async t => {
   server.close()
   proxy.close()
 })
+
+test('Timeout', async t => {
+  const server = await createServer()
+  const proxy = await createProxy()
+  server.on('request', (req, res) => res.end('ok'))
+
+  try {
+    await request({
+      method: 'GET',
+      hostname: server.address().address,
+      port: server.address().port,
+      path: '/',
+      timeout: 1,
+      agent: new HttpProxyAgent({
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 256,
+        maxFreeSockets: 256,
+        scheduling: 'lifo',
+        proxy: `http://${proxy.address().address}:${proxy.address().port}`
+      })
+    })
+    t.fail('Should throw')
+  } catch (err) {
+    t.is(err.message, 'Proxy timeout')
+  }
+
+  server.close()
+  proxy.close()
+})
diff --git a/test/http-https.test.js b/test/http-https.test.js
@@ -311,3 +311,33 @@ test('Configure the agent to NOT reuse sockets', async t => {
   server.close()
   proxy.close()
 })
+
+test('Timeout', async t => {
+  const server = await createSecureServer()
+  const proxy = await createProxy()
+  server.on('request', (req, res) => res.end('ok'))
+
+  try {
+    await request({
+      method: 'GET',
+      hostname: server.address().address,
+      port: server.address().port,
+      path: '/',
+      timeout: 1,
+      agent: new HttpsProxyAgent({
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 256,
+        maxFreeSockets: 256,
+        scheduling: 'lifo',
+        proxy: `http://${proxy.address().address}:${proxy.address().port}`
+      })
+    })
+    t.fail('Should throw')
+  } catch (err) {
+    t.is(err.message, 'Proxy timeout')
+  }
+
+  server.close()
+  proxy.close()
+})
diff --git a/test/https-http.test.js b/test/https-http.test.js
@@ -311,3 +311,33 @@ test('Configure the agent to NOT reuse sockets', async t => {
   server.close()
   proxy.close()
 })
+
+test('Timeout', async t => {
+  const server = await createServer()
+  const proxy = await createSecureProxy()
+  server.on('request', (req, res) => res.end('ok'))
+
+  try {
+    await request({
+      method: 'GET',
+      hostname: server.address().address,
+      port: server.address().port,
+      path: '/',
+      timeout: 1,
+      agent: new HttpProxyAgent({
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 256,
+        maxFreeSockets: 256,
+        scheduling: 'lifo',
+        proxy: `http://${proxy.address().address}:${proxy.address().port}`
+      })
+    })
+    t.fail('Should throw')
+  } catch (err) {
+    t.is(err.message, 'Proxy timeout')
+  }
+
+  server.close()
+  proxy.close()
+})
diff --git a/test/https-https.test.js b/test/https-https.test.js
@@ -311,3 +311,33 @@ test('Configure the agent to NOT reuse sockets', async t => {
   server.close()
   proxy.close()
 })
+
+test('Timeout', async t => {
+  const server = await createSecureServer()
+  const proxy = await createSecureProxy()
+  server.on('request', (req, res) => res.end('ok'))
+
+  try {
+    await request({
+      method: 'GET',
+      hostname: server.address().address,
+      port: server.address().port,
+      path: '/',
+      timeout: 1,
+      agent: new HttpsProxyAgent({
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 256,
+        maxFreeSockets: 256,
+        scheduling: 'lifo',
+        proxy: `http://${proxy.address().address}:${proxy.address().port}`
+      })
+    })
+    t.fail('Should throw')
+  } catch (err) {
+    t.is(err.message, 'Proxy timeout')
+  }
+
+  server.close()
+  proxy.close()
+})