Merge pull request #99 from jocxfin/fix-service-worker-bug

Fix service worker bug causing infinite load #97
jocxfin · Feb 21, 2025 · 208c1a6 · 208c1a6
2 parents ece7fc5 + ff28e1e
commit 208c1a6
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,4 +6,4 @@ RUN apk update && apk upgrade --no-cache && \
     pip install --no-cache-dir -r requirements.txt
 COPY . .
 EXPOSE 5069
-CMD ["gunicorn", "-w", "2", "-t", "4", "-k", "uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:5069", "app:app_asgi"]
+CMD ["sh", "-c", "rm -rf /app/__pycache__ && gunicorn -w 2 -t 4 -k uvicorn.workers.UvicornWorker -b 0.0.0.0:5069 app:app_asgi"]
diff --git a/app.py b/app.py
@@ -85,6 +85,8 @@ def serve_manifest():
 
 @app.route(config.BASE_PATH + '/service-worker.js')
 def serve_sw():
-    return send_file('service-worker.js', mimetype='application/javascript')
+    response = send_file('service-worker.js', mimetype='application/javascript')
+    response.headers['Cache-Control'] = 'no-store'
+    return response
 
 app_asgi = WsgiToAsgi(app)
diff --git a/service-worker.js b/service-worker.js
@@ -55,11 +55,20 @@ self.addEventListener('fetch', (event) => {
 
           caches.open(CACHE_NAME)
             .then((cache) => {
-              cache.put(event.request, responseToCache);
+              if (responseToCache) {
+                cache.put(event.request, responseToCache);
+              }
             });
 
           return response;
         });
       })
   );
 });
+
+function hardReload() {
+  self.skipWaiting();
+  clients.matchAll({ type: 'window' }).then(windowClients => {
+    windowClients.forEach(windowClient => windowClient.navigate(windowClient.url));
+  });
+}
diff --git a/static/index.js b/static/index.js
@@ -68,13 +68,18 @@ async function generatePassword() {
       if (data.passwords && Array.isArray(data.passwords)) {
         data.passwords.forEach((pwd, index) => {
           if (index < 5) {
-            document.querySelector(`.multipw${index}`).textContent = pwd;
+            const element = document.querySelector(`.multipw${index}`);
+            if (element) {
+              element.textContent = pwd;
+            }
             refreshpw.classList.remove('loading');
           }
         });
       } else {
-        passwordInput.value = data.password;
-        scrambleAnimation(data.password);
+        if (passwordInput) {
+          passwordInput.value = data.password;
+          scrambleAnimation(data.password);
+        }
         refreshpw.classList.remove('loading');
       }
     })
@@ -85,14 +90,18 @@ async function generatePassword() {
 
 function scrambleAnimation(finalPassword) {
   let scrambled = Array.from({ length: finalPassword.length }, () => getRandomCharacter());
-  passwordInput.value = scrambled.join('');
+  if (passwordInput) {
+    passwordInput.value = scrambled.join('');
+  }
   const maxDelay = 300;
 
   finalPassword.split('').forEach((char, index) => {
     let delay = Math.random() * maxDelay;
     setTimeout(() => {
       scrambled[index] = char;
-      passwordInput.value = scrambled.join('');
+      if (passwordInput) {
+        passwordInput.value = scrambled.join('');
+      }
     }, delay);
   });
 }
@@ -172,3 +181,15 @@ function copyPassword(index) {
     document.body.removeChild(textArea);
   }
 }
+
+function hardReload() {
+  if (navigator.serviceWorker && navigator.serviceWorker.controller) {
+    navigator.serviceWorker.controller.postMessage({ action: 'hard-reload' });
+  } else {
+    window.location.reload(true);
+  }
+}
+
+if (!navigator.serviceWorker || !navigator.serviceWorker.controller) {
+  hardReload();
+}