request timeout for fetch

Author: kobenguyent

lib/helper/GraphQL.js

@@ -89,14 +89,11 @@ class GraphQL extends Helper {
     this.debugSection('Request', JSON.stringify(request))
 
     let response
-    const controller = new AbortController()
-    const id = setTimeout(() => controller.abort(), timeout)
-
     const url = request.url ? (request.baseURL ? request.baseURL + request.url : request.url) : request.baseURL
     const fetchOptions = {
       method: request.method || 'POST',
       headers: request.headers || {},
-      signal: controller.signal,
+      signal: AbortSignal.timeout(timeout),
     }
 
     if (request.data) {
@@ -111,7 +108,6 @@ class GraphQL extends Helper {
 
     try {
       const fetchResponse = await fetch(url, fetchOptions)
-      clearTimeout(id)
 
       const headers = {}
       fetchResponse.headers.forEach((value, key) => {
@@ -143,8 +139,7 @@ class GraphQL extends Helper {
         this.debugSection('Response', `Response error. Status code: ${fetchResponse.status}`)
       }
     } catch (err) {
-      clearTimeout(id)
-      if (err.name === 'AbortError') {
+      if (err.name === 'TimeoutError' || err.name === 'AbortError') {
         throw new Error(`Request timed out after ${timeout}ms`)
       }
       throw err

lib/helper/REST.js

@@ -182,6 +182,7 @@ class REST extends Helper {
 
     const _debugRequest = { ...request }
     const timeout = request.timeout || this.options.timeout
+    request.timeout = timeout
 
     if (this.headers && this.headers.auth) {
       request.auth = this.headers.auth
@@ -227,14 +228,11 @@ class REST extends Helper {
     }
 
     let response
-    const controller = new AbortController()
-    const id = setTimeout(() => controller.abort(), timeout)
-
     const url = request.url ? (request.baseURL ? request.baseURL + request.url : request.url) : request.baseURL
     const fetchOptions = {
       method: request.method || 'GET',
       headers: request.headers || {},
-      signal: controller.signal,
+      signal: AbortSignal.timeout(timeout),
     }
 
     if (request.data) {
@@ -258,7 +256,6 @@ class REST extends Helper {
 
     try {
       const fetchResponse = await fetch(url, fetchOptions)
-      clearTimeout(id)
 
       const headers = {}
       fetchResponse.headers.forEach((value, key) => {
@@ -294,8 +291,7 @@ class REST extends Helper {
         }
       }
     } catch (err) {
-      clearTimeout(id)
-      if (err.name === 'AbortError') {
+      if (err.name === 'TimeoutError' || err.name === 'AbortError') {
         throw new Error(`Request timed out after ${timeout}ms`)
       }
       throw err

lib/test-server.js

@@ -125,6 +125,11 @@ class TestServer {
       res.json(req.headers)
     })
 
+    this.app.get('/timeout', (req, res) => {
+      const ms = parseInt(req.query.ms) || 5000
+      setTimeout(() => res.json({ message: 'done' }), ms)
+    })
+
     this.app.post('/headers', (req, res) => {
       res.json(req.headers)
     })

test/rest/REST_test.js

@@ -129,10 +129,14 @@ describe('REST', () => {
       response.data.name.should.eql('Vasya')
     })
 
-    it('should set timeout for the request', async () => {
-      await I.setRequestTimeout(2000)
-      const response = await I.sendGetRequest('/posts')
-      response.config.timeout.should.eql(2000)
+    it('should throw error when request times out', async () => {
+      await I.setRequestTimeout(100)
+      try {
+        await I.sendGetRequest('/timeout?ms=500')
+        throw new Error('Should have timed out')
+      } catch (e) {
+        e.message.should.contain('Request timed out after 100ms')
+      }
     })
   })