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

optimize & bump version

Browse Source
This commit is contained in:
asvow
2025-05-06 21:55:26 +08:00
parent 56d7f27266
commit 288fcc8d60
11 changed files with 635 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
htdocs/luci-static/resources/view/tailscale/log.js
View File

@@ -5,67 +5,66 @@
'require view';
return view.extend({
retrieveLog: async function() {
return Promise.all([
async retrieveLog() {
const stat = await Promise.all([
L.resolveDefault(fs.stat('/sbin/logread'), null),
L.resolveDefault(fs.stat('/usr/sbin/logread'), null)
]).then(function(stat) {
var logger = stat[0] ? stat[0].path : stat[1] ? stat[1].path : null;
]);
const logger = stat[0] ? stat[0].path : stat[1] ? stat[1].path : null;
return fs.exec_direct(logger, [ '-e', 'tailscale' ]).then(logdata => {
var statusMappings = {
'daemon.err': { status: 'StdErr', startIndex: 9 },
'daemon.notice': { status: 'Info', startIndex: 10 }
};
const loglines = logdata.trim().split(/\n/).map(function(log) {
var logParts = log.split(' ').filter(Boolean);
if (logParts.length >= 6) {
var formattedTime = logParts[1] + ' ' + logParts[2] + ' - ' + logParts[3];
var status = logParts[5];
var mapping = statusMappings[status] || { status: status, startIndex: 9 };
status = mapping.status;
var startIndex = mapping.startIndex;
var message = logParts.slice(startIndex).join(' ');
return formattedTime + ' [ ' + status + ' ] - ' + message;
} else {
return 'Log is empty.';
}
}).filter(Boolean);
return { value: loglines.join('\n'), rows: loglines.length + 1 };
}).catch(function(err) {
ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message)));
return '';
});
});
const logdata = await fs.exec_direct(logger, ['-e', 'tailscale']);
const statusMappings = {
'daemon.err': { status: 'StdErr', startIndex: 9 },
'daemon.notice': { status: 'Info', startIndex: 10 }
};
const loglines = logdata.trim().split(/\n/).map(function(log) {
const logParts = log.split(' ').filter(Boolean);
if (logParts.length >= 6) {
const formattedTime = `${logParts[1]} ${logParts[2]} - ${logParts[3]}`;
const status = logParts[5];
const mapping = statusMappings[status] || { status: status, startIndex: 9 };
const newStatus = mapping.status;
const startIndex = mapping.startIndex;
const message = logParts.slice(startIndex).join(' ');
return `${formattedTime} [ ${newStatus} ] - ${message}`;
} else {
return 'Log is empty.';
}
}).filter(Boolean);
return { value: loglines.join('\n'), rows: loglines.length + 1 };
},
pollLog: async function() {
async pollLog() {
const element = document.getElementById('syslog');
if (element) {
const log = await this.retrieveLog();
element.value = log.value;
element.rows = log.rows;
try {
const log = await this.retrieveLog();
element.value = log.value;
element.rows = log.rows;
} catch (err) {
ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message)));
}
}
},
load: async function() {
load() {
poll.add(this.pollLog.bind(this));
return await this.retrieveLog();
return this.retrieveLog();
},
render: function(loglines) {
var scrollDownButton = E('button', {
'id': 'scrollDownButton',
'class': 'cbi-button cbi-button-neutral'
render(loglines) {
const scrollDownButton = E('button', {
id: 'scrollDownButton',
class: 'cbi-button cbi-button-neutral'
}, _('Scroll to tail', 'scroll to bottom (the tail) of the log file')
);
scrollDownButton.addEventListener('click', function() {
scrollUpButton.scrollIntoView();
});
var scrollUpButton = E('button', {
'id' : 'scrollUpButton',
'class': 'cbi-button cbi-button-neutral'
const scrollUpButton = E('button', {
id : 'scrollUpButton',
class: 'cbi-button cbi-button-neutral'
}, _('Scroll to head', 'scroll to top (the head) of the log file')
);
scrollUpButton.addEventListener('click', function() {
@@ -73,16 +72,16 @@ return view.extend({
});
return E([], [
E('div', { 'id': 'content_syslog' }, [
E('div', {'style': 'padding-bottom: 20px'}, [scrollDownButton]),
E('div', { id: 'content_syslog' }, [
E('div', { style: 'padding-bottom: 20px' }, [scrollDownButton]),
E('textarea', {
'id': 'syslog',
'style': 'font-size:12px',
'readonly': 'readonly',
'wrap': 'off',
'rows': loglines.rows,
id: 'syslog',
style: 'font-size:12px',
readonly: 'readonly',
wrap: 'off',
rows: loglines.rows,
}, [ loglines.value ]),
E('div', {'style': 'padding-bottom: 20px'}, [scrollUpButton])
E('div', { style: 'padding-bottom: 20px' }, [scrollUpButton])
])
]);
},