fix the connect timeout does not work

JacksonTian · Nov 6, 2024 · a1d3692 · a1d3692
1 parent 65e84c6
commit a1d3692
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [12.x, 14.x, 16.x, 18.x, 20.x]
+        node-version: [14.x, 16.x, 18.x, 20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

diff --git a/lib/index.js b/lib/index.js
@@ -167,6 +167,14 @@ export function request(url, opts) {
       });
     }
 
+    request.on('timeout', () => {
+      var err = new Error();
+      err.name = 'RequestTimeoutError';
+      err.message = `ConnectTimeout: Connect ${url} failed.`;
+      request.destroy();
+      reject(err);
+    });
+
     request.on('response', fulfilled);
     request.on('error', rejected);
     request.once('socket', function (socket) {

diff --git a/test/index.test.js b/test/index.test.js
@@ -23,7 +23,7 @@ const server = http.createServer((req, res) => {
     setTimeout(() => {
       res.writeHead(200, {'Content-Type': 'text/plain'});
       res.end('Hello world!');
-    }, 200);
+    }, 1200);
   } else if (req.url === '/stream') {
     res.writeHead(200);
     const buffers = [];
@@ -209,19 +209,33 @@ describe('httpx', () => {
 
   it('timeout should ok', async function () {
     try {
-      await make(server)('/timeout', {timeout: 100});
+      await make(server)('/timeout', {timeout: 1000});
     } catch (ex) {
       assert.strictEqual(ex.name, 'RequestTimeoutError');
       const port = server.address().port;
-      assert.strictEqual(ex.message, `ReadTimeout(100). GET http://127.0.0.1:${port}/timeout failed.`);
+      assert.strictEqual(ex.message, `ReadTimeout(1000). GET http://127.0.0.1:${port}/timeout failed.`);
+      return;
+    }
+    assert.ok(false, 'should not ok');
+  });
+
+  it('timeout(connectTimeout) should ok', async function () {
+    try {
+      await httpx.request('http://100.100.100.200', {
+        readTimeout: 1000,
+        connectTimeout: 1000
+      });
+    } catch (ex) {
+      assert.strictEqual(ex.name, 'RequestTimeoutError');
+      assert.strictEqual(ex.message, 'ConnectTimeout: Connect http://100.100.100.200 failed.');
       return;
     }
     assert.ok(false, 'should not ok');
   });
 
   it('timeout(readTimeout) should ok', async function () {
     try {
-      await make(server)('/readTimeout', {readTimeout: 100, connectTimeout: 50});
+      await make(server)('/readTimeout', {readTimeout: 100, connectTimeout: 1000});
     } catch (ex) {
       assert.strictEqual(ex.name, 'RequestTimeoutError');
       const port = server.address().port;
@@ -233,7 +247,7 @@ describe('httpx', () => {
 
   it('timeout(readTimeout & timeout) should ok', async function () {
     try {
-      await make(server)('/readTimeout', {readTimeout: 100, connectTimeout: 50, timeout: 300});
+      await make(server)('/readTimeout', {readTimeout: 100, connectTimeout: 1000, timeout: 300});
     } catch (ex) {
       assert.strictEqual(ex.name, 'RequestTimeoutError');
       const port = server.address().port;