From 3975e5d7f2fd931e902e68842f5ebfe63860452f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?=
 <kasper.rynning-tonnesen@knowit.no>
Date: Tue, 28 Jan 2020 15:49:25 +0100
Subject: [PATCH] Better service-worker cache-handling

---
 public/service-worker.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/public/service-worker.js b/public/service-worker.js
index f9decdc..3430d14 100644
--- a/public/service-worker.js
+++ b/public/service-worker.js
@@ -20,7 +20,7 @@ self.addEventListener("activate", event => {
 });
 
 self.addEventListener("install", event => {
-  console.log("Service Worker installing.");
+  console.log("Arbeids arbeideren installerer seg.");
   event.waitUntil(
     caches.open(CACHE_NAME).then(cache => cache.addAll(STATIC_CACHE_URLS))
   );
@@ -28,25 +28,22 @@ self.addEventListener("install", event => {
 
 self.addEventListener("fetch", event => {
   event.respondWith(
-    fetch(event.request).catch(function() {
-      return caches.match(event.request);
-    })
-  );
-  event.waitUntil(
     fetch(event.request)
-      .then(function(response) {
-        cache(event.request, response);
+      .then(response => cache(event.request, response))
+      .catch(function() {
+        return caches.match(event.request);
       })
-      .catch(error => {})
   );
 });
 
 function cache(request, response) {
+  //console.log(response.type === "error" || response.type === "opaque", request);
   if (response.type === "error" || response.type === "opaque") {
-    return Promise.resolve(); // do not put in cache network errors
+    return response;
   }
 
-  return caches
-    .open(CACHE_NAME)
-    .then(cache => cache.put(request, response.clone()));
+  return caches.open(CACHE_NAME).then(cache => {
+    cache.put(request, response.clone());
+    return response;
+  });
 }