Merge pull request #43 from MattCCC/add-media-types

Add media types
MattCCC · Aug 20, 2024 · 3add41b · 3add41b
2 parents 40f15f6 + fd36e8e
commit 3add41b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/request-handler.ts b/src/request-handler.ts
@@ -621,25 +621,36 @@ export class RequestHandler {
             (response as Response)?.headers?.get('Content-Type') || '',
           );
           let data;
+          const responseClone = response.clone();
 
           // Handle edge case of no content type being provided... We assume json here.
           if (!contentType) {
             try {
-              data = await response.json();
+              data = await responseClone.json();
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
             } catch (_error) {
               //
             }
           }
 
           if (typeof data === 'undefined') {
-            if (contentType && contentType.includes('application/json')) {
-              // Parse JSON response
-              data = await response.json();
+            if (
+              contentType &&
+              (contentType.includes('application/json') ||
+                // This Media Type Suffix is standardizded by IETF in RFC 6839
+                contentType.includes('+json'))
+            ) {
+              data = await response.json(); // Parse JSON response
+            } else if (contentType.includes('multipart/form-data')) {
+              data = await response.formData(); // Parse as FormData
+            } else if (contentType.includes('application/octet-stream')) {
+              data = await response.blob(); // Parse as blob
+            } else if (
+              contentType.includes('application/x-www-form-urlencoded')
+            ) {
+              data = await response.formData(); // Handle URL-encoded forms
             } else if (typeof response.text !== 'undefined') {
               data = await response.text();
-            } else if (typeof response.blob !== 'undefined') {
-              data = await response.blob();
             } else {
               // Handle streams
               data = response.body || response.data || null;

diff --git a/src/types/request-handler.ts b/src/types/request-handler.ts
@@ -77,7 +77,7 @@ export interface BaseRequestConfig<D = any> {
 export interface ExtendedResponse<T = any> extends Omit<Response, 'headers'> {
   data: T;
   error: ResponseError<T>;
-  headers: HeadersObject | HeadersInit;
+  headers: HeadersObject & HeadersInit;
   config: ExtendedRequestConfig;
   request?: ExtendedRequestConfig;
 }

diff --git a/test/request-handler.spec.ts b/test/request-handler.spec.ts
@@ -554,6 +554,7 @@ describe('Request Handler', () => {
         }
         return Promise.resolve({
           ok: true,
+          clone: jest.fn().mockReturnValue({}),
           json: jest.fn().mockResolvedValue({}),
         });
       });