@selkirk-systems/fetch 1.0.2 → 1.0.10

package/dist/{FetchWrapper.js → Fetch.js}

@@ -33,7 +33,17 @@ export function applyMiddleware(middleware = []) {
   _middlewares = middleware;
   _middlewares.push(FetchErrorHandler);
 }
+export function OnOKResponse(fn) {
+  return ([network, isAbort]) => {
+    //Is any status is outside 200 - 299 it is not ok
+    if (network.status.code < 200 || network.status.code >= 300 || isAbort) {
+      return [network, isAbort];
+    }
 
+    //Run the function since its all ok
+    return fn([network, isAbort]);
+  };
+}
 /**
 * Make the fetch request with the given configuration options.
 * 
@@ -131,27 +141,29 @@ export default function Fetch(url, options = {}) {
         return [{
           request: request,
           response: nextResp || response,
-          data: data
+          data: data,
+          status: {
+            code: response.status,
+            text: response.statusText,
+            isAbort: false
+          }
         }, false];
       }
       return handleError(normalizeError(data, request, response, config), config);
     }).catch(err => {
       deleteCachedRequestSignal(finalUrl);
-      const error = isNormalizedError(err) ? err : normalizeTransportError(err);
+      const error = isNormalizedError(err) ? err : normalizeTransportError(err, request, config);
       return handleError(error, config);
     });
   } catch (err) {
     deleteCachedRequestSignal(finalUrl);
-    return handleError(normalizeTransportError(err), config);
-  }
-  if (config._promiseChain) {
-    //If catch is added outside, then assume they want to handle errors and 
-    //not have them swallowed
-
-    config._promiseChain.catch = function (...args) {
-      config._hasCatch = true;
-      return ORIGINAL_CATCH_FN.apply(this, args);
-    };
+    return handleError(normalizeTransportError(err, {
+      url: finalUrl,
+      headers: finalHeaders,
+      method: finalMethod,
+      body: finalBody,
+      signal: finalSignal.signal
+    }, config), config);
   }
   return config._promiseChain;
 }
@@ -207,9 +219,10 @@ function handleError(normalizedError, config) {
   //Added a catch outside
   if (!hasCatch && !nextErr) {
     if (promiseChain && promiseChain.cancel) promiseChain.cancel();
+
     //In the case of aborted requests etc, we treat them as success and let the initial fetch chain 
     //handle them.
-    return Promise.resolve([normalizedError, true]);
+    return Promise.resolve([normalizedError, normalizedError.status.isAbort]);
   }
 
   // The request failed in a critical way; the content of this error will be
@@ -366,15 +379,19 @@ function normalizeError(data, request, response, config) {
 * application errors returned by the server. At a minimum, we want every error to
 * have the following properties:
 * 
+* - request
 * - data.type
 * - data.message
-* - status.code
-* - status.text
-* - status.isAbort
+* - response.status.code
+* - response.status.text
+* - response.status.isAbort
 */
