diff --git a/src/service-worker.ts b/src/service-worker.ts index f73efba0..918793f8 100644 --- a/src/service-worker.ts +++ b/src/service-worker.ts @@ -5,82 +5,82 @@ import { build, files, version } from '$service-worker' -// Create a unique cache name for this deployment const CACHE = `cache-${version}` - -const ASSETS = [ - ...build, // the app itself - ...files, // everything in `static` -] +const ASSETS = [...build, ...files] self.addEventListener('install', (event) => { console.info('[i] Installing service worker') - // Create a new cache and add all files to it + async function addFilesToCache() { const cache = await caches.open(CACHE) await cache.addAll(ASSETS) } - event.waitUntil(addFilesToCache()) + event.waitUntil( + addFilesToCache().then(() => { + self.skipWaiting() + }), + ) }) self.addEventListener('activate', (event) => { console.info('[i] Activating service worker') - // Remove previous cached data from disk + async function deleteOldCaches() { for (const key of await caches.keys()) { if (key !== CACHE) await caches.delete(key) } } - event.waitUntil(deleteOldCaches()) + event.waitUntil( + deleteOldCaches().then(() => { + self.clients.claim() + }), + ) }) self.addEventListener('fetch', (e) => { const event = e as FetchEvent - // ignore POST requests etc if (event.request.method !== 'GET') return async function respond() { const url = new URL(event.request.url) 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) - - if (response) return response - } - + // Bypass completely for API calls if (url.pathname.includes('/api/')) { - return fetch(event.request) + try { + return await fetch(event.request) + } catch (err) { + return new Response(JSON.stringify({ error: 'Offline' }), { + status: 503, + headers: { 'Content-Type': 'application/json' }, + }) + } + } + + if (ASSETS.includes(url.pathname)) { + const cachedResponse = await cache.match(event.request) + if (cachedResponse) return cachedResponse } - // 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 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.ok) { + if (response.status === 200) { cache.put(event.request, response.clone()) } return response } catch (err) { - const response = await cache.match(event.request) + // Fallback to cache if network is unavailable + const cachedResponse = await cache.match(event.request) + if (cachedResponse) return cachedResponse - if (response) { - return response - } - - // if there's no cache, then just error out - // as there is nothing we can do to respond to this request throw err } }