cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-10-31 08:45:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🍓 Sync 2026-09-15 02:13:06

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-09-15 02:13:06 +08:00
1 parent 0e5393594c
commit 1dd96ac2bb
146 files changed
+26541 -508
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js
+2 -2
View File
@@ -165,8 +165,8 @@ return baseclass.extend({
const fields = [
{ label: _('Active Connections'), value: ct_max ? ct_count : null },
{ label: _('Online Users'), value: onlineusers ? onlineusers.onlineusers : null },
{ label: _('Total download bandwidth'), value: this.bandwidthBar(download, capacity) },
{ label: _('Total upload bandwidth'), value: this.bandwidthBar(upload, capacity) }
{ label: _('Total upload bandwidth'), value: this.bandwidthBar(upload, capacity) },
{ label: _('Total download bandwidth'), value: this.bandwidthBar(download, capacity) }
];
const ctstatus = E('table', { 'class': 'table' });
luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
+20 -13
View File
@@ -44,7 +44,7 @@ return baseclass.extend({
if (!this.ouiLoader) {
this.ouiLoader = Promise.all([L.resolveDefault(uci.load('oui')), new Promise(function(resolve) {
const script = document.createElement('script');
script.src = L.resource('oui/oui.js') + '?v=7';
script.src = L.resource('oui/oui.js') + '?v=8';
script.onload = function() { resolve(window.luciOUI); };
script.onerror = function() { resolve(null); };
document.head.appendChild(script);
@@ -88,7 +88,13 @@ return baseclass.extend({
return this.rateValue(this.clientAddresses(lease, hints), data, direction);
},
rateValue(addresses, data, direction, mac) {
rateValue(addresses, data, direction, mac, online) {
if (direction == 'connections') {
if (online === false)
return [0, '0'];
const value = data?.connections?.[mac?.toUpperCase()];
return value != null ? [Number(value), String(value)] : [-1, '-'];
}
if (direction == 'total') {
const value = data?.totals?.[mac?.toUpperCase()];
return value != null ? [Number(value), '%1024.2mB'.format(value)] : [-1, '-'];
@@ -103,13 +109,14 @@ return baseclass.extend({
return addresses.length ? [ total, '%1024.1mB/s'.format(total) ] : [ -1, '-' ];
},
rateCell(lease, hints, direction) {
rateCell(lease, hints, direction, online) {
const addresses = this.clientAddresses(lease, hints);
const value = this.rateValue(addresses, this.rateData, direction, lease.macaddr);
const value = this.rateValue(addresses, this.rateData, direction, lease.macaddr, online);
return [ value[0], E('span', {
'class': 'luci-client-rate',
'data-addresses': JSON.stringify(addresses),
'data-direction': direction,
'data-online': online === false ? '0' : '1',
'data-mac': lease.macaddr || ''
}, value[1]) ];
},
@@ -197,7 +204,7 @@ return baseclass.extend({
this.rateData = data;
// Query again: the normal overview refresh may have replaced the rows.
document.querySelectorAll('.luci-client-rate').forEach(cell => {
const value = this.rateValue(JSON.parse(cell.dataset.addresses), data, cell.dataset.direction, cell.dataset.mac);
const value = this.rateValue(JSON.parse(cell.dataset.addresses), data, cell.dataset.direction, cell.dataset.mac, cell.dataset.online !== '0');
cell.textContent = value[1];
cell.closest('td')?.setAttribute('data-value', value[0]);
});
@@ -374,8 +381,9 @@ return baseclass.extend({
},
renderLeases(dhcp_leases, host_hints, macaddr, web, arp, history) {
const arpClients = this.arpLeases(arp);
const leases = [...(Array.isArray(dhcp_leases.dhcp_leases) ? dhcp_leases.dhcp_leases : []),
...this.arpLeases(arp),
...arpClients,
...(Array.isArray(history?.dhcp_leases) ? history.dhcp_leases : []).map(lease => ({ ...lease, _historical: true }))];
const leases6 = [...(Array.isArray(dhcp_leases.dhcp6_leases) ? dhcp_leases.dhcp6_leases : []),
...(Array.isArray(history?.dhcp6_leases) ? history.dhcp6_leases : []).map(lease => ({ ...lease, _historical: true }))];
@@ -403,9 +411,8 @@ return baseclass.extend({
};
const clients = this.mergeLeases(leases, leases6, host_hints);
const onlineMACs = new Set(String(arp || '').trim().split(/\n/).map(line => line.trim().split(/\s+/))
.filter(fields => fields.length == 6 && fields[5] == 'br-lan')
.map(fields => fields[3].toUpperCase()));
// Failed neighbours can retain their MAC in /proc/net/arp with flags 0x0.
const onlineMACs = new Set(arpClients.map(client => client.macaddr));
const table = E('table', { 'id': 'status_leases', 'class': 'table leases' }, [
E('tr', { 'class': 'tr table-titles' }, [
E('th', { 'class': 'th' }, _('Online')),
@@ -416,6 +423,7 @@ return baseclass.extend({
E('th', { 'class': 'th' }, _('Upload')),
E('th', { 'class': 'th' }, _('Download')),
E('th', { 'class': 'th', 'data-total-traffic': '1' }, _('Total traffic')),
E('th', { 'class': 'th' }, _('Connection count')),
isReadonlyView ? E([]) : E('th', { 'class': 'th cbi-section-actions center' }, _('Static Lease'))
])
]);
@@ -423,9 +431,7 @@ return baseclass.extend({
this.initLeaseTable(table);
cbi_update_table(table, clients.map(client => {
const hint = machints.find(h => h[0].toUpperCase() == client.macaddr);
let host = client.hostname || hint?.[1];
if (hint && client.hostname && client.hostname != hint[1])
host = '%s (%s)'.format(client.hostname, hint[1]);
const host = client.hostname || hint?.[1];
const vendor = macaddr?.[client.macaddr?.toLowerCase()]?.vendor;
const online = onlineMACs.has(client.macaddr);
const status = online ? _('Online') : _('Offline');
@@ -444,7 +450,8 @@ return baseclass.extend({
vendor ? `${client.macaddr} (${vendor})` : client.macaddr || '-',
this.rateCell(client, host_hints, 'upload'),
this.rateCell(client, host_hints, 'download'),
this.rateCell(client, host_hints, 'total')
this.rateCell(client, host_hints, 'total'),
this.rateCell(client, host_hints, 'connections', online)
];
if (!isReadonlyView)
columns.push(this.leaseActions(client));