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>
This commit is contained in:
Paul Spooren
parent
db98461321
commit
c318a10c14
1 changed files with 338 additions and 302 deletions
|
|
@ -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", "commit", { "config": "attendedsysupgrade" })
|
||||
ubus_call("uci", "set", {
|
||||
"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';
|
||||
|
|
@ -19,7 +33,7 @@ function set_server() {
|
|||
function edit_server() {
|
||||
$("#server").type = 'text';
|
||||
$("#server").onkeydown = function(event) {
|
||||
if(event.key === 'Enter') {
|
||||
if (event.key === 'Enter') {
|
||||
set_server();
|
||||
return false;
|
||||
}
|
||||
|
|
@ -45,9 +59,7 @@ function edit_packages() {
|
|||
}
|
||||
|
||||
// requests to the upgrade server
|
||||
function server_request(request_dict, path, callback) {
|
||||
request_dict.distro = data.release.distribution;
|
||||
request_dict.target = data.release.target;
|
||||
function server_request(path, callback) {
|
||||
var request = new XMLHttpRequest();
|
||||
request.open("POST", data.url + "/" + path, true);
|
||||
request.setRequestHeader("Content-type", "application/json");
|
||||
|
|
@ -68,19 +80,35 @@ 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({ "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" })
|
||||
uci_get({
|
||||
"config": "attendedsysupgrade",
|
||||
"section": "server",
|
||||
"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();
|
||||
}
|
||||
|
||||
function setup_ready() {
|
||||
// checks if a async ubus calls have finished
|
||||
if(ubus_counter != ubus_closed) {
|
||||
if (ubus_counter != ubus_closed) {
|
||||
setTimeout(setup_ready, 300)
|
||||
} else {
|
||||
if(data.auto_search == 1) {
|
||||
if (data.auto_search == 1) {
|
||||
upgrade_check();
|
||||
} else {
|
||||
show("#upgrade_button");
|
||||
|
|
@ -97,23 +125,24 @@ 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";
|
||||
request_data.id = ubus_counter;
|
||||
request_data.method = "call";
|
||||
request_data.params = [ data.ubus_rpc_session, command, argument, params ]
|
||||
request_data.params = [data.ubus_rpc_session, command, argument, params]
|
||||
var request_json = JSON.stringify(request_data)
|
||||
ubus_counter++;
|
||||
var request = new XMLHttpRequest();
|
||||
request.open("POST", ubus_url, true);
|
||||
request.setRequestHeader("Content-type", "application/json");
|
||||
request.onload = function(event) {
|
||||
if(request.status === 200) {
|
||||
if (request.status === 200) {
|
||||
var response = JSON.parse(request.responseText)
|
||||
if(!("error" in response) && "result" in response) {
|
||||
if(response.result.length === 2) {
|
||||
if(command === "uci") {
|
||||
if (!("error" in response) && "result" in response) {
|
||||
if (response.result.length === 2) {
|
||||
if (command === "uci") {
|
||||
data[variable] = response.result[1].value
|
||||
} else {
|
||||
data[variable] = response.result[1][variable]
|
||||
|
|
@ -131,7 +160,7 @@ function ubus_call(command, argument, params, variable) {
|
|||
function set_status(type, message, loading) {
|
||||
$("#status_box").className = "alert-message " + type;
|
||||
var loading_image = '';
|
||||
if(loading) {
|
||||
if (loading) {
|
||||
loading_image = '<img src="/luci-static/resources/icons/loading.gif" alt="Loading" style="vertical-align:middle"> ';
|
||||
}
|
||||
$("#status_box").innerHTML = loading_image + message;
|
||||
|
|
@ -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,21 +187,23 @@ 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) {
|
||||
info_output += "<h3>New firmware release available</h3>"
|
||||
info_output += data.release.version + " to " + request_json.version
|
||||
data.latest_version = request_json.version;
|
||||
if (request_json.version) {
|
||||
info_output += "<h3>New release <b>" + request_json.version + "</b> available</h3>"
|
||||
info_output += "Installed version: " + data.release.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)
|
||||
|
||||
if(data.advanced_mode == 1) {
|
||||
if (data.advanced_mode == 1) {
|
||||
show("#edit_button");
|
||||
}
|
||||
var upgrade_button = $("#upgrade_button")
|
||||
|
|
@ -179,33 +211,29 @@ 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
|
||||
// Needed values
|
||||
// version/release
|
||||
// board_name or model (server tries to find the correct profile)
|
||||
// packages
|
||||
// The rest is added by server_request()
|
||||
// Request firmware using the following parameters
|
||||
// distro, version, target, board_name/model, packages
|
||||
$("#upgrade_button").disabled = true;
|
||||
hide("#edit_packages");
|
||||
hide("#edit_button");
|
||||
hide("#keep_container");
|
||||
|
||||
var request_dict = {}
|
||||
request_dict.version = data.latest_version;
|
||||
// remove "installed" entry as unused by build requests
|
||||
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
|
||||
|
||||
if(data.edit_packages == true) {
|
||||
if (data.edit_packages == true) {
|
||||
request_dict.packages = $("#edit_packages").value.split("\n")
|
||||
} else {
|
||||
request_dict.packages = data.packages;
|
||||
}
|
||||
|
||||
server_request(request_dict, "api/upgrade-request", upgrade_request_callback)
|
||||
server_request("api/upgrade-request", upgrade_request_callback)
|
||||
}
|
||||
|
||||
function upgrade_request_callback(request) {
|
||||
|
|
@ -214,7 +242,7 @@ function upgrade_request_callback(request) {
|
|||
data.files = request_json.files;
|
||||
data.sysupgrade = request_json.sysupgrade;
|
||||
|
||||
var info_output = 'Firmware created: <a href="' + data.url + data.files + data.sysupgrade + '"><b>' + data.sysupgrade+ '</b></a>'
|
||||
var info_output = 'Firmware created: <a href="' + data.url + data.files + data.sysupgrade + '"><b>' + data.sysupgrade + '</b></a>'
|
||||
info_output += ' <a target="_blank" href="' + data.url + request_json.log + '">Build log</a>'
|
||||
set_status("info", info_output);
|
||||
|
||||
|
|
@ -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)
|
||||
}
|
||||
|
|
@ -237,7 +267,7 @@ function flash_image() {
|
|||
function ping_ubus() {
|
||||
// Tries to connect to ubus. If the connection fails the device is likely still rebooting.
|
||||
// If more time than ping_max passes update may failed
|
||||
if(ping_max > 0) {
|
||||
if (ping_max > 0) {
|
||||
ping_max--;
|
||||
var request = new XMLHttpRequest();
|
||||
request.open("GET", ubus_url, true);
|
||||
|
|
@ -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 {
|
||||
|
|
@ -291,9 +323,11 @@ function download_image() {
|
|||
download_request.open("GET", data.url + data.files + data.sysupgrade);
|
||||
download_request.responseType = "arraybuffer";
|
||||
|
||||
download_request.onload = function () {
|
||||
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");
|
||||
|
|
@ -320,15 +352,12 @@ function server_request(request_dict, path, callback) {
|
|||
|
||||
} else if (request.status === 202) {
|
||||
var imagebuilder = request.getResponseHeader("X-Imagebuilder-Status");
|
||||
if(imagebuilder === "queue") {
|
||||
if (imagebuilder === "queue") {
|
||||
// in queue
|
||||
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") {
|
||||
} else if (imagebuilder === "building") {
|
||||
set_status("info", "Building image", true);
|
||||
console.log("building");
|
||||
} else {
|
||||
|
|
@ -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
|
||||
|
|
@ -362,7 +393,7 @@ function server_request(request_dict, path, callback) {
|
|||
|
||||
var error_box_content = "<b>Internal server error</b><br />"
|
||||
error_box_content += request_json.error
|
||||
if(request_json.log != undefined) {
|
||||
if (request_json.log != undefined) {
|
||||
data.log_url = request_json.log
|
||||
}
|
||||
set_status("danger", error_box_content)
|
||||
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Reference in a new issue