Removed caching of subdirectories

Subdirectories with the exception of /assets/ will not get cached by the Service Worker. A normal network fetch() will be executed.

Added scope to Service Worker register.

Added "fetchContent()" which performs a normal network fetch() and follows redirects.
This commit is contained in:
Victor Westerlund 2020-12-15 14:46:41 +01:00
parent 4a181e15e9
commit 1e762a65ea
3 changed files with 34 additions and 9 deletions

View file

@ -1,3 +1,5 @@
if(navigator.serviceWorker) { if(navigator.serviceWorker) {
navigator.serviceWorker.register("sw.js"); navigator.serviceWorker.register("sw.js",{
scope: "/"
});
} }

View file

@ -1,4 +1,4 @@
const version = "12140858"; const version = "12151420";
const root = "/"; const root = "/";
let activeCaches = [ let activeCaches = [
@ -8,7 +8,7 @@ let activeCaches = [
self.addEventListener("install", event => { self.addEventListener("install", event => {
event.waitUntil( event.waitUntil(
caches.open(`content-${version}`).then(cache => cache.addAll([ caches.open(`content-${version}`).then(cache => cache.addAll([
root, root + "index.html",
root + "assets/css/style.css", root + "assets/css/style.css",
root + "assets/img/favicon.png", root + "assets/img/favicon.png",
root + "assets/js/script.js", root + "assets/js/script.js",
@ -34,8 +34,8 @@ self.addEventListener("activate", event => {
) )
}); });
// Fetch and save content to bucket // Fetch and cache content to bucket
async function fetchContent(event) { async function fetchToCache(event) {
const networkFetch = fetch(event.request); const networkFetch = fetch(event.request);
event.waitUntil( event.waitUntil(
@ -49,13 +49,35 @@ async function fetchContent(event) {
return response || networkFetch; return response || networkFetch;
} }
// Fetch and follow redirects without caching
async function fetchContent(url,i = 0) {
console.log(i);
if(i >= 5) {
throw new Error("ERR_TOO_MANY_REDIRECTS");
}
return await fetch(url).then(response => {
if(response.redirected) {
i++;
return fetchContent(response.url,i);
}
return response;
});
}
self.addEventListener("fetch", event => { self.addEventListener("fetch", event => {
const url = new URL(event.request.url); const url = new URL(event.request.url);
const origin = (url.origin == location.origin) ? true : false; // Is same-origin const origin = (url.origin == location.origin) ? true : false; // Is same-origin
// Fetch cross-origin content // Speed up TTFB by serving index file first
if(!origin) { if(origin && url.pathname == "/") {
event.respondWith(fetch(url.href)); event.respondWith(caches.match(root + "index.html"));
return;
}
// Fetch cross-origin none-asset content
if(!origin || (url.pathname.substring(1,7) != "assets")) {
event.respondWith(fetchContent(url.href));
return; return;
} }
@ -68,7 +90,7 @@ self.addEventListener("fetch", event => {
// Respond with content for cache or fetch and save // Respond with content for cache or fetch and save
event.respondWith( event.respondWith(
caches.match(event.request).then(response => response || fetchContent(event)) caches.match(event.request).then(response => response || fetchToCache(event))
); );
}); });
// Victor Westerlund // Victor Westerlund

1
public/test/index.html Normal file
View file

@ -0,0 +1 @@
<p>Hello</p>