Merge pull request #1618 from hakobpogh/master

Author: jenschude

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

@@ -68,14 +68,15 @@ export default function createHttpMiddleware({
   } = {},
   fetch: fetcher,
   abortController: _abortController,
+  getAbortController
 }: HttpMiddlewareOptions): Middleware {
   if (!fetcher && typeof fetch === 'undefined')
     throw new Error(
       '`fetch` is not available. Please pass in `fetch` as an option or have it globally available.'
     )
-  if (timeout && !_abortController && typeof AbortController === 'undefined')
+  if (timeout && !getAbortController && !_abortController && typeof AbortController === 'undefined')
     throw new Error(
-      '`AbortController` is not available. Please pass in `AbortController` as an option or have it globally available when using timeout.'
+      '`AbortController` is not available. Please pass in `getAbortController` as an option or have AbortController globally available when using timeout.'
     )
   let fetchFunction: typeof fetch
   if (fetcher) {
@@ -87,15 +88,15 @@ export default function createHttpMiddleware({
     fetchFunction = fetch
   }
 
-  let abortController
-  if (timeout || _abortController)
-    // eslint-disable-next-line
-    abortController = _abortController || new AbortController()
-
   return (next: Next): Next => (
     request: MiddlewareRequest,
     response: MiddlewareResponse
   ) => {
+    let abortController
+    if (timeout || getAbortController || _abortController)
+      // eslint-disable-next-line
+      abortController = (getAbortController ? getAbortController(): null) || _abortController || new AbortController()
+
     const url = host.replace(/\/$/, '') + request.uri
     const body =
       typeof request.body === 'string' || Buffer.isBuffer(request.body)

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

@@ -36,7 +36,7 @@ describe('Http', () => {
       createHttpMiddleware({ host: testHost, timeout: 100, fetch })
     }).toThrow(
       new Error(
-        '`AbortController` is not available. Please pass in `AbortController` as an option or have it globally available when using timeout.'
+        '`AbortController` is not available. Please pass in `getAbortController` as an option or have AbortController globally available when using timeout.'
       )
     )
   })
@@ -102,6 +102,39 @@ describe('Http', () => {
       httpMiddleware(next)(request, response)
     }))
 
+  test('execute a get request with getAbortController timeout (success)', () => {
+    expect.assertions(1)
+    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: 1000, // time out after 1s
+        fetch,
+        getAbortController: () => new AbortController(),
+      })
+      nock(testHost)
+        .defaultReplyHeaders({
+          'Content-Type': 'application/json',
+        })
+        .get('/foo/bar')
+        .delay(10) // delay response with 10ms
+        .reply(200, { foo: 'bar' })
+
+      httpMiddleware(next)(request, response)
+    })})
+
   test('execute a get request with short timeout (fail)', () =>
     new Promise((resolve, reject) => {
       const request = createTestRequest({
@@ -134,6 +167,39 @@ describe('Http', () => {
       httpMiddleware(next)(request, response)
     }))
 
+  test('execute a get request with getAbortController short timeout (fail)', () => {
+    expect.assertions(1)
+    return new Promise((resolve, reject) => {
+      const request = createTestRequest({
+        uri: '/foo/bar',
+      })
+      const response = { resolve, reject }
+      const next = (req, res) => {
+        expect(res).toEqual({
+          ...response,
+          error: expect.any(Error),
+          statusCode: 0,
+        })
+        resolve()
+      }
+      // Use default options
+      const httpMiddleware = createHttpMiddleware({
+        host: testHost,
+        timeout: 10, // time out after 10ms
+        fetch,
+        getAbortController: () => new AbortController(),
+      })
+      nock(testHost)
+        .defaultReplyHeaders({
+          'Content-Type': 'application/json',
+        })
+        .get('/foo/bar')
+        .delay(100) // delay response with 100ms
+        .reply(200, { foo: 'bar' })
+
+      httpMiddleware(next)(request, response)
+    })})
+
   test('execute a request with timeout and client re-use', () =>
     new Promise((resolve, reject) => {
       const request = createTestRequest({

types/sdk.js

@@ -243,7 +243,8 @@ export type HttpMiddlewareOptions = {
     maxDelay?: number,
   },
   fetch?: typeof fetch,
-  abortController?: AbortController,
+  abortController?: AbortController, // deprecated
+  getAbortController: () => AbortController
 }
 export type QueueMiddlewareOptions = {
   concurrency: number,