Fix service worker mess

Reviewed-on: #26

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "scan-wave",
 	"private": true,
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",

src/service-worker.ts

@@ -1,86 +1,71 @@
+/// <reference lib="webworker" />
 /// <reference types="@sveltejs/kit" />
 import { build, files, version } from '$service-worker';
 
-// Create a unique cache name for this deployment
+declare const self: ServiceWorkerGlobalScope;
-const CACHE = `cache-${version}`;
 
+const CACHE = `cache-${version}`;
 const ASSETS = [
-	...build, // the app itself
+    ...build,
-	...files  // everything in `static`
+    ...files
 ];
 
-self.addEventListener('install', (event) => {
+self.addEventListener('install', (event: ExtendableEvent) => {
-	// Create a new cache and add all files to it
+    const addFilesToCache = async () => {
-	async function addFilesToCache() {
         const cache = await caches.open(CACHE);
         await cache.addAll(ASSETS);
-	}
+    };
+
+	console.log("[SW] Installing new service worker");
 
     event.waitUntil(addFilesToCache());
+    self.skipWaiting();
 });
 
-self.addEventListener('activate', (event) => {
+self.addEventListener('activate', (event: ExtendableEvent) => {
-	// Remove previous cached data from disk
+    const deleteOldCaches = async () => {
-	async function deleteOldCaches() {
         for (const key of await caches.keys()) {
             if (key !== CACHE) await caches.delete(key);
+			console.log("[SW] Removing old service worker")
         }
-	}
+    };
 
     event.waitUntil(deleteOldCaches());
+    self.clients.claim();
 });
 
-self.addEventListener('fetch', (event) => {
+self.addEventListener('fetch', (event: FetchEvent) => {
-	// ignore POST requests etc
     if (event.request.method !== 'GET') return;
 
-	async function respond() {
     const url = new URL(event.request.url);
 
-		// Skip caching for auth routes
+    // Never cache private routes
-		if (url.pathname.startsWith('/auth/')) {
+    if (url.pathname.startsWith('/private')) {
-			return fetch(event.request);
+        event.respondWith(fetch(event.request));
+        return;
     }
 
+    const respond = async () => {
         const cache = await caches.open(CACHE);
 
-		// `build`/`files` can always be served from the cache
         if (ASSETS.includes(url.pathname)) {
-			const response = await cache.match(url.pathname);
+            const cached = await cache.match(url.pathname);
-
+            if (cached) return cached;
-			if (response) {
-				return response;
-			}
         }
 
-		// for everything else, try the network first, but
-		// fall back to the cache if we're offline
         try {
             const response = await fetch(event.request);
-
+            if (response.status === 200 && build.length > 0 && url.pathname.startsWith(`/${build[0]}/`)) {
-			// if we're offline, fetch can return a value that is not a Response
-			// instead of throwing - and we can't pass this non-Response to respondWith
-			if (!(response instanceof Response)) {
-				throw new Error('invalid response from fetch');
-			}
-
-			if (response.status === 200) {
                 cache.put(event.request, response.clone());
             }
-
-			return response;
-		} catch (err) {
-			const response = await cache.match(event.request);
-
-			if (response) {
             return response;
+        } catch {
+            const cached = await cache.match(event.request);
+            if (cached) return cached;
         }
 
-			// if there's no cache, then just error out
+        return new Response('Not found', { status: 404 });
-			// as there is nothing we can do to respond to this request
+    };
-			throw err;
-		}
-	}
 
     event.respondWith(respond());
 });