@selkirk-systems/fetch 1.1.0 → 1.2.1

package/dist/Fetch.js

@@ -50,6 +50,9 @@ export function OnOKResponse(fn) {
     return fn([network, isAbort]);
   };
 }
+function isServiceWorker() {
+  return self;
+}
 
 /**
 * Make the fetch request with the given configuration options.
@@ -111,9 +114,11 @@ function Fetch(url, options = {}) {
       // For form data posts, we want the browser to build the Content-
       // Type for us so that it puts in both the "multipart/form-data" plus the
       // correct, auto-generated field delimiter.
-      delete finalHeaders["content-type"];
-      finalMethod = "POST";
-      finalBody = buildFormData(config.form);
+      //delete ( finalHeaders["content-type"] );
+
+      //finalMethod = "POST";
+      //finalBody = buildFormData( config.form );
+      finalBody = config.form;
     } else if (config.json) {
       finalHeaders["content-type"] = config.contentType || "application/x-json";
       finalBody = JSON.stringify(config.json);
@@ -122,7 +127,7 @@ function Fetch(url, options = {}) {
     } else {
       finalHeaders["content-type"] = config.contentType;
     }
-    request = new window.Request(finalUrl, {
+    request = new Request(finalUrl, {
       headers: finalHeaders,
       method: finalMethod,
       body: finalBody,
@@ -136,7 +141,7 @@ function Fetch(url, options = {}) {
 
     //Cache requests abort signal by url
     cacheRequestSignal(finalUrl, finalSignal);
-    config._promiseChain = Promise.resolve(window.fetch(request)).then(async response => {
+    config._promiseChain = Promise.resolve(fetch(request)).then(async response => {
       deleteCachedRequestSignal(finalUrl);
       const data = await unwrapResponseData(response);
       if (response.ok) {
@@ -294,7 +299,12 @@ function buildFormData(form) {
 function buildURL(url, templateData, params) {
   if (url.href) return url;
   const formattedUrl = buildURLTemplate(url, templateData);
-  const finalUrl = new URL(formattedUrl, `${window.location.origin}${window.baseUrl || ""}`);
+  let finalUrl;
+  if (self) {
+    finalUrl = new URL(formattedUrl);
+  } else {
+    finalUrl = new URL(formattedUrl, `${window.location.origin}${window.baseUrl || ""}`);
+  }
   const searchParams = new URLSearchParams();
   Object.entries(params).forEach(([key, value]) => {
     if (Array.isArray(value)) {
@@ -428,14 +438,24 @@ export const putJsonInCache = (cache, url, json) => {
   const response = new Response(JSON.stringify(json), responseObjectJson);
   return cache.put(url, response);
 };
-let _cache = null;
+const _caches = {};
 const DATA_METHODS = {
   "GET": null,
   "PATCH": null,
   "POST": null,
   "PUT": null
 };
-const fetch = (url, options = {}) => {
+const API_REG_EXP = /p\/.+com\/(.*?)\//;
+export const getCacheNameFromUrl = url => {
+  const matchArray = url.toString().match(API_REG_EXP);
+  return matchArray && matchArray.length >= 1 ? matchArray[1] : null;
+};
+const _fetch = (url, options = {}) => {
+  const cacheName = getCacheNameFromUrl(url);
+  if (!self || !cacheName) {
+    return Fetch(url, options);
+  }
+  let _cache = _caches[cacheName];
   function cacheResponse([response, isAbort]) {
     const status = response.status.code;
     const headers = response.request.headers;
@@ -451,7 +471,7 @@ const fetch = (url, options = {}) => {
           ...responseObjectJson
         };
         finalOptions.headers['Time-Cached'] = new Date().getTime();
-        const responseObj = new Response(JSON.stringify(response), finalOptions);
+        const responseObj = new Response(JSON.stringify(response.data), finalOptions);
         _cache.put(url, responseObj);
         dispatch(UPDATE_CACHE, {
           url: url,
@@ -483,7 +503,7 @@ const fetch = (url, options = {}) => {
           return Promise.resolve([{
             request: null,
             response: response,
-            data: obj.data,
+            data: obj,
             status: {
               code: response.status,
               text: response.statusText,
@@ -498,7 +518,8 @@ const fetch = (url, options = {}) => {
   if (_cache) {
     return cacheMatch();
   }
-  return caches.open('fetch').then(cache => {
+  return caches.open(cacheName).then(cache => {
+    _caches[cacheName] = cache;
     _cache = cache;
   }).then(cacheMatch);
 };
@@ -513,4 +534,4 @@ function expiredCache(timeCached) {
   const now = new Date().getTime();
   return Math.abs(now - timeCached) >= CACHED_EXPIRY_TIMESTAMP;
 }
-export default fetch;
+export default _fetch;

package/dist/middleware/FetchErrorHandler.js

@@ -8,30 +8,33 @@ const handler = err => response => options => next => {
   return next(null, response);
 };
 
-// NOTE: event name is all lower case as per DOM convention
-window.addEventListener("unhandledrejection", function (e) {
-  // NOTE: e.preventDefault() must be manually called to prevent the default
-  // action which is currently to log the stack trace to console.warn
-  e.preventDefault();
-  // NOTE: parameters are properties of the event detail property
-  var reason = e.reason || e.detail.reason;
-  //var promise = e.detail.promise;
-  // See Promise.onPossiblyUnhandledRejection for parameter documentation
-  console.groupEnd();
-  console.groupEnd();
-  console.groupEnd();
-  throw reason;
-});
+//HANDLE: Not being called from a service worker
+if (!self) {
+  // NOTE: event name is all lower case as per DOM convention
+  window.addEventListener("unhandledrejection", function (e) {
+    // NOTE: e.preventDefault() must be manually called to prevent the default
+    // action which is currently to log the stack trace to console.warn
+    e.preventDefault();
+    // NOTE: parameters are properties of the event detail property
+    var reason = e.reason || e.detail.reason;
+    //var promise = e.detail.promise;
+    // See Promise.onPossiblyUnhandledRejection for parameter documentation
+    console.groupEnd();
+    console.groupEnd();
+    console.groupEnd();
+    throw reason;
+  });
 
-// NOTE: event name is all lower case as per DOM convention
-window.addEventListener("rejectionhandled", function (e) {
-  // NOTE: e.preventDefault() must be manually called prevent the default
-  // action which is currently unset (but might be set to something in the future)
-  e.preventDefault();
-  // NOTE: parameters are properties of the event detail property
-  var promise = e.reason || e.detail.promise;
-  // See Promise.onUnhandledRejectionHandled for parameter documentation
-  console.groupEnd();
-  console.log("REJECTION HANDLED", promise);
-});
+  // NOTE: event name is all lower case as per DOM convention
+  window.addEventListener("rejectionhandled", function (e) {
+    // NOTE: e.preventDefault() must be manually called prevent the default
+    // action which is currently unset (but might be set to something in the future)
+    e.preventDefault();
+    // NOTE: parameters are properties of the event detail property
+    var promise = e.reason || e.detail.promise;
+    // See Promise.onUnhandledRejectionHandled for parameter documentation
+    console.groupEnd();
+    console.log("REJECTION HANDLED", promise);
+  });
+}
 export default handler;

package/lib/Fetch.js

@@ -17,7 +17,6 @@ const CONTENT_TYPE_DOWNLOADS = {
     'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': true
 }
 
-
 //30 minutes
 const CACHED_EXPIRY_TIMESTAMP = 30 * 60000;
 
@@ -59,6 +58,10 @@ export function OnOKResponse( fn ) {
     }
 }
 
+function isServiceWorker() {
+    return self;
+}
+
 
 /**
 * Make the fetch request with the given configuration options.
@@ -130,10 +133,11 @@ function Fetch( url, options = {} ) {
             // For form data posts, we want the browser to build the Content-
             // Type for us so that it puts in both the "multipart/form-data" plus the
             // correct, auto-generated field delimiter.
-            delete ( finalHeaders["content-type"] );
+            //delete ( finalHeaders["content-type"] );
 
-            finalMethod = "POST";
-            finalBody = buildFormData( config.form );
+            //finalMethod = "POST";
+            //finalBody = buildFormData( config.form );
+            finalBody = config.form;
 
         } else if ( config.json ) {
 
@@ -149,7 +153,7 @@ function Fetch( url, options = {} ) {
             finalHeaders["content-type"] = config.contentType;
         }
 
-        request = new window.Request(
+        request = new Request(
             finalUrl,
             {
                 headers: finalHeaders,
@@ -167,7 +171,7 @@ function Fetch( url, options = {} ) {
         //Cache requests abort signal by url
         cacheRequestSignal( finalUrl, finalSignal );
 
-        config._promiseChain = Promise.resolve( window.fetch( request ) )
+        config._promiseChain = Promise.resolve( fetch( request ) )
             .then( async ( response ) => {
 
                 deleteCachedRequestSignal( finalUrl );
@@ -390,8 +394,14 @@ function buildURL( url, templateData, params ) {
     if ( url.href ) return url;
 
     const formattedUrl = buildURLTemplate( url, templateData );
+    let finalUrl;
 
-    const finalUrl = new URL( formattedUrl, `${window.location.origin}${window.baseUrl || ""}` );
+    if ( self ) {
+        finalUrl = new URL( formattedUrl );
+    }
+    else {
+        finalUrl = new URL( formattedUrl, `${window.location.origin}${window.baseUrl || ""}` );
+    }
 
     const searchParams = new URLSearchParams();
 
@@ -564,7 +574,8 @@ export const putJsonInCache = ( cache, url, json ) => {
 
 }
 
-let _cache = null;
+const _caches = {};
+
 const DATA_METHODS = {
     "GET": null,
     "PATCH": null,
@@ -572,8 +583,22 @@ const DATA_METHODS = {
     "PUT": null
 }
 
-const fetch = ( url, options = {} ) => {
+const API_REG_EXP = /p\/.+com\/(.*?)\//;
+
+export const getCacheNameFromUrl = ( url ) => {
+    const matchArray = url.toString().match( API_REG_EXP );
+    return matchArray && matchArray.length >= 1 ? matchArray[1] : null;
+}
+
+const _fetch = ( url, options = {} ) => {
+
+    const cacheName = getCacheNameFromUrl( url );
+
+    if ( !self || !cacheName ) {
+        return Fetch( url, options );
+    }
 
+    let _cache = _caches[cacheName];
 
     function cacheResponse( [response, isAbort] ) {
 
@@ -599,7 +624,7 @@ const fetch = ( url, options = {} ) => {
                 const finalOptions = { ...responseObjectJson };
                 finalOptions.headers['Time-Cached'] = new Date().getTime();
 
-                const responseObj = new Response( JSON.stringify( response ), finalOptions );
+                const responseObj = new Response( JSON.stringify( response.data ), finalOptions );
                 _cache.put( url, responseObj );
 
                 dispatch( UPDATE_CACHE, { url: url, response: response } );
@@ -650,7 +675,7 @@ const fetch = ( url, options = {} ) => {
                     return Promise.resolve( [{
                         request: null,
                         response: response,
-                        data: obj.data,
+                        data: obj,
                         status: {
                             code: response.status,
                             text: response.statusText,
@@ -666,12 +691,15 @@ const fetch = ( url, options = {} ) => {
         } )
     }
 
-    if ( _cache ) {
 
+
+    if ( _cache ) {
         return cacheMatch()
     }
 
-    return caches.open( 'fetch' ).then( ( cache ) => {
+
+    return caches.open( cacheName ).then( ( cache ) => {
+        _caches[cacheName] = cache;
         _cache = cache;
     } ).then( cacheMatch )
 
@@ -690,4 +718,4 @@ function expiredCache( timeCached ) {
     return Math.abs( now - timeCached ) >= CACHED_EXPIRY_TIMESTAMP;
 }
 
-export default fetch;
+export default _fetch;

package/lib/middleware/FetchErrorHandler.js

@@ -11,32 +11,35 @@ const handler = ( err ) => ( response ) => ( options ) => ( next ) => {
     return next( null, response );
 };
 
-// NOTE: event name is all lower case as per DOM convention
-window.addEventListener( "unhandledrejection", function ( e ) {
-    // NOTE: e.preventDefault() must be manually called to prevent the default
-    // action which is currently to log the stack trace to console.warn
-    e.preventDefault();
-    // NOTE: parameters are properties of the event detail property
-    var reason = e.reason || e.detail.reason;
-    //var promise = e.detail.promise;
-    // See Promise.onPossiblyUnhandledRejection for parameter documentation
-    console.groupEnd();
-    console.groupEnd();
-    console.groupEnd();
-    throw reason;
-} );
+//HANDLE: Not being called from a service worker
+if ( !self ) {
+    // NOTE: event name is all lower case as per DOM convention
+    window.addEventListener( "unhandledrejection", function ( e ) {
+        // NOTE: e.preventDefault() must be manually called to prevent the default
+        // action which is currently to log the stack trace to console.warn
+        e.preventDefault();
+        // NOTE: parameters are properties of the event detail property
+        var reason = e.reason || e.detail.reason;
+        //var promise = e.detail.promise;
+        // See Promise.onPossiblyUnhandledRejection for parameter documentation
+        console.groupEnd();
+        console.groupEnd();
+        console.groupEnd();
+        throw reason;
+    } );
 
-// NOTE: event name is all lower case as per DOM convention
-window.addEventListener( "rejectionhandled", function ( e ) {
-    // NOTE: e.preventDefault() must be manually called prevent the default
-    // action which is currently unset (but might be set to something in the future)
-    e.preventDefault();
-    // NOTE: parameters are properties of the event detail property
-    var promise = e.reason || e.detail.promise;
-    // See Promise.onUnhandledRejectionHandled for parameter documentation
-    console.groupEnd();
-    console.log( "REJECTION HANDLED", promise );
-} );
+    // NOTE: event name is all lower case as per DOM convention
+    window.addEventListener( "rejectionhandled", function ( e ) {
+        // NOTE: e.preventDefault() must be manually called prevent the default
+        // action which is currently unset (but might be set to something in the future)
+        e.preventDefault();
+        // NOTE: parameters are properties of the event detail property
+        var promise = e.reason || e.detail.promise;
+        // See Promise.onUnhandledRejectionHandled for parameter documentation
+        console.groupEnd();
+        console.log( "REJECTION HANDLED", promise );
+    } );
+}
 
 export default handler;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selkirk-systems/fetch",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Abortable fetch library",
   "keywords": [],
   "author": "Marcos Bernal <mbernal@selkirksystems.com>",
@@ -36,5 +36,5 @@
   "peerDependencies": {
     "@selkirk-systems/state-management": ">=1.0.0"
   },
-  "gitHead": "4f7bf2bed7794dfe4651752033317e80386bb782"
+  "gitHead": "319e3d6212d678f409052a628b9a28455ecc7ecd"
 }