From bf0c358e8930f7520fdec3282347835bc82c6518 Mon Sep 17 00:00:00 2001
From: daffinm <miles.daffin@gmail.com>
Date: Sat, 4 Apr 2020 14:25:49 +0100
Subject: [PATCH] Removed experiment with code sharing between front and back
 end. PITA for users of the SW Client.

---
 index.html      |  3 +--
 js/sw-client.js | 15 ++++++++++++---
 js/sw-utils.js  | 12 ------------
 sw.js           | 18 ++++++++++++++----
 4 files changed, 27 insertions(+), 21 deletions(-)
 delete mode 100644 js/sw-utils.js

diff --git a/index.html b/index.html
index 5f93021..82ebd26 100644
--- a/index.html
+++ b/index.html
@@ -7,9 +7,8 @@
           content="user-scalable=yes, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
 
     <script src="js/assert.js"></script>
-    <script src="js/debug-console.js"></script>
-    <script src="js/sw-utils.js"></script>
     <script src="js/sw-client.js"></script>
+    <script src="js/debug-console.js"></script>
 
     <link rel="manifest" href="manifest.json">
     <style>
diff --git a/js/sw-client.js b/js/sw-client.js
index 4c61522..65b33f2 100644
--- a/js/sw-client.js
+++ b/js/sw-client.js
@@ -1,5 +1,4 @@
 // Uses assert from assert.js
-// Uses SwUtils.logRegistration from sw-utils.js
 
 function ServiceWorkerClient(url, debug, ui) {
     assert.isDefined(url);
@@ -31,7 +30,7 @@ function ServiceWorkerClient(url, debug, ui) {
         debug.log('Registering service worker...');
         navigator.serviceWorker.register(url)
             .then(function (reg) {
-                SwUtils.logRegistration(reg, 'Service worker registered', debug);
+                logRegistration(reg, 'Service worker registered', debug);
                 navigator.serviceWorker.waiting.then(function(reg) {
                     debug.log('New waiting service worker found.');
                     handleUpdateTo(reg, false);
@@ -47,7 +46,7 @@ function ServiceWorkerClient(url, debug, ui) {
         navigator.serviceWorker.register(url).then(async function (reg) {
             await fetch(url, {method: 'HEAD'}); // trigger error if offline.
             reg.update().then(function (reg) {
-                SwUtils.logRegistration(reg, 'Checking for updates', debug);
+                logRegistration(reg, 'Checking for updates', debug);
                 if (updateIsAvailable(reg)) {
                     debug.log('Update found by update checker. Handling it...');
                     handleUpdateTo(reg, updateButtonPressed);
@@ -68,6 +67,16 @@ function ServiceWorkerClient(url, debug, ui) {
     //--------------------------------------------------------------------------------------------------------------
     // Private methods
     //--------------------------------------------------------------------------------------------------------------
+    function logRegistration(reg, message) {
+        message = message ? message : 'Service Worker registration';
+        const yes = '✓';
+        const no = '𐄂';
+        let installing = reg.installing ? yes : no;
+        let waiting = reg.waiting ? yes : no;
+        let active = reg.active ? yes : no;
+        message = `${message}\n - installing: ${installing}\n - waiting:    ${waiting}\n - active:     ${active}`;
+        debug.log(message);
+    }
     function updateIsAvailable(reg) {
         let newSw = (reg.installing || reg.waiting);
         let activeSw = reg.active;
diff --git a/js/sw-utils.js b/js/sw-utils.js
deleted file mode 100644
index 1818a41..0000000
--- a/js/sw-utils.js
+++ /dev/null
@@ -1,12 +0,0 @@
-SwUtils = Object.freeze({
-    logRegistration(reg, message, debug) {
-        message = message ? message : 'Service Worker registration';
-        const yes = '✓';
-        const no = '𐄂';
-        let installing = reg.installing ? yes : no;
-        let waiting = reg.waiting ? yes : no;
-        let active = reg.active ? yes : no;
-        message = `${message}\n - installing: ${installing}\n - waiting:    ${waiting}\n - active:     ${active}`;
-        debug.log(message);
-    }
-});
\ No newline at end of file
diff --git a/sw.js b/sw.js
index 487c09b..33d4bb6 100644
--- a/sw.js
+++ b/sw.js
@@ -1,12 +1,22 @@
 const DEBUG_LOGGING = true;
 const WORKBOX_DEBUG = false;
 
+function logRegistration(reg, message) {
+    message = message ? message : 'Service Worker registration';
+    const yes = '✓';
+    const no = '𐄂';
+    let installing = reg.installing ? yes : no;
+    let waiting = reg.waiting ? yes : no;
+    let active = reg.active ? yes : no;
+    message = `${message}\n - installing: ${installing}\n - waiting:    ${waiting}\n - active:     ${active}`;
+    debug.log(message);
+}
+
 importScripts('js/debug-console.js');
-importScripts('js/sw-utils.js');
 const debug = new DebugConsole(DEBUG_LOGGING, 'Service Worker', 'indianred');
 debug.heading('New Service Worker installing...');
 
-SwUtils.logRegistration(self.registration, 'At startup: registration state', debug);
+logRegistration(self.registration, 'At startup: registration state', debug);
 
 const WORKBOX_VERSION = "5.1.2";
 importScripts(`https://storage.googleapis.com/workbox-cdn/releases/${WORKBOX_VERSION}/workbox-sw.js`);
@@ -25,7 +35,7 @@ self.addEventListener('message', (event) => {
     }
 });
 self.addEventListener('install', function (event) {
-    SwUtils.logRegistration(self.registration, 'On install: registration state', debug);
+    logRegistration(self.registration, 'On install: registration state', debug);
 });
 const FIRST_TIME = (!self.registration.active);
 if (FIRST_TIME) {
@@ -45,7 +55,7 @@ self.clients.matchAll().then(function (clientArray) {
 // If there are no controlled clients then a new service worker will activate automatically, even if there
 // is a previous active version. And it will carry on doing this each time until a client becomes controlled.
 self.addEventListener('activate', function(event) {
-    SwUtils.logRegistration(self.registration, 'On activate: registration state', debug);
+    logRegistration(self.registration, 'On activate: registration state', debug);
     // Note. Our client page is initially uncontrolled by a service worker because it was not served by a the
     // service worker. So how do we bring it under control in a way that does not take control away from the user?
     // ---