domenico/luci-app-tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

synchronous loading status

Browse Source
This commit is contained in:
asvow
2024-01-28 21:08:01 +08:00
parent 3014c403ee
commit 3ad75af454
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/luci-static/resources/view/tailscale/base.js
View File

@@ -30,10 +30,13 @@ function getServiceStatus() {
function getLoginStatus() { function getLoginStatus() {
return fs.exec("/usr/sbin/tailscale", ["status"]).then(function(res) { return fs.exec("/usr/sbin/tailscale", ["status"]).then(function(res) {
if (res.stdout.includes("Logged out")) if (res.stdout.includes("Logged out")) {
return false; return false;
else } else {
return true; return true;
}
}).catch(function(error) {
return undefined;
}); });
} }
@@ -50,12 +53,14 @@ function renderStatus(isRunning) {
} }
function renderLogin(isLoggedIn) { function renderLogin(isLoggedIn) {
var spanTemp = '<em><span style="color:%s"><strong>%s %s</strong></span></em>'; var spanTemp = '<span style="color:%s">%s</span>';
var renderHTML; var renderHTML;
if (isLoggedIn) { if (isLoggedIn === undefined) {
renderHTML = String.format(spanTemp, 'green', _('Logged'), _('IN')); renderHTML = String.format(spanTemp, 'orange', _('NOT RUNNING'));
} else if (isLoggedIn) {
renderHTML = String.format(spanTemp, 'green', _('Logged IN'));
} else { } else {
renderHTML = String.format(spanTemp, 'red', _('Logged'), _('OUT')); renderHTML = String.format(spanTemp, 'red', _('Logged OUT'));
} }
return renderHTML; return renderHTML;
@@ -64,12 +69,14 @@ function renderLogin(isLoggedIn) {
return view.extend({ return view.extend({
load: function() { load: function() {
return Promise.all([ return Promise.all([
uci.load('tailscale') uci.load('tailscale'),
getServiceStatus()
]); ]);
}, },
render: function(data) { render: function(data) {
var m, s, o; var m, s, o;
var isRunning = data[1];
m = new form.Map('tailscale', _('Tailscale'), m = new form.Map('tailscale', _('Tailscale'),
_('Tailscale is a cross-platform and easy to use virtual LAN.')); _('Tailscale is a cross-platform and easy to use virtual LAN.'));
@@ -77,15 +84,8 @@ return view.extend({
s = m.section(form.TypedSection); s = m.section(form.TypedSection);
s.anonymous = true; s.anonymous = true;
s.render = function () { s.render = function () {
poll.add(function () {
return L.resolveDefault(getServiceStatus()).then(function (res) {
var view = document.getElementById("service_status");
view.innerHTML = renderStatus(res);
});
});
return E('div', { class: 'cbi-section', id: 'status_bar' }, [ return E('div', { class: 'cbi-section', id: 'status_bar' }, [
E('p', { id: 'service_status' }, _('Collecting data ...')) E('p', { id: 'service_status' }, renderStatus(isRunning))
]); ]);
} }