Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-14 15:36:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: add async to diagnostics section UI

Browse Source
This commit is contained in:
Ivan K
2025-02-18 18:56:34 +03:00
parent fc99bd7aaa
commit d934bcc5e9
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js
View File

@@ -649,16 +649,13 @@ return view.extend({
// Service Status Section // Service Status Section
let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, singbox, system) { let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, singbox, system) {
return E('div', { 'class': 'cbi-section' }, [ return E('div', { 'class': 'cbi-section' }, [
E('h3', {}, _('Service Status')),
E('div', { 'class': 'table', style: 'display: flex; gap: 20px;' }, [ E('div', { 'class': 'table', style: 'display: flex; gap: 20px;' }, [
// Podkop Column // Podkop Column
E('div', { 'style': 'flex: 1; padding: 15px; background: #f8f9fa; border-radius: 8px;' }, [ E('div', { 'style': 'flex: 1; padding: 15px; background: #f8f9fa; border-radius: 8px;' }, [
E('div', { 'style': 'margin-bottom: 15px;' }, [ E('div', { 'style': 'margin-bottom: 15px;' }, [
E('strong', {}, _('Podkop Status')), E('strong', {}, _('Podkop Status')),
E('br'), E('br'),
E('span', { E('span', { 'style': `color: ${podkopStatus.running ? '#4caf50' : '#f44336'}` }, [
'style': `color: ${podkopStatus.running ? '#4caf50' : '#f44336'}`
}, [
podkopStatus.running ? '✔' : '✘', podkopStatus.running ? '✔' : '✘',
' ', ' ',
podkopStatus.status podkopStatus.status
@@ -809,9 +806,7 @@ return view.extend({
E('div', { 'style': 'margin-bottom: 15px;' }, [ E('div', { 'style': 'margin-bottom: 15px;' }, [
E('strong', {}, _('Sing-box Status')), E('strong', {}, _('Sing-box Status')),
E('br'), E('br'),
E('span', { E('span', { 'style': `color: ${singboxStatus.running ? '#4caf50' : '#f44336'}` }, [
'style': `color: ${singboxStatus.running ? '#4caf50' : '#f44336'}`
}, [
singboxStatus.running ? '✔' : '✘', singboxStatus.running ? '✔' : '✘',
' ', ' ',
`${singboxStatus.status}` `${singboxStatus.status}`
@@ -1175,7 +1170,11 @@ return view.extend({
o = s.taboption('diagnostics', form.DummyValue, '_status'); o = s.taboption('diagnostics', form.DummyValue, '_status');
o.rawhtml = true; o.rawhtml = true;
o.cfgvalue = function () { o.cfgvalue = function () {
return Promise.all([ return E('div', { id: 'diagnostics-status' }, _('Loading diagnostics...'));
};
function updateDiagnostics() {
Promise.all([
fs.exec('/etc/init.d/podkop', ['get_status']), fs.exec('/etc/init.d/podkop', ['get_status']),
fs.exec('/etc/init.d/podkop', ['get_sing_box_status']), fs.exec('/etc/init.d/podkop', ['get_sing_box_status']),
fs.exec('/etc/init.d/podkop', ['show_version']), fs.exec('/etc/init.d/podkop', ['show_version']),
@@ -1186,17 +1185,21 @@ return view.extend({
try { try {
const parsedPodkopStatus = JSON.parse(podkopStatus.stdout || '{"running":0,"enabled":0,"status":"unknown"}'); const parsedPodkopStatus = JSON.parse(podkopStatus.stdout || '{"running":0,"enabled":0,"status":"unknown"}');
const parsedSingboxStatus = JSON.parse(singboxStatus.stdout || '{"running":0,"enabled":0,"status":"unknown"}'); const parsedSingboxStatus = JSON.parse(singboxStatus.stdout || '{"running":0,"enabled":0,"status":"unknown"}');
return createStatusSection(parsedPodkopStatus, parsedSingboxStatus, podkop, luci, singbox, system); var newContent = createStatusSection(parsedPodkopStatus, parsedSingboxStatus, podkop, luci, singbox, system);
var container = document.getElementById('diagnostics-status');
if (container) {
container.innerHTML = '';
container.appendChild(newContent);
}
} catch (e) { } catch (e) {
console.error('Error parsing status:', e); console.error('Error parsing diagnostics status:', e);
return E('div', { 'class': 'alert-message warning' }, [ var container = document.getElementById('diagnostics-status');
E('strong', {}, _('Error loading status')), E('br'), if (container) {
E('pre', {}, e.toString()) container.innerHTML = '<div class="alert-message warning"><strong>' + _('Error loading diagnostics') + '</strong><br><pre>' + e.toString() + '</pre></div>';
]); }
} }
}); });
}; }
// Add new section 'extra' // Add new section 'extra'
var s = m.section(form.TypedSection, 'extra', _('Extra configurations')); var s = m.section(form.TypedSection, 'extra', _('Extra configurations'));
@@ -1523,6 +1526,15 @@ return view.extend({
// o = s.taboption('basic', form.Flag, 'socks5', _('Mixed enable'), _('Browser port: 2080 (extra +1)')); // o = s.taboption('basic', form.Flag, 'socks5', _('Mixed enable'), _('Browser port: 2080 (extra +1)'));
// o.default = '0'; // o.default = '0';
// o.rmempty = false; // o.rmempty = false;
return m.render();
let map_promise = m.render();
map_promise.then(node => {
node.classList.add('fade-in');
updateDiagnostics();
return node;
});
return map_promise;
} }
}); });