fix: make timeouts stricter (#40)

Author: achingbrain

src/http.js

@@ -30,23 +30,29 @@ const timeout = (promise, ms, abortController) => {
     return promise
   }
 
-  return new Promise((resolve, reject) => {
-    const timeoutID = setTimeout(() => {
-      reject(new TimeoutError())
-
-      abortController.abort()
-    }, ms)
+  const start = Date.now()
 
-    promise
-      .then((result) => {
+  return new Promise((resolve, reject) => {
+    const after = (next) => {
+      return (res) => {
         clearTimeout(timeoutID)
+        const time = Date.now() - start
 
-        resolve(result)
-      }, (err) => {
-        clearTimeout(timeoutID)
+        if (time >= ms) {
+          abortController.abort()
+          reject(new TimeoutError())
+          return
+        }
 
-        reject(err)
-      })
+        if (next) {
+          next(res)
+        }
+      }
+    }
+    const timeoutID = setTimeout(after(), ms)
+
+    promise
+      .then(after(resolve), after(reject))
   })
 }
 
@@ -138,7 +144,13 @@ class HTTP {
       opts.headers.set('content-type', 'application/json')
     }
 
-    const response = await timeout(fetch(url, opts), opts.timeout, this.abortController)
+    const response = await timeout(fetch(url, {
+      ...opts,
+
+      // node-fetch implements it's own timeout in an addition to the spec so do not
+      // pass the timeout value on, otherwise there are two sources of timeout errors
+      timeout: undefined
+    }), opts.timeout, this.abortController)
 
     if (!response.ok && opts.throwHttpErrors) {
       if (opts.handleError) {

test/http.spec.js

@@ -24,6 +24,12 @@ describe('http', function () {
     expect(rsp).to.be.deep.eq({ test: 'one' })
   })
 
+  it('makes a GET request with a really short timeout', function () {
+    return expect(HTTP.get(`${process.env.ECHO_SERVER}/redirect?to=${encodeURI(`${process.env.ECHO_SERVER}/echo/query?test=one`)}`, {
+      timeout: 1
+    })).to.eventually.be.rejectedWith().instanceOf(HTTP.TimeoutError)
+  })
+
   it('makes a JSON request', async () => {
     const req = await HTTP.post(`${process.env.ECHO_SERVER}/echo`, {
       json: {