@constructor-io/constructorio-node 5.1.2 → 5.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructor-io/constructorio-node",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "description": "Constructor.io Node.js client",
   "main": "src/constructorio.js",
   "types": "src/types/constructorio.d.ts",

package/src/modules/tracker.js

@@ -139,6 +139,7 @@ function send(url, userParameters, networkParameters, method = 'GET', body = {})
 
   if (request) {
     const instance = this;
+    const emitError = helpers.getEmitError(instance, { url, method });
 
     request.then((response) => {
       // Request was successful, and returned a 2XX status code
@@ -152,26 +153,25 @@ function send(url, userParameters, networkParameters, method = 'GET', body = {})
 
       // Request was successful, but returned a non-2XX status code
       else {
-        response.json().then((json) => {
-          instance.eventemitter.emit('error', {
-            url,
-            method,
-            message: json && json.message,
+        const contentType = response.headers.get('Content-Type') || '';
+
+        if (contentType.includes('application/json')) {
+          response.json().then((json) => {
+            emitError(json && json.message);
+          }).catch((error) => {
+            emitError(error.type);
           });
-        }).catch((error) => {
-          instance.eventemitter.emit('error', {
-            url,
-            method,
-            message: error.type,
+        } else {
+          // If not JSON, fallback to text
+          response.text().then((text) => {
+            emitError(text || 'Unknown error message');
+          }).catch((error) => {
+            emitError(`Error reading text: ${error.message}`);
           });
-        });
+        }
       }
     }).catch((error) => {
-      instance.eventemitter.emit('error', {
-        url,
-        method,
-        message: error.toString(),
-      });
+      emitError(error.toString());
     });
   }
 }

package/src/utils/helpers.js

@@ -134,6 +134,12 @@ const utils = {
 
     return url;
   },
+
+  getEmitError(instance, { url, method }) {
+    return function emitError(message) {
+      instance.eventemitter.emit('error', { url, method, message });
+    };
+  },
 };
 
 module.exports = utils;