Added pattern.gif "redirect" with SW

Added placeholder 'pattern.php' script.

SW:
Added uniform version control.
'handleRequest()' is now 'fetchContent()' and automatically saves response to 'bucket' Cahce Storage (removed between SW versions)

Added uniform same-origin check with 'const origin'.

Fixed issue where "cache lookup -> fetch fallback" wouldn't actually load content from cache.
This commit is contained in:
Victor Westerlund 2020-12-07 07:27:40 +01:00
parent e30593f849
commit e8dd97a291
2 changed files with 33 additions and 16 deletions

View file

@ -0,0 +1,8 @@
<?php
$gif = imagecreatefromgif("./pattern.gif");
header("Content-Type: image/gif");
imagegif($gif);
imagedestroy($gif);

View file

@ -1,16 +1,18 @@
const activeCaches = [ const version = "12062129";
"content-v1"
];
const root = "/victorwesterlund.com/public/"; const root = "/victorwesterlund.com/public/";
let activeCaches = [
`content-${version}`
];
self.addEventListener("install", event => { self.addEventListener("install", event => {
event.waitUntil( event.waitUntil(
caches.open("content-v1").then(cache => cache.addAll([ caches.open(`content-${version}`).then(cache => cache.addAll([
root, root,
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",
root + "assets/img/pattern.gif",
root + "assets/fonts/RobotoMono-Bold.woff2", root + "assets/fonts/RobotoMono-Bold.woff2",
root + "assets/fonts/RobotoMono-Regular.woff2" root + "assets/fonts/RobotoMono-Regular.woff2"
])) ]))
@ -32,15 +34,14 @@ self.addEventListener("activate", event => {
) )
}); });
/* ---- */ // Fetch and save content to bucket
function fetchContent(event) {
function handleRequest(event) {
const networkFetch = fetch(event.request); const networkFetch = fetch(event.request);
event.waitUntil( event.waitUntil(
networkFetch.then(response => { networkFetch.then(response => {
const responseClone = response.clone(); const responseClone = response.clone();
caches.open("downloaded").then(cache => cache.put(event.request, responseClone)); caches.open("bucket").then(cache => cache.put(event.request, responseClone));
}) })
); );
@ -50,16 +51,24 @@ function handleRequest(event) {
self.addEventListener("fetch", event => { self.addEventListener("fetch", event => {
const url = new URL(event.request.url); const url = new URL(event.request.url);
console.log(url); const origin = (url.origin == location.origin) ? true : false; // Is same-origin
if(url.origin != location.origin) {
// Fetch cross-origin content
if(!origin) {
event.respondWith(fetch(url.href)); event.respondWith(fetch(url.href));
return;
} }
// if(url.origin == location.origin && url.pathname == root) { // Get pattern.gif from generator. Fall back to cache on failure
// event.respondWith(caches.match("index.html")); if(origin && url.pathname.endsWith("pattern.gif")) {
// return; const pattern = new Request(`${location.origin}/${root}/assets/img/pattern.php`);
// } event.respondWith(fetch(pattern) || caches.match(event.request).then(response => response));
return;
}
event.respondWith(caches.match(url.pathname) || handleRequest(event)); // Respond with content for cache or fetch and save
event.respondWith(
caches.match(event.request).then(response => response || fetchContent(event))
);
}); });
// Victor Westerlund // Victor Westerlund