feat: do cache revalidation when it actually exists
This commit is contained in:
parent
8cc7a64338
commit
b18ea923e2
1 changed files with 14 additions and 10 deletions
24
src/sw.mjs
24
src/sw.mjs
|
@ -46,18 +46,20 @@ const cacheAndRevalidate = async ({ request, preloadResponsePromise, fallbackUrl
|
||||||
const responseFromCache = await cache.match(request);
|
const responseFromCache = await cache.match(request);
|
||||||
if (responseFromCache) {
|
if (responseFromCache) {
|
||||||
logInfo('using cached response...', { force: forceLogging, context: 'cozy-sw', data: responseFromCache.url })
|
logInfo('using cached response...', { force: forceLogging, context: 'cozy-sw', data: responseFromCache.url })
|
||||||
|
// get network response for revalidation of cached assets
|
||||||
|
fetch(request.clone()).then((responseFromNetwork) => {
|
||||||
|
if (responseFromNetwork) {
|
||||||
|
logInfo('fetched updated resource...', { force: forceLogging, context: 'cozy-sw', data: responseFromNetwork.url })
|
||||||
|
putInCache(request, responseFromNetwork.clone());
|
||||||
|
}
|
||||||
|
}).catch((error) => {
|
||||||
|
logError('failed to fetch updated resource', { force: forceLogging, context: 'cozy-sw', data: error })
|
||||||
|
});
|
||||||
|
|
||||||
return responseFromCache;
|
return responseFromCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
// get network response for revalidation of cached assets
|
|
||||||
fetch(request.clone()).then((responseFromNetwork) => {
|
|
||||||
if (responseFromNetwork) {
|
|
||||||
logInfo('updated cached resource...', { force: forceLogging, context: 'cozy-sw', data: responseFromNetwork.url })
|
|
||||||
putInCache(request, responseFromNetwork.clone());
|
|
||||||
}
|
|
||||||
}).catch((error) => {
|
|
||||||
logError('failed to fetch updated resource', { force: forceLogging, context: 'cozy-sw', data: error })
|
|
||||||
});
|
|
||||||
|
|
||||||
// Try to use the preloaded response, if it's there
|
// Try to use the preloaded response, if it's there
|
||||||
// NOTE: Chrome throws errors regarding preloadResponse, see:
|
// NOTE: Chrome throws errors regarding preloadResponse, see:
|
||||||
|
@ -115,11 +117,13 @@ self.addEventListener('activate', (event) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
self.addEventListener('install', (event) => {
|
self.addEventListener('install', (event) => {
|
||||||
|
|
||||||
logInfo('installing service worker...', { force: forceLogging, context: 'cozy-sw' })
|
logInfo('installing service worker...', { force: forceLogging, context: 'cozy-sw' })
|
||||||
|
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) => {
|
||||||
|
|
Loading…
Reference in a new issue