fix: improve request errors

Signed-off-by: getlarge <ed@getlarge.eu>

src/baseRequest.js

@@ -2,19 +2,24 @@
 // SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
 // Code is Apache-2.0 and docs are CC-BY-4.0
 
-import {
+import { Promise } from 'es6-promise'
-    Promise
-} from 'es6-promise'
 import fetchPonyfill from 'fetch-ponyfill'
-import {
+import { vsprintf } from 'sprintf-js'
-    vsprintf
-} from 'sprintf-js'
 
 import formatText from './format_text'
 import stringifyAsQueryParam from './stringify_as_query_param'
 
 const fetch = fetchPonyfill(Promise)
 
+export function ResponseError(message,  status, requestURI) {
+    this.name = 'ResponseError'
+    this.message = message
+    this.status = status
+    this.requestURI = requestURI
+    this.stack = (new Error()).stack
+}
+
+ResponseError.prototype = new Error;
 
 /**
  * @private
@@ -45,12 +50,7 @@ function handleResponse(res) {
     // If status is not a 2xx (based on Response.ok), assume it's an error
     // See https://developer.mozilla.org/en-US/docs/Web/API/GlobalFetch/fetch
     if (!(res && res.ok)) {
-        const errorObject = {
+        throw new ResponseError('HTTP Error: Requested page not reachable', `${res.status} ${res.statusText}`, res.url)
-            message: 'HTTP Error: Requested page not reachable',
-            status: `${res.status} ${res.statusText}`,
-            requestURI: res.url
-        }
-        throw errorObject
     }
     return res
 }

src/transport.js

@@ -46,28 +46,21 @@ export default class Transport {
             connection = this.pickConnection()
             // Date in milliseconds
             const startTime = Date.now()
-            try {
+            // eslint-disable-next-line no-await-in-loop
-                // eslint-disable-next-line no-await-in-loop
+            response = await connection.request(
-                response = await connection.request(
+                path,
-                    path,
+                headers,
-                    headers,
+                this.timeout,
-                    this.timeout,
+                this.maxBackoffTime
-                    this.maxBackoffTime
+            )
-                )
+            const elapsed = Date.now() - startTime
-                const elapsed = Date.now() - startTime
+            if (connection.backoffTime > 0 && this.timeout > 0) {
-                if (connection.backoffTime > 0 && this.timeout > 0) {
+                this.timeout -= elapsed
-                    this.timeout -= elapsed
+            } else {
-                } else {
+                // No connection error, the response is valid
-                    // No connection error, the response is valid
+                return response
-                    return response
-                }
-            } catch (err) {
-                throw err
             }
         }
-        const errorObject = {
+        throw new Error('TimeoutError')
-            message: 'TimeoutError',
-        }
-        throw errorObject
     }
 }