fix(sdk-middleware-http): abortController timing (#1600)

Co-authored-by: Daniel Eriksson <[email protected]>

Author: jluterek

packages/sdk-middleware-http/src/http.js

@@ -90,12 +90,6 @@ export default function createHttpMiddleware({
     // eslint-disable-next-line
     abortController = _abortController || new AbortController()
 
-  let timer
-  if (timeout)
-    timer = setTimeout(() => {
-      abortController.abort()
-    }, timeout)
-
   return (next: Next): Next => (
     request: MiddlewareRequest,
     response: MiddlewareResponse
@@ -125,6 +119,12 @@ export default function createHttpMiddleware({
     let retryCount = 0
     // wrap in a fn so we can retry if error occur
     function executeFetch() {
+      // Kick off timer for abortController directly before fetch.
+      let timer
+      if (timeout)
+        timer = setTimeout(() => {
+          abortController.abort()
+        }, timeout)
       // $FlowFixMe
       fetcher(url, fetchOptions)
         .then(

packages/sdk-middleware-http/test/http.spec.js

@@ -134,6 +134,39 @@ describe('Http', () => {
       httpMiddleware(next)(request, response)
     }))
 
+  test('execute a request with timeout and client re-use', () =>
+    new Promise((resolve, reject) => {
+      const request = createTestRequest({
+        uri: '/foo/bar',
+      })
+      const response = { resolve, reject }
+      const next = (req, res) => {
+        expect(res).toEqual({
+          ...response,
+          body: { foo: 'bar' },
+          statusCode: 200,
+        })
+        resolve()
+      }
+      // Use default options
+      const httpMiddleware = createHttpMiddleware({
+        host: testHost,
+        timeout: 100, // time out after 100ms
+        fetch,
+        abortController: new AbortController(),
+      })
+      nock(testHost)
+        .defaultReplyHeaders({
+          'Content-Type': 'application/json',
+        })
+        .get('/foo/bar')
+        .reply(200, { foo: 'bar' })
+      // Set delay to emulate instantiated SDK sitting idle
+      setTimeout(() => {
+        httpMiddleware(next)(request, response)
+      }, 110)
+    }))
+
   test('should accept HEAD request and return without response body', () =>
     new Promise((resolve, reject) => {
       const request = createTestRequest({ uri: '/foo', method: 'HEAD' })