Invoke responseMiddleware in error cases as well

graffle-js · Aug 2, 2022 · 7e54114 · 7e54114
1 parent fec536b
commit 7e54114
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 44 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -245,12 +245,19 @@ export class GraphQLClient {
       method,
       fetchOptions,
       middleware: requestMiddleware,
-    }).then(response => {
-      if (responseMiddleware) {
-        responseMiddleware(response)
-      }
-      return response
     })
+      .then((response) => {
+        if (responseMiddleware) {
+          responseMiddleware(response)
+        }
+        return response
+      })
+      .catch((error) => {
+        if (responseMiddleware) {
+          responseMiddleware(error)
+        }
+        throw error
+      })
   }
 
   /**
@@ -290,12 +297,19 @@ export class GraphQLClient {
       method,
       fetchOptions,
       middleware: requestMiddleware,
-    }).then(response => {
-      if (responseMiddleware) {
-        responseMiddleware(response)
-      }
-      return response.data
     })
+      .then((response) => {
+        if (responseMiddleware) {
+          responseMiddleware(response)
+        }
+        return response.data
+      })
+      .catch((error) => {
+        if (responseMiddleware) {
+          responseMiddleware(error)
+        }
+        throw error
+      })
   }
 
   /**
@@ -336,12 +350,19 @@ export class GraphQLClient {
       method,
       fetchOptions,
       middleware: requestMiddleware,
-    }).then(response => {
-      if (responseMiddleware) {
-        responseMiddleware(response)
-      }
-      return response.data
     })
+      .then((response) => {
+        if (responseMiddleware) {
+          responseMiddleware(response)
+        }
+        return response.data
+      })
+      .catch((error) => {
+        if (responseMiddleware) {
+          responseMiddleware(error)
+        }
+        throw error
+      })
   }
 
   setHeaders(headers: Dom.RequestInit['headers']): GraphQLClient {
@@ -422,7 +443,7 @@ async function makeRequest<T = any, V = Variables>({
 
     const { errors, ...rest } = result
     const data = fetchOptions.errorPolicy === 'ignore' ? rest : result
-    
+
     return {
       ...(isBathchingQuery ? { data } : data),
       headers,

diff --git a/src/types.ts b/src/types.ts
@@ -66,7 +66,7 @@ export interface Response<T> {
 export type PatchedRequestInit = Omit<Dom.RequestInit, "headers"> & {
   headers?: MaybeFunction<Dom.RequestInit['headers']>
   requestMiddleware?: (request: Dom.RequestInit) => Dom.RequestInit
-  responseMiddleware?: (response: Response<unknown>) => void
+  responseMiddleware?: (response: Response<unknown> | Error) => void
 };
 
 export type BatchRequestDocument<V = Variables> = {

diff --git a/tests/general.test.ts b/tests/general.test.ts
@@ -122,40 +122,91 @@ describe('middleware', () => {
   let requestMiddleware: jest.Mock
   let responseMiddleware: jest.Mock
 
-  beforeEach(() => {
-    ctx.res({
-      body: {
-        data: {
-          result: 123,
+  describe('successful requests', () => {
+    beforeEach(() => {
+      ctx.res({
+        body: {
+          data: {
+            result: 123,
+          },
         },
-      },
+      })
+
+      requestMiddleware = jest.fn((req) => ({ ...req }))
+      responseMiddleware = jest.fn()
+      client = new GraphQLClient(ctx.url, {
+        requestMiddleware,
+        responseMiddleware,
+      })
     })
 
-    requestMiddleware = jest.fn(req => ({ ...req }))
-    responseMiddleware = jest.fn()
-    client = new GraphQLClient(ctx.url, { requestMiddleware, responseMiddleware })
-  })
+    it('request', async () => {
+      const requestPromise = client.request<{ result: number }>(`x`)
+      expect(requestMiddleware).toBeCalledTimes(1)
+      const res = await requestPromise
+      expect(responseMiddleware).toBeCalledTimes(1)
+      expect(res.result).toBe(123)
+    })
 
-  it('request', async () => {
-    const requestPromise = client.request<{ result: number }>(`x`)
-    expect(requestMiddleware).toBeCalledTimes(1)
-    const res = await requestPromise
-    expect(responseMiddleware).toBeCalledTimes(1)
-    expect(res.result).toBe(123)
-  })
+    it('rawRequest', async () => {
+      const requestPromise = client.rawRequest<{ result: number }>(`x`)
+      expect(requestMiddleware).toBeCalledTimes(1)
+      await requestPromise
+      expect(responseMiddleware).toBeCalledTimes(1)
+    })
 
-  it('rawRequest', async () => {
-    const requestPromise = client.rawRequest<{ result: number }>(`x`)
-    expect(requestMiddleware).toBeCalledTimes(1)
-    await requestPromise
-    expect(responseMiddleware).toBeCalledTimes(1)
+    it('batchRequests', async () => {
+      const requestPromise = client.batchRequests<{ result: number }>([{ document: `x` }])
+      expect(requestMiddleware).toBeCalledTimes(1)
+      await requestPromise
+      expect(responseMiddleware).toBeCalledTimes(1)
+    })
   })
 
-  it('batchRequests', async () => {
-    const requestPromise = client.batchRequests<{ result: number }>([{ document: `x` }])
-    expect(requestMiddleware).toBeCalledTimes(1)
-    await requestPromise
-    expect(responseMiddleware).toBeCalledTimes(1)
+  describe('failed requests', () => {
+    beforeEach(() => {
+      ctx.res({
+        body: {
+          errors: {
+            message: 'Syntax Error GraphQL request (1:1) Unexpected Name "x"\n\n1: x\n   ^\n',
+            locations: [
+              {
+                line: 1,
+                column: 1,
+              },
+            ],
+          },
+        },
+      })
+
+      requestMiddleware = jest.fn((req) => ({ ...req }))
+      responseMiddleware = jest.fn()
+      client = new GraphQLClient(ctx.url, {
+        requestMiddleware,
+        responseMiddleware,
+      })
+    })
+
+    it('request', async () => {
+      const requestPromise = client.request<{ result: number }>(`x`)
+      expect(requestMiddleware).toBeCalledTimes(1)
+      await expect(requestPromise).rejects.toThrowError()
+      expect(responseMiddleware).toBeCalledTimes(1)
+    })
+
+    it('rawRequest', async () => {
+      const requestPromise = client.rawRequest<{ result: number }>(`x`)
+      expect(requestMiddleware).toBeCalledTimes(1)
+      await expect(requestPromise).rejects.toThrowError()
+      expect(responseMiddleware).toBeCalledTimes(1)
+    })
+
+    it('batchRequests', async () => {
+      const requestPromise = client.batchRequests<{ result: number }>([{ document: `x` }])
+      expect(requestMiddleware).toBeCalledTimes(1)
+      await expect(requestPromise).rejects.toThrowError()
+      expect(responseMiddleware).toBeCalledTimes(1)
+    })
   })
 })