feat: remove preload fallback & fix logError missing
This commit is contained in:
parent
b18ea923e2
commit
3bd2082c4e
1 changed files with 2 additions and 26 deletions
28
src/sw.mjs
28
src/sw.mjs
|
@ -38,7 +38,7 @@ const putInCache = async (request, response) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const cacheAndRevalidate = async ({ request, preloadResponsePromise, fallbackUrl }) => {
|
const cacheAndRevalidate = async ({ request, fallbackUrl }) => {
|
||||||
|
|
||||||
const cache = await caches.open(cacheName);
|
const cache = await caches.open(cacheName);
|
||||||
|
|
||||||
|
@ -53,27 +53,12 @@ const cacheAndRevalidate = async ({ request, preloadResponsePromise, fallbackUrl
|
||||||
putInCache(request, responseFromNetwork.clone());
|
putInCache(request, responseFromNetwork.clone());
|
||||||
}
|
}
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
logError('failed to fetch updated resource', { force: forceLogging, context: 'cozy-sw', data: error })
|
logInfo('failed to fetch updated resource', { force: forceLogging, context: 'cozy-sw', data: error })
|
||||||
});
|
});
|
||||||
|
|
||||||
return responseFromCache;
|
return responseFromCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Try to use the preloaded response, if it's there
|
|
||||||
// NOTE: Chrome throws errors regarding preloadResponse, see:
|
|
||||||
// https://bugs.chromium.org/p/chromium/issues/detail?id=1420515
|
|
||||||
// https://github.com/mdn/dom-examples/issues/145
|
|
||||||
// To avoid those errors, remove or comment out this block of preloadResponse
|
|
||||||
// code along with enableNavigationPreload() and the "activate" listener.
|
|
||||||
const preloadResponse = await preloadResponsePromise;
|
|
||||||
if (preloadResponse) {
|
|
||||||
putInCache(request, preloadResponse.clone());
|
|
||||||
logInfo('using preload response', { force: forceLogging, context: 'cozy-sw', data: preloadResponse.url })
|
|
||||||
return preloadResponse;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Try to get the resource from the network for 5 seconds
|
// Try to get the resource from the network for 5 seconds
|
||||||
const responseFromNetwork = await fetch(request.clone());
|
const responseFromNetwork = await fetch(request.clone());
|
||||||
|
@ -103,17 +88,9 @@ const cacheAndRevalidate = async ({ request, preloadResponsePromise, fallbackUrl
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const enableNavigationPreload = async () => {
|
|
||||||
if (self.registration.navigationPreload) {
|
|
||||||
// Enable navigation preloads!
|
|
||||||
await self.registration.navigationPreload.enable();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
self.addEventListener('activate', (event) => {
|
self.addEventListener('activate', (event) => {
|
||||||
logInfo('activating service worker...', { force: forceLogging, context: 'cozy-sw' })
|
logInfo('activating service worker...', { force: forceLogging, context: 'cozy-sw' })
|
||||||
cleanOldCaches();
|
cleanOldCaches();
|
||||||
event.waitUntil(enableNavigationPreload());
|
|
||||||
});
|
});
|
||||||
|
|
||||||
self.addEventListener('install', (event) => {
|
self.addEventListener('install', (event) => {
|
||||||
|
@ -132,7 +109,6 @@ self.addEventListener('fetch', (event) => {
|
||||||
event.respondWith(
|
event.respondWith(
|
||||||
cacheAndRevalidate({
|
cacheAndRevalidate({
|
||||||
request: event.request,
|
request: event.request,
|
||||||
preloadResponsePromise: event.preloadResponse,
|
|
||||||
fallbackUrl: './',
|
fallbackUrl: './',
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue