feat(openapi): accept empty body, improve decode error

Author: dinwwwh

packages/openapi/src/adapters/fetch/openapi-payload-codec.test.ts

@@ -107,6 +107,23 @@ describe('openAPIPayloadCodec', () => {
 
       const result = await codec.decode(response)
       expect(result).toBeUndefined()
+
+      const response2 = new Response('', {
+        headers: { 'Content-Type': 'application/json' },
+      })
+
+      const result2 = await codec.decode(response2)
+      expect(result2).toBeUndefined()
+    })
+
+    it('throws 400 BAD_REQUEST when the body is invalid', async () => {
+      const response = new Response('invalid json', {
+        headers: { 'Content-Type': 'application/json' },
+      })
+
+      await expect(codec.decode(response))
+        .rejects
+        .toThrow('Cannot parse request/response. Please check the request/response body and Content-Type header.')
     })
   })
 })

packages/openapi/src/adapters/fetch/openapi-payload-codec.ts

@@ -145,54 +145,69 @@ export class OpenAPIPayloadCodec {
   }
 
   async decode(re: Request | Response | Headers | URLSearchParams | FormData): Promise<unknown> {
-    if (
-      re instanceof Headers
-      || re instanceof URLSearchParams
-      || re instanceof FormData
-    ) {
-      return BracketNotation.deserialize([...re.entries()])
-    }
+    try {
+      if (
+        re instanceof Headers
+        || re instanceof URLSearchParams
+        || re instanceof FormData
+      ) {
+        return BracketNotation.deserialize([...re.entries()])
+      }
 
-    const contentType = re.headers.get('content-type')
-    const contentDisposition = re.headers.get('content-disposition')
-    const fileName = contentDisposition ? cd.parse(contentDisposition).parameters.filename : undefined
+      const contentType = re.headers.get('content-type')
+      const contentDisposition = re.headers.get('content-disposition')
+      const fileName = contentDisposition ? cd.parse(contentDisposition).parameters.filename : undefined
 
-    if (fileName) {
-      const blob = await re.blob()
-      const file = new File([blob], fileName, {
-        type: blob.type,
-      })
+      if (fileName) {
+        const blob = await re.blob()
+        const file = new File([blob], fileName, {
+          type: blob.type,
+        })
 
-      return file
-    }
+        return file
+      }
+
+      if (!contentType || contentType.startsWith('application/json')) {
+        if (!re.body) {
+          return undefined
+        }
+
+        const text = await re.text()
 
-    if (!contentType || contentType.startsWith('application/json')) {
-      if (!re.body) {
-        return undefined
+        if (!text) {
+          return undefined
+        }
+
+        return JSON.parse(text)
       }
 
-      return await re.json()
-    }
+      if (contentType.startsWith('application/x-www-form-urlencoded')) {
+        const params = new URLSearchParams(await re.text())
+        return this.decode(params)
+      }
 
-    if (contentType.startsWith('application/x-www-form-urlencoded')) {
-      const params = new URLSearchParams(await re.text())
-      return this.decode(params)
-    }
+      if (contentType.startsWith('text/')) {
+        const text = await re.text()
+        return text
+      }
 
-    if (contentType.startsWith('text/')) {
-      const text = await re.text()
-      return text
-    }
+      if (contentType.startsWith('multipart/form-data')) {
+        const form = await re.formData()
+        return this.decode(form)
+      }
 
-    if (contentType.startsWith('multipart/form-data')) {
-      const form = await re.formData()
-      return this.decode(form)
+      const blob = await re.blob()
+      return new File([blob], 'blob', {
+        type: blob.type,
+      })
+    }
+    catch (e) {
+      throw new ORPCError({
+        code: 'BAD_REQUEST',
+        message: 'Cannot parse request/response. Please check the request/response body and Content-Type header.',
+        cause: e,
+      })
     }
-
-    const blob = await re.blob()
-    return new File([blob], 'blob', {
-      type: blob.type,
-    })
   }
 }