fix(transformers): xhr requests incorrectly parsing JSON response types

itsmichaelbtw · Nov 25, 2022 · c75376b · c75376b
1 parent 6eea194
commit c75376b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/lib/core/api/xhr.ts b/lib/core/api/xhr.ts
@@ -39,7 +39,10 @@ export class BrowserRequest implements UrbexRequestApi {
 
             request.open(uppercase(config.method), config.url.href, true);
 
-            if (BROWSER_RESPONSE_TYPES.includes(config.responseType)) {
+            if (
+                BROWSER_RESPONSE_TYPES.includes(config.responseType) &&
+                config.responseType !== "json"
+            ) {
                 request.responseType = config.responseType as BrowserResponseTypes;
             }
 

diff --git a/lib/core/request-config.ts b/lib/core/request-config.ts
@@ -60,10 +60,11 @@ export class RequestConfig {
             this.set(this.createConfigurationObject(config, true));
         }
 
-        this.$config.pipelines.request.unshift(transformRequestData);
+        this.$config.pipelines.request.push(transformRequestData);
+        this.$config.pipelines.response.push(transformResponseData);
 
         if (environment.isNode) {
-            this.$config.pipelines.response.unshift(decodeResponseData, transformResponseData);
+            this.$config.pipelines.response.unshift(decodeResponseData);
         }
     }
 

diff --git a/lib/core/transformers.ts b/lib/core/transformers.ts
@@ -10,7 +10,7 @@ export const transformRequestData = new PipelineExecutor<RequestExecutor>((confi
 });
 
 export const decodeResponseData = new PipelineExecutor<ResponseExecutor>(async (response) => {
-    const responseType = response.config.responseType;
+    const { responseType, maxContentLength } = response.config;
 
     if (responseType === "raw" || responseType === "stream") {
         return Promise.resolve(response);
@@ -24,7 +24,6 @@ export const decodeResponseData = new PipelineExecutor<ResponseExecutor>(async (
 
             if (decoder) {
                 const decompressed = await decoder(response.data);
-                const maxContentLength = response.config.maxContentLength;
 
                 if (maxContentLength > -1 || maxContentLength !== Infinity) {
                     if (decompressed.length > maxContentLength) {
@@ -45,23 +44,25 @@ export const decodeResponseData = new PipelineExecutor<ResponseExecutor>(async (
 });
 
 export const transformResponseData = new PipelineExecutor<ResponseExecutor>((response) => {
-    const responseType = response.config.responseType;
+    const { responseType, responseEncoding } = response.config;
 
     if (responseType === "raw" || responseType === "arraybuffer" || responseType === "stream") {
         return Promise.resolve(response);
     }
 
     if (response.data) {
-        // https://stackoverflow.com/questions/24356713/node-js-readfile-error-with-utf8-encoded-file-on-windows
+        let data = response.data;
 
-        const { responseEncoding, responseType } = response.config;
+        if (environment.isNode) {
+            // https://stackoverflow.com/questions/24356713/node-js-readfile-error-with-utf8-encoded-file-on-windows
 
-        const bufferString = response.data.toString(responseEncoding);
+            data = response.data.toString(responseEncoding);
+        }
 
         if (responseType === "json") {
-            response.data = safeJSONParse(bufferString, true);
+            response.data = safeJSONParse(data, true);
         } else {
-            response.data = bufferString;
+            response.data = data;
         }
     }