Error on response.ok false

package.json

@@ -1,12 +1,24 @@
 {
   "name": "use-http",
-  "version": "0.2.1",
+  "version": "0.2.5",
   "homepage": "http://use-http.com",
   "main": "dist/index.js",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/alex-cory/use-http.git"
+  "scripts": {
+    "prepublishOnly": "yarn build # runs before publish",
+    "build": "rm -rf dist && tsc --module CommonJS",
+    "build:watch": "rm -rf dist && tsc -w --module CommonJS",
+    "tsc": "tsc -p . --noEmit && tsc -p ./src/__tests__",
+    "test:browser": "yarn tsc && jest -c ./config/jest.config.js --env=jsdom",
+    "test:browser:watch": "yarn tsc && jest --watch -c ./config/jest.config.js --env=jsdom",
+    "test:server": "yarn tsc && jest -c ./config/jest.config.js --env=node --testPathIgnorePatterns useFetch.test.tsx makeRouteAndOptions.test.tsx",
+    "test:server:watch": "yarn tsc && jest --watch -c ./config/jest.config.js --env=node --testPathIgnorePatterns useFetch.test.tsx makeRouteAndOptions.test.tsx",
+    "test:watch": "yarn test:browser:watch && yarn test:server:watch",
+    "test": "yarn test:browser && yarn test:server",
+    "clean": "npm prune; yarn cache clean; rm -rf ./node_modules package-lock.json yarn.lock; yarn",
+    "lint": "eslint ./src/**/*.{ts,tsx}",
+    "lint:fix": "npm run lint -- --fix",
+    "lint:watch": "watch 'yarn lint'"
   },
   "dependencies": {
     "use-ssr": "^1.0.22"
@@ -47,25 +59,13 @@
     "typescript": "^3.4.5",
     "watch": "^1.0.2"
   },
-  "scripts": {
-    "prepublishOnly": "yarn build # runs before publish",
-    "build": "rm -rf dist && tsc --module CommonJS",
-    "build:watch": "rm -rf dist && tsc -w --module CommonJS",
-    "tsc": "tsc -p . --noEmit && tsc -p ./src/__tests__",
-    "test:browser": "yarn tsc && jest -c ./config/jest.config.js --env=jsdom",
-    "test:browser:watch": "yarn tsc && jest --watch -c ./config/jest.config.js --env=jsdom",
-    "test:server": "yarn tsc && jest -c ./config/jest.config.js --env=node --testPathIgnorePatterns useFetch.test.tsx makeRouteAndOptions.test.tsx",
-    "test:server:watch": "yarn tsc && jest --watch -c ./config/jest.config.js --env=node --testPathIgnorePatterns useFetch.test.tsx makeRouteAndOptions.test.tsx",
-    "test:watch": "yarn test:browser:watch && yarn test:server:watch",
-    "test": "yarn test:browser && yarn test:server",
-    "clean": "npm prune; yarn cache clean; rm -rf ./node_modules package-lock.json yarn.lock; yarn",
-    "lint": "eslint ./src/**/*.{ts,tsx}",
-    "lint:fix": "npm run lint -- --fix",
-    "lint:watch": "watch 'yarn lint'"
-  },
   "files": [
     "dist"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/alex-cory/use-http.git"
+  },
   "keywords": [
     "react hook",
     "react-hook",

src/__tests__/useFetch.test.tsx

@@ -566,6 +566,7 @@ describe('useFetch - BROWSER - errors', (): void => {
     fetch.mockRejectOnce(expectedError)
     fetch.mockResponseOnce(JSON.stringify(expectedSuccess))
   })
+  console.log('fetch', fetch)
 
   it('should reset the error after each call', async (): Promise<void> => {
     const { result } = renderHook(
@@ -627,4 +628,17 @@ describe('useFetch - BROWSER - errors', (): void => {
     expect(result.current.response.ok).toBe(undefined)
     expect(result.current.error).toEqual(expectedError)
   })
+
+  it ('should set the `error` properly when the response.ok is false', async (): Promise<void> => {
+    fetch.mockResponseOnce('', )
+    // console.log('fetch.Response', fetch.Response)
+    const { result } = renderHook(
+      () => useFetch('https://example.com'),
+    )
+    // await waitForNextUpdate()
+    await result.current.get()
+    console.log('result', result.current)
+    expect(result.current.response.ok).toBe(false)
+    expect(result.current.error).toEqual(expectedError)
+  })
 })

src/useFetch.ts

@@ -81,6 +81,7 @@ function useFetch<TData = any>(...args: UseFetchArgs): UseFetch<TData> {
 
       let newData
       let theRes
+      let theErr
 
       try {
         theRes = ((await fetch(`${url}${path}${route}`, options)) || {}) as Res<TData>
@@ -89,7 +90,9 @@ function useFetch<TData = any>(...args: UseFetchArgs): UseFetch<TData> {
         try {
           newData = await theRes.json()
         } catch (err) {
-          newData = (await theRes.text()) as any // FIXME: should not be `any` type
+          try {
+            newData = (await theRes.text()) as any // FIXME: should not be `any` type
+          } catch(er) {}
         }
 
         newData = (defaults.data && isEmpty(newData)) ? defaults.data : newData
@@ -101,10 +104,19 @@ function useFetch<TData = any>(...args: UseFetchArgs): UseFetch<TData> {
 
       } catch (err) {
         if (attempts.current > 0) return doFetch(routeOrBody, body)
-        if (attempts.current < 1 && timedout.current) setError({ name: 'AbortError', message: 'Timeout Error' })
-        if (err.name !== 'AbortError') setError(err)
+        if (attempts.current < 1 && timedout.current) {
+          setError({ name: 'AbortError', message: 'Timeout Error' })
+          theErr = err
+        }
+        if (err.name !== 'AbortError') {
+          setError(err)
+          theErr = err
+        }
 
       } finally {
+        console.log('theRes', theRes)
+        console.log('theErr', theErr)
+        if (theRes && !theRes.ok && !theErr) setError({ name: theRes.status, message: theRes.statusText })
         if (attempts.current > 0) attempts.current -= 1
         timedout.current = false
         if (timer) clearTimeout(timer)