diff options
Diffstat (limited to 'app/javascript/mastodon/service_worker/entry.js')
-rw-r--r-- | app/javascript/mastodon/service_worker/entry.js | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/app/javascript/mastodon/service_worker/entry.js b/app/javascript/mastodon/service_worker/entry.js index ba54ae996..c1854c1cd 100644 --- a/app/javascript/mastodon/service_worker/entry.js +++ b/app/javascript/mastodon/service_worker/entry.js @@ -1,4 +1,4 @@ -import { freeStorage } from '../storage/modifier'; +import { freeStorage, storageFreeable } from '../storage/modifier'; import './web_push_notifications'; function openSystemCache() { @@ -10,9 +10,12 @@ function openWebCache() { } function fetchRoot() { - return fetch('/', { credentials: 'include' }); + return fetch('/', { credentials: 'include', redirect: 'manual' }); } +const firefox = navigator.userAgent.match(/Firefox\/(\d+)/); +const invalidOnlyIfCached = firefox && firefox[1] < 60; + // Cause a new version of a registered Service Worker to replace an existing one // that is already installed, and replace the currently active worker on open pages. self.addEventListener('install', function(event) { @@ -28,48 +31,49 @@ self.addEventListener('fetch', function(event) { const asyncResponse = fetchRoot(); const asyncCache = openWebCache(); - event.respondWith(asyncResponse.then(async response => { - if (response.ok) { - const cache = await asyncCache; - await cache.put('/', response); - return response.clone(); - } - - throw null; - }).catch(() => asyncCache.then(cache => cache.match('/')))); + event.respondWith(asyncResponse.then( + response => asyncCache.then(cache => cache.put('/', response.clone())) + .then(() => response), + () => asyncCache.then(cache => cache.match('/')))); } else if (url.pathname === '/auth/sign_out') { const asyncResponse = fetch(event.request); const asyncCache = openWebCache(); - event.respondWith(asyncResponse.then(async response => { + event.respondWith(asyncResponse.then(response => { if (response.ok || response.type === 'opaqueredirect') { - await Promise.all([ + return Promise.all([ asyncCache.then(cache => cache.delete('/')), indexedDB.deleteDatabase('mastodon'), - ]); + ]).then(() => response); } return response; })); - } else if (process.env.CDN_HOST ? url.host === process.env.CDN_HOST : url.pathname.startsWith('/system/')) { - event.respondWith(openSystemCache().then(async cache => { - const cached = await cache.match(event.request.url); + } else if (storageFreeable && (ATTACHMENT_HOST ? url.host === ATTACHMENT_HOST : url.pathname.startsWith('/system/'))) { + event.respondWith(openSystemCache().then(cache => { + return cache.match(event.request.url).then(cached => { + if (cached === undefined) { + const asyncResponse = invalidOnlyIfCached && event.request.cache === 'only-if-cached' ? + fetch(event.request, { cache: 'no-cache' }) : fetch(event.request); - if (cached === undefined) { - const fetched = await fetch(event.request); + return asyncResponse.then(response => { + if (response.ok) { + const put = cache.put(event.request.url, response.clone()); - if (fetched.ok) { - try { - await cache.put(event.request.url, fetched.clone()); - } finally { - freeStorage(); - } - } + put.catch(() => freeStorage()); - return fetched; - } + return put.then(() => { + freeStorage(); + return response; + }); + } + + return response; + }); + } - return cached; + return cached; + }); })); } }); |