Try serve search data from cache

Author: fallaciousreasoning

public/serviceWorker.js

@@ -9,7 +9,7 @@ const shouldConserveData = () => {
 
   if (connection.saveData)
     return true;
-  
+
   return connection.type === "cellular";
 };
 
@@ -31,28 +31,28 @@ const downloadFirstRunAssets = async () => {
   ]);
 };
 
-self.addEventListener('install', function(e) {
+self.addEventListener('install', function (e) {
   console.log('[ServiceWorker] Install');
   e.waitUntil(downloadFirstRunAssets()
     .then(() => self.skipWaiting()));
 });
 
-self.addEventListener('activate', function(e) {
+self.addEventListener('activate', function (e) {
   console.log('[ServiceWorker] Activate');
   return self.clients.claim();
 });
 
 const cache = async (request, response) => {
   if (response.then)
     response = await response;
-  
+
   const copy = response.clone();
-  
+
   if (copy.ok) {
     const store = await caches.open(CACHE_NAME);
     await store.put(request, copy);
   }
-  
+
   // Return the response, to make this thenable.
   return response;
 }
@@ -63,37 +63,37 @@ const networkThenCache = async e => {
     .catch(() => caches.match(e.request));
 }
 
-const cacheThenNetwork = async e => {  
-  const cached = await caches.match(e.response);
+const cacheThenNetwork = async e => {
+  const cached = await caches.match(e.request);
   if (cached)
     return cached;
-  
+
   return fetch(e.request).then(r => cache(e.request, r));
 }
 
 const raceNetworkAndCache = async (e) => {
-    const cachePromise = caches.match(e.request);
-    const fetchPromise = fetch(e.request);
+  const cachePromise = caches.match(e.request);
+  const fetchPromise = fetch(e.request);
 
-    // Gets a promise returning a clone of the fetch request.
-    const getFetchResponseClone = () => fetchPromise.then(r => r.clone());
+  // Gets a promise returning a clone of the fetch request.
+  const getFetchResponseClone = () => fetchPromise.then(r => r.clone());
 
-    // Always update what's in the cache whatever it is we tried to fetch.
-    e.waitUntil(cache(e.request, getFetchResponseClone()));
+  // Always update what's in the cache whatever it is we tried to fetch.
+  e.waitUntil(cache(e.request, getFetchResponseClone()));
 
-    const responseToReturn = getFetchResponseClone();
-    // If the cache doesn't have the request, try and fetch it from the network.
-    const cachedOrNetwork = cachePromise
-        .then(response => response || responseToReturn)
-        .catch(() => responseToReturn);
+  const responseToReturn = getFetchResponseClone();
+  // If the cache doesn't have the request, try and fetch it from the network.
+  const cachedOrNetwork = cachePromise
+    .then(response => response || responseToReturn)
+    .catch(() => responseToReturn);
 
-    // If the network encounters an error, try and return a cached response.
-    const networkOrCache = responseToReturn
-        .catch(() => cachePromise);
+  // If the network encounters an error, try and return a cached response.
+  const networkOrCache = responseToReturn
+    .catch(() => cachePromise);
 
-    // Promise.race throws an error if either promise rejects, so be careful
-    // that neither promise can throw.
-    return Promise.race([cachedOrNetwork, networkOrCache]);
+  // Promise.race throws an error if either promise rejects, so be careful
+  // that neither promise can throw.
+  return Promise.race([cachedOrNetwork, networkOrCache]);
 };
 
 
@@ -103,15 +103,18 @@ const maybeConserve = (normal, conservative) => {
 };
 
 // Map regexes to a strategy.
-const rules = {    
+const rules = {
   // First party scripts should be fetched from the network, if possible. 
   [self.registration.scope]: networkThenCache,
 
   // Fetch latest mountain data, if we have a network connection.
   "https://raw.githubusercontent.com/fallaciousreasoning/nz-mountains/main/mountains.json": networkThenCache,
+
+  // Use search data from cache.
+  'https://search.topos.nz/data/min_excluded_places.json': cacheThenNetwork
 }
 
-self.addEventListener('fetch', function(e) {
+self.addEventListener('fetch', function (e) {
   for (const rule in rules) {
     const regex = new RegExp(rule);
     if (regex.test(e.request.url)) {