@vida-global/core 2.0.4 → 2.0.6

package/lib/http/client.js

@@ -72,14 +72,31 @@ class HttpClient {
 
     async #handleRequestResponse(res, payload) {
         if (res.status && res.status < 300) {
-            const json = await res.json();
-            return {data: json, status: res.status};
+            const data = await this.#parseResponseData(res);
+            return {data, status: res.status};
         } else {
             throw new HttpError(res, payload);
         }
     }
 
 
+    async #parseResponseData(res) {
+        const body = await res.text();
+        if (!this.#isJsonResponse(res)) return body;
+
+        try {
+            return JSON.parse(body);
+        } catch(err) {
+            return body;
+        }
+    }
+
+
+    #isJsonResponse(res) {
+        return res.headers?.get('content-type')?.includes('application/json') || false;
+    }
+
+
     #prepareRequestPayload(url, requestData, headers, method, timeout, signal) {
         const payload = {};
 

package/lib/server/serverController.js

@@ -36,7 +36,7 @@ class VidaServerController {
     ***********************************************************************************************/
     async performRequest(action) {
         try {
-            APM.setControllerName(this.constructor.name, action);
+            this.setControllerNameForAPM(action)
             await this.#performRequest(action)
         } catch(err) {
             await this.#handleError(err);
@@ -44,6 +44,11 @@ class VidaServerController {
     }
 
 
+    setControllerNameForAPM(action) {
+        APM.setControllerName(this.constructor.name, action);
+    }
+
+
     async #performRequest(action) {
         await this.#setupRequestState()
         if (this.rendered) return this.#response.end();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vida-global/core",
-    "version": "2.0.4",
+    "version": "2.0.6",
     "description": "Core libraries for supporting Vida development",
     "author": "",
     "license": "ISC",

package/test/http/client.test.js

@@ -92,6 +92,40 @@ describe('HttpClient', () => {
     });
 
 
+    describe('response parsing', () => {
+        const client = new HttpClient();
+
+
+        it ('parses json responses', async () => {
+            Helpers.mockFetchResponse({ body: Helpers.responseBody, contentType: 'application/json' });
+
+            const result = await client.get(Helpers.apiUrl);
+
+            expect(result).toEqual({ data: Helpers.responsePayload, status: 200 });
+        });
+
+
+        it ('returns text responses as strings', async () => {
+            const body = 'ok';
+            Helpers.mockFetchResponse({ body, contentType: 'text/plain' });
+
+            const result = await client.get(Helpers.apiUrl);
+
+            expect(result).toEqual({ data: body, status: 200 });
+        });
+
+
+        it ('returns invalid json responses as strings', async () => {
+            const body = 'not json';
+            Helpers.mockFetchResponse({ body, contentType: 'application/json' });
+
+            const result = await client.get(Helpers.apiUrl);
+
+            expect(result).toEqual({ data: body, status: 200 });
+        });
+    });
+
+
     describe('abort/timeout support', () => {
         const client = new HttpClient();
 

package/test/http/helpers/client.js

@@ -16,6 +16,7 @@ const baseUrl          = `https://${TestHelpers.Faker.Text.randomString()}.com`.
 const endpoint         = `/${TestHelpers.Faker.Text.randomString()}`;
 const apiUrl           = `${baseUrl}${endpoint}`;
 const responsePayload  = randomPayload();
+const responseBody     = JSON.stringify(responsePayload);
 
 
 class ClientWithUrlRoot extends HttpClient {
@@ -29,9 +30,17 @@ class ClientWithUrlRoot extends HttpClient {
 * MOCKS
 ***************************************************************************************************/
 const mockFetchSuccess = () => {
+    mockFetchResponse({ body: responseBody, contentType: 'application/json' });
+}
+
+
+const mockFetchResponse = ({ body, contentType, status = 200 }) => {
     global.fetch = jest.fn().mockResolvedValue({
-        json: jest.fn().mockResolvedValue(responsePayload),
-        status: 200,
+        headers: {
+            get: jest.fn((headerName) => headerName == 'content-type' ? contentType : undefined),
+        },
+        status,
+        text: jest.fn().mockResolvedValue(body),
     });
 }
 
@@ -74,7 +83,9 @@ module.exports = {
     ClientWithUrlRoot,
     endpoint,
     expectRequest,
+    mockFetchResponse,
     mockFetchSuccess,
     randomPayload,
+    responseBody,
     responsePayload,
 };