@cocreate/pwa 1.6.9 → 1.6.11

package/demo/pages/test3.html

@@ -1,56 +1,56 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <title>Hello!</title>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <!-- import the webpage's stylesheet -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="../css/style.css" />
-    <link rel="stylesheet" href="../css/test3.css" />
-    <!-- Manifest -->
-    <link rel="manifest" href="../manifest.webmanifest" />
-    <!--<link rel="manifest" href="./manifest.webmanifest">  -->
-    <link rel="manifest" href="/manifest.webmanifest">
-</head>
-
-<body class="test3-bg-color">
-    <nav class="navbar navbar-expand-sm bg-dark">
-        <!-- Links -->
-        <ul class="navbar-nav">
-            <li class="nav-item active">
-                <a class="nav-link" href="../index.html">Home</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="./test1.html">Test1</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="./test2.html">Test 2</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#">Test 3</a>
-            </li>
-        </ul>
-    </nav>
-    <p id="requireHTTPS" class="hidden">
-        <b>STOP!</b> This page <b>must</b> be served over HTTPS. Please
-        <a>reload this page via HTTPS</a>.
-    </p>
-
-    <p>
-        Make me installable, follow the
-        <a href="https://web.dev/codelab-make-installable/">instructions</a> here.
-    </p>
-
-    <!-- Install button, hidden by default -->
-    <div id="installContainer" class="hidden">
-        <button id="installBtn" type="button">Install</button>
-    </div>
-
-    <script src="../../dist/CoCreate-pwa.js" defer></script>
-    
-</body>
-
-</html>
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <title>Hello!</title>
+        <meta charset="utf-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <!-- import the webpage's stylesheet -->
+        <link
+            rel="stylesheet"
+            href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" />
+        <link rel="stylesheet" href="../css/style.css" />
+        <link rel="stylesheet" href="../css/test3.css" />
+        <!-- Manifest -->
+        <link rel="manifest" href="../manifest.webmanifest" />
+        <!--<link rel="manifest" href="./manifest.webmanifest">  -->
+        <link rel="manifest" href="/manifest.webmanifest" />
+    </head>
+
+    <body class="test3-bg-color">
+        <nav class="navbar navbar-expand-sm bg-dark">
+            <!-- Links -->
+            <ul class="navbar-nav">
+                <li class="nav-item active">
+                    <a class="nav-link" href="../index.html">Home</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="./test1.html">Test1</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="./test2.html">Test 2</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#">Test 3</a>
+                </li>
+            </ul>
+        </nav>
+        <p id="requireHTTPS" class="hidden">
+            <b>STOP!</b> This page <b>must</b> be served over HTTPS. Please
+            <a>reload this page via HTTPS</a>.
+        </p>
+
+        <p>
+            Make me installable, follow the
+            <a href="https://web.dev/codelab-make-installable/">instructions</a>
+            here.
+        </p>
+
+        <!-- Install button, hidden by default -->
+        <div id="installContainer" class="hidden">
+            <button id="installBtn" type="button">Install</button>
+        </div>
+
+        <script src="../../dist/CoCreate-pwa.js" defer></script>
+    </body>
+</html>

package/demo/sw.js

