chore!: fix new version of node-fetch

Author: ehmicky

src/index.test.js

@@ -314,14 +314,15 @@ test('Can parse text responses', async (t) => {
 test('Handle error empty responses', async (t) => {
   const accountId = uuidv4()
   const status = 404
-  const scope = nock(origin).get(`${pathPrefix}/accounts/${accountId}`).reply(status)
+  const expectedResponse = 'test'
+  const scope = nock(origin).get(`${pathPrefix}/accounts/${accountId}`).reply(status, expectedResponse)
 
   const client = getClient()
   const error = await t.throwsAsync(client.getAccount({ account_id: accountId }))
 
   t.is(error.status, status)
-  t.is(error.message, 'Not Found')
-  t.is(error.data, '')
+  t.is(error.message, expectedResponse)
+  t.is(error.data, expectedResponse)
   t.true(error instanceof TextHTTPError)
   t.true(error.stack !== undefined)
   t.true(scope.isDone())
@@ -337,7 +338,7 @@ test('Handle error text responses', async (t) => {
   const error = await t.throwsAsync(client.getAccount({ account_id: accountId }))
 
   t.is(error.status, status)
-  t.is(error.message, 'Not Found')
+  t.is(error.message, expectedResponse)
   t.is(error.data, expectedResponse)
   t.true(error instanceof TextHTTPError)
   t.true(error.stack !== undefined)
@@ -356,7 +357,7 @@ test('Handle error text responses on JSON endpoints', async (t) => {
   const error = await t.throwsAsync(client.getAccount({ account_id: accountId }))
 
   t.is(error.status, status)
-  t.is(error.message, 'Not Found')
+  t.is(error.message, expectedResponse)
   t.is(error.data, expectedResponse)
   t.true(error instanceof TextHTTPError)
   t.true(error.stack !== undefined)
@@ -373,7 +374,7 @@ test('Handle error JSON responses', async (t) => {
   const error = await t.throwsAsync(client.getAccount({ account_id: accountId }))
 
   t.is(error.status, status)
-  t.is(error.message, 'Not Found')
+  t.notThrows(() => JSON.parse(error.message))
   t.deepEqual(error.json, errorJson)
   t.true(error instanceof JSONHTTPError)
   t.true(error.stack !== undefined)
@@ -550,7 +551,7 @@ test('Gives up retrying on API rate limiting after a timeout', async (t) => {
   const error = await t.throwsAsync(client.getAccount({ account_id: accountId }))
 
   t.is(error.status, 429)
-  t.is(error.message, 'Too Many Requests')
+  t.is(error.message, JSON.stringify({ retryAt }))
   t.true(Number.isInteger(error.json.retryAt))
 
   t.false(scope.isDone())

src/methods/response.js

@@ -10,7 +10,7 @@ export const parseResponse = async function (response) {
 
   if (!response.ok) {
     const ErrorType = responseType === 'json' ? JSONHTTPError : TextHTTPError
-    throw new ErrorType(response, parsedResponse)
+    throw addFallbackErrorMessage(new ErrorType(response, parsedResponse), textResponse)
   }
 
   return parsedResponse
@@ -34,13 +34,20 @@ const parseJsonResponse = function (response, textResponse, responseType) {
   try {
     return JSON.parse(textResponse)
   } catch {
-    throw new TextHTTPError(response, textResponse)
+    throw addFallbackErrorMessage(new TextHTTPError(response, textResponse), textResponse)
   }
 }
 
+const addFallbackErrorMessage = function (error, textResponse) {
+  error.message = error.message || textResponse
+  return error
+}
+
 export const getFetchError = function (error, url, opts) {
   const data = omit.default(opts, ['Authorization'])
-  error.name = 'FetchError'
+  if (error.name !== 'FetchError') {
+    error.name = 'FetchError'
+  }
   error.url = url
   error.data = data
   return error