fix: sw waiting for network resolution too long on Safari
This commit is contained in:
parent
5bea1c96ba
commit
a0885a60a0
1 changed files with 18 additions and 21 deletions
21
src/sw.mjs
21
src/sw.mjs
|
@ -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
|
||||||
|
@ -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) => {
|
||||||
|
|
Loading…
Reference in a new issue