simplify sw caching

This commit is contained in:
creeper123123321 2024-03-07 09:24:07 -03:00
parent 28d148590f
commit 989f6b0d22

View File

@ -14,12 +14,8 @@ self.addEventListener("install", () => {
}); });
self.addEventListener("fetch", evt => { self.addEventListener("fetch", evt => {
if (!shouldCache(evt.request.url) || evt.request.method !== "GET") return; if (!isImmutable(evt.request.url) || evt.request.method !== "GET") return;
if (isImmutable(evt.request.url)) { evt.respondWith(fromCache(evt.request).catch(() => tryNetwork(evt.request)));
evt.respondWith(fromCache(evt.request).catch(() => tryNetworkAndCache(evt.request)));
} else {
evt.respondWith(tryNetworkAndCache(evt.request).catch(() => fromCache(evt.request)));
}
}); });
function isImmutable(url) { function isImmutable(url) {
@ -27,22 +23,22 @@ function isImmutable(url) {
return ["cdnjs.cloudflare.com", "alcdn.msauth.net"].indexOf(parsed.host) !== -1; return ["cdnjs.cloudflare.com", "alcdn.msauth.net"].indexOf(parsed.host) !== -1;
} }
function shouldCache(it) { function tryNetwork(request) {
return [".js", ".css", ".png", ".html", ".webp", "manifest.json"].findIndex(end => it.endsWith(end)) !== -1
|| it === new URL("./", self.location).toString()
}
function tryNetworkAndCache(request) {
return fetch(request) return fetch(request)
.then(async response => { .then(async response => {
if (!shouldCache(response.url)) return response; if (!isImmutable(request.url)) return response;
try { try {
await fromCache(request); await fromCache(request)
.catch(async e => {
console.log("caching due to: " + e);
console.log(request);
let cache = await caches.open(cacheId);
// passing request directly doesn't work well with workers due to opaque response
await cache.add(request.url);
});
} catch (e) { } catch (e) {
console.log("caching due to: " + e); console.log("failed to cache: " + e)
let cache = await caches.open(cacheId);
await cache.add(request);
} }
return response; return response;
}); });
@ -54,11 +50,6 @@ function fromCache(request) {
let matching = await cache.match(request); let matching = await cache.match(request);
if (matching == null) return Promise.reject("no match"); if (matching == null) return Promise.reject("no match");
let timeDiff = new Date() - new Date(matching.headers.get("date"));
if (!isImmutable(request.url) && timeDiff >= 24 * 60 * 60 * 1000) {
await cache.delete(request);
return Promise.reject("expired");
}
return matching; return matching;
}); });
} }