@@ -1,112 +1,112 @@
-const CACHE_STATIC_NAME = "static-v1";
-const CACHE_DYNAMIC_NAME = "dynamic-v2";
-const CACHE_INMUTABLE_NAME = "inmutable-v1";
-const CACHE_TEMP = 'temp-cache';
-const CACHE_DYNAMIC_LIMIT = 50;
-const fetchedMap = []
-const cacheType = 'cache'
-const requestMap = new Map()
-
-function deleteCache(key) {
-    return caches.delete(key);
-}
-
-self.addEventListener("install", (e) => {
-    console.log('Service Worker Installing')
-
-    self.skipWaiting();
-    // caches.open(CACHE_DYNAMIC_NAME).then((cache) => {
-    //     cache.keys().then((keys) => {
-    //         keys.forEach(key => {
-    //             fetchedMap.push(key.url)
-    //         })
-    //         deleteCache()
-    //     })
-    // })
-});
-
-self.addEventListener("activate", async (e) => {
-    // console.log('sw activate Event!')
-    // const bgFetch = await self.registration.backgroundFetch.fetch(new Date().toISOString(), fetchedMap);
-    // console.log('backgfetch', bgFetch)
-
-    // e.waitUntil(updateCache())
-        // updateCache() 
-        e.waitUntil(clients.claim());
-});
-
-self.addEventListener("fetch", (e) => {
-    if (!(e.request.url.indexOf('http') === 0)) return;
-    e.respondWith(
-        caches
-        .match(e.request)
-        .then((cachesObj) => {
-            if (!navigator.onLine && !!cachesObj)
-                return cachesObj;
-            
-            if (cacheType == 'cache' && !!cachesObj) {
-                // console.log('returned from cache')
-                requestMap.set(cachesObj, '')
-                fetch(e.request).then((newResp) => {
-                    caches.open(CACHE_DYNAMIC_NAME).then((cache) => {
-                            cache.put(e.request, newResp);
-                            // cleanCache(CACHE_DYNAMIC_NAME, CACHE_DYNAMIC_LIMIT);
-                    }).catch(() => {
-
-                    });
-                }).catch(() => {
-                    return caches.match('./offline.html');
-                })
-                return cachesObj;
-            } else {
-                return fetch(e.request).then((newResp) => {
-                        caches.open(CACHE_DYNAMIC_NAME).then((cache) => {
-                            cache.put(e.request, newResp);
-                            // cleanCache(CACHE_DYNAMIC_NAME, CACHE_DYNAMIC_LIMIT);
-                        }).catch(() => {});
-                        return newResp.clone();
-                    })
-                    .catch(() => {
-                        return caches.match('./offline.html');
-                    })
-                }
-        })
-        .catch(function() {
-            console.log('Fetch failed retuned offline page! ')
-            return caches.match('./offline.html');
-        })
-    );
-});
-
-async function updateCache(){
-    console.log('updateCache!')
-    caches.open(CACHE_DYNAMIC_NAME)
-        .then((cache) => {
-            console.log('added', fetchedMap)
-            cache.addAll(fetchedMap)
-        }
-    )
-}
-
-self.addEventListener('backgroundfetchsuccess', (event) => {
-    const bgFetch = event.registration;
-  
-    event.waitUntil(async function() {
-      // Create/open a cache.
-      const cache = await caches.open(CACHE_DYNAMIC_NAME);
-      // Get all the records.
-      const records = await bgFetch.matchAll();
-      // Copy each request/response across.
-      const promises = records.map(async (record) => {
-        const response = await record.responseReady;
-        console.log('putting ')
-        await cache.put(record.request, response);
-      });
-  
-      // Wait for the copying to complete
-      await Promise.all(promises);
-  
-      // Update the progress notification.
-    //   event.updateUI({ title: 'Episode 5 ready to listen!' });
-    }());
+const CACHE_STATIC_NAME = "static-v1";
+const CACHE_DYNAMIC_NAME = "dynamic-v2";
+const CACHE_INMUTABLE_NAME = "inmutable-v1";
+const CACHE_TEMP = 'temp-cache';
+const CACHE_DYNAMIC_LIMIT = 50;
+const fetchedMap = []
+const cacheType = 'cache'
+const requestMap = new Map()
+
+function deleteCache(key) {
+    return caches.delete(key);
+}
+
+self.addEventListener("install", (e) => {
+    console.log('Service Worker Installing')
+
+    self.skipWaiting();
+    // caches.open(CACHE_DYNAMIC_NAME).then((cache) => {
+    //     cache.keys().then((keys) => {
+    //         keys.forEach(key => {
+    //             fetchedMap.push(key.url)
+    //         })
+    //         deleteCache()
+    //     })
+    // })
+});
+
+self.addEventListener("activate", async (e) => {
+    // console.log('sw activate Event!')
+    // const bgFetch = await self.registration.backgroundFetch.fetch(new Date().toISOString(), fetchedMap);
+    // console.log('backgfetch', bgFetch)
+
+    // e.waitUntil(updateCache())
+        // updateCache() 
+        e.waitUntil(clients.claim());
+});
+
+self.addEventListener("fetch", (e) => {
+    if (!(e.request.url.indexOf('http') === 0)) return;
+    e.respondWith(
+        caches
+        .match(e.request)
+        .then((cachesObj) => {
+            if (!navigator.onLine && !!cachesObj)
+                return cachesObj;
+            
+            if (cacheType == 'cache' && !!cachesObj) {
+                // console.log('returned from cache')
+                requestMap.set(cachesObj, '')
+                fetch(e.request).then((newResp) => {
+                    caches.open(CACHE_DYNAMIC_NAME).then((cache) => {
+                            cache.put(e.request, newResp);
+                            // cleanCache(CACHE_DYNAMIC_NAME, CACHE_DYNAMIC_LIMIT);
+                    }).catch(() => {
+
+                    });
+                }).catch(() => {
+                    return caches.match('./offline.html');
+                })
+                return cachesObj;
+            } else {
+                return fetch(e.request).then((newResp) => {
+                        caches.open(CACHE_DYNAMIC_NAME).then((cache) => {
+                            cache.put(e.request, newResp);
+                            // cleanCache(CACHE_DYNAMIC_NAME, CACHE_DYNAMIC_LIMIT);
+                        }).catch(() => {});
+                        return newResp.clone();
+                    })
+                    .catch(() => {
+                        return caches.match('./offline.html');
+                    })
+                }
+        })
+        .catch(function() {
+            console.log('Fetch failed retuned offline page! ')
+            return caches.match('./offline.html');
+        })
+    );
+});
+
+async function updateCache(){
+    console.log('updateCache!')
+    caches.open(CACHE_DYNAMIC_NAME)
+        .then((cache) => {
+            console.log('added', fetchedMap)
+            cache.addAll(fetchedMap)
+        }
+    )
+}
+
+self.addEventListener('backgroundfetchsuccess', (event) => {
+    const bgFetch = event.registration;
+  
+    event.waitUntil(async function() {
+      // Create/open a cache.
+      const cache = await caches.open(CACHE_DYNAMIC_NAME);
+      // Get all the records.
+      const records = await bgFetch.matchAll();
+      // Copy each request/response across.
+      const promises = records.map(async (record) => {
+        const response = await record.responseReady;
+        console.log('putting ')
+        await cache.put(record.request, response);
+      });
+  
+      // Wait for the copying to complete
+      await Promise.all(promises);
+  
+      // Update the progress notification.
+    //   event.updateUI({ title: 'Episode 5 ready to listen!' });
+    }());
   });