Catch all exceptions in JS function updateUI

[coffee/coffee-flask.git] / templates / main.js

diff --git a/templates/main.js b/templates/main.js
index 63aa40dcad4dd513d2afa3f4bbcd5572360e174a..f0b50e1e5f3de1a735a17bbeabc21914c6256f1c 100644 (file)
--- a/templates/main.js
+++ b/templates/main.js
@@ -3,10 +3,10 @@ var flask = "{{ url_for('hello', _external=True) }}"
 // State variables
 
 var updateRemote = undefined;   // defined iff remote server accessible
-var loggedIn = false;           // true after swiping the cards
 var timeToLogout = undefined;   // defined during logout countdown
 var logoutTimer;
 var reloadTimer = undefined;
+var id_user;                    // ID of the user who is to be accounted for the next coffee
 
 console.log("hello from flask");
 //sendJSON("{\"type\":\"empty\"}");
@@ -15,25 +15,14 @@ function update(id, msg) {
     document.getElementById(id).innerHTML = msg;
 }
 
-function loadLocalStorage() {
+function replayOfflineQueue() {
     if (localStorage) {
-        if (localStorage.length) {
-            var entries = [];
-            for (var i = 0; i < localStorage.length; i++) {
-                var value = localStorage.getItem(localStorage.key(i));
-                try {
-                    var key = localStorage.key(i);
-                    var value = localStorage.getItem(key);
-                    entries.push({ key: key, value: value });
-                } catch (err) {
-                    console.log("no json: " + value)
-                }
-            }
-            localStorage.clear();
-            entries.sort((entry1, entry2) => { return entry1.key > entry2.key;});
-            for (var i = 0; i < entries.length; i++) {
-                updateRemote(entries[i].value);
-            }
+        let queue = JSON.parse(localStorage.getItem("offlineQueue")) || [];
+        if (Array.isArray(queue)) {
+            queue.forEach(function (entry) {
+                updateRemote(entry.data);
+            });
+            localStorage.removeItem("offlineQueue");
         }
     }
 }
@@ -45,44 +34,39 @@ var flavorChosen;
 // call this function. This function updates the UI to match the state.
 function updateUI()
 {
-    if (updateRemote === undefined) {
-        update("remote", "<center>Server offline...</center>");
-        document.getElementById("local").style.display = "block";
-        loadRemote();
-    } else {
-        document.getElementById("local").style.display = "none";
-
-        if (loggedIn) {
-            document.getElementById("nextStep").innerHTML = "Now select a beverage on the coffee machine…";
+    try {
+        if (updateRemote === undefined) {
+            update("remote", "<center>Server offline...</center>");
+            document.getElementById("local").style.display = "block";
+            loadRemote();
         } else {
-            document.getElementById("nextStep").innerHTML = "Enjoy your " + flavorChosen + "!";
-        }
+            document.getElementById("local").style.display = "none";
 
-        if (timeToLogout !== undefined)
-            document.getElementById("logout_button").value = '\nlogout\n(' + timeToLogout + ' s)';
+            if (id_user !== undefined) {
+                document.getElementById("nextStep").innerHTML = "Now select a beverage on the coffee machine…";
+            } else {
+                document.getElementById("nextStep").innerHTML = "Enjoy your " + flavorChosen + "!";
+            }
+
+            if (timeToLogout !== undefined)
+                document.getElementById("logout_button").innerHTML = '<br>logout<br>(' + timeToLogout + ' s)';
+        }
+    }
+    catch (err) {
+        console.log("Error: ", err);
     }
 }
 
 function hiddenUpdateRemote(json) {
     var msg = JSON.parse(json);
 
-    //update("json", "json: " + JSON.stringify(msg))
-
     switch(msg.type) {
         case "empty":
-            //update("json","");
             break;
         case "rfid":
-            /*update("json",
-                "uid: " + msg.uid + "<br>" +
-                "card type: " + msg.card_type + "<br>" +
-                "uid size: " + msg.size + " bytes<br>" +
-                "sak: " + msg.sak
-            );*/
             login(msg.uid);
             break;
         case "keys":
-            //update("json", "key: " + msg.key);
             var flavor = getFlavor(msg.key);
             if (flavor !== "") {
                 addCoffee(flavor);
@@ -102,7 +86,7 @@ function loadRemote(string) {
             if (this.status == 200) {
                 update("remote", this.responseText);
                 updateRemote = hiddenUpdateRemote;
-                loadLocalStorage();
+                replayOfflineQueue();
                 updateUI();
                 clearTimeout(reloadTimer);
             } else {
@@ -117,6 +101,7 @@ function loadRemote(string) {
 loadRemote();
 
 function ajax(method, route, data, id) {
+    var now = Date.now();
     var xhr = new XMLHttpRequest();
     xhr.onreadystatechange = function() {
         if (this.readyState == 4) {
@@ -128,7 +113,6 @@ function ajax(method, route, data, id) {
                 updateUI();
 
                 if (localStorage) {
-                    var now = Date.now();
                     var fuck = JSON.stringify({
                         type: "fuck",
                         method: method,
@@ -136,8 +120,14 @@ function ajax(method, route, data, id) {
                         data: data,
                         id: id
                     });
-                    localStorage.setItem(now, fuck);
-                    console.log(now + ": " + fuck);
+                    let queue = JSON.parse(localStorage.getItem("offlineQueue")) || [];
+                    queue.push({ time: Date.now(), data: fuck });
+                    try {
+                        localStorage.setItem("offlineQueue", JSON.stringify(queue));
+                    }
+                    catch (err) {
+                        console.log(err);
+                    }
                 }
             }
         }
@@ -155,7 +145,7 @@ function ajax(method, route, data, id) {
 
 function login(id) {
     ajax("POST", "login", id, "user");
-    loggedIn = true;
+    id_user = id;
     clearTimeout(logoutTimer);
     timeToLogout = undefined;
 }
@@ -163,7 +153,7 @@ function login(id) {
 function logout() {
     sendReset();
     ajax("GET", "logout", "", "user");
-    loggedIn = false;
+    id_user = undefined;
     timeToLogout = undefined;
 }
 
@@ -195,12 +185,13 @@ function getFlavor(letter) {
 function addCoffee(flavor) {
     var data = JSON.stringify({
         time: new Date().toISOString(),
-        flavor: flavor
+        flavor: flavor,
+        uid: id_user
     });
-    if (loggedIn) {
+    if (id_user) {
         ajax("POST", "coffee/add", data, "user");
         flavorChosen = flavor;
-        loggedIn = false;
+        id_user = undefined;
         countingTimeLogout(10); //mean 10 seconds
     }
 }