@cocreate/pwa 1.19.0 → 1.19.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.19.1](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.19.0...v1.19.1) (2024-04-28)
+
+
+### Bug Fixes
+
+* uncommented checkCache ([7372303](https://github.com/CoCreate-app/CoCreate-pwa/commit/737230325c59346687b699b3dfc0496be038f5a6))
+
 # [1.19.0](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.18.2...v1.19.0) (2024-03-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/pwa",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "description": "A simple pwa component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "pwa",

package/src/service-worker.js

@@ -23,6 +23,8 @@
  */
 
 const cacheName = "dynamic-v2";
+const updatedOn = new Date('2024-04-28T03:15:28.668Z');
+
 let organization_id = ""
 let storage = true
 
@@ -46,14 +48,23 @@ self.addEventListener("fetch", async (e) => {
         caches
             .match(e.request)
             .then(async (cacheResponse) => {
-                if (!navigator.onLine || !!cacheResponse && cacheType !== 'false') {
-                    const organization = cacheResponse.headers.get('organization')
-                    const lastModified = cacheResponse.headers.get('last-modified')
+                let fetchedOn
+                if (cacheResponse && cacheType !== 'false') {
+                    fetchedOn = cacheResponse.headers.get('fetched-on')
+                    if (fetchedOn)
+                        fetchedOn = new Date(fetchedOn)
+                }
 
-                    // returnedFromCache[e.request.url] = { organization, lastModified }
+                const organization = cacheResponse.headers.get('organization')
+
+                if (!navigator.onLine || !!cacheResponse && cacheType !== 'false' && (!fetchedOn && !organization || fetchedOn > updatedOn)) {
+                    console.log('servering cache fetchOn greater', fetchedOn > updatedOn, organization)
+                    const lastModified = cacheResponse.headers.get('last-modified')
                     sendCacheUpdate(e.request.url, organization, lastModified);
                     return cacheResponse;
                 } else {
+                    console.log('fetching fetchOn less', fetchedOn > updatedOn)
+
                     const networkResponse = await fetch(e.request);
 
                     if (!organization_id)
@@ -178,7 +189,7 @@ const sendCacheUpdate = (url, organization, lastModified) => {
         });
 
         fetchTimeout = null;
-        returnedFromCache = {};
+        // returnedFromCache = {};
     }, 500);
 };