@cocreate/pwa 1.12.0 → 1.13.0

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# [1.13.0](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.12.0...v1.13.0) (2023-10-09)
+
+
+### Bug Fixes
+
+* check data.status and clientId to prevent duplicate request ([3d2cff7](https://github.com/CoCreate-app/CoCreate-pwa/commit/3d2cff7e5d2eb6a83b13102039f66b218d770b23))
+* handle organization, and lastModified ([d4c819b](https://github.com/CoCreate-app/CoCreate-pwa/commit/d4c819b88f4334d68e95e2b7d2c7dc01562b5de5))
+* remove cache.js has been relocated CoCreate-cache ([224532a](https://github.com/CoCreate-app/CoCreate-pwa/commit/224532a01824f41adf5da7ced3ca83365c2507db))
+* removed deleteCache, deleteFile from export default ([7710ef5](https://github.com/CoCreate-app/CoCreate-pwa/commit/7710ef50a9fbcab6a5f17f0fddbce9251bb420e0))
+
+
+### Features
+
+* checkCache - check cache responses for last-modified and send.crud() read.object to see if the object has been modified. If crud returns objects add to cache. ([8c0eba3](https://github.com/CoCreate-app/CoCreate-pwa/commit/8c0eba35b2364b55d6e0e8fe896658491fad8ac3))
+* checkCache message event will dispatch client the returnedFromCache object containg all the cache responses during page load. {[url]: {organization, lastModified}} ([60f179c](https://github.com/CoCreate-app/CoCreate-pwa/commit/60f179c99a25402152da5951b2cd1ecd78a0b73b))
+* update cache using pathname and host ([8fb604b](https://github.com/CoCreate-app/CoCreate-pwa/commit/8fb604b820aac3c4a15ca81139edabe09f0de10c))
+
 # [1.12.0](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.11.0...v1.12.0) (2023-09-19)
 
 

package/package.json

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

package/src/index.js

@@ -20,7 +20,6 @@
 // you must obtain a commercial license from CoCreate LLC.
 // For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
 
-import { deleteCache, deleteFile } from './cache.js'
 import localStorage from '@cocreate/local-storage'
 
 const button = document.querySelector('[actions*="install"]');
@@ -126,4 +125,4 @@ if ('serviceWorker' in navigator) {
     }
 }
 
-export default { deleteCache, deleteFile, persistData }
+export default { persistData }

package/src/service-worker.js

@@ -25,6 +25,7 @@
 const cacheName = "dynamic-v2";
 let organization_id = ""
 let storage = true
+let returnedFromCache = {};
 
 const queryString = self.location.search;
 const queryParams = new URLSearchParams(queryString);
@@ -47,6 +48,10 @@ self.addEventListener("fetch", async (e) => {
             .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')
+
+                    returnedFromCache[e.request.url] = { organization, lastModified }
                     return cacheResponse;
                 } else {
                     const networkResponse = await fetch(e.request);
@@ -63,9 +68,12 @@ self.addEventListener("fetch", async (e) => {
 
                         caches.open(cacheName).then((cache) => {
                             if (networkResponse.status !== 206 && networkResponse.status !== 502) {
+                                const networkModified = networkResponse.headers.get('last-modified');
+                                // if (!networkModified) {
+                                //     networkResponse.headers.set('Last-Modified', new Date().toISOString());
+                                // }
                                 cache.put(e.request, networkResponse);
                                 if (cacheType === 'reload' || cacheType === 'prompt') {
-                                    const networkModified = networkResponse.headers.get('last-modified');
                                     const cacheModified = cacheResponse.headers.get('last-modified');
                                     if (networkModified !== cacheModified) {
                                         self.clients.matchAll().then((clients) => {
@@ -100,8 +108,56 @@ self.addEventListener("fetch", async (e) => {
 });
 
 self.addEventListener('message', function (event) {
-    if (event.data === 'getOrganization')
-        event.source.postMessage(organization_id);
+    if (event.data.action === 'getOrganization')
+        event.source.postMessage({ action: 'getOrganization', organization_id });
+    else if (event.data.action === 'checkCache') {
+        event.source.postMessage({ action: 'checkCache', returnedFromCache: { ...returnedFromCache } });
+        returnedFromCache = {}
+    }
+});
+
+
+self.addEventListener('push', (event) => {
+    const pushData = event.data.json(); // Assuming the push payload is JSON data
+
+    // Process the push notification data as needed
+    const { socketUrl, _id } = pushData;
+
+    // Establish a WebSocket connection
+    const socket = new WebSocket(socketUrl);
+
+    // Handle WebSocket events
+    socket.addEventListener('open', () => {
+        // The WebSocket connection is open, send the message to the server
+        socket.send(JSON.stringify({ method: 'read.object', array: 'files', object: { _id }, uid: '' }));
+    });
+
+    socket.addEventListener('message', (event) => {
+        // Handle messages received from the server over the WebSocket
+        const serverData = JSON.parse(event.data);
+        if (serverData.uid === uid) {
+            // TODO: add file to cache and close socket
+        }
+    });
+
+    socket.addEventListener('close', () => {
+        // Handle the WebSocket connection being closed
+        console.log('WebSocket connection closed.');
+    });
+
+    socket.addEventListener('error', (error) => {
+        // Handle WebSocket errors
+        console.error('WebSocket error:', error);
+    });
+
+    // Ensure that the service worker stays active until the WebSocket connection is closed
+    event.waitUntil(
+        new Promise((resolve) => {
+            socket.addEventListener('close', () => {
+                resolve();
+            });
+        })
+    );
 });
 
 // self.addEventListener('backgroundfetchsuccess', (event) => {

package/src/cache.js

@@ -1,63 +0,0 @@
-import socket from "@cocreate/socket-client"
-
-// const cacheName = "dynamic-v2"
-
-const cacheBtn = document.getElementById('cacheBtn');
-
-function putFile(cacheName, data) {
-    if (!data.name || !data.path || !data.src || !data['content-type'])
-        return
-    // Open the cache and update it with the new file data
-    caches.open(cacheName).then((cache) => {
-        // Create a Response object with the file data
-        const fileResponse = new Response(data.src, {
-            headers: {
-                'Content-Type': data['content-type'],
-            },
-        });
-
-        // Update the cache with the new version (or add it if not in the cache)
-        const fileUrl = window.location.origin + data.pathname;
-        cache.put(fileUrl, fileResponse).then(() => {
-            console.log(`Updated cache for ${fileUrl}`);
-        });
-    });
-}
-
-function deleteCache(cacheName) {
-    if ('serviceWorker' in navigator) {
-        return caches.delete(cacheName);
-    }
-}
-
-function deleteFile(cacheName, fileName) {
-    if ('serviceWorker' in navigator) {
-        caches.open(cacheName).then(function (cache) {
-            cache.delete(fileName).then(function (response) {
-                return response
-                // console.log(cacheName, fileName, response)
-            });
-        })
-    }
-}
-
-if (cacheBtn) {
-    cacheBtn.addEventListener('click', function () {
-        deleteFile('dynamic-v2', '/CoCreate-components/CoCreate-pwa/src/index.js');
-    });
-}
-
-function fileChange(data) {
-    if (!data.array === 'files' || !data.object)
-        return
-
-    for (let i = 0; i < data.object.length; i++)
-        putFile('dynamic-v2', data.object[i])
-}
-
-socket.listen('create.object', (data) => fileChange(data));
-socket.listen('read.object', (data) => fileChange(data));
-socket.listen('update.object', (data) => fileChange(data));
-socket.listen('delete.object', (data) => fileChange(data));
-
-export { putFile, deleteFile, deleteCache }