@cocreate/pwa 1.9.2 → 1.10.1

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.10.1](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.10.0...v1.10.1) (2023-09-18)
+
+
+### Bug Fixes
+
+*  Add path and pathname ([1eaa09c](https://github.com/CoCreate-app/CoCreate-pwa/commit/1eaa09c1bb7dab55868e02ac4b994b1464a4f38e))
+* bug in cache ([35229bc](https://github.com/CoCreate-app/CoCreate-pwa/commit/35229bc521e867ece5bc8140d9cdfcde0587220b))
+* set cache name ([35fcedd](https://github.com/CoCreate-app/CoCreate-pwa/commit/35fceddf099cb74a028a8ae2448e6d6ee4cb9ee4))
+* Update CoCreate depndencies to latest versions ([42fca0a](https://github.com/CoCreate-app/CoCreate-pwa/commit/42fca0a8852974cf5aec912e00c1b2d8dc7ff0f6))
+
+# [1.10.0](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.9.2...v1.10.0) (2023-09-17)
+
+
+### Bug Fixes
+
+* object.$filter ([1e73390](https://github.com/CoCreate-app/CoCreate-pwa/commit/1e73390bc97f840c54fb2043624bbeda622b63d9))
+
+
+### Features
+
+* cache updates dynaically using crud and sockert listener ([17e1646](https://github.com/CoCreate-app/CoCreate-pwa/commit/17e1646949ec49efc487e8e3cbcd565e5aa0c6b9))
+
 ## [1.9.2](https://github.com/CoCreate-app/CoCreate-pwa/compare/v1.9.1...v1.9.2) (2023-09-07)
 
 

package/CoCreate.config.js

@@ -1,25 +1,24 @@
-module.exports = {
-    "organization_id": "",
-    "key": "",
-    "host": "",
-    "sources": [
-        {
-            "array": "files",
-            "object": {
-                "_id": "637ca5ac50234ef1671ce327",
-                "name": "index.html",
-                "path": "/docs/pwa/index.html",
-                "src": "{{./docs/index.html}}",
-                "host": [
-                    "cocreate.app",
-                    "general.cocreate.app"
-                ],
-                "directory": "/docs/pwa",
-                "parentDirectory": "{{parentDirectory}}",
-                "content-type": "{{content-type}}",
-                "public": "true",
-                "website_id": "614298c2829b690010a5c031"
-            }
-        }
-    ]
-}
+module.exports = {
+    "organization_id": "",
+    "key": "",
+    "host": "",
+    "sources": [
+        {
+            "array": "files",
+            "object": {
+                "_id": "637ca5ac50234ef1671ce327",
+                "name": "index.html",
+                "path": "/docs/pwa",
+                "pathname": "/docs/pwa/index.html",
+                "src": "{{./docs/index.html}}",
+                "host": [
+                    "cocreate.app",
+                    "general.cocreate.app"
+                ],
+                "directory": "pwa",
+                "content-type": "{{content-type}}",
+                "public": "true"
+            }
+        }
+    ]
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/pwa",
-  "version": "1.9.2",
+  "version": "1.10.1",
   "description": "A simple pwa component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "pwa",
@@ -59,6 +59,6 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/local-storage": "^1.10.0"
+    "@cocreate/local-storage": "^1.10.1"
   }
 }

package/src/cache.js

@@ -1,28 +1,37 @@
+import socket from "@cocreate/socket-client"
+
+// const cacheName = "dynamic-v2"
+
 const cacheBtn = document.getElementById('cacheBtn');
 
-function deleteCache(cache) {
+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) => {
+        // Construct the URL for the file based on the fileObject's path and src
+        const fileUrl = new URL(data.name, window.location.origin + data.path).toString();
+
+        // 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)
+        cache.put(fileUrl, fileResponse).then(() => {
+            console.log(`Updated cache for ${fileUrl}`);
+        });
+    });
+}
+
+function deleteCache(cacheName) {
     if ('serviceWorker' in navigator) {
-        return caches.delete(key);
-
-        // caches.keys().then(function(cacheNames) {
-        //     cacheNames.forEach(function(cacheName) {
-        //         if (cacheName == cache)
-        //             caches.delete(cacheName);
-        //     });
-        // });
+        return caches.delete(cacheName);
     }
 }
 
-// function cleanCache(cacheName, numeroItems) {
-//     caches.open(cacheName).then((cache) => {
-//         return cache.keys().then((keys) => {
-//             if (keys.length > numeroItems) {
-//                 cache.delete(keys[0]).then(cleanCache(cacheName, numeroItems));
-//             }
-//         });
-//     });
-// }
-
 function deleteFile(cacheName, fileName) {
     if ('serviceWorker' in navigator) {
         caches.open(cacheName).then(function (cache) {
@@ -34,11 +43,23 @@ function deleteFile(cacheName, fileName) {
     }
 }
 
-
 if (cacheBtn) {
     cacheBtn.addEventListener('click', function () {
         deleteFile('dynamic-v2', '/CoCreate-components/CoCreate-pwa/src/index.js');
     });
 }
 
-export { deleteCache, deleteFile }
+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 }

package/src/service-worker.js

@@ -15,10 +15,12 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  ********************************************************************************/
 
-// Commercial Licensing Information:
-// For commercial use of this software without the copyleft provisions of the AGPLv3,
-// you must obtain a commercial license from CoCreate LLC.
-// For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
+/**
+ * Commercial Licensing Information:
+ * For commercial use of this software without the copyleft provisions of the AGPLv3,
+ * you must obtain a commercial license from CoCreate LLC.
+ * For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
+ */
 
 const cacheName = "dynamic-v2";
 let organization_id = ""
@@ -40,46 +42,11 @@ self.addEventListener("activate", async (e) => {
 self.addEventListener("fetch", async (e) => {
     if (!(e.request.url.indexOf('http') === 0) || e.request.method === 'POST') return;
 
-    if (!storage) {
-        console.log('storage:', storage);
-
-        const url = new URL(e.request.url);
-        const hostname = url.host;
-        const pathname = url.pathname;
-
-        let file = await readFile({
-            database: '5ff747727005da1c272740ab',
-            array: 'files',
-            filter: {
-                path: hostname,
-                host: '*'
-            }
-        });
-
-        if (file) {
-            console.log('file:', file);
-            console.log('Pathname:', pathname);
-            console.log('file', file)
-        }
-
-        if (file && file.object && file.object[0]) {
-            file = file.object[0]
-
-            const modifiedRequest = new Request(e.request, {
-                headers: new Headers({
-                    'File-Content': file.src,
-                    'Content-Type': file['content-type']
-                })
-            });
-            e.request = modifiedRequest
-        }
-    }
-
     e.respondWith(
         caches
             .match(e.request)
             .then(async (cacheResponse) => {
-                if (!navigator.onLine && !!cacheResponse && cacheType !== 'false') {
+                if (!navigator.onLine || !!cacheResponse && cacheType !== 'false') {
                     return cacheResponse;
                 } else {
                     const networkResponse = await fetch(e.request);
@@ -91,10 +58,6 @@ self.addEventListener("fetch", async (e) => {
                     if (storageHeader)
                         storage = storageHeader
 
-                    if (!cacheResponse || cacheType === 'false' || cacheType === 'offline') {
-                        return networkResponse.clone();
-                    }
-
                     if (cacheType && cacheType !== 'false') {
                         console.log('caching')
 
@@ -119,6 +82,10 @@ self.addEventListener("fetch", async (e) => {
                         });
                     }
 
+                    if (!cacheResponse || cacheType === 'false' || cacheType === 'offline') {
+                        return networkResponse.clone();
+                    }
+
                 }
 
                 if (!!cacheResponse && cacheType !== 'false' && cacheType !== 'offline') {
@@ -132,56 +99,6 @@ self.addEventListener("fetch", async (e) => {
     );
 });
 
-
-function readFile(data) {
-    return new Promise((resolve) => {
-        const request = indexedDB.open(data.database);
-
-        request.onsuccess = function () {
-            const db = request.result
-            console.log('readFile', data)
-            try {
-                const transaction = db.transaction(data.array, "readonly");
-                const objectStore = transaction.objectStore(data.array);
-                const cursorRequest = objectStore.openCursor();
-
-                cursorRequest.onsuccess = function () {
-                    const cursor = cursorRequest.result;
-                    if (cursor) {
-                        const file = cursor.value;
-                        if (!file || !file.src || !file.path || !file.host)
-                            cursor.continue();
-                        else if (file.path !== data.filter.path || !file.host.includes(data.filter.host))
-                            cursor.continue();
-                        else {
-                            db.close()
-                            return resolve(file);
-                        }
-                    } else {
-                        // Resolve the Promise when cursor is finished
-                        db.close()
-                        resolve();
-                    }
-                };
-
-                cursorRequest.onerror = function () {
-                    console.error("Cursor error:", cursorRequest.error);
-                    db.close()
-                    resolve();
-                };
-            } catch (error) {
-
-            }
-
-        };
-
-        request.onerror = function (event) {
-            reject(event.target.error);
-        };
-
-    })
-}
-
 self.addEventListener('message', function (event) {
     if (event.data === 'getOrganization')
         event.source.postMessage(organization_id);