@selkirk-systems/fetch 0.1.2 → 0.1.4

package/dist/index.js

@@ -9,74 +9,82 @@ require('isomorphic-fetch');
 var _networkTimer = null;
 
 function _checkFetchStatus(response) {
-    if (response.status >= 200 && response.status < 300) {
-        if (response.text.length > 0) {
-            return response.json();
-        }
-    } else {
-        var error = new Error(response.statusText);
-        if (response.text.length) {
-            return response.json().then(function (result) {
-                error.response = result;
-                throw error;
+   if (response.status >= 200 && response.status < 300) {
+      return response.text().then(function (text) {
+         return text ? JSON.parse(text) : {};
+      });
+   } else {
+      var error = new Error(response.statusText);
+      return response.text().then(function (text) {
+         if (text) {
+            JSON.parse(text).json().then(function (result) {
+               error.response = result;
+               throw error;
             });
-        } else {
+         } else {
             throw error;
-        }
-    }
+         }
+      });
+   }
+}
+
+function _parseJSON(response) {
+   return response.text().then(function (text) {
+      return text ? JSON.parse(text) : {};
+   });
 }
 
 function _invokeFetch(url, props) {
-    if (!url) {
-        throw new Error("fetch:Missing Parameter - URL");
-    }
-
-    var options = {
-        method: "GET",
-        credentials: 'same-origin',
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json'
-        }
-    };
-
-    options = Assign(options, props);
-
-    if (_networkTimer) {
-        return new Promise(function (resolve, reject) {
-            setTimeout(resolve, _networkTimer);
-        });
-    }
-
-    if (options.headers['Content-Type'] === "application/json" && options.body) options.body = JSON.stringify(options.body);
-
-    return fetch(url, options).then(_checkFetchStatus);
+   if (!url) {
+      throw new Error("fetch:Missing Parameter - URL");
+   }
+
+   var options = {
+      method: "GET",
+      credentials: 'same-origin',
+      headers: {
+         'Accept': 'application/json',
+         'Content-Type': 'application/json'
+      }
+   };
+
+   options = Assign(options, props);
+
+   if (_networkTimer) {
+      return new Promise(function (resolve, reject) {
+         setTimeout(resolve, _networkTimer);
+      });
+   }
+
+   if (options.headers['Content-Type'] === "application/json" && options.body) options.body = JSON.stringify(options.body);
+
+   return fetch(url, options).then(_checkFetchStatus);
 }
 module.exports = function (dispatcher, params) {
-    if (!dispatcher) return _invokeFetch;
+   if (!dispatcher) return _invokeFetch;
 
-    var options = Assign({
-        lastErrorEvent: "LAST_ERROR_EVENT",
-        errorID: null
-    }, params);
+   var options = Assign({
+      lastErrorEvent: "LAST_ERROR_EVENT",
+      errorID: null
+   }, params);
 
-    return function (url, props, responseEvent) {
-        return _invokeFetch(url, props).then(function (response) {
+   return function (url, props, responseEvent) {
+      return _invokeFetch(url, props).then(function (response) {
 
-            if (!responseEvent) return null;
+         if (!responseEvent) return null;
 
-            dispatcher.handleViewAction({
-                actionType: responseEvent,
-                item: response
-            });
+         dispatcher.handleViewAction({
+            actionType: responseEvent,
+            item: response
+         });
 
-            return response;
-        }).catch(function (err) {
-            console.error(new Error("Fetch - " + options.errorID || ""), err);
-            dispatcher.handleViewAction({
-                actionType: options.lastErrorEvent,
-                item: { error: err, id: options.errorID }
-            });
-        });
-    };
+         return response;
+      }).catch(function (err) {
+         console.error(new Error("Fetch - " + options.errorID || ""), err);
+         dispatcher.handleViewAction({
+            actionType: options.lastErrorEvent,
+            item: { error: err, id: options.errorID }
+         });
+      });
+   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selkirk-systems/fetch",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "A wrapper on fetch-polyfill that will work for server and client environments",
   "selkirk": {
     "bambooDeploy": "npm",

package/src/index.js

@@ -8,22 +8,30 @@ const _networkTimer = null;
 
 function _checkFetchStatus(response) {
    if (response.status >= 200 && response.status < 300) {
-	   if (response.text.length > 0) {
-	   		return response.json()
-   		}
+      return response.text().then(function(text) {
+  	  		return text ? JSON.parse(text) : {}
+      });
    } else {
       var error = new Error(response.statusText);
-      if (response.text.length) {
-	       return response.json().then((result)=>{
-	           error.response = result;
-	           throw error;
-	       });
-      } else {
-    	  throw error;
-      }
+       return response.text().then(function(text) {
+    	   if (text) {
+    		   JSON.parse(text).json().then((result)=>{
+		           error.response = result;
+		           throw error;
+		       });
+    	   } else {
+    		   throw error;
+    	   }
+       });
    }
 }
 
+function _parseJSON(response) {
+	  return response.text().then(function(text) {
+	    return text ? JSON.parse(text) : {}
+	  });
+}
+
 function _invokeFetch(url,props) {
    if(!url) {
       throw new Error("fetch:Missing Parameter - URL");