From 1d3e9cefb7dda6fa144460089a98687478188fc1 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Sun, 30 Aug 2020 14:57:25 -0400 Subject: [PATCH] I hate service workers for not reloading things. --- src/service-worker.js | 112 +++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/src/service-worker.js b/src/service-worker.js index 2289a55..e059585 100644 --- a/src/service-worker.js +++ b/src/service-worker.js @@ -8,75 +8,75 @@ const to_cache = shell.concat(files); const cached = new Set(to_cache); self.addEventListener('install', event => { - event.waitUntil( - caches - .open(ASSETS) - .then(cache => cache.addAll(to_cache)) - .then(() => { - self.skipWaiting(); - }) - ); + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); }); self.addEventListener('activate', event => { - event.waitUntil( - caches.keys().then(async keys => { - // delete old caches - for (const key of keys) { - if (key !== ASSETS) await caches.delete(key); - } + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } - self.clients.claim(); - }) - ); + self.clients.claim(); + }) + ); }); self.addEventListener('fetch', event => { - if (event.request.method !== 'GET' || event.request.headers.has('range')) return; + if (event.request.method !== 'GET' || event.request.headers.has('range')) return; - const url = new URL(event.request.url); + const url = new URL(event.request.url); - // don't try to handle e.g. data: URIs - if (!url.protocol.startsWith('http')) return; + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; - // ignore dev server requests - if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; - // always serve static files and bundler-generated assets from cache - if (url.host === self.location.host && cached.has(url.pathname)) { - event.respondWith(caches.match(event.request)); - return; - } + // always serve static files and bundler-generated assets from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } - // for pages, you might want to serve a shell `service-worker-index.html` file, - // which Sapper has generated for you. It's not right for every - // app, but if it's right for yours then uncomment this section - /* - if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { - event.respondWith(caches.match('/service-worker-index.html')); - return; - } - */ + // for pages, you might want to serve a shell `service-worker-index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/service-worker-index.html')); + return; + } + */ - if (event.request.cache === 'only-if-cached') return; + if (event.request.cache === 'only-if-cached') return; - // for everything else, try the network first, falling back to - // cache if the user is offline. (If the pages never change, you - // might prefer a cache-first approach to a network-first one.) - event.respondWith( - caches - .open(`offline${timestamp}`) - .then(async cache => { - try { - const response = await fetch(event.request); - cache.put(event.request, response.clone()); - return response; - } catch(err) { - const response = await cache.match(event.request); - if (response) return response; + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request, {credentials: 'same-origin'}); + // cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; - throw err; - } - }) - ); + throw err; + } + }) + ); });