fix the connect timeout does not work

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

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
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,7 +209,7 @@ 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;
@@ -219,9 +219,23 @@ describe('httpx', () => {
     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;