Merge branch 'try-catch-json-parse' of github.com:commercetools/nodejs into try-catch-json-parse

Author: markus-azer

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

@@ -100,7 +100,10 @@ export default function createHttpMiddleware({
     let abortController: any
     if (timeout || getAbortController || _abortController)
       // eslint-disable-next-line
-      abortController = (getAbortController ? getAbortController(): null) || _abortController || new AbortController()
+      abortController =
+        (getAbortController ? getAbortController() : null) ||
+        _abortController ||
+        new AbortController()
 
     const url = host.replace(/\/$/, '') + request.uri
     const body =
@@ -153,17 +156,31 @@ export default function createHttpMiddleware({
               }
 
               res.text().then((result: Object) => {
-                let resBody
-
+                // Try to parse the response as JSON
+                let parsed
                 try {
-                  resBody = result.length > 0 ? JSON.parse(result) : {}
+                  parsed = result.length > 0 ? JSON.parse(result) : {}
                 } catch (err) {
-                  resBody = result
+                  if (enableRetry && retryCount < maxRetries) {
+                    setTimeout(
+                      executeFetch,
+                      calcDelayDuration(
+                        retryCount,
+                        retryDelay,
+                        maxRetries,
+                        backoff,
+                        maxDelay
+                      )
+                    )
+                    retryCount += 1
+                    return
+                  }
+                  parsed = result
                 }
 
                 const parsedResponse: Object = {
                   ...response,
-                  body: resBody,
+                  body: parsed,
                   statusCode: res.status,
                 }
 

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

@@ -70,7 +70,7 @@ describe('Http', () => {
       httpMiddleware(next)(request, response)
     }))
 
-  test('execute a get request which give not json response', () =>
+  test("execute a get request which doesn't return a json response", () =>
     new Promise((resolve, reject) => {
       const request = createTestRequest({
         uri: '/foo/bar',