-function normalizeTransportError(transportError) {
+function normalizeTransportError(transportError, request, config) {
   const isAbort = transportError.name === "AbortError";
   return {
+    request: request,
+    response: null,
+    config: config,
     data: {
       type: "TransportError",
       message: isAbort ? "Network Request Aborted" : UNEXPECTED_ERROR_MESSAGE,
@@ -382,7 +399,7 @@ function normalizeTransportError(transportError) {
     },
     status: {
       code: 0,
-      text: "Unknown",
+      text: transportError.message || "Unknown",
       isAbort: isAbort
     }
   };

package/dist/index.js

@@ -1,3 +1,3 @@
 export { default as Download } from './Download';
-export { default as fetch, applyMiddleware } from './FetchWrapper';
+export { default as fetch, applyMiddleware, OnOKResponse } from './Fetch';
 export { ADD_ERROR } from "./constants/ErrorConstants";

package/lib/{FetchWrapper.js → Fetch.js}

@@ -38,6 +38,19 @@ export function applyMiddleware( middleware = [] ) {
     _middlewares.push( FetchErrorHandler );
 }
 
+
+export function OnOKResponse( fn ) {
+    return ( [network, isAbort] ) => {
+
+        //Is any status is outside 200 - 299 it is not ok
+        if ( network.status.code < 200 || network.status.code >= 300 || isAbort ) {
+            return [network, isAbort];
+        }
+
+        //Run the function since its all ok
+        return fn( [network, isAbort] );
+    }
+}
 /**
 * Make the fetch request with the given configuration options.
 * 
@@ -166,7 +179,12 @@ export default function Fetch( url, options = {} ) {
                         {
                             request: request,
                             response: nextResp || response,
-                            data: data
+                            data: data,
+                            status: {
+                                code: response.status,
+                                text: response.statusText,
+                                isAbort: false
+                            },
                         },
                         false
                     ]
@@ -184,7 +202,7 @@ export default function Fetch( url, options = {} ) {
 
                 const error = isNormalizedError( err ) ?
                     err :
-                    normalizeTransportError( err );
+                    normalizeTransportError( err, request, config );
 
                 return handleError(
                     error,
@@ -198,23 +216,17 @@ export default function Fetch( url, options = {} ) {
         deleteCachedRequestSignal( finalUrl );
 
         return handleError(
-            normalizeTransportError( err ),
+            normalizeTransportError( err, {
+                url: finalUrl,
+                headers: finalHeaders,
+                method: finalMethod,
+                body: finalBody,
+                signal: finalSignal.signal
+            }, config ),
             config
         );
     }
 
-
-    if ( config._promiseChain ) {
-
-        //If catch is added outside, then assume they want to handle errors and 
-        //not have them swallowed
-
-        config._promiseChain.catch = function ( ...args ) {
-            config._hasCatch = true;
-            return ORIGINAL_CATCH_FN.apply( this, args );
-        };
-    }
-
     return config._promiseChain;
 }
 
@@ -273,9 +285,10 @@ function handleError( normalizedError, config ) {
     //Added a catch outside
     if ( !hasCatch && !nextErr ) {
         if ( promiseChain && promiseChain.cancel ) promiseChain.cancel();
+
         //In the case of aborted requests etc, we treat them as success and let the initial fetch chain 
         //handle them.
-        return Promise.resolve( [normalizedError, true] );
+        return Promise.resolve( [normalizedError, normalizedError.status.isAbort] );
     }
 
     // The request failed in a critical way; the content of this error will be
@@ -490,16 +503,20 @@ function normalizeError( data, request, response, config ) {
 * application errors returned by the server. At a minimum, we want every error to
 * have the following properties:
 * 
+* - request
 * - data.type
 * - data.message
-* - status.code
-* - status.text
-* - status.isAbort
+* - response.status.code
+* - response.status.text
+* - response.status.isAbort
 */
-function normalizeTransportError( transportError ) {
+function normalizeTransportError( transportError, request, config ) {
 
     const isAbort = ( transportError.name === "AbortError" )
     return ( {
+        request: request,
+        response: null,
+        config: config,
         data: {
             type: "TransportError",
             message: isAbort ? "Network Request Aborted" : UNEXPECTED_ERROR_MESSAGE,
@@ -507,7 +524,7 @@ function normalizeTransportError( transportError ) {
         },
         status: {
             code: 0,
-            text: "Unknown",
+            text: transportError.message || "Unknown",
             isAbort: isAbort
         }
     } );

package/lib/index.js

@@ -1,3 +1,3 @@
 export { default as Download } from './Download';
-export { default as fetch, applyMiddleware } from './FetchWrapper';
+export { default as fetch, applyMiddleware, OnOKResponse } from './Fetch';
 export { ADD_ERROR } from "./constants/ErrorConstants";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selkirk-systems/fetch",
-  "version": "1.0.2",
+  "version": "1.0.10",
   "description": "Abortable fetch library",
   "keywords": [],
   "author": "Marcos Bernal <mbernal@selkirksystems.com>",
@@ -26,7 +26,8 @@
   "scripts": {
     "test": "node ./__tests__/**",
     "docs": "jsdoc --configure ../../jsdoc.json -r ./lib -d docs",
-    "build": "del dist && cross-env CI=false NODE_ENV=production babel lib --out-dir dist --copy-files --ignore __tests__,spec.js,test.js,__snapshots__"
+    "build": "del dist /Q && cross-env CI=false NODE_ENV=production babel lib --out-dir dist --copy-files --ignore __tests__,spec.js,test.js,__snapshots__",
+    "prepublishOnly": "npm run build"
   },
   "bugs": {
     "url": "https://bitbucket.org/selkirk/web-component-library/issues"
@@ -35,5 +36,5 @@
   "peerDependencies": {
     "@selkirk-systems/state-management": "^1.0.0"
   },
-  "gitHead": "5c983164ac8e9ba82f7029463483fe5635987802"
+  "gitHead": "4b7ac96fea827d9ac5d1faa40917fa3a39599329"
 }

package/dist/index.d.ts

@@ -1 +0,0 @@
-declare module '@selkirk-systems/fetch';