Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5145 from msylgj/patch-2

Browse source 
luci-app-frpc/frps:add service status display
This commit is contained in:
Florian Eckert 2021-06-29 08:58:19 +02:00 committed by GitHub
commit 06d63dc283
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 104 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
View file

@ -2,6 +2,7 @@
'require view';
'require ui';
'require form';
'require rpc';
'require tools.widgets as widgets';
// [Widget, Option, Title, Description, {Param: 'Value'}],
@ -115,12 +116,60 @@ function defOpts(s, opts, params) {
}
}
var callServiceList = rpc.declare({
object: 'service',
method: 'list',
params: ['name'],
expect: { '': {} }
});
function getServiceStatus() {
return L.resolveDefault(callServiceList('frpc'), {}).then(function (res) {
var isRunning = false;
try {
isRunning = res['frpc']['instances']['instance1']['running'];
} catch (e) { }
return isRunning;
});
}
function renderStatus(isRunning) {
var renderHTML = "";
var spanTemp = "<span style=\"color:%s;font-weight:bold;margin-left:15px\">%s - %s</span>";
if (isRunning) {
renderHTML += String.format(spanTemp, 'green', _("frp Client"), _("RUNNING"));
} else {
renderHTML += String.format(spanTemp, 'red', _("frp Client"), _("NOT RUNNING"));
}
return renderHTML;
}
return view.extend({
render: function() {
var m, s, o;
m = new form.Map('frpc', _('frp Client'));
s = m.section(form.NamedSection, '_status');
s.anonymous = true;
s.render = function (section_id) {
L.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-map' },
E('div', { class: 'cbi-section'}, [
E('div', { id: 'service_status' },
_('Collecting data ...'))
])
);
}
s = m.section(form.NamedSection, 'common', 'conf');
s.dynamic = true;

3
applications/luci-app-frpc/root/usr/share/rpcd/acl.d/luci-app-frpc.json
View file

@ -6,6 +6,9 @@
"/etc/passwd": ["read"],
"/etc/group": ["read"]
},
"ubus": {
"service": [ "list" ]
},
"uci": ["frpc"]
},
"write": {

49
applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js
View file

@ -1,6 +1,7 @@
'use strict';
'require view';
'require form';
'require rpc';
'require tools.widgets as widgets';
// [Widget, Option, Title, Description, {Param: 'Value'}],
@ -90,12 +91,60 @@ function defOpts(s, opts, params) {
}
}
var callServiceList = rpc.declare({
object: 'service',
method: 'list',
params: ['name'],
expect: { '': {} }
});
function getServiceStatus() {
return L.resolveDefault(callServiceList('frps'), {}).then(function (res) {
var isRunning = false;
try {
isRunning = res['frps']['instances']['instance1']['running'];
} catch (e) { }
return isRunning;
});
}
function renderStatus(isRunning) {
var renderHTML = "";
var spanTemp = "<span style=\"color:%s;font-weight:bold;margin-left:15px\">%s - %s</span>";
if (isRunning) {
renderHTML += String.format(spanTemp, 'green', _("frp Server"), _("RUNNING"));
} else {
renderHTML += String.format(spanTemp, 'red', _("frp Server"), _("NOT RUNNING"));
}
return renderHTML;
}
return view.extend({
render: function() {
var m, s, o;
m = new form.Map('frps', _('frp Server'));
s = m.section(form.NamedSection, '_status');
s.anonymous = true;
s.render = function (section_id) {
L.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-map' },
E('div', { class: 'cbi-section'}, [
E('div', { id: 'service_status' },
_('Collecting data ...'))
])
);
}
s = m.section(form.NamedSection, 'common', 'conf');
s.dynamic = true;

3
applications/luci-app-frps/root/usr/share/rpcd/acl.d/luci-app-frps.json
View file

@ -6,6 +6,9 @@
"/etc/group": [ "read" ],
"/etc/passwd": [ "read" ]
},
"ubus": {
"service": [ "list" ]
},
"uci": ["frps"]
},
"write": {