From 15fdb938eeffcc034c146e581484da451631f8d5 Mon Sep 17 00:00:00 2001
From: Michael Mainguy <mike.mainguy@gmail.com>
Date: Wed, 8 May 2024 09:17:06 -0500
Subject: [PATCH] Added SW cache clear mechanism.

---
 index.html   | 10 +++++-
 public/sw.js | 87 +++++++++++++++++++---------------------------------
 src/vrApp.ts |  2 +-
 3 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/index.html b/index.html
index 2996ac2..068e756 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,15 @@
 <img id="loadingGrid" src="/assets/grid6.jpg"/>
 <script>
     if (typeof navigator.serviceWorker !== 'undefined') {
-        navigator.serviceWorker.register('/sw.js')
+        if (localStorage.getItem('serviceWorkerVersion') != '8') {
+            caches.keys().then(cacheNames => {
+                cacheNames.forEach(cacheName => {
+                    caches.delete(cacheName);
+                });
+            });
+            localStorage.setItem('serviceWorkerVersion', '8');
+        }
+        navigator.serviceWorker.register('/sw.js', {updateViaCache: 'none'});
     }
 </script>
 <script>
diff --git a/public/sw.js b/public/sw.js
index 1aa4e30..b5c4b06 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -1,29 +1,52 @@
 importScripts('https://storage.googleapis.com/workbox-cdn/releases/7.1.0/workbox-sw.js');
-const VERSION = '6';
+const VERSION = '8';
 const CACHE = "deepdiagram";
 const IMAGEDELIVERY_CACHE = "deepdiagram-images";
 
 // TODO: replace the following with the correct offline fallback page i.e.: const offlineFallbackPage = "offline.html";
 const offlineFallbackPage = "/";
-
+/*self.addEventListener('install', async (event) => {
+   self.skipWaiting();
+});
+self.addEventListener('activate', async (event) => {
+    self.skipWaiting();
+    self.clients.matchAll({
+        type: 'window'
+    }).then(windowClients => {
+        windowClients.forEach((windowClient) => {
+            windowClient.navigate(windowClient.url);
+        });
+    });
+});
+*/
 self.addEventListener("message", (event) => {
     if (event.data && event.data.type === "SKIP_WAITING") {
         self.skipWaiting();
     }
 });
 
-self.addEventListener('install', async (event) => {
+
+/*self.addEventListener('install', async (event) => {
     event.waitUntil(
         caches.open(CACHE)
             .then((cache) => cache.add(offlineFallbackPage))
     );
 });
-
-if (workbox.navigationPreload.isSupported()) {
+*/
+/*if (workbox.navigationPreload.isSupported()) {
     workbox.navigationPreload.enable();
-}
+}*/
+
 workbox.routing.registerRoute(
-    new RegExp('/.*\\.png'),
+    new RegExp('/.*\\.wasm'),
+    new workbox.strategies.CacheFirst({
+        cacheName: CACHE
+    })
+);
+console.warn('workbox');
+
+workbox.routing.registerRoute(
+    new RegExp('/assets/.*'),
     new workbox.strategies.CacheFirst({
         cacheName: CACHE
     })
@@ -41,24 +64,7 @@ workbox.routing.registerRoute(
         cacheName: CACHE
     })
 );
-workbox.routing.registerRoute(
-    new RegExp('/.*\\.svg'),
-    new workbox.strategies.CacheFirst({
-        cacheName: CACHE
-    })
-);
-workbox.routing.registerRoute(
-    new RegExp('/.*\\.jpeg'),
-    new workbox.strategies.CacheFirst({
-        cacheName: CACHE
-    })
-);
-workbox.routing.registerRoute(
-    new RegExp('/.*\\.jpg'),
-    new workbox.strategies.CacheFirst({
-        cacheName: CACHE
-    })
-);
+
 workbox.routing.registerRoute(
     new RegExp('/.*\\.glb'),
     new workbox.strategies.CacheFirst({
@@ -71,34 +77,5 @@ workbox.routing.registerRoute(
         cacheName: CACHE
     })
 );
-workbox.routing.registerRoute(
-    new RegExp('/.*\\.js'),
-    new workbox.strategies.CacheFirst({
-        cacheName: CACHE
-    })
-);
-workbox.routing.registerRoute(
-    new RegExp('/.*\\.wasm'),
-    new workbox.strategies.CacheFirst({
-        cacheName: CACHE
-    })
-);
-self.addEventListener('fetch', (event) => {
-    if (event.request.mode === 'navigate') {
-        event.respondWith((async () => {
-            try {
-                const preloadResp = await event.preloadResponse;
-                if (preloadResp) {
-                    return preloadResp;
-                }
-                const networkResp = await fetch(event.request);
-                return networkResp;
-            } catch (error) {
 
-                const cache = await caches.open(CACHE);
-                const cachedResp = await cache.match(offlineFallbackPage);
-                return cachedResp;
-            }
-        })());
-    }
-});
\ No newline at end of file
+
diff --git a/src/vrApp.ts b/src/vrApp.ts
index a8bbcd5..6b30bc5 100644
--- a/src/vrApp.ts
+++ b/src/vrApp.ts
@@ -15,7 +15,7 @@ import {Introduction} from "./tutorial/introduction";
 
 const webGpu = false;
 
-log.setLevel('error', false);
+log.setLevel('debug', false);
 const canvas = (document.querySelector('#gameCanvas') as HTMLCanvasElement);
 export class VrApp {