luci-app-attendedsysupgrade: refactor and format

* Reuse `request_dict` between requests.
* used vim Autoformat plugin to make the javascript code nice.
* add board_name as it eventually replaces board/model in requests

Signed-off-by: Paul Spooren <mail@aparcar.org>

applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js

@@ -1,14 +1,28 @@
-function $(s) { return document.getElementById(s.substring(1)); }
+function $(s) {
+    return document.getElementById(s.substring(1));
+}
 
-function show(s) { $(s).style.display = 'block'; }
+function show(s) {
+    $(s).style.display = 'block';
+}
 
-function hide(s) { $(s).style.display = 'none'; }
+function hide(s) {
+    $(s).style.display = 'none';
+}
 
 function set_server() {
     hide("#status_box");
     data.url = $("#server").value;
-	ubus_call("uci", "set", { "config": "attendedsysupgrade", "section": "server", values: { "url": data.url } })
+    ubus_call("uci", "set", {
-	ubus_call("uci", "commit", { "config": "attendedsysupgrade" })
+        "config": "attendedsysupgrade",
+        "section": "server",
+        values: {
+            "url": data.url
+        }
+    })
+    ubus_call("uci", "commit", {
+        "config": "attendedsysupgrade"
+    })
     var server_button = $("#server")
     server_button.type = 'button';
     server_button.className = 'cbi-button cbi-button-edit';
@@ -45,9 +59,7 @@ function edit_packages() {
 }
 
 // requests to the upgrade server
-function server_request(request_dict, path, callback) {
+function server_request(path, callback) {
-	request_dict.distro = data.release.distribution;
-	request_dict.target = data.release.target;
     var request = new XMLHttpRequest();
     request.open("POST", data.url + "/" + path, true);
     request.setRequestHeader("Content-type", "application/json");
@@ -68,10 +80,26 @@ function setup() {
     ubus_call("system", "board", {}, "board_name");
     ubus_call("system", "board", {}, "model");
     ubus_call("system", "info", {}, "memory");
-	uci_get({ "config": "attendedsysupgrade", "section": "server", "option": "url" })
+    uci_get({
-	uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "upgrade_packages" })
+        "config": "attendedsysupgrade",
-	uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "advanced_mode" })
+        "section": "server",
-	uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "auto_search" })
+        "option": "url"
+    })
+    uci_get({
+        "config": "attendedsysupgrade",
+        "section": "client",
+        "option": "upgrade_packages"
+    })
+    uci_get({
+        "config": "attendedsysupgrade",
+        "section": "client",
+        "option": "advanced_mode"
+    })
+    uci_get({
+        "config": "attendedsysupgrade",
+        "section": "client",
+        "option": "auto_search"
+    })
     setup_ready();
 }
 
@@ -97,6 +125,7 @@ function uci_get(option) {
 
 ubus_counter = 0;
 ubus_closed = 0;
+
 function ubus_call(command, argument, params, variable) {
     var request_data = {};
     request_data.jsonrpc = "2.0";
@@ -144,12 +173,13 @@ function upgrade_check() {
     hide("#status_box");
     hide("#server_div");
     set_status("info", "Searching for upgrades", true);
-	var request_dict = {}
+    request_dict.distro = data.release.distribution;
     request_dict.version = data.release.version;
+    request_dict.target = data.release.target;
     request_dict.revision = data.release.revision;
     request_dict.installed = data.packages;
     request_dict.upgrade_packages = data.upgrade_packages
-	server_request(request_dict, "api/upgrade-check", upgrade_check_callback)
+    server_request("api/upgrade-check", upgrade_check_callback)
 }
 
 function upgrade_check_callback(request_text) {
@@ -157,17 +187,19 @@ function upgrade_check_callback(request_text) {
 
     // create simple output to tell user what's going to be upgrade (release/packages)
     var info_output = ""
-	if(request_json.version != undefined) {
+    if (request_json.version) {
-		info_output += "<h3>New firmware release available</h3>"
+        info_output += "<h3>New release <b>" + request_json.version + "</b> available</h3>"
-		info_output += data.release.version + " to " + request_json.version
+        info_output += "Installed version: " + data.release.version
-		data.latest_version = request_json.version;
+        request_dict.version = request_json.version;
     }
-	if(request_json.upgrades != undefined) {
+    if (request_json.upgrades) {
+        if (request_json.upgrades != {}) {
             info_output += "<h3>Package upgrades available</h3>"
             for (var upgrade in request_json.upgrades) {
                 info_output += "<b>" + upgrade + "</b>: " + request_json.upgrades[upgrade][1] + " to " + request_json.upgrades[upgrade][0] + "<br />"
             }
         }
+    }
     data.packages = request_json.packages
     set_status("success", info_output)
 
@@ -179,23 +211,20 @@ function upgrade_check_callback(request_text) {
     upgrade_button.style.display = "block";
     upgrade_button.disabled = false;
     upgrade_button.onclick = upgrade_request;
-
 }
 
 function upgrade_request() {
-	// Request the image
+    // Request firmware using the following parameters
-	// Needed values
+    // distro, version, target, board_name/model, packages
-	// version/release
-	// board_name or model (server tries to find the correct profile)
-	// packages
-	// The rest is added by server_request()
     $("#upgrade_button").disabled = true;
     hide("#edit_packages");
     hide("#edit_button");
     hide("#keep_container");
 
-	var request_dict = {}
+    // remove "installed" entry as unused by build requests
-	request_dict.version = data.latest_version;
+    delete request_dict.installed
+    // add board info to let server determine profile
+    request_dict.board_name = data.board_name
     request_dict.board = data.board_name
     request_dict.model = data.model
 
@@ -204,8 +233,7 @@ function upgrade_request() {
     } else {
         request_dict.packages = data.packages;
     }
-
+    server_request("api/upgrade-request", upgrade_request_callback)
-	server_request(request_dict, "api/upgrade-request", upgrade_request_callback)
 }
 
 function upgrade_request_callback(request) {
@@ -229,7 +257,9 @@ function upgrade_request_callback(request) {
 function flash_image() {
     // Flash image via rpc-sys upgrade_start
     set_status("warning", "Flashing firmware. Don't unpower device", true)
-	ubus_call("rpc-sys", "upgrade_start", { "keep": $("#keep").checked }, 'message');
+    ubus_call("rpc-sys", "upgrade_start", {
+        "keep": $("#keep").checked
+    }, 'message');
     ping_max = 3600; // in seconds
     setTimeout(ping_ubus, 10000)
 }
@@ -250,7 +280,9 @@ function ping_ubus() {
             $("#upgrade_button").value = "Reload page";
             show("#upgrade_button");
             $("#upgrade_button").disabled = false;
-			$("#upgrade_button").onclick = function() { location.reload(); }
+            $("#upgrade_button").onclick = function() {
+                location.reload();
+            }
         });
         request.send();
     } else {
@@ -293,7 +325,9 @@ function download_image() {
 
     download_request.onload = function() {
         if (this.status === 200) {
-			var blob = new Blob([download_request.response], {type: "application/octet-stream"});
+            var blob = new Blob([download_request.response], {
+                type: "application/octet-stream"
+            });
             upload_image(blob)
         }
     };
@@ -301,10 +335,8 @@ function download_image() {
     download_request.send();
 }
 
-function server_request(request_dict, path, callback) {
+function server_request(path, callback) {
     var request_json;
-	request_dict.distro = data.release.distribution;
-	request_dict.target = data.release.target;
     var request = new XMLHttpRequest();
     request.open("POST", data.url + "/" + path, true);
     request.setRequestHeader("Content-type", "application/json");
@@ -325,9 +357,6 @@ function server_request(request_dict, path, callback) {
                 var queue = request.getResponseHeader("X-Build-Queue-Position");
                 set_status("info", "In build queue position " + queue, true)
                 console.log("queued");
-			} else if(imagebuilder === "initialize") {
-				set_status("info", "Setting up ImageBuilder", true)
-				console.log("Setting up imagebuilder");
             } else if (imagebuilder === "building") {
                 set_status("info", "Building image", true);
                 console.log("building");
@@ -336,7 +365,9 @@ function server_request(request_dict, path, callback) {
                 set_status("info", "Processing request", true);
                 console.log(imagebuilder)
             }
-			setTimeout(function() { server_request(request_dict, path, callback) }, 5000)
+            setTimeout(function() {
+                server_request(path, callback)
+            }, 5000)
 
         } else if (request.status === 204) {
             // no upgrades available
@@ -372,11 +403,16 @@ function server_request(request_dict, path, callback) {
         } else if (request.status === 502) {
             // python part offline
             set_status("danger", "Server down for maintenance")
-			setTimeout(function() { server_request(request_dict, path, callback) }, 30000)
+            setTimeout(function() {
+                server_request(path, callback)
+            }, 30000)
         } else if (request.status === 503) {
             set_status("danger", "Server overloaded")
-			setTimeout(function() { server_request(request_dict, path, callback) }, 30000)
+            setTimeout(function() {
+                server_request(path, callback)
+            }, 30000)
         }
     });
 }
+request_dict = {}
 document.onload = setup()