ayo/ayco.io-astro
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: sw waiting for network resolution too long on Safari

Browse source
This commit is contained in:
Ayo Ayco 2024-08-19 14:51:40 +02:00
parent 5bea1c96ba
commit a0885a60a0
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/sw.mjs
View file

@ -9,7 +9,7 @@ const cleanOldCaches = async () => {
const allowCacheNames = ['cozy-reader', cacheName]; const allowCacheNames = ['cozy-reader', cacheName];
const allCaches = await caches.keys(); const allCaches = await caches.keys();
allCaches.forEach(key => { allCaches.forEach(key => {
if(!allowCacheNames.includes(key)) { if (!allowCacheNames.includes(key)) {
caches.delete(key); caches.delete(key);
} }
}); });
@ -25,7 +25,7 @@ const putInCache = async (request, response) => {
// if exists, replace // if exists, replace
const keys = await cache.keys(); const keys = await cache.keys();
if(keys.includes(request)) { if (keys.includes(request)) {
cache.delete(request); cache.delete(request);
} }
@ -39,22 +39,17 @@ const cacheAndRevalidate = async ({ request, preloadResponsePromise, fallbackUrl
// Try get the resource from the cache // Try get the resource from the cache
const responseFromCache = await cache.match(request); const responseFromCache = await cache.match(request);
try { if (responseFromCache) {
// get network response for revalidation of stale assets // get network response for revalidation of cached assets
const responseFromNetwork = await fetch(request.clone()); fetch(request.clone()).then((responseFromNetwork) => {
if(responseFromNetwork) { if (responseFromNetwork) {
putInCache(request, responseFromNetwork.clone()); putInCache(request, responseFromNetwork.clone());
} }
}).catch((error) => {
logError('failed to fetch updated resource', { force: forceLogging, context: 'cozy-sw', data: error })
});
if(responseFromCache) {
return responseFromCache; return responseFromCache;
} else {
return responseFromNetwork;
}
} catch (error) {
if(responseFromCache) {
return responseFromCache;
}
} }
// Try to use the preloaded response, if it's there // Try to use the preloaded response, if it's there
@ -64,7 +59,7 @@ const cacheAndRevalidate = async ({ request, preloadResponsePromise, fallbackUrl
// To avoid those errors, remove or comment out this block of preloadResponse // To avoid those errors, remove or comment out this block of preloadResponse
// code along with enableNavigationPreload() and the "activate" listener. // code along with enableNavigationPreload() and the "activate" listener.
const preloadResponse = await preloadResponsePromise; const preloadResponse = await preloadResponsePromise;
if(preloadResponse) { if (preloadResponse) {
putInCache(request, preloadResponse.clone()); putInCache(request, preloadResponse.clone());
return preloadResponse; return preloadResponse;
} }
@ -82,7 +77,7 @@ const cacheAndRevalidate = async ({ request, preloadResponsePromise, fallbackUrl
// Try the fallback // Try the fallback
const fallbackResponse = await cache.match(fallbackUrl); const fallbackResponse = await cache.match(fallbackUrl);
if(fallbackResponse) { if (fallbackResponse) {
return fallbackResponse; return fallbackResponse;
} }
@ -97,7 +92,7 @@ const cacheAndRevalidate = async ({ request, preloadResponsePromise, fallbackUrl
}; };
const enableNavigationPreload = async () => { const enableNavigationPreload = async () => {
if(self.registration.navigationPreload) { if (self.registration.navigationPreload) {
// Enable navigation preloads! // Enable navigation preloads!
await self.registration.navigationPreload.enable(); await self.registration.navigationPreload.enable();
} }
@ -109,10 +104,12 @@ self.addEventListener('activate', (event) => {
}); });
self.addEventListener('install', (event) => { self.addEventListener('install', (event) => {
self.skipWaiting(); // go straight to activate
event.waitUntil( event.waitUntil(
addResourcesToCache(__assets ?? []) addResourcesToCache(__assets ?? [])
); );
self.skipWaiting(); // activate updated SW
}); });
self.addEventListener('fetch', (event) => { self.addEventListener('fetch', (event) => {