@selkirk-systems/fetch 1.2.0 → 1.2.1

package/dist/Fetch.js

@@ -438,17 +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 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 = {}) => {
-  if (self) {
+  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;
@@ -464,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,
@@ -496,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,
@@ -511,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);
 };

package/lib/Fetch.js

@@ -574,7 +574,8 @@ export const putJsonInCache = ( cache, url, json ) => {
 
 }
 
-let _cache = null;
+const _caches = {};
+
 const DATA_METHODS = {
     "GET": null,
     "PATCH": null,
@@ -582,12 +583,23 @@ const DATA_METHODS = {
     "PUT": null
 }
 
+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 = {} ) => {
 
-    if ( self ) {
+    const cacheName = getCacheNameFromUrl( url );
+
+    if ( !self || !cacheName ) {
         return Fetch( url, options );
     }
 
+    let _cache = _caches[cacheName];
+
     function cacheResponse( [response, isAbort] ) {
 
         const status = response.status.code;
@@ -612,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 } );
@@ -663,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,
@@ -679,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 )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selkirk-systems/fetch",
-  "version": "1.2.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": "5898e1276808bd3fe25d44f3935befe00c54513e"
+  "gitHead": "319e3d6212d678f409052a628b9a28455ecc7ecd"
 }