fix: sw held back by network request for updating cached assets
This commit is contained in:
parent
985dcb15e8
commit
28abc2bc6e
1 changed files with 10 additions and 18 deletions
28
src/sw.mjs
28
src/sw.mjs
|
@ -44,28 +44,20 @@ 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
|
logInfo('using cached response...', { force: forceLogging, context: 'cozy-sw', data: responseFromCache.url })
|
||||||
const responseFromNetwork = await fetch(request.clone());
|
return responseFromCache;
|
||||||
|
}
|
||||||
|
|
||||||
|
// get network response for revalidation of cached assets
|
||||||
|
fetch(request.clone()).then((responseFromNetwork) => {
|
||||||
if (responseFromNetwork) {
|
if (responseFromNetwork) {
|
||||||
logInfo('updated cached resource...', { force: forceLogging, context: 'cozy-sw', data: responseFromNetwork.url })
|
logInfo('updated cached resource...', { force: forceLogging, context: 'cozy-sw', data: responseFromNetwork.url })
|
||||||
putInCache(request, responseFromNetwork.clone());
|
putInCache(request, responseFromNetwork.clone());
|
||||||
}
|
}
|
||||||
|
}).catch((error) => {
|
||||||
if (responseFromCache) {
|
logError('failed to fetch updated resource', { force: forceLogging, context: 'cozy-sw', data: error })
|
||||||
logInfo('using cached response...', { force: forceLogging, context: 'cozy-sw', data: responseFromCache.url })
|
});
|
||||||
return responseFromCache;
|
|
||||||
} else {
|
|
||||||
logInfo('using network response...', { force: forceLogging, context: 'cozy-sw', data: responseFromNetwork.url })
|
|
||||||
return responseFromNetwork;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logInfo('failed to fetch updated resource', { force: forceLogging, context: 'cozy-sw', data: request.url })
|
|
||||||
if (responseFromCache) {
|
|
||||||
logInfo('using cached response', { force: forceLogging, context: 'cozy-sw', data: responseFromCache.url })
|
|
||||||
return responseFromCache;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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:
|
||||||
|
|
Loading…
Reference in a new issue