' +
- '' +
- '
';
- o.load = function(section_id) {
- return customRules;
- };
- o.write = function(section_id, formvalue) {
- // Prepare the new custom rules (only the table definition)
- const newRules = `table inet qosmate_custom {
-${formvalue.trim()}
-}`;
-
- // Delete the existing table before applying new rules
- // If deletion fails (table doesn't exist), ignore the error
- return fs.exec('nft', ['delete', 'table', 'inet', 'qosmate_custom'])
- .catch(() => { /* ignore deletion error */ })
- .then(() => fs.write('/etc/qosmate.d/custom_rules.nft', newRules))
- .then(() => fs.exec('/etc/init.d/qosmate', ['validate_custom_rules']))
- .then(() => fs.read('/tmp/qosmate_custom_rules_validation.txt'))
- .then((result) => {
- if (result.includes('Overall validation: PASSED')) {
- ui.addNotification(null, E('p', _('Rules validation successful.')), 'success');
- } else {
- ui.addNotification(null, E('p', _('Rules validation failed. Please check the validation result below.')), 'warning');
- }
- });
- };
-
- o = s.option(form.TextValue, 'inline_rules', _('Inline Extra Rules'));
- o.rows = 10;
- o.wrap = 'off';
- o.rmempty = true;
- o.monospace = true;
- o.datatype = 'string';
- o.description = _('Statements only – run inside chain dscptag at hook $NFT_HOOK / priority $NFT_PRIORITY. Do not start with \'table\' or \'chain\'. Included only if validation passes.') +
- '' +
- '' +
- '
';
- o.load = function(section_id) {
- return inlineRules;
- };
- o.write = function(section_id, formvalue) {
- return fs.write('/etc/qosmate.d/inline_dscptag.nft', formvalue || '')
- .then(() => fs.exec('/etc/init.d/qosmate', ['validate_custom_rules']))
- .then(() => fs.read('/tmp/qosmate_custom_rules_validation.txt'))
- .then((result) => {
- if (result.includes('Overall validation: PASSED')) {
- ui.addNotification(null, E('p', _('Rules validation successful.')), 'success');
- } else {
- ui.addNotification(null, E('p', _('Rules validation failed. Please check the validation result below.')), 'warning');
- }
- });
- };
-
- o = s.option(form.DummyValue, '_validation_result', _('Validation Result'));
- o.rawhtml = true;
- o.default = validationResult
- ? '' +
- '
'
- : _('No validation performed yet');
-
- o = s.option(form.Button, '_validate', _('Validate Rules'));
- o.inputstyle = 'apply';
- o.inputtitle = _('Validate');
- o.onclick = function(ev) {
- var map = this.map;
- var section_id = 'custom_rules'; // Assuming this is the correct section_id
-
- var customRulesTextarea = document.getElementById('widget.cbid.qosmate.' + section_id + '.custom_rules');
- var inlineRulesTextarea = document.getElementById('widget.cbid.qosmate.' + section_id + '.inline_rules');
-
- if (!customRulesTextarea || !inlineRulesTextarea) {
- ui.addNotification(null, E('p', _('Error: Could not find rules textareas')), 'error');
- return;
- }
-
- var currentCustomRules = customRulesTextarea.value;
- var currentInlineRules = inlineRulesTextarea.value;
- var fullCustomContent = `table inet qosmate_custom {\n${currentCustomRules.trim()}\n}`;
-
- ui.showModal(_('Validating Rules'), [
- E('p', { 'class': 'spinning' }, _('Please wait while the rules are being validated...'))
- ]);
-
- return fs.write('/etc/qosmate.d/custom_rules.nft', fullCustomContent)
- .then(() => {
- return fs.write('/etc/qosmate.d/inline_dscptag.nft', currentInlineRules || '');
- })
- .then(() => {
- return fs.exec('/etc/init.d/qosmate', ['validate_custom_rules']);
- })
- .then(() => {
- return fs.read('/tmp/qosmate_custom_rules_validation.txt');
- })
- .then((result) => {
- ui.hideModal();
- if (result.includes('Overall validation: PASSED')) {
- ui.addNotification(null, E('p', _('Rules validation successful.')), 'success');
- } else {
- ui.addNotification(null, E('p', _('Rules validation failed. Please check the validation result below.')), 'warning');
- }
- var validationResultElement = document.getElementById('cbid.qosmate.custom_rules._validation_result');
- if (validationResultElement) {
- validationResultElement.innerHTML = '' + - validationResult + '
' +
- '
';
- }
- ui.showModal(_('Finalizing Validation'), [
- E('p', { 'class': 'spinning' }, _('Finalizing validation results, please wait...'))
- ]);
-
- setTimeout(function() {
- window.location.reload();
- }, 2000);
- })
- .catch((err) => {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Error during validation: ') + err), 'error');
-
- ui.showModal(_('Finalizing Validation'), [
- E('p', { 'class': 'spinning' }, _('Finalizing validation results, please wait...'))
- ]);
-
- setTimeout(function() {
- window.location.reload();
- }, 2000);
- });
- };
-
- // Add toggle functionality
- if (typeof window.toggleExample === 'undefined') {
- window.toggleExample = function(type) {
- var element = document.getElementById(type + '-example');
- var button = event.target;
- if (element.style.display === 'none') {
- element.style.display = 'block';
- button.innerHTML = '▲ ' + button.innerHTML.split(' ').slice(1).join(' ');
- } else {
- element.style.display = 'none';
- button.innerHTML = '▼ ' + button.innerHTML.split(' ').slice(1).join(' ');
- }
- };
- }
-
- return m.render();
- }
-});
diff --git a/luci-app-qosmate/htdocs/luci-static/resources/view/hfsc.js b/luci-app-qosmate/htdocs/luci-static/resources/view/hfsc.js
deleted file mode 100644
index c491b5315..000000000
--- a/luci-app-qosmate/htdocs/luci-static/resources/view/hfsc.js
+++ /dev/null
@@ -1,203 +0,0 @@
-'use strict';
-'require view';
-'require form';
-'require ui';
-'require uci';
-'require rpc';
-'require fs';
-
-// Helper function to add relevance info to descriptions
-function addRelevanceInfo(description, settingName, rootQdisc, gameqdisc) {
- var isRelevant = true;
- var note = '';
-
- // Check basic ROOT_QDISC relevance
- if (rootQdisc !== 'hfsc' && rootQdisc !== 'hybrid') {
- isRelevant = false;
- note = ' ⚠ Not used with ' + rootQdisc.toUpperCase();
- } else {
- // Check gameqdisc-specific dependencies
- var gameqdiscDependencies = {
- 'netem': ['netemdelayms', 'netemjitterms', 'netemdist', 'netem_direction', 'pktlossp'],
- 'pfifo': ['PFIFOMIN', 'PACKETSIZE'], // PFIFO-specific settings
- // MAXDEL is used by multiple qdiscs, so handle separately
- };
-
- // Settings that are used by multiple gameqdiscs
- var multiGameqdiscSettings = {
- 'MAXDEL': ['red', 'pfifo', 'bfifo', 'drr', 'qfq'] // Used for burst/limit calculations
- };
-
- // Check if setting is gameqdisc-specific
- var isGameqdiscSpecific = false;
- var requiredGameqdisc = '';
- var supportedGameqdiscs = [];
-
- // Check single-gameqdisc dependencies
- for (var qdisc in gameqdiscDependencies) {
- if (gameqdiscDependencies[qdisc].includes(settingName)) {
- isGameqdiscSpecific = true;
- if (qdisc !== gameqdisc) {
- isRelevant = false;
- requiredGameqdisc = qdisc;
- }
- break;
- }
- }
-
- // Check multi-gameqdisc settings
- if (!isGameqdiscSpecific && multiGameqdiscSettings[settingName]) {
- supportedGameqdiscs = multiGameqdiscSettings[settingName];
- isGameqdiscSpecific = true;
- if (!supportedGameqdiscs.includes(gameqdisc)) {
- isRelevant = false;
- }
- }
-
- // Check hybrid-specific settings
- if (rootQdisc === 'hybrid') {
- if (settingName === 'nongameqdisc' || settingName === 'nongameqdiscoptions') {
- isRelevant = false;
- note = ' ⚠ Hybrid mode uses CAKE for default class and fq_codel for bulk traffic';
- }
- }
-
- // Generate appropriate note
- if (isRelevant) {
- if (isGameqdiscSpecific) {
- note = ' ✓ Active for ' + rootQdisc.toUpperCase() + ' + ' + gameqdisc.toUpperCase();
- } else {
- note = ' ✓ Active for ' + rootQdisc.toUpperCase();
- }
- } else {
- if (requiredGameqdisc) {
- note = ' ⚠ Only relevant for ' + requiredGameqdisc.toUpperCase() + ' gameqdisc';
- } else if (supportedGameqdiscs.length > 0) {
- var gameqdiscList = supportedGameqdiscs.map(function(q) { return q.toUpperCase(); }).join(', ');
- note = ' ⚠ Only relevant for ' + gameqdiscList + ' gameqdisc' + (supportedGameqdiscs.length > 1 ? 's' : '');
- }
- }
- }
-
- return description + note;
-}
-
-var callInitAction = rpc.declare({
- object: 'luci',
- method: 'setInitAction',
- params: ['name', 'action'],
- expect: { result: false }
-});
-
-return view.extend({
- handleSaveApply: function(ev) {
- return this.handleSave(ev)
- .then(() => ui.changes.apply())
- .then(() => uci.load('qosmate'))
- .then(() => uci.get_first('qosmate', 'global', 'enabled'))
- .then(enabled => {
- if (enabled === '0') {
- return fs.exec_direct('/etc/init.d/qosmate', ['stop']);
- } else {
- return fs.exec_direct('/etc/init.d/qosmate', ['restart']);
- }
- })
- .then(() => {
- ui.hideModal();
- window.location.reload();
- })
- .catch(err => {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Failed to save settings or update QoSmate service: ') + err.message));
- });
- },
-
- render: function() {
- return Promise.all([
- uci.load('qosmate')
- ]).then(() => {
- var m, s, o;
- var rootQdisc = uci.get('qosmate', 'settings', 'ROOT_QDISC') || 'hfsc';
- var gameqdisc = uci.get('qosmate', 'hfsc', 'gameqdisc') || 'pfifo';
-
- var relevanceText = '';
- if (rootQdisc === 'hfsc') {
- relevanceText = _('HFSC mode active.');
- } else if (rootQdisc === 'hybrid') {
- relevanceText = _('Hybrid mode - these settings control realtime traffic (high priority class).');
- } else {
- relevanceText = _('Current Root QDisc is %s - HFSC settings are not used.').format(rootQdisc.toUpperCase());
- }
-
- m = new form.Map('qosmate', _('QoSmate HFSC Settings'), _('Configure HFSC settings for QoSmate.') + ' ' + relevanceText);
-
- s = m.section(form.NamedSection, 'hfsc', 'hfsc', _('HFSC Settings'));
- s.anonymous = true;
-
- function createOption(name, title, description, placeholder, datatype) {
- var opt = s.option(form.Value, name, title, description);
- opt.datatype = datatype || 'string';
- opt.rmempty = true;
- opt.placeholder = placeholder;
-
- if (datatype === 'uinteger') {
- opt.validate = function(section_id, value) {
- if (value === '' || value === null) return true;
- if (!/^\d+$/.test(value)) return _('Must be a non-negative integer or empty');
- return true;
- };
- }
-
- // Add relevance info to description
- opt.description = addRelevanceInfo(description, name, rootQdisc, gameqdisc);
-
- return opt;
- }
-
- o = s.option(form.ListValue, 'gameqdisc', _('Game Queue Discipline'),
- addRelevanceInfo(_('Queueing method for traffic classified as realtime'), 'gameqdisc', rootQdisc, gameqdisc));
- o.value('pfifo', _('PFIFO'));
- o.value('fq_codel', _('FQ_CODEL'));
- o.value('bfifo', _('BFIFO'));
- o.value('red', _('RED'));
- o.value('netem', _('NETEM'));
- o.default = 'pfifo';
-
- createOption('GAMEUP', _('Game Upload (kbps)'), _('Bandwidth reserved for realtime upload traffic'), _('Default: 15% of UPRATE + 400'), 'uinteger');
- createOption('GAMEDOWN', _('Game Download (kbps)'), _('Bandwidth reserved for realtime download traffic'), _('Default: 15% of DOWNRATE + 400'), 'uinteger');
-
- o = s.option(form.ListValue, 'nongameqdisc', _('Non-Game Queue Discipline'),
- addRelevanceInfo(_('Select the queueing discipline for non-realtime traffic'), 'nongameqdisc', rootQdisc, gameqdisc));
- o.value('fq_codel', _('FQ_CODEL'));
- o.value('cake', _('CAKE'));
- o.default = 'fq_codel';
-
- createOption('nongameqdiscoptions', _('Non-Game QDisc Options'), _('Cake options for non-realtime queueing discipline'), _('Default: besteffort ack-filter'));
- createOption('MAXDEL', _('Max Delay (ms)'), _('Target max delay for realtime packets after burst (pfifo, bfifo, red)'), _('Default: 24'), 'uinteger');
- createOption('PFIFOMIN', _('PFIFO Min'), _('Minimum packet count for PFIFO queue'), _('Default: 5'), 'uinteger');
- createOption('PACKETSIZE', _('Avg Packet Size (B)'), _('Used with PFIFOMIN to calculate PFIFO limit'), _('Default: 450'), 'uinteger');
- createOption('netemdelayms', _('NETEM Delay (ms)'), _('NETEM delay in milliseconds'), _('Default: 30'), 'uinteger');
- createOption('netemjitterms', _('NETEM Jitter (ms)'), _('NETEM jitter in milliseconds'), _('Default: 7'), 'uinteger');
-
- o = s.option(form.ListValue, 'netem_direction', _('NETEM Direction'),
- addRelevanceInfo(_('Select which direction to apply the NETEM delay/jitter settings'), 'netem_direction', rootQdisc, gameqdisc));
- o.depends('gameqdisc', 'netem');
- o.value('both', _('Both Directions'));
- o.value('egress', _('Egress Only'));
- o.value('ingress', _('Ingress Only'));
- o.default = 'both';
-
- o = s.option(form.ListValue, 'netemdist', _('NETEM Distribution'),
- addRelevanceInfo(_('NETEM delay distribution'), 'netemdist', rootQdisc, gameqdisc));
- o.value('experimental', _('Experimental'));
- o.value('normal', _('Normal'));
- o.value('pareto', _('Pareto'));
- o.value('paretonormal', _('Pareto Normal'));
- o.default = 'normal';
-
- createOption('pktlossp', _('Packet Loss Percentage'), _('Percentage of packet loss'), _('Default: none'));
-
- return m.render();
- });
- }
-});
diff --git a/luci-app-qosmate/htdocs/luci-static/resources/view/ipsets.js b/luci-app-qosmate/htdocs/luci-static/resources/view/ipsets.js
deleted file mode 100644
index 094e1ce16..000000000
--- a/luci-app-qosmate/htdocs/luci-static/resources/view/ipsets.js
+++ /dev/null
@@ -1,106 +0,0 @@
-'use strict';
-'require view';
-'require rpc';
-'require ui';
-'require uci';
-'require form';
-'require fs';
-'require tools.widgets as widgets';
-
-var callInitAction = rpc.declare({
- object: 'luci',
- method: 'setInitAction',
- params: ['name', 'action'],
- expect: { result: false }
-});
-
-return view.extend({
- handleSaveApply: function(ev) {
- return this.handleSave(ev)
- .then(() => ui.changes.apply())
- .then(() => uci.load('qosmate'))
- .then(() => uci.get_first('qosmate', 'global', 'enabled'))
- .then(enabled => {
- if (enabled === '0') {
- return fs.exec_direct('/etc/init.d/qosmate', ['stop']);
- } else {
- return fs.exec_direct('/etc/init.d/qosmate', ['restart']);
- }
- })
- .then(() => {
- ui.hideModal();
- window.location.reload();
- })
- .catch(err => {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Failed to save settings or update QoSmate service: ') + err.message));
- });
- },
-
- render: function() {
- var m, s, o;
-
- m = new form.Map('qosmate', _('QoSmate IP Sets'),
- _('Define groups of IP addresses that can be referenced in QoS rules using @setname'));
-
- s = m.section(form.GridSection, 'ipset', _('IP Sets'));
- s.addremove = true;
- s.anonymous = true;
- s.sortable = true;
-
- o = s.option(form.Value, 'name', _('Set Name'));
- o.rmempty = false;
- o.validate = function(section_id, value) {
- if (!value) {
- return _('Set name is required');
- }
- if (!/^[a-zA-Z0-9_]+$/.test(value)) {
- return _('Set name must contain only letters, numbers, and underscore');
- }
- return true;
- };
-
- o = s.option(form.ListValue, 'mode', _('Set Mode'));
- o.value('static', _('Static'));
- o.value('dynamic', _('Dynamic'));
- o.default = 'static';
- o.rmempty = false;
-
- o = s.option(form.ListValue, 'family', _('Family'));
- o.value('ipv4', _('IPv4'));
- o.value('ipv6', _('IPv6'));
- o.default = 'ipv4';
- o.rmempty = false;
-
- o = s.option(form.DynamicList, 'ip4', _('IPv4 Addresses'));
- o.datatype = 'or(ip4addr,iprange4)';
- o.rmempty = true;
- o.placeholder = _('Add IPv4 address, subnet or range');
- o.depends({ mode: 'static', family: 'ipv4' });
-
- o = s.option(form.DynamicList, 'ip6', _('IPv6 Addresses'));
- o.datatype = 'or(ip6addr,iprange6)';
- o.rmempty = true;
- o.placeholder = _('Add IPv6 address, subnet or range');
- o.depends({ mode: 'static', family: 'ipv6' });
-
- o = s.option(form.Value, 'timeout', _('Timeout'));
- o.placeholder = _('e.g., 1h');
- o.depends('mode', 'dynamic');
- o.validate = function(section_id, value) {
- if (!value)
- return true; // Allow empty value if applicable
- // Validate that the timeout is in a valid format (e.g., combination of numbers and allowed time units: h, m, s)
- if (!/^(\d+[hms])+$/.test(value)) {
- return _('Timeout must be in a valid format (e.g., "10s", "1h", "2h12m10s")');
- }
- return true;
- };
-
- o = s.option(form.Flag, 'enabled', _('Enabled'));
- o.default = '1';
- o.rmempty = false;
-
- return m.render();
- }
-});
diff --git a/luci-app-qosmate/htdocs/luci-static/resources/view/ratelimits.js b/luci-app-qosmate/htdocs/luci-static/resources/view/ratelimits.js
deleted file mode 100644
index 2c813355c..000000000
--- a/luci-app-qosmate/htdocs/luci-static/resources/view/ratelimits.js
+++ /dev/null
@@ -1,238 +0,0 @@
-'use strict';
-'require view';
-'require form';
-'require ui';
-'require uci';
-'require fs';
-'require rpc';
-'require validation';
-
-var callInitAction = rpc.declare({
- object: 'luci',
- method: 'setInitAction',
- params: ['name', 'action'],
- expect: { result: false }
-});
-
-// Bridges LuCI's validation types into plain functions; see LuCI.validation docs
-var stubValidator = {
- factory: validation,
- apply: function(type, value, args) {
- if (value != null)
- this.value = value;
- return validation.types[type].apply(this, args);
- },
- assert: function(condition) { return !!condition; }
-};
-
-// Validation helper for IP/IPv6 targets
-function validateTargetField(section_id, value) {
- if (!value || value.length === 0) return true;
-
- var values = Array.isArray(value) ? value : value.split(/\s+/);
- var ipv4Regex = /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)){3})(?:\/(?:[0-9]|[1-2]\d|3[0-2]))?$/;
- var ipv6Regex = /^(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}$|^(?:[A-Fa-f0-9]{1,4}:){1,7}:$|^(?:[A-Fa-f0-9]{1,4}:){1,6}:[A-Fa-f0-9]{1,4}$|^(?:[A-Fa-f0-9]{1,4}:){1,5}(?::[A-Fa-f0-9]{1,4}){1,2}$|^(?:[A-Fa-f0-9]{1,4}:){1,4}(?::[A-Fa-f0-9]{1,4}){1,3}$|^(?:[A-Fa-f0-9]{1,4}:){1,3}(?::[A-Fa-f0-9]{1,4}){1,4}$|^(?:[A-Fa-f0-9]{1,4}:){1,2}(?::[A-Fa-f0-9]{1,4}){1,5}$|^[A-Fa-f0-9]{1,4}:(?::[A-Fa-f0-9]{1,4}){1,6}$|^:(?::[A-Fa-f0-9]{1,4}){1,7}$|^(?:[A-Fa-f0-9]{1,4}:){7}:$|^::$/;
- var ipv6CidrRegex = /^(?:[A-Fa-f0-9]{1,4}:){1,7}[A-Fa-f0-9]{0,4}\/(?:[0-9]|[1-9]\d|1[01]\d|12[0-8])$/;
-
- for (var i = 0; i < values.length; i++) {
- var v = values[i];
-
- // Check for set reference
- if (v.startsWith('@') || v.startsWith('!=@')) {
- var setName = v.replace(/^(!=)?@/, '');
- if (!/^[a-zA-Z0-9_]+$/.test(setName)) {
- return _('Invalid set name format: ') + v;
- }
- continue;
- }
-
- // Strip != prefix for validation
- var isNegated = v.startsWith('!=');
- var valueToValidate = isNegated ? v.substring(2) : v;
-
- // Block MAC addresses explicitly
- var macRegex = /^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/;
- if (macRegex.test(valueToValidate)) {
- return _('MAC addresses not supported: ') + v + _(' (use IP addresses instead)');
- }
-
- // nftables accepts address ranges wherever a plain address is allowed
- if (valueToValidate.indexOf('-') !== -1) {
- if (!stubValidator.apply('iprange', valueToValidate)) {
- return _('Invalid IP range: ') + v;
- }
- continue;
- }
-
- // Validate IP/CIDR/IPv6
- if (!ipv4Regex.test(valueToValidate) &&
- !ipv6Regex.test(valueToValidate) &&
- !ipv6CidrRegex.test(valueToValidate)) {
- return _('Invalid target format: ') + v + _(' (expected IP, IPv6, CIDR, or @setname)');
- }
- }
-
- return true;
-}
-
-return view.extend({
- handleSaveApply: function(ev) {
- return this.handleSave(ev)
- .then(() => ui.changes.apply())
- .then(() => uci.load('qosmate'))
- .then(() => uci.get_first('qosmate', 'global', 'enabled'))
- .then(enabled => {
- if (enabled === '0') {
- return fs.exec_direct('/etc/init.d/qosmate', ['stop']);
- } else {
- return fs.exec_direct('/etc/init.d/qosmate', ['restart']);
- }
- })
- .then(() => {
- ui.hideModal();
- window.location.reload();
- })
- .catch(err => {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Failed to save settings or update QoSmate service: ') + err.message));
- });
- },
-
- render: function() {
- return Promise.all([
- uci.load('qosmate')
- ]).then(() => {
- var m, s, o;
-
- m = new form.Map('qosmate', _('QoSmate Rate Limits'),
- _('Configure per-device bandwidth limits using nftables meters. Limits are applied based on the source IP of devices, making it easy to control traffic for specific devices or subnets.'));
-
- s = m.section(form.GridSection, 'ratelimit', _('Rate Limits'));
- s.addremove = true;
- s.anonymous = true;
- s.sortable = true;
-
- s.tab('general', _('General'));
- s.tab('limits', _('Limits'));
-
- // General tab
- o = s.taboption('general', form.Value, 'name', _('Name'));
- o.rmempty = false;
- o.placeholder = _('e.g., Guest Network Limit');
-
- o = s.taboption('general', form.DynamicList, 'target', _('Target Devices'));
- o.datatype = 'string';
- o.placeholder = _('192.168.1.100, !=192.168.1.77, 2001:db8::1');
- o.rmempty = false;
- o.validate = validateTargetField;
- o.write = function(section_id, formvalue) {
- // Ensure != prefix is properly formatted
- var values = formvalue.map(function(v) {
- return v.replace(/^!(?!=)/, '!=');
- });
- return this.super('write', [section_id, values]);
- };
- var superRenderWidgetTarget = o.renderWidget;
- o.renderWidget = function(section_id, option_index, cfgvalue) {
- var widget = superRenderWidgetTarget.call(this, section_id, option_index, cfgvalue);
- var descr = E('div', { 'class': 'cbi-value-description' },
- 'IP/IPv6/CIDR addresses and subnets only. Exclusions: !=192.168.1.77, IP Sets: @vip_guests');
- return E('div', {}, [widget, descr]);
- };
-
- o = s.taboption('general', form.Flag, 'enabled', _('Enabled'));
- o.default = '1';
- o.rmempty = false;
- o.editable = true;
-
- // Limits tab
- o = s.taboption('limits', form.Value, 'download_limit', _('Download Limit (Kbit/s)'));
- o.datatype = 'uinteger';
- o.placeholder = _('10000');
- o.default = '10000';
- o.validate = function(section_id, value) {
- if (!value) return true;
- var intVal = parseInt(value);
- if (intVal < 0 || intVal > 100000000) {
- return _('Must be between 0 and 100000000 Kbit/s');
- }
- return true;
- };
- var superRenderWidgetDownload = o.renderWidget;
- o.renderWidget = function(section_id, option_index, cfgvalue) {
- var widget = superRenderWidgetDownload.call(this, section_id, option_index, cfgvalue);
- var descr = E('div', { 'class': 'cbi-value-description' }, _('Traffic TO device. 0 = unlimited'));
- return E('div', {}, [widget, descr]);
- };
-
- o = s.taboption('limits', form.Value, 'upload_limit', _('Upload Limit (Kbit/s)'));
- o.datatype = 'uinteger';
- o.placeholder = _('10000');
- o.default = '10000';
- o.validate = function(section_id, value) {
- if (!value) return true;
- var intVal = parseInt(value);
- if (intVal < 0 || intVal > 100000000) {
- return _('Must be between 0 and 100000000 Kbit/s');
- }
- return true;
- };
- var superRenderWidgetUpload = o.renderWidget;
- o.renderWidget = function(section_id, option_index, cfgvalue) {
- var widget = superRenderWidgetUpload.call(this, section_id, option_index, cfgvalue);
- var descr = E('div', { 'class': 'cbi-value-description' }, _('Traffic FROM device. 0 = unlimited'));
- return E('div', {}, [widget, descr]);
- };
-
- o = s.taboption('limits', form.Value, 'burst_factor', _('Burst Factor'));
- o.placeholder = _('1.0');
- o.default = '1.0';
- o.validate = function(section_id, value) {
- if (!value || value === '') return true;
-
- // Only allow digits, comma, and period
- if (!/^[0-9,\.]+$/.test(value)) {
- return _('Only digits and decimal separators allowed');
- }
-
- // Accept both comma and period as decimal separator
- var normalizedValue = value.replace(',', '.');
-
- // Validate decimal format
- if (!/^\d*\.?\d*$/.test(normalizedValue)) {
- return _('Invalid decimal format');
- }
-
- var floatVal = parseFloat(normalizedValue);
- if (isNaN(floatVal) || floatVal < 0.0 || floatVal > 10.0) {
- return _('Must be between 0.0 and 10.0 (0 = no burst)');
- }
- return true;
- };
- o.write = function(section_id, formvalue) {
- // Normalize comma to period before saving
- if (formvalue) {
- formvalue = formvalue.replace(',', '.');
- }
- return this.super('write', [section_id, formvalue]);
- };
- var superRenderWidgetBurst = o.renderWidget;
- o.renderWidget = function(section_id, option_index, cfgvalue) {
- var widget = superRenderWidgetBurst.call(this, section_id, option_index, cfgvalue);
- var descr = E('div', { 'class': 'cbi-value-description' }, _('0 = no burst (strict), 1.0 = rate as burst, higher = more burst'));
- return E('div', {}, [widget, descr]);
- };
-
- // Custom modal title
- s.modaltitle = function(section_id) {
- var name = uci.get('qosmate', section_id, 'name');
- if (name) {
- return _('Edit Rate Limit: %s').format(name);
- }
- return _('Add Rate Limit');
- };
-
- return m.render();
- });
- }
-});
diff --git a/luci-app-qosmate/htdocs/luci-static/resources/view/rules.js b/luci-app-qosmate/htdocs/luci-static/resources/view/rules.js
deleted file mode 100644
index 20965c002..000000000
--- a/luci-app-qosmate/htdocs/luci-static/resources/view/rules.js
+++ /dev/null
@@ -1,634 +0,0 @@
-'use strict';
-'require view';
-'require ui';
-'require uci';
-'require form';
-'require rpc';
-'require fs';
-'require poll';
-'require validation';
-'require tools.widgets as widgets';
-
-var callInitAction = rpc.declare({
- object: 'luci',
- method: 'setInitAction',
- params: ['name', 'action'],
- expect: { result: false }
-});
-
-var callRuleCounters = rpc.declare({
- object: 'luci.qosmate_stats',
- method: 'getRuleCounters',
- expect: { rule_counters: [] }
-});
-
-// Bridges LuCI's validation types into plain functions; see LuCI.validation docs
-var stubValidator = {
- factory: validation,
- apply: function(type, value, args) {
- if (value != null)
- this.value = value;
- return validation.types[type].apply(this, args);
- },
- assert: function(condition) { return !!condition; }
-};
-
-// IPv6 suffix matching validation helpers
-function isIPv6SuffixFormat(value) {
- // Format: ::suffix/::mask - allow empty suffix/mask with * instead of +
- return /^::([0-9a-fA-F:]*)\/::([0-9a-fA-F:]*)$/.test(value);
-}
-
-function validateIPv6Part(part) {
- // Special case: empty part is valid (for ::/::mask)
- if (part === '') return true;
-
- // Check for multiple consecutive colons (:: can only appear once)
- if (/:{3,}/.test(part)) return false;
- if (/[^0-9a-fA-F:]/.test(part)) return false; // Only hex and colons allowed
-
- // Check if :: appears more than once
- var doubleColonCount = (part.match(/::/g) || []).length;
- if (doubleColonCount > 1) return false;
-
- // For suffix matching, we already have :: at the start, so no more :: allowed
- if (doubleColonCount > 0) return false;
-
- // Split by colons and check each segment
- var segments = part.split(':');
-
- // Can't have more than 8 segments (for a full IPv6)
- if (segments.length > 8) return false;
-
- for (var i = 0; i < segments.length; i++) {
- var seg = segments[i];
- // Each segment must be 0-4 hex digits
- if (!/^[0-9a-fA-F]{0,4}$/.test(seg)) {
- return false;
- }
- }
-
- return true;
-}
-
-function parseIPv6Suffix(value) {
- const match = value.match(/^::([0-9a-fA-F:]*)\/::([0-9a-fA-F:]*)$/);
- if (!match) return null;
-
- // Validate both parts
- if (!validateIPv6Part(match[1]) || !validateIPv6Part(match[2])) {
- return null;
- }
-
- return {
- suffix: match[1],
- mask: match[2],
- isSuffixMatch: true
- };
-}
-
-// Common IP validation function for src_ip and dest_ip fields
-function validateIPField(section_id, value) {
- if (!value || value.length === 0) {
- return true;
- }
-
- var values = Array.isArray(value) ? value : value.split(/\s+/);
- var ipCidrRegex = /^(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)){3})(?:\/(?:[0-9]|[1-2]\d|3[0-2]))?|(?:(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}|(?:[A-Fa-f0-9]{1,4}:){1,7}:|(?:[A-Fa-f0-9]{1,4}:){1,6}:[A-Fa-f0-9]{1,4}|(?:[A-Fa-f0-9]{1,4}:){1,5}(?::[A-Fa-f0-9]{1,4}){1,2}|(?:[A-Fa-f0-9]{1,4}:){1,4}(?::[A-Fa-f0-9]{1,4}){1,3}|(?:[A-Fa-f0-9]{1,4}:){1,3}(?::[A-Fa-f0-9]{1,4}){1,4}|(?:[A-Fa-f0-9]{1,4}:){1,2}(?::[A-Fa-f0-9]{1,4}){1,5}|[A-Fa-f0-9]{1,4}:(?:(?::[A-Fa-f0-9]{1,4}){1,6})|:(?:(?::[A-Fa-f0-9]{1,4}){1,7}|:))(?:\/(?:[0-9]|[1-9]\d|1[0-1]\d|12[0-8]))?)$/;
-
- // Check for mixed IPv4/IPv6 within this field
- var hasIPv4 = false;
- var hasIPv6 = false;
-
- for (var i = 0; i < values.length; i++) {
- var v = values[i].replace(/^!(?!=)/, '!=');
-
- // Check for set reference
- if (v.startsWith('@') || v.startsWith('!=@')) {
- var setName = v.replace(/^(!=)?@/, '');
- if (!/^[a-zA-Z0-9_]+$/.test(setName)) {
- return _('Invalid set name format. Must start with @ followed by letters, numbers, or underscore');
- }
- continue; // Don't check IP version for sets
- }
-
- // Strip != prefix for validation
- var isNegated = v.startsWith('!=');
- var valueToValidate = isNegated ? v.substring(2) : v;
-
- // Check for IPv6 suffix format
- if (isIPv6SuffixFormat(valueToValidate)) {
- var suffixData = parseIPv6Suffix(valueToValidate);
- if (!suffixData) {
- return _('Invalid IPv6 suffix format. Use ::suffix/::mask with valid IPv6 segments (e.g. ::1234:5678/::ffff:ffff)');
- }
- hasIPv6 = true;
- }
- // nftables accepts address ranges wherever a plain address is allowed
- else if (valueToValidate.indexOf('-') !== -1) {
- if (!stubValidator.apply('iprange', valueToValidate)) {
- return _('Invalid IP range: ') + v;
- }
- if (valueToValidate.indexOf(':') !== -1) {
- hasIPv6 = true;
- } else {
- hasIPv4 = true;
- }
- }
- else {
- if (!ipCidrRegex.test(valueToValidate)) {
- return _('Invalid IP address or CIDR format: ') + v;
- }
- // Detect IP version
- if (valueToValidate.indexOf(':') !== -1) {
- hasIPv6 = true;
- } else {
- hasIPv4 = true;
- }
- }
- }
-
- return true;
-}
-
-return view.extend({
- // Rule counter polling
- counterData: {},
- pollHandler: null,
- pollInterval: 8,
-
- load: function() {
- this.counterData = {};
- return this.super && this.super('load') || Promise.resolve();
- },
-
- // Create polling function for rule counter updates
- createPollFunction: function() {
- var view = this;
- return function() {
-
- return callRuleCounters().then(function(result) {
-
- if (result && Array.isArray(result)) {
-
- view.updateCounterData(result);
- } else {
-
- }
- return result;
- }).catch(function(err) {
-
- return null;
- });
- };
- },
-
- // Start counter polling
- startCounterPolling: function() {
- if (this.pollHandler) {
- return; // Already polling
- }
-
- var view = this;
- var startPollingWhenReady = function() {
- var luciTable = document.querySelector('.cbi-section-table');
-
-
- if (luciTable) {
-
- view.pollHandler = view.createPollFunction();
- poll.add(view.pollHandler, view.pollInterval);
- view.pollHandler(); // Initial call
- } else {
-
- setTimeout(startPollingWhenReady, 1000); // Retry after 1 second
- }
- };
-
- startPollingWhenReady();
- },
-
- // Stop counter polling
- stopCounterPolling: function() {
- if (this.pollHandler) {
- poll.remove(this.pollHandler);
- this.pollHandler = null;
-
- }
- },
-
- // Update counter data and refresh UI
- updateCounterData: function(ruleCounters) {
- var view = this;
- view.counterData = {};
-
- if (Array.isArray(ruleCounters)) {
- ruleCounters.forEach(function(rule) {
- view.counterData[rule.rule_name] = {
- packets: rule.total_packets || 0,
- bytes: rule.total_bytes || 0,
- ipv4_packets: rule.ipv4_packets || 0,
- ipv6_packets: rule.ipv6_packets || 0
- };
- });
- view.updateActivityColumnInTable();
- }
- },
-
- // Update Activity column in LuCI table
- updateActivityColumnInTable: function() {
- var view = this;
- setTimeout(function() {
- // Find LuCI table and Activity column
- var table = document.querySelector('.cbi-section-table');
- if (!table) {
-
- return;
- }
-
-
- var headerRow = table.querySelector('tr');
- var activityColumnIndex = -1;
-
- if (headerRow) {
- var headers = headerRow.querySelectorAll('th');
- headers.forEach(function(th, index) {
- if (th.textContent.includes(_('Activity'))) {
- activityColumnIndex = index;
-
- }
- });
- }
-
- if (activityColumnIndex >= 0) {
- var dataRows = table.querySelectorAll('tr[data-sid]');
-
-
- dataRows.forEach(function(row) {
- var sectionId = row.getAttribute('data-sid');
- var cells = row.querySelectorAll('td');
- if (cells[activityColumnIndex] && sectionId) {
- var ruleName = uci.get('qosmate', sectionId, 'name');
- var counterEnabled = uci.get('qosmate', sectionId, 'counter');
-
-
-
- var activityCell = cells[activityColumnIndex];
- var content = view.formatCounterDisplay(ruleName, counterEnabled);
- activityCell.innerHTML = '';
- activityCell.appendChild(content);
- }
- });
- }
- }, 200); // Give LuCI time to render
- },
-
- // Format counter display
- formatCounterDisplay: function(ruleName, counterEnabled) {
- if (counterEnabled !== '1') {
- return E('span', {'style': 'color: #999; font-size: 0.9em;'}, '-');
- }
-
- var stats = this.counterData[ruleName];
- if (!stats || stats.packets === 0) {
- return E('span', {'style': 'color: #999; font-size: 0.9em;'}, _('no activity'));
- }
-
- var totalPackets = stats.packets;
- var displayText = '';
-
- // Format packet count for readability
- if (totalPackets >= 1000000) {
- displayText = (totalPackets / 1000000).toFixed(1) + 'M pkts';
- } else if (totalPackets >= 1000) {
- displayText = (totalPackets / 1000).toFixed(1) + 'K pkts';
- } else {
- displayText = totalPackets + ' pkts';
- }
-
- // Add IPv4/IPv6 breakdown if both are present
- var breakdown = '';
- if (stats.ipv4_packets > 0 && stats.ipv6_packets > 0) {
- breakdown = ` (v4:${stats.ipv4_packets}, v6:${stats.ipv6_packets})`;
- }
-
- return E('span', {
- 'style': 'color: #0a84ff; font-size: 0.9em; font-weight: 500;',
- 'title': `Total: ${totalPackets} packets, ${(stats.bytes / 1024).toFixed(1)} KB${breakdown}`
- }, displayText);
- },
-
- handleSaveApply: function(ev) {
- return this.handleSave(ev)
- .then(() => ui.changes.apply())
- .then(() => uci.load('qosmate'))
- .then(() => uci.get_first('qosmate', 'global', 'enabled'))
- .then(enabled => {
- if (enabled === '0') {
- return fs.exec_direct('/etc/init.d/qosmate', ['stop']);
- } else {
- return fs.exec_direct('/etc/init.d/qosmate', ['restart']);
- }
- })
- .then(() => {
- ui.hideModal();
- window.location.reload();
- })
- .catch(err => {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Failed to save settings or update QoSmate service: ') + err.message));
- });
- },
-
- render: function() {
- var m, s, o;
-
- m = new form.Map('qosmate', _('QoSmate Rules'),
- _('Configure QoS rules for marking packets with DSCP values.'));
-
- s = m.section(form.GridSection, 'rule', _('Rules'));
- s.addremove = true;
- s.anonymous = true;
- s.sortable = true;
-
- s.tab('general', _('General Settings'));
- s.tab('mapping', _('DSCP Mapping'));
-
- // Add mapping information to the description
- s.description = E('div', { 'class': 'cbi-section-descr' }, [
- E('h4', _('HFSC Mapping:')),
- E('table', { 'class': 'table' }, [
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left', 'width': '25%' }, _('High Priority [Realtime] (1:11)')),
- E('td', { 'class': 'td left' }, 'EF, CS5, CS6, CS7')
- ]),
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left' }, _('Fast Non-Realtime (1:12)')),
- E('td', { 'class': 'td left' }, 'CS4, AF41, AF42')
- ]),
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left' }, _('Normal (1:13)')),
- E('td', { 'class': 'td left' }, 'CS0')
- ]),
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left' }, _('Low Priority (1:14)')),
- E('td', { 'class': 'td left' }, 'CS2, AF11')
- ]),
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left' }, _('Bulk (1:15)')),
- E('td', { 'class': 'td left' }, 'CS1')
- ])
- ]),
- E('p', { 'style': 'font-size:0.9em; margin: -5px 0 15px 5px;' }, [
- E('strong', _('Hybrid Note:')), ' ',
- _('Uses Realtime (1:11) & Bulk (1:15) classes with their dscp values from HFSC. All other traffic is handled by a single CAKE class (1:13).')
- ]),
- E('h4', _('CAKE Mapping (diffserv4):')),
- E('table', { 'class': 'table' }, [
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left', 'width': '25%' }, _('Voice (Highest Priority)')),
- E('td', { 'class': 'td left' }, 'CS7, CS6, EF, VA, CS5, CS4')
- ]),
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left' }, _('Video')),
- E('td', { 'class': 'td left' }, 'CS3, AF4x, AF3x, AF2x, CS2, TOS1')
- ]),
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left' }, _('Best Effort')),
- E('td', { 'class': 'td left' }, 'CS0, AF1x, TOS0')
- ]),
- E('tr', { 'class': 'tr' }, [
- E('td', { 'class': 'td left' }, _('Bulk (Lowest Priority)')),
- E('td', { 'class': 'td left' }, 'CS1, LE')
- ])
- ])
- ]);
-
- o = s.taboption('general', form.Value, 'name', _('Name'));
- o.rmempty = false;
-
- o = s.option(form.DummyValue, 'proto', _('Protocol'));
- o.cfgvalue = function(section_id) {
- var proto = uci.get('qosmate', section_id, 'proto');
- if (Array.isArray(proto)) {
- return proto.map(function(p) {
- if (p === 'ipv6-icmp') return 'ICMPv6';
- return p.toUpperCase();
- }).join(', ');
- } else if (typeof proto === 'string') {
- if (proto === 'ipv6-icmp') return 'ICMPv6';
- return proto.toUpperCase();
- }
- return _('Any');
- };
-
- o = s.taboption('general', form.MultiValue, 'proto', _('Protocol'));
- o.value('tcp', _('TCP'));
- o.value('udp', _('UDP'));
- o.value('icmp', _('ICMP'));
- o.value('ipv6-icmp', _('ICMPv6'));
- o.rmempty = true;
- o.default = 'tcp udp';
- o.modalonly = true;
-
- o.cfgvalue = function(section_id) {
- var value = uci.get('qosmate', section_id, 'proto');
- if (Array.isArray(value)) {
- return value;
- } else if (typeof value === 'string') {
- return value.split(/\s+/);
- }
- return [];
- };
-
- o.write = function(section_id, value) {
- if (value && value.length) {
- uci.set('qosmate', section_id, 'proto', value.join(' '));
- } else {
- uci.unset('qosmate', section_id, 'proto');
- }
- };
-
- o.validate = function(section_id, value) {
- if (!value || value.length === 0) {
- return true;
- }
-
- var valid = ['tcp', 'udp', 'icmp', 'ipv6-icmp'];
- var toValidate = Array.isArray(value) ? value : value.split(/\s+/);
-
- for (var i = 0; i < toValidate.length; i++) {
- if (valid.indexOf(toValidate[i]) === -1) {
- return _('Invalid protocol: %s').format(toValidate[i]);
- }
- }
- return true;
- };
-
- o.remove = function(section_id) {
- uci.unset('qosmate', section_id, 'proto');
- };
-
- o = s.taboption('general', form.DynamicList, 'src_ip', _('Source IP'));
- o.datatype = 'string';
- o.placeholder = _('IP address, range, @setname or ::suffix/::mask');
- o.rmempty = true;
- o.validate = function(section_id, value) {
- return validateIPField(section_id, value);
- };
- o.write = function(section_id, formvalue) {
- var values = formvalue.map(function(v) {
- return v.replace(/^!(?!=)/, '!=');
- });
- return this.super('write', [section_id, values]);
- };
-
- o = s.taboption('general', form.DynamicList, 'src_port', _('Source port'));
- o.datatype = 'list(neg(portrange))';
- o.placeholder = _('any');
- o.rmempty = true;
- o.write = function(section_id, formvalue) {
- var values;
- // Handle array and string inputs
- if (Array.isArray(formvalue)) {
- values = formvalue.map(function(v) {
- // Also handle if individual values contain spaces
- if (typeof v === 'string' && v.indexOf(' ') !== -1) {
- return v.split(/\s+/).map(function(part) {
- return part.replace(/^!(?!=)/, '!=');
- }).join(' ');
- }
- return typeof v === 'string' ? v.replace(/^!(?!=)/, '!=') : v;
- });
- } else if (typeof formvalue === 'string') {
- // If it's a string, split by spaces and process each part
- values = formvalue.split(/\s+/).map(function(v) {
- return v.replace(/^!(?!=)/, '!=');
- });
- } else {
- values = formvalue;
- }
- return this.super('write', [section_id, values]);
- };
-
- o = s.taboption('general', form.DynamicList, 'dest_ip', _('Destination IP'));
- o.datatype = 'string';
- o.placeholder = _('IP address, range, @setname or ::suffix/::mask');
- o.rmempty = true;
- o.validate = function(section_id, value) {
- return validateIPField(section_id, value);
- };
- o.write = function(section_id, formvalue) {
- var values = formvalue.map(function(v) {
- return v.replace(/^!(?!=)/, '!=');
- });
- return this.super('write', [section_id, values]);
- };
-
- o = s.taboption('general', form.DynamicList, 'dest_port', _('Destination port'));
- o.datatype = 'list(neg(portrange))';
- o.placeholder = _('any');
- o.rmempty = true;
- o.write = function(section_id, formvalue) {
- var values;
- // Handle array and string inputs
- if (Array.isArray(formvalue)) {
- values = formvalue.map(function(v) {
- // Also handle if individual values contain spaces
- if (typeof v === 'string' && v.indexOf(' ') !== -1) {
- return v.split(/\s+/).map(function(part) {
- return part.replace(/^!(?!=)/, '!=');
- }).join(' ');
- }
- return typeof v === 'string' ? v.replace(/^!(?!=)/, '!=') : v;
- });
- } else if (typeof formvalue === 'string') {
- // If it's a string, split by spaces and process each part
- values = formvalue.split(/\s+/).map(function(v) {
- return v.replace(/^!(?!=)/, '!=');
- });
- } else {
- values = formvalue;
- }
- return this.super('write', [section_id, values]);
- };
-
- o = s.taboption('general', form.ListValue, 'class', _('DSCP Class'));
- o.value('ef', _('EF - Expedited Forwarding (46)'));
- o.value('cs5', _('CS5 (40)'));
- o.value('cs6', _('CS6 (48)'));
- o.value('cs7', _('CS7 (56)'));
- o.value('cs4', _('CS4 (32)'));
- o.value('af41', _('AF41 (34)'));
- o.value('af42', _('AF42 (36)'));
- o.value('af11', _('AF11 (10)'));
- o.value('cs2', _('CS2 (16)'));
- o.value('cs1', _('CS1 (8)'));
- o.value('cs0', _('CS0 - Best Effort (0)'));
- o.rmempty = false;
-
- o = s.taboption('general', form.Flag, 'counter', _('Enable counter'));
- o.rmempty = false;
-
- o = s.taboption('general', form.Flag, 'trace', _('Enable trace'));
- o.rmempty = false;
- o.default = '0'; // Default to disabled
- o.description = _('Debug only');
-
- o = s.taboption('general', form.Flag, 'enabled', _('Enable'));
- o.rmempty = false;
- o.editable = true;
- o.default = '1'; // Set default value to enabled
- o.write = function(section_id, formvalue) {
- // Always write the value, whether it's '0' or '1'
- uci.set('qosmate', section_id, 'enabled', formvalue);
- };
- o.load = function(section_id) {
- var value = uci.get('qosmate', section_id, 'enabled');
- // If the value is undefined (not set in config), return '1' (enabled)
- return (value === undefined) ? '1' : value;
- };
-
- // Add counter activity column for live monitoring
- o = s.option(form.DummyValue, 'counter_activity', _('Activity'));
- o.cfgvalue = function(section_id) {
- var counterEnabled = uci.get('qosmate', section_id, 'counter');
- if (counterEnabled !== '1') {
- return '-';
- }
- return 'loading...';
- };
- o.textvalue = function(section_id) {
- var counterEnabled = uci.get('qosmate', section_id, 'counter');
- if (counterEnabled !== '1') return '-';
- return 'loading...';
- };
-
- var self = this;
- // Store reference to the map for grid updates
- this.gridMap = m;
- this.gridSection = s;
-
- return m.render().then(function(rendered) {
- // Store view instance globally for textvalue access
- document.qosmateRulesView = self;
-
- // Start counter polling
- if (!self.pollHandler) {
- self.startCounterPolling();
- }
-
- return rendered;
- });
- },
-
- // Handle view destruction - cleanup polling
- handleDestroy: function() {
- this.stopCounterPolling();
- },
-
- // Handle window unload - cleanup polling
- handleUnload: function() {
- this.stopCounterPolling();
- }
-});
diff --git a/luci-app-qosmate/htdocs/luci-static/resources/view/settings.js b/luci-app-qosmate/htdocs/luci-static/resources/view/settings.js
deleted file mode 100644
index c654db646..000000000
--- a/luci-app-qosmate/htdocs/luci-static/resources/view/settings.js
+++ /dev/null
@@ -1,991 +0,0 @@
-'use strict';
-'require view';
-'require form';
-'require ui';
-'require uci';
-'require rpc';
-'require fs';
-'require poll';
-'require tools.widgets as widgets';
-const UI_VERSION = '1.2.0';
-const UI_UPD_CHANNEL = 'release';
-
-var callInitAction = rpc.declare({
- object: 'luci',
- method: 'setInitAction',
- params: ['name', 'action'],
- expect: { result: false }
-});
-
-function createStatusText(status, text) {
- var colors = {
- 'current': '#4CAF50', // Green
- 'update': '#FF5252', // Red
- 'error': '#FFC107', // Yellow
- 'unknown': '#9E9E9E' // Gray
- };
-
- var icons = {
- 'current': '✓ ',
- 'update': '↑ ',
- 'error': '⚠ ',
- 'unknown': '? '
- };
-
- return E('span', {
- 'style': 'color: ' + colors[status] + '; font-weight: bold; font-size: 13px;'
- }, icons[status] + text);
-}
-
-var healthCheckData = null;
-var activeCakeType = null;
-var versionInfo = {
- backend: { current: 'Unknown', latest: 'Unknown', channel: 'Unknown' },
- frontend: { current: 'Unknown', latest: 'Unknown', channel: 'Unknown' }
-};
-
-// Check if Software Flow Offloading is enabled
-function isSfoEnabled() {
- return uci.get('firewall', '@defaults[0]', 'flow_offloading') === '1';
-}
-
-// The auto-setup runs detached, because a speed test regularly takes longer than uhttpd's
-// script_timeout (60s by default) and a request waiting for the whole run gets killed. Progress is
-// followed in the output file, which the backend ends with the AUTO_SETUP_DONE marker.
-function pollAutoSetupOutput(outputFile, tries, lastError) {
- // read_direct, because ubus file.read stops at the first NUL byte and the output file can
- // contain NUL padding while it is still being written
- return fs.read_direct(outputFile).catch(function(err) { lastError = err; return ''; }).then(function(output) {
- if (/^AUTO_SETUP_DONE/m.test(output))
- return output;
-
- if (tries <= 0)
- return Promise.reject(new Error(lastError
- ? _('Auto setup did not finish, last error: ') + lastError
- : _('Auto setup did not finish within 5 minutes.')));
-
- var status = document.getElementById('qosmate-auto-setup-status');
- var lines = output.replace(/\r/g, '\n').trim().split('\n');
- if (status && lines[lines.length - 1])
- status.textContent = lines[lines.length - 1];
-
- return new Promise(function(resolve) { window.setTimeout(resolve, 2000); })
- .then(function() { return pollAutoSetupOutput(outputFile, tries - 1, lastError); });
- });
-}
-
-function fetchVersionInfo() {
- return fs.exec_direct('/etc/init.d/qosmate', ['check_version'])
- .then(function(output) {
- // Check for API limit error
- if (output.includes('HTTP error 403') || output.includes('API rate limit exceeded')) {
- console.warn('GitHub API rate limit likely reached.');
-
- // Try to parse current versions even if latest check failed due to rate limit
- const backendCurrentMatch = output.match(/Backend versions:[\s\S]*?Current version: (.+)/);
- const backendChannelMatch = output.match(/Backend versions:[\s\S]*?Update channel: (.+)/);
- const frontendCurrentMatch = output.match(/Frontend versions:[\s\S]*?Current version: (.+)/);
- const frontendChannelMatch = output.match(/Frontend versions:[\s\S]*?Update channel: (.+)/);
-
- versionInfo = {
- backend: {
- current: backendCurrentMatch ? backendCurrentMatch[1].trim() : 'Unknown',
- latest: 'API limit reached',
- channel: backendChannelMatch ? backendChannelMatch[1].trim() : 'Unknown'
- },
- frontend: {
- current: frontendCurrentMatch ? frontendCurrentMatch[1].trim() : 'Unknown',
- latest: 'API limit reached',
- channel: frontendChannelMatch ? frontendChannelMatch[1].trim() : 'Unknown'
- }
- };
-
- } else {
- // Normal processing
- const backendCurrentMatch = output.match(/Backend versions:[\s\S]*?Current version: (.+)/);
- const backendLatestMatch = output.match(/Backend versions:[\s\S]*?Latest version: (.+)/);
- const backendChannelMatch = output.match(/Backend versions:[\s\S]*?Update channel: (.+)/);
-
- const frontendCurrentMatch = output.match(/Frontend versions:[\s\S]*?Current version: (.+)/);
- const frontendLatestMatch = output.match(/Frontend versions:[\s\S]*?Latest version: (.+)/);
- const frontendChannelMatch = output.match(/Frontend versions:[\s\S]*?Update channel: (.+)/);
-
- versionInfo = {
- backend: {
- current: backendCurrentMatch ? backendCurrentMatch[1].trim() : 'Unknown',
- latest: backendLatestMatch ? backendLatestMatch[1].trim() : 'Unknown',
- channel: backendChannelMatch ? backendChannelMatch[1].trim() : 'Unknown'
- },
- frontend: {
- current: frontendCurrentMatch ? frontendCurrentMatch[1].trim() : 'Unknown',
- latest: frontendLatestMatch ? frontendLatestMatch[1].trim() : 'Unknown',
- channel: frontendChannelMatch ? frontendChannelMatch[1].trim() : 'Unknown'
- }
- };
- }
-
- return versionInfo;
- })
- .catch(function(error) {
- console.error('Error fetching version information:', error);
- // Keep previous info if available, otherwise set to error state
- if (versionInfo.backend.current === 'Unknown' && versionInfo.frontend.current === 'Unknown') {
- versionInfo = {
- backend: { current: 'Unknown', latest: 'Error', channel: 'Unknown' },
- frontend: { current: 'Unknown', latest: 'Error', channel: 'Unknown' }
- };
- } else {
- versionInfo.backend.latest = 'Error';
- versionInfo.frontend.latest = 'Error';
- }
-
- return versionInfo;
- });
-}
-
-return view.extend({
- handleSaveApply: function(ev) {
- return this.handleSave(ev)
- .then(() => ui.changes.apply())
- .then(() => uci.load('qosmate'))
- .then(() => uci.get_first('qosmate', 'global', 'enabled'))
- .then(enabled => {
- if (enabled === '0') {
- return fs.exec_direct('/etc/init.d/qosmate', ['stop']);
- } else {
- return fs.exec_direct('/etc/init.d/qosmate', ['restart']);
- }
- })
- .then(() => {
- ui.hideModal();
- window.location.reload();
- })
- .catch(err => {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Failed to save settings or update QoSmate service: ') + err.message));
- });
- },
-
- load: function() {
- return Promise.all([
- uci.load('qosmate'),
- uci.load('firewall'),
- this.fetchHealthCheck(),
- fetchVersionInfo(),
- fs.read('/tmp/qosmate/cake_type').then(function(res) {
- activeCakeType = (res || '').trim() || null;
- }).catch(function() { activeCakeType = null; })
- ]).catch(error => {
- console.error('Error in load function:', error);
- ui.addNotification(null, E('p', _('Error loading initial data: %s').format(error.message || error)), 'error');
- return [null, null, null];
- });
- },
-
- fetchHealthCheck: function() {
- return fs.exec_direct('/etc/init.d/qosmate', ['health_check'])
- .then((res) => {
- var output = res.trim();
- // Parse the full status string (everything between status= and ;errors=)
- var statusMatch = output.match(/status=(.*?);errors=/);
- var errorsMatch = output.match(/errors=(\d+)$/);
-
- var statusString = statusMatch ? statusMatch[1] : 'Unknown';
- var errorsCount = errorsMatch ? parseInt(errorsMatch[1]) : 0;
-
- var statusSegments = statusString.split(';');
- var detailsArray = [];
- statusSegments.forEach(function(segment) {
- if (!segment) return;
- detailsArray.push(segment);
- });
-
- healthCheckData = {
- details: detailsArray,
- errors: errorsCount
- };
- // console.log("Health check data loaded successfully:", healthCheckData);
- })
- .catch((err) => {
- console.error('Health check failed:', err);
- healthCheckData = {
- details: ['Health check failed: ' + err],
- errors: 1
- };
- });
- },
-
- render: function() {
- var m, s_info, s_status, o;
-
- m = new form.Map('qosmate', _(''),
- _('For detailed setup instructions and advanced configuration options, please check the ') +
- 'README.');
-
- s_info = m.section(form.NamedSection, 'global', 'global', _('Version & Updates'));
- s_info.anonymous = true;
-
- // Version information
- o = s_info.option(form.DummyValue, '_version', _('Version Information'));
- o.rawhtml = true;
- o.render = function(section_id) {
- // Determine if an update is available for backend
- var backendUpdateAvailable = versionInfo.backend.current !== versionInfo.backend.latest &&
- versionInfo.backend.current !== 'Unknown' &&
- versionInfo.backend.latest !== 'Unknown' &&
- versionInfo.backend.latest !== 'API limit reached' &&
- versionInfo.backend.latest !== 'Error';
-
- // Determine if an update is available for frontend
- var frontendUpdateAvailable = versionInfo.frontend.current !== versionInfo.frontend.latest &&
- versionInfo.frontend.current !== 'Unknown' &&
- versionInfo.frontend.latest !== 'Unknown' &&
- versionInfo.frontend.latest !== 'API limit reached' &&
- versionInfo.frontend.latest !== 'Error';
-
- var container = E('div');
-
- // Create each component section
- function createComponentSection(title, info) {
- var section = E('div', { 'style': 'display: flex; align-items: center; margin-bottom: 8px;' });
- var titleEl = E('div', {
- 'style': 'display: inline-block; min-width: 75px; font-weight: bold; margin-right: 1px;'
- }, title);
-
- section.appendChild(titleEl);
-
- var channelEl = E('div', {
- 'style': 'display: inline-block; min-width: 70px; color: #888; margin-right: 15px;'
- }, [
- E('span', { 'style': 'font-family: monospace;' }, 'Channel: ' + info.channel)
- ]);
-
- section.appendChild(channelEl);
-
- function isLikelyCommitHash(s) {
- // Check if string is a hex string longer than 10 chars.
- return typeof s === 'string' && s.length > 10 && /^[a-fA-F0-9]+$/.test(s);
- }
-
- var currentVersionText = isLikelyCommitHash(info.current) ? info.current.substring(0, 7) : info.current;
- var latestVersionText = isLikelyCommitHash(info.latest) ? info.latest.substring(0, 7) : info.latest;
-
- var versionInfo = E('div', { 'style': 'display: inline-block; margin-right: 10px;' }, [
- currentVersionText,
- ' → ',
- E('span', {
- 'style': (title === 'Backend' && backendUpdateAvailable) ||
- (title === 'Frontend' && frontendUpdateAvailable) ?
- 'color: #ff7d7d; font-weight: bold;' : ''
- }, latestVersionText)
- ]);
-
- section.appendChild(versionInfo);
-
- var statusType = '';
- var statusText = '';
-
- if ((title === 'Backend' && backendUpdateAvailable) ||
- (title === 'Frontend' && frontendUpdateAvailable)) {
- statusType = 'update';
- statusText = _('UPDATE AVAILABLE');
- } else if (info.latest === 'API limit reached') {
- statusType = 'error';
- statusText = _('API LIMIT');
- } else if (info.latest === 'Error') {
- statusType = 'error';
- statusText = _('ERROR');
- } else if (info.current !== 'Unknown' && info.latest !== 'Unknown') {
- statusType = 'current';
- statusText = _('CURRENT');
- } else {
- statusType = 'unknown';
- statusText = _('UNKNOWN');
- }
-
- section.appendChild(createStatusText(statusType, statusText));
-
- return section;
- }
-
- // Create component sections
- container.appendChild(createComponentSection('Backend', versionInfo.backend));
- container.appendChild(createComponentSection('Frontend', versionInfo.frontend));
-
- // Add the update button if updates are available
- if (backendUpdateAvailable || frontendUpdateAvailable) {
- var buttonContainer = E('div', { 'style': 'margin-top: 10px;' });
-
- var updateButton = E('button', {
- 'class': 'cbi-button cbi-button-apply',
- 'click': ui.createHandlerFn(this, function() {
- // Create update wizard modal
- var updateOptions = [];
-
- if (backendUpdateAvailable) {
- updateOptions.push({
- name: 'backend',
- title: _('Backend'),
- current: versionInfo.backend.current,
- latest: versionInfo.backend.latest
- });
- }
-
- if (frontendUpdateAvailable) {
- updateOptions.push({
- name: 'frontend',
- title: _('Frontend'),
- current: versionInfo.frontend.current,
- latest: versionInfo.frontend.latest
- });
- }
-
- var modalContent = [
- E('h4', {}, _('Update QoSmate Components')),
- E('p', {}, _('Select components to update:'))
- ];
-
- var checkboxes = {};
- updateOptions.forEach(function(option) {
- var checkbox = E('input', {
- 'type': 'checkbox',
- 'id': 'update_' + option.name,
- 'name': 'update_' + option.name,
- 'checked': 'checked'
- });
-
- checkboxes[option.name] = checkbox;
-
- modalContent.push(
- E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title', 'for': 'update_' + option.name }, option.title),
- E('div', { 'class': 'cbi-value-field' }, [
- checkbox,
- ' ',
- option.current,
- ' → ',
- E('span', { 'style': 'color: #ff7d7d; font-weight: bold;' }, option.latest)
- ])
- ])
- );
- });
-
- // Update channel info
- modalContent.push(
- E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, _('Update Channel')),
- E('div', { 'class': 'cbi-value-field' }, [
- E('span', {}, versionInfo.backend.channel === versionInfo.frontend.channel ?
- versionInfo.backend.channel :
- _('%s (Backend) / %s (Frontend)').format(versionInfo.backend.channel, versionInfo.frontend.channel)),
- E('div', { 'style': 'font-size: 90%; color: #888; margin-top: 5px;' },
- _('To change the update channel, go to the Advanced tab'))
- ])
- ])
- );
-
- // Add buttons
- modalContent.push(
- E('div', { 'class': 'right' }, [
- E('button', {
- 'class': 'btn',
- 'click': ui.hideModal
- }, _('Cancel')),
- ' ',
- E('button', {
- 'class': 'cbi-button cbi-button-positive',
- 'click': ui.createHandlerFn(this, function() {
- var componentsToUpdate = [];
-
- updateOptions.forEach(function(option) {
- if (checkboxes[option.name].checked) {
- componentsToUpdate.push(option.name);
- }
- });
-
- if (componentsToUpdate.length === 0) {
- ui.hideModal();
- return;
- }
-
- ui.showModal(_('Updating QoSmate'), [
- E('p', { 'class': 'spinning' }, _('Please wait while QoSmate is being updated...'))
- ]);
-
- // Use the current channel from versionInfo
- var selectedChannel;
- if (versionInfo.backend.channel === versionInfo.frontend.channel) {
- selectedChannel = versionInfo.backend.channel;
- } else {
- // If channels are mixed, show a confirmation dialog
- if (!confirm(_('Components are using different update channels (%s/%s). Continue with %s channel?')
- .format(versionInfo.backend.channel, versionInfo.frontend.channel, versionInfo.backend.channel))) {
- ui.hideModal();
- return;
- }
- selectedChannel = versionInfo.backend.channel;
- }
-
- var updateArgs = ['update'];
-
- // Add component selection if not updating both components
- if (componentsToUpdate.length === 1) {
- updateArgs.push('-c', componentsToUpdate[0]);
- }
-
- // Add channel selection
- updateArgs.push('-v', selectedChannel);
-
- console.log('Executing update command:', '/etc/init.d/qosmate', updateArgs);
-
- return fs.exec_direct('/etc/init.d/qosmate', updateArgs)
- .then(function(result) {
- console.log('Update command result:', result);
- // If result contains error messages, treat it as an error
- if (result && (result.includes('error') || result.includes('Error') || result.includes('failed'))) {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Update process encountered issues: %s').format(result)), 'warning');
- return;
- }
-
- // Simulate update completion after 5 seconds
- setTimeout(function() {
- ui.hideModal();
- ui.addNotification(null, E('p', _('QoSmate updated successfully.')), 'success');
- window.setTimeout(function() {
- location.reload();
- }, 1000);
- }, 5000);
- })
- .catch(function(err) {
- console.error('Update error:', err);
- ui.hideModal();
-
- var errorMessage = _('Failed to update QoSmate');
-
- if (err) {
- if (typeof err === 'string') {
- errorMessage += ': ' + err;
- } else if (err.message) {
- errorMessage += ': ' + err.message;
- } else {
- errorMessage += ': ' + JSON.stringify(err);
- }
- }
-
- if (selectedChannel === 'snapshot') {
- errorMessage += '. ' + _('Note: The "snapshot" channel might not be available in the current repository configuration.');
- }
-
- ui.addNotification(null, E('p', errorMessage), 'error');
- });
- })
- }, _('Update Now'))
- ])
- );
-
- ui.showModal(_('QoSmate Update'), modalContent);
- })
- }, [
- E('span', { 'class': 'cbi-button-icon cbi-icon-reload' }),
- ' ',
- _('Update QoSmate')
- ]);
-
- buttonContainer.appendChild(updateButton);
- container.appendChild(buttonContainer);
- }
-
- return E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, _('Version Information')),
- E('div', { 'class': 'cbi-value-field' }, [
- container
- ])
- ]);
- };
-
- // Section, also targeting 'global' but with a UI title for grouping
- s_status = m.section(form.NamedSection, 'global', 'global', _('Service Status & Control'));
-
- // Service Status (Health Check)
- o = s_status.option(form.DummyValue, '_health_check', _(''));
- o.rawhtml = true;
- o.render = function(section_id) {
- if (!healthCheckData) {
- return E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, _('Service Status')),
- E('div', { 'class': 'cbi-value-field' }, _('Loading health check status...'))
- ]);
- }
-
- var statusHtml = E('div', { 'class': 'health-status', 'style': 'display: flex; gap: 16px; align-items: center;' });
-
- healthCheckData.details.forEach(function(detail) {
- var [type, status] = detail.split(':');
- var displayType = type.charAt(0).toUpperCase() + type.slice(1);
- var icon, color;
- switch(status.toLowerCase()) {
- case 'enabled':
- case 'started':
- icon = '✓';
- color = 'green';
- break;
- case 'disabled':
- case 'stopped':
- icon = '✕';
- color = 'red';
- break;
- case 'ok':
- icon = '✓';
- color = 'green';
- break;
- case 'failed':
- icon = '✕';
- color = 'red';
- break;
- case 'missing':
- icon = '⚠';
- color = 'orange';
- break;
- default:
- icon = '⚠';
- color = 'orange';
- }
-
- statusHtml.appendChild(
- E('div', { 'style': 'display: flex; align-items: center; gap: 4px;', 'title': detail }, [
- E('span', {
- 'style': 'color: ' + color + '; font-size: 15px; font-weight: bold; min-width: 20px;'
- }, icon),
- E('span', {
- 'style': 'font-size: 13px; color: #666;'
- }, _(displayType)),
- ])
- );
- });
-
- return E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, _('Service Status')),
- E('div', { 'class': 'cbi-value-field' }, statusHtml)
- ]);
- };
-
- // Service Control buttons
- o = s_status.option(form.DummyValue, '_buttons', _(''));
- o.rawhtml = true;
- o.render = function(section_id) {
- var buttonStyle = 'button cbi-button';
- return E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, _('Service Control')),
- E('div', { 'class': 'cbi-value-field' }, [
- E('button', {
- 'class': buttonStyle + ' cbi-button-apply',
- 'click': ui.createHandlerFn(this, function() {
- return fs.exec_direct('/etc/init.d/qosmate', ['start'])
- .then(function() {
- ui.addNotification(null, E('p', _('QoSmate started')), 'success');
- window.setTimeout(function() { location.reload(); }, 1000);
- })
- .catch(function(e) { ui.addNotification(null, E('p', _('Failed to start QoSmate: ') + e), 'error'); });
- })
- }, _('Start')),
- ' ',
- E('button', {
- 'class': buttonStyle + ' cbi-button-neutral',
- 'click': ui.createHandlerFn(this, function() {
- return fs.exec_direct('/etc/init.d/qosmate', ['restart'])
- .then(function() {
- ui.addNotification(null, E('p', _('QoSmate restarted')), 'success');
- window.setTimeout(function() { location.reload(); }, 1000);
- })
- .catch(function(e) { ui.addNotification(null, E('p', _('Failed to restart QoSmate: ') + e), 'error'); });
- })
- }, _('Restart')),
- ' ',
- E('button', {
- 'class': buttonStyle + ' cbi-button-reset',
- 'click': ui.createHandlerFn(this, function() {
- return fs.exec_direct('/etc/init.d/qosmate', ['stop'])
- .then(function() {
- ui.addNotification(null, E('p', _('QoSmate stopped')), 'success');
- window.setTimeout(function() { location.reload(); }, 1000);
- })
- .catch(function(e) { ui.addNotification(null, E('p', _('Failed to stop QoSmate: ') + e), 'error'); });
- })
- }, _('Stop'))
- ])
- ]);
- };
-
- // Auto Setup Button
- o = s_status.option(form.Button, '_auto_setup', _('Auto Setup'));
- o.inputstyle = 'apply';
- o.inputtitle = _('Start Auto Setup');
- o.onclick = ui.createHandlerFn(this, function() {
- ui.showModal(_('Auto Setup'), [
- E('p', _('This will run a speed test and configure QoSmate automatically.')),
- E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, _('Gaming Device IP (optional)')),
- E('input', { 'id': 'gaming_ip', 'type': 'text', 'class': 'cbi-input-text' })
- ]),
- E('div', { 'class': 'right' }, [
- E('button', {
- 'class': 'btn',
- 'click': ui.hideModal
- }, _('Cancel')),
- ' ',
- E('button', {
- 'class': 'btn cbi-button-action',
- 'click': ui.createHandlerFn(this, function() {
- var gamingIp = document.getElementById('gaming_ip').value;
- ui.showModal(_('Running Auto Setup'), [
- E('p', { 'class': 'spinning', 'id': 'qosmate-auto-setup-status' }, _('Please wait while the auto setup is in progress...')),
- E('div', { 'style': 'margin-top: 1em; border-top: 1px solid #ccc; padding-top: 1em;' }, [
- E('p', { 'style': 'font-weight: bold;' }, _('Note:')),
- E('p', _('Router-based speed tests may underestimate actual speeds. These results serve as a starting point and may require manual adjustment for optimal performance.'))
- ])
- ]);
- return fs.exec_direct('/etc/init.d/qosmate', ['auto_setup_detached', gamingIp])
- .then(function(res) {
- var outputFile = (res || '').trim();
-
- // a backend without auto_setup_detached prints its usage instead of a path
- var run = (outputFile.charAt(0) === '/')
- ? pollAutoSetupOutput(outputFile, 150)
- : fs.exec_direct('/etc/init.d/qosmate', ['auto_setup_noninteractive', gamingIp])
- .then(function(res2) { return fs.read_direct((res2 || '').trim()); });
-
- return run.then(function(output) {
- ui.hideModal();
-
- var wanInterface = output.match(/Detected WAN interface: (.+)/);
- var downloadSpeed = output.match(/Download speed: ([\d.]+) Mbit\/s/);
- var uploadSpeed = output.match(/Upload speed: ([\d.]+) Mbit\/s/);
- var downrate = output.match(/DOWNRATE: (\d+) kbps/);
- var uprate = output.match(/UPRATE: (\d+) kbps/);
-
- if (!downloadSpeed || !uploadSpeed || parseFloat(downloadSpeed[1]) <= 0 || parseFloat(uploadSpeed[1]) <= 0 ||
- !downrate || !uprate || parseInt(downrate[1]) <= 0 || parseInt(uprate[1]) <= 0) {
- ui.addNotification(null, [
- E('p', _('Invalid speed test results. Please try again or set values manually.')),
- E('pre', { 'style': 'white-space: pre-wrap; max-height: 12em; overflow: auto;' },
- output.trim().split('\n').slice(-10).join('\n'))
- ], 'error');
- return;
- }
-
- // 'rules?' keeps this working with backends that report a single rule
- var gamingRules = output.match(/Gaming device rules? added for IP: (.+)/);
- var existingRule = output.match(/A rule for IP (.+) already exists/);
- var warnings = output.match(/^Warning: .+$/gm) || [];
-
- ui.showModal(_(''), [
- E('h2', { 'style': 'text-align:center; margin-bottom: 1em;' }, _('Auto Setup Results')),
- E('h3', { 'style': 'margin-bottom: 0.5em;' }, _('Speed Test Results')),
- E('p', { 'style': 'color: orange; margin-bottom: 1em;' }, _('Note: Router-based speed tests may underestimate actual speeds. For best results, consider running tests from a LAN device and manually entering the values. These results serve as a starting point.')),
- warnings.length ? E('div', { 'class': 'alert-message warning', 'style': 'margin-bottom: 1em;' },
- warnings.map(function(line) { return E('p', {}, line.replace(/^Warning: /, '')); })) : '',
- E('div', { 'style': 'display: table; width: 100%;' }, [
- E('div', { 'style': 'display: table-row;' }, [
- E('div', { 'style': 'display: table-cell; padding: 5px; font-weight: bold;' }, _('WAN Interface')),
- E('div', { 'style': 'display: table-cell; padding: 5px;' }, wanInterface ? wanInterface[1] : _('Not detected'))
- ]),
- E('div', { 'style': 'display: table-row;' }, [
- E('div', { 'style': 'display: table-cell; padding: 5px; font-weight: bold;' }, _('Download Speed')),
- E('div', { 'style': 'display: table-cell; padding: 5px;' }, downloadSpeed ? downloadSpeed[1] + ' Mbit/s' : _('Not available'))
- ]),
- E('div', { 'style': 'display: table-row;' }, [
- E('div', { 'style': 'display: table-cell; padding: 5px; font-weight: bold;' }, _('Upload Speed')),
- E('div', { 'style': 'display: table-cell; padding: 5px;' }, uploadSpeed ? uploadSpeed[1] + ' Mbit/s' : _('Not available'))
- ])
- ]),
- E('h3', { 'style': 'margin-top: 1em; margin-bottom: 0.5em;' }, _('QoS Configuration')),
- E('div', { 'style': 'display: table; width: 100%;' }, [
- E('div', { 'style': 'display: table-row;' }, [
- E('div', { 'style': 'display: table-cell; padding: 5px; font-weight: bold;' }, _('Download Rate')),
- E('div', { 'style': 'display: table-cell; padding: 5px;' }, downrate ? downrate[1] + ' kbps' : _('Not set'))
- ]),
- E('div', { 'style': 'display: table-row;' }, [
- E('div', { 'style': 'display: table-cell; padding: 5px; font-weight: bold;' }, _('Upload Rate')),
- E('div', { 'style': 'display: table-cell; padding: 5px;' }, uprate ? uprate[1] + ' kbps' : _('Not set'))
- ])
- ]),
- (gamingRules || existingRule) ? E('div', { 'style': 'margin-top: 1em;' }, [
- E('div', { 'style': 'font-weight: bold;' }, _('Gaming Rules')),
- E('div', {}, gamingRules ? _('Added for IP: ') + gamingRules[1]
- : _('Rule already exists for IP: ') + existingRule[1])
- ]) : '',
- E('div', { 'class': 'right', 'style': 'margin-top: 1em;' }, [
- E('button', {
- 'class': 'btn cbi-button-action',
- 'click': ui.createHandlerFn(this, function() {
- ui.showModal(_('Applying Changes'), [
- E('p', { 'class': 'spinning' }, _('Please wait while the changes are being applied...'))
- ]);
-
- var rootQdisc = uci.get('qosmate', 'settings', 'ROOT_QDISC');
- var downrateValue = downrate ? parseInt(downrate[1]) : 0;
- var uprateValue = uprate ? parseInt(uprate[1]) : 0;
-
- if (rootQdisc === 'hfsc' && (downrateValue <= 0 || uprateValue <= 0)) {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Invalid rates for HFSC. Please set non-zero values manually.')), 'error');
- } else {
- uci.set('qosmate', 'settings', 'DOWNRATE', downrateValue.toString());
- uci.set('qosmate', 'settings', 'UPRATE', uprateValue.toString());
-
- uci.save()
- .then(() => {
- return fs.exec_direct('/etc/init.d/qosmate', ['restart']);
- })
- .then(() => {
- ui.hideModal();
- ui.addNotification(null, E('p', _('QoSmate settings updated and service restarted.')), 'success');
- window.setTimeout(function() {
- location.reload();
- }, 2000);
- })
- .catch(function(err) {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Failed to update settings or restart QoSmate: ') + err), 'error');
- });
- }
- })
- }, _('Apply and Reload'))
- ])
- ]);
- });
- })
- .catch(function(err) {
- ui.hideModal();
- ui.addNotification(null, E('p', _('Auto setup failed: ') + err), 'error');
- });
- })
- }, _('Start'))
- ])
- ]);
- });
-
- let s_basic = m.section(form.NamedSection, 'settings', 'settings', _('Basic Settings'));
- s_basic.anonymous = true;
-
- function createOption(name, title, description, placeholder, datatype) {
- var opt = s_basic.option(form.Value, name, title, description);
- opt.datatype = datatype || 'string';
- opt.rmempty = true;
- opt.placeholder = placeholder;
-
- if (datatype === 'uinteger') {
- opt.validate = function(section_id, value) {
- if (value === '' || value === null) return true;
- if (!/^\d+$/.test(value)) return _('Must be a non-negative integer or empty');
- // 0 is valid for every qdisc: it disables shaping for that direction
- return true;
- };
- }
- return opt;
- }
-
- var wanInterface = uci.get('qosmate', 'settings', 'WAN') || '';
- o = s_basic.option(widgets.DeviceSelect, 'WAN', _('WAN Interface'), _('Select the WAN interface'));
- o.rmempty = false;
- o.editable = true;
- o.default = wanInterface;
-
- createOption('DOWNRATE', _('Download Rate (kbps)'), _('Set the download rate in kbps. 0 disables ingress shaping (no IFB device is created).'), _('Default: 90000'), 'uinteger');
- createOption('UPRATE', _('Upload Rate (kbps)'), _('Set the upload rate in kbps. 0 disables egress shaping.'), _('Default: 45000'), 'uinteger');
-
- // Function to get QDisc description based on value
- function getQdiscDescriptionForValue(value) {
- switch(value) {
- case 'hfsc':
- return _('HFSC - Hierarchical Fair Service Curve. Configure realtime traffic settings in the HFSC tab.');
- case 'cake': {
- var base = _('CAKE - Common Applications Kept Enhanced. Configure CAKE-specific parameters in the CAKE tab.');
- if (!activeCakeType) return base;
- var useMq = uci.get('qosmate', 'cake', 'USE_MQ') || '0';
- var mqStatus;
- if (activeCakeType === 'cake_mq') {
- mqStatus = ' ✓ ' + _('cake_mq active');
- } else if (useMq === '1') {
- mqStatus = ' ⚠ ' + _('cake_mq not available');
- } else {
- mqStatus = ' — ' + _('cake_mq off');
- }
- return base + mqStatus;
- }
- case 'hybrid':
- return _('Hybrid - HFSC as shaper, Game Qdisc for realtime traffic, CAKE for default traffic and fq_codel for bulk traffic. Configure realtime class settings in HFSC tab and default class settings in CAKE tab.');
- case 'htb':
- return _('HTB - Hierarchical Token Bucket. Simple 3-tier priority system with pre-configured settings - no additional qdisc configuration required.');
- default:
- return _('Select the root queueing discipline');
- }
- }
-
- // Get description for current value
- function getQdiscDescription() {
- var rootQdisc = uci.get('qosmate', 'settings', 'ROOT_QDISC') || 'hfsc';
- return getQdiscDescriptionForValue(rootQdisc);
- }
-
- o = s_basic.option(form.ListValue, 'ROOT_QDISC', _('Root Queueing Discipline'), getQdiscDescription());
- o.value('hfsc', _('HFSC'));
- o.value('cake', _('CAKE'));
- o.value('hybrid', _('Hybrid'));
- o.value('htb', _('HTB (Experimental)'));
- o.default = 'hfsc';
- o.onchange = function(ev, section_id, value) {
- // Update description dynamically using shared function
- var newDescription = getQdiscDescriptionForValue(value);
-
- // Find and update the description element
- var node = ev.target.closest('.cbi-value');
- if (node) {
- var descNode = node.querySelector('.cbi-value-description');
- if (descNode) {
- descNode.textContent = newDescription;
- }
- }
-
- // Update dependent fields
- var downrate = this.map.lookupOption('DOWNRATE', section_id)[0];
- var uprate = this.map.lookupOption('UPRATE', section_id)[0];
- if (downrate && uprate) {
- downrate.map.checkDepends();
- uprate.map.checkDepends();
- }
- };
-
- // Software Flow Offloading Warning
- o = s_basic.option(form.DummyValue, '_sfo_warning', _('Software Flow Offloading Status'));
- o.rawhtml = true;
- o.render = function(section_id) {
- if (isSfoEnabled()) {
- return E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, E('span', { 'style': 'color: orange; font-weight: bold;' }, '⚠')),
- E('div', { 'class': 'cbi-value-field', 'style': 'color: orange;' }, [
- E('strong', {}, _('Software Flow Offloading active - some limitations apply')),
- E('br'),
- _('✓ Static rules work ✗ Dynamic rules may not work')
- ])
- ]);
- } else {
- return E('div');
- }
- };
-
- // Notice when a direction is not shaped (rate 0, same convention as sqm-scripts)
- o = s_basic.option(form.DummyValue, '_shaping_direction', _('Shaping Direction'));
- o.rawhtml = true;
- o.render = function(section_id) {
- var downrate = parseInt(uci.get('qosmate', 'settings', 'DOWNRATE') || '0');
- var uprate = parseInt(uci.get('qosmate', 'settings', 'UPRATE') || '0');
- if (downrate > 0 && uprate > 0) return E('div');
-
- var lines = [];
- if (downrate === 0 && uprate === 0) {
- lines.push(E('strong', {}, _('No shaping active: both rates are 0')));
- lines.push(E('br'));
- lines.push(_('Only nftables DSCP marking is applied, no queues are created.'));
- } else if (downrate === 0) {
- lines.push(E('strong', {}, _('Download shaping disabled (DOWNRATE=0)')));
- lines.push(E('br'));
- lines.push(_('No IFB device is created. TCP bulk detection is off because its thresholds derive from the download rate, CAKE ingress options have no effect, and incoming packets carry no DSCP.'));
- lines.push(E('br'));
- lines.push(_('Set ACK_FILTER_EGRESS explicitly in the CAKE tab: "auto" cannot decide without a download rate.'));
- } else {
- lines.push(E('strong', {}, _('Upload shaping disabled (UPRATE=0)')));
- lines.push(E('br'));
- lines.push(_('No egress qdisc is created, so traffic classification only affects the download queue.'));
- }
-
- return E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, E('span', { 'style': 'color: orange; font-weight: bold;' }, '⚠')),
- E('div', { 'class': 'cbi-value-field', 'style': 'color: orange;' }, lines)
- ]);
- };
-
- // Warning for bandwidth ratio
- o = s_basic.option(form.DummyValue, '_ratio_warning', _('Bandwidth Ratio Warning'));
- o.rawhtml = true;
- o.render = function(section_id) {
- var downrate = uci.get('qosmate', 'settings', 'DOWNRATE') || '90000';
- var uprate = uci.get('qosmate', 'settings', 'UPRATE') || '45000';
- var bwmaxratio = uci.get('qosmate', 'advanced', 'BWMAXRATIO') || '20';
-
- downrate = parseInt(downrate);
- uprate = parseInt(uprate);
- bwmaxratio = parseInt(bwmaxratio);
-
- if (uprate > 0 && downrate / uprate > bwmaxratio) {
- var ratio = Math.floor(downrate / uprate);
- var upload_mbps = Math.floor(uprate / 1000);
- var limited_download = Math.floor(bwmaxratio * uprate / 1000);
- return E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, E('span', { 'style': 'color: orange; font-weight: bold;' }, '⚠️')),
- E('div', { 'class': 'cbi-value-field', 'style': 'color: orange;' }, [
- E('strong', {}, _('Large download/upload difference detected (') + ratio + ':1 ratio)'),
- E('br'),
- _('Your download speed has been limited to prevent connection issues.'),
- E('br'),
- _('Current limit: ') + limited_download + _(' Mbps (based on your ') + upload_mbps + _(' Mbps upload)') + _('To override: Advanced Settings → BWMAXRATIO'),
- ])
- ]);
- } else {
- return E('div');
- }
- };
-
- // Autorate Section
- var s_autorate = m.section(form.NamedSection, 'autorate', 'autorate', _('Dynamic Bandwidth (Autorate)'));
- s_autorate.anonymous = true;
-
- o = s_autorate.option(form.Flag, 'enabled', _('Enable Autorate'),
- _('Dynamically adjust bandwidth based on latency measurements. Fine-tune in Advanced tab.'));
- o.rmempty = false;
-
- o = s_autorate.option(form.DummyValue, '_autorate_status', _(''));
- o.rawhtml = true;
- o.render = function(section_id) {
- var enabled = uci.get('qosmate', 'autorate', 'enabled');
- if (enabled !== '1') {
- return E('div');
- }
-
- var uprate = parseInt(uci.get('qosmate', 'settings', 'UPRATE') || '0');
- var downrate = parseInt(uci.get('qosmate', 'settings', 'DOWNRATE') || '0');
-
- var minUl = parseInt(uci.get('qosmate', 'autorate', 'min_ul_rate')) || Math.floor(uprate * 25 / 100);
- var maxUl = parseInt(uci.get('qosmate', 'autorate', 'max_ul_rate')) || Math.floor(uprate * 105 / 100);
- var minDl = parseInt(uci.get('qosmate', 'autorate', 'min_dl_rate')) || Math.floor(downrate * 25 / 100);
- var maxDl = parseInt(uci.get('qosmate', 'autorate', 'max_dl_rate')) || Math.floor(downrate * 105 / 100);
-
- return E('div', { 'class': 'cbi-value' }, [
- E('label', { 'class': 'cbi-value-title' }, _('Active Range')),
- E('div', { 'class': 'cbi-value-field' }, [
- E('span', { 'style': 'color: #2196F3;' }, '↓ '),
- minDl + ' - ' + maxDl + ' kbps',
- E('span', { 'style': 'margin: 0 12px; color: #666;' }, '|'),
- E('span', { 'style': 'color: #4CAF50;' }, '↑ '),
- minUl + ' - ' + maxUl + ' kbps'
- ])
- ]);
- };
-
- return m.render();
- }
-});
-
-function updateQosmate() {
- // Implement the update logic here
- ui.showModal(_('Updating QoSmate'), [
- E('p', { 'class': 'spinning' }, _('Updating QoSmate. Please wait...'))
- ]);
-
- // Simulating an update process
- setTimeout(function() {
- ui.hideModal();
- window.location.reload();
- }, 5000);
-}
diff --git a/luci-app-qosmate/htdocs/luci-static/resources/view/statistics.js b/luci-app-qosmate/htdocs/luci-static/resources/view/statistics.js
deleted file mode 100644
index 3583963e9..000000000
--- a/luci-app-qosmate/htdocs/luci-static/resources/view/statistics.js
+++ /dev/null
@@ -1,2251 +0,0 @@
-'use strict';
-'require view';
-'require poll';
-'require rpc';
-'require ui';
-'require form';
-'require dom';
-'require fs';
-'require uci';
-
-// Define RPC calls
-var callQoSmateStats = rpc.declare({
- object: 'luci.qosmate_stats',
- method: 'getStats',
- expect: { }
-});
-
-var callQoSmateHistoricalStats = rpc.declare({
- object: 'luci.qosmate_stats',
- method: 'getHistoricalStats',
- expect: { }
-});
-
-var callQoSmateRrdData = rpc.declare({
- object: 'luci.qosmate_stats',
- method: 'getRrdData',
- expect: { }
-});
-
-// Utility functions
-var formatSize = function(bytes) {
- var sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB'];
- if (bytes == 0) return '0 B';
- var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
- return Math.round(bytes / Math.pow(1024, i) * 100) / 100 + ' ' + sizes[i];
-};
-
-var convertToKbps = function(bytesPerSecond) {
- return (bytesPerSecond * 8 / 1000).toFixed(2) + ' Kbit/s';
-};
-
-// Format time value intelligently (microseconds to ms or s when appropriate)
-var formatTime = function(microseconds) {
- if (microseconds === undefined || microseconds === null) return '0 µs';
-
- if (microseconds === 0) return '0 µs';
-
- if (microseconds >= 1000000) {
- // Convert to seconds for values >= 1s
- return (microseconds / 1000000).toFixed(2) + ' s';
- } else if (microseconds >= 1000) {
- // Convert to milliseconds for values >= 1ms
- return (microseconds / 1000).toFixed(2) + ' ms';
- } else {
- // Keep as microseconds for small values
- return microseconds + ' µs';
- }
-};
-
-// Parse size string like "10.5 MiB" to bytes
-var parseSizeToBytes = function(sizeStr) {
- if (!sizeStr || typeof sizeStr !== 'string') return 0;
-
- var numericPart = parseFloat(sizeStr);
- var unit = sizeStr.split(' ')[1];
- var multiplier = 1;
-
- if (unit === 'KiB') multiplier = 1024;
- else if (unit === 'MiB') multiplier = 1024 * 1024;
- else if (unit === 'GiB') multiplier = 1024 * 1024 * 1024;
- else if (unit === 'TiB') multiplier = 1024 * 1024 * 1024 * 1024;
-
- return numericPart * multiplier;
-};
-
-// Convert bytes to Kbits
-var bytesToKbits = function(bytes) {
- return (bytes * 8 / 1000).toFixed(2);
-};
-
-var callQoSmateAutorateStats = rpc.declare({
- object: 'luci.qosmate_stats',
- method: 'getAutorateStats',
- expect: { }
-});
-
-// Standard chart colors
-var chartColors = ['#4CAF50', '#2196F3', '#FFC107', '#F44336', '#9C27B0', '#795548', '#FF9800', '#607D8B'];
-
-// Lightweight Canvas time-series chart renderer
-var TimeSeriesChart = {
- draw: function(canvas, config) {
- var ctx = canvas.getContext('2d');
- var dpr = window.devicePixelRatio || 1;
- var w = canvas.clientWidth;
- var h = canvas.clientHeight;
-
- canvas.width = w * dpr;
- canvas.height = h * dpr;
- ctx.scale(dpr, dpr);
- ctx.clearRect(0, 0, w, h);
-
- // Detect text color from page theme (works for light and dark themes)
- var textColor = window.getComputedStyle(canvas.parentNode || canvas).color || '#ccc';
-
- var pad = { top: 20, right: 15, bottom: 32, left: 58 };
-
- // Determine data ranges
- var xMin = Infinity, xMax = -Infinity, yMin = Infinity, yMax = -Infinity;
- (config.series || []).forEach(function(s) {
- (s.data || []).forEach(function(pt) {
- if (pt[0] < xMin) xMin = pt[0];
- if (pt[0] > xMax) xMax = pt[0];
- if (pt[1] < yMin) yMin = pt[1];
- if (pt[1] > yMax) yMax = pt[1];
- });
- });
- (config.hLines || []).forEach(function(hl) {
- if (hl.value < yMin) yMin = hl.value;
- if (hl.value > yMax) yMax = hl.value;
- });
-
- if (!isFinite(xMin)) { xMin = 0; xMax = 300; }
- if (!isFinite(yMin)) { yMin = 0; yMax = 100; }
- var yr = yMax - yMin || 1;
- yMin = Math.max(0, yMin - yr * 0.05);
- yMax = yMax + yr * 0.1;
- if (xMax - xMin < 1) xMax = xMin + 60;
-
- // Measure longest Y-axis label to set dynamic left padding
- ctx.font = '10px sans-serif';
- var yTicks = this._ticks(yMin, yMax, 5);
- var maxLabelW = 0;
- yTicks.forEach(function(v) {
- var label = config.yFmt ? config.yFmt(v) : String(v);
- var lw = ctx.measureText(label).width;
- if (lw > maxLabelW) maxLabelW = lw;
- });
- pad.left = Math.max(58, Math.ceil(maxLabelW + 12));
- var cw = w - pad.left - pad.right;
- var ch = h - pad.top - pad.bottom;
- if (cw < 50 || ch < 50) return;
-
- var xS = function(v) { return pad.left + (v - xMin) / (xMax - xMin) * cw; };
- var yS = function(v) { return pad.top + ch - (v - yMin) / (yMax - yMin) * ch; };
-
- // Grid and labels
- ctx.fillStyle = textColor;
- ctx.font = '10px sans-serif';
-
- // Y axis
- ctx.textAlign = 'right';
- yTicks.forEach(function(v) {
- var y = yS(v);
- ctx.strokeStyle = '#e0e0e0';
- ctx.lineWidth = 0.5;
- ctx.beginPath(); ctx.moveTo(pad.left, y); ctx.lineTo(pad.left + cw, y); ctx.stroke();
- ctx.fillText(config.yFmt ? config.yFmt(v) : String(v), pad.left - 5, y + 3);
- });
-
- // X axis (relative time with time-aware ticks)
- ctx.textAlign = 'center';
- this._timeTicks(xMin, xMax, 6).forEach(function(v) {
- var x = xS(v);
- ctx.strokeStyle = '#e0e0e0';
- ctx.lineWidth = 0.5;
- ctx.beginPath(); ctx.moveTo(x, pad.top); ctx.lineTo(x, pad.top + ch); ctx.stroke();
- var ago = Math.round(xMax - v);
- var label;
- if (ago <= 0) label = 'now';
- else if (ago < 120) label = '-' + ago + 's';
- else if (ago < 5400) label = '-' + Math.round(ago / 60) + 'min';
- else if (ago < 172800) { var h = ago / 3600; label = '-' + (h % 1 === 0 ? h.toFixed(0) : h.toFixed(1)) + 'h'; }
- else { var d = ago / 86400; label = '-' + (d % 1 === 0 ? d.toFixed(0) : d.toFixed(1)) + 'd'; }
- ctx.fillText(label, x, pad.top + ch + 15);
- });
-
- // Chart border
- ctx.strokeStyle = '#ccc'; ctx.lineWidth = 1;
- ctx.strokeRect(pad.left, pad.top, cw, ch);
-
- // Clip to chart area
- ctx.save();
- ctx.beginPath(); ctx.rect(pad.left, pad.top, cw, ch); ctx.clip();
-
- // Horizontal reference lines
- (config.hLines || []).forEach(function(hl) {
- ctx.strokeStyle = hl.color || '#999';
- ctx.lineWidth = hl.width || 1;
- if (hl.dashed) ctx.setLineDash([5, 3]);
- ctx.beginPath();
- var y = yS(hl.value);
- ctx.moveTo(pad.left, y); ctx.lineTo(pad.left + cw, y);
- ctx.stroke(); ctx.setLineDash([]);
- });
-
- // Data series
- (config.series || []).forEach(function(s) {
- if (!s.data || s.data.length < 2) return;
- ctx.strokeStyle = s.color || '#2196F3';
- ctx.lineWidth = s.width || 2;
- if (s.dashed) ctx.setLineDash([5, 3]);
-
- if (s.fill) {
- ctx.fillStyle = s.fill;
- ctx.beginPath();
- ctx.moveTo(xS(s.data[0][0]), yS(yMin));
- s.data.forEach(function(pt) { ctx.lineTo(xS(pt[0]), yS(pt[1])); });
- ctx.lineTo(xS(s.data[s.data.length - 1][0]), yS(yMin));
- ctx.closePath(); ctx.fill();
- }
-
- ctx.beginPath();
- ctx.moveTo(xS(s.data[0][0]), yS(s.data[0][1]));
- for (var i = 1; i < s.data.length; i++) ctx.lineTo(xS(s.data[i][0]), yS(s.data[i][1]));
- ctx.stroke(); ctx.setLineDash([]);
- });
-
- ctx.restore();
-
- // Legend is rendered as DOM elements outside the canvas (see updateAutorateUI)
- },
-
- _ticks: function(min, max, count) {
- var range = max - min;
- if (range <= 0) return [min];
- var rough = range / count;
- var mag = Math.pow(10, Math.floor(Math.log10(rough)));
- var n = rough / mag;
- var step = n <= 1.5 ? mag : n <= 3.5 ? 2 * mag : n <= 7.5 ? 5 * mag : 10 * mag;
- var ticks = [];
- for (var v = Math.ceil(min / step) * step; v <= max; v += step)
- ticks.push(Math.round(v * 1000) / 1000);
- return ticks;
- },
-
- // Time-aware tick generation: picks clean second/minute/hour/day intervals
- _timeTicks: function(min, max, count) {
- var span = max - min;
- if (span <= 0) return [max];
- var steps = [1, 2, 5, 10, 15, 30, 60, 120, 300, 600, 900, 1800,
- 3600, 7200, 10800, 21600, 43200, 86400, 172800, 432000, 604800];
- var ideal = span / count;
- var step = steps[steps.length - 1];
- for (var i = 0; i < steps.length; i++) {
- if (steps[i] >= ideal) { step = steps[i]; break; }
- }
- var ticks = [];
- var maxAgo = Math.floor(span / step) * step;
- for (var ago = maxAgo; ago >= 0; ago -= step)
- ticks.push(max - ago);
- return ticks;
- }
-};
-
-// Statistics tables and charts are rendered with translated headings, so they
-// have to be grouped into the Egress/Ingress tabs by comparing against the
-// translations as well. A plain English keyword match such as
-// title.includes('Egress') dropped every table and chart in a non-English UI.
-var qosmateEgressHeadings = [
- 'CAKE Egress Statistics',
- 'CAKE Statistics for Default Class (Egress)',
- 'Egress Bytes Sent by Class',
- 'Egress Bytes Sent by Tin',
- 'Egress Dropped Packets by Class',
- 'Egress Dropped Packets by Tin',
- 'Egress Packets Sent by Class',
- 'Egress Packets Sent by Tin',
- 'HFSC Egress Class Statistics',
- 'HTB Egress Class Statistics',
- 'Hybrid Egress Class Statistics'
-];
-
-var qosmateIngressHeadings = [
- 'CAKE Ingress Statistics',
- 'CAKE Statistics for Default Class (Ingress)',
- 'HFSC Ingress Class Statistics',
- 'HTB Ingress Class Statistics',
- 'Hybrid Ingress Class Statistics',
- 'Ingress Bytes Sent by Class',
- 'Ingress Bytes Sent by Tin',
- 'Ingress Dropped Packets by Class',
- 'Ingress Dropped Packets by Tin',
- 'Ingress Packets Sent by Class',
- 'Ingress Packets Sent by Tin'
-];
-
-var isEgressHeading = function(heading) {
- for (var i = 0; i < qosmateEgressHeadings.length; i++)
- if (heading === _(qosmateEgressHeadings[i]))
- return true;
- return false;
-};
-
-var isIngressHeading = function(heading) {
- for (var i = 0; i < qosmateIngressHeadings.length; i++)
- if (heading === _(qosmateIngressHeadings[i]))
- return true;
- return false;
-};
-
-// Main view
-return view.extend({
- pollInterval: 5,
- lastData: null,
- charts: {},
- pollHandler: null,
- activeTabIndex: 0, // Track the active tab
- autorateData: null, // Persistent autorate state across polls
- autorateTimeRange: '60m', // Active time range for autorate charts
-
- load: function() {
- return Promise.all([
- callQoSmateStats(),
- callQoSmateHistoricalStats(),
- callQoSmateRrdData(),
- callQoSmateAutorateStats(),
- uci.load('qosmate')
- ]);
- },
-
- // Helper function to create a poll handler with consistent behavior
- createPollFunction: function() {
- var view = this;
- return function() {
- return Promise.all([
- callQoSmateStats(),
- callQoSmateHistoricalStats(),
- callQoSmateRrdData(),
- callQoSmateAutorateStats()
- ]).then(function(data) {
- view.updateContent(data);
- return data;
- }).catch(function(error) {
- // Simple error handling to show feedback when API calls fail
- console.error('Error fetching QoS statistics:', error);
-
- // Find the content container
- var contentContainer = document.querySelector('.qosmate-content-container');
- if (contentContainer) {
- // Show error message
- dom.content(contentContainer, E('div', { 'class': 'cbi-section' }, [
- E('p', { 'class': 'alert-message warning' }, [
- _('Error loading QoS statistics. Please check if the QoSmate service is running.')
- ])
- ]));
- }
-
- return null;
- });
- };
- },
-
- // Create a table to display QoS statistics
- createStatsTable: function(title, headers, rows) {
- var table = E('table', { 'class': 'table cbi-section-table' });
-
- // Add table headers
- var headerRow = E('tr', { 'class': 'tr table-titles' });
- headers.forEach(function(header) {
- headerRow.appendChild(E('th', { 'class': 'th' }, header));
- });
- table.appendChild(headerRow);
-
- // Add table rows
- if (rows && rows.length > 0) {
- rows.forEach(function(row) {
- var tableRow = E('tr', { 'class': 'tr' });
- row.forEach(function(cell) {
- tableRow.appendChild(E('td', { 'class': 'td' }, cell));
- });
- table.appendChild(tableRow);
- });
- } else {
- var emptyRow = E('tr', { 'class': 'tr' });
- emptyRow.appendChild(E('td', {
- 'class': 'td',
- 'colspan': headers.length,
- 'style': 'text-align: center;'
- }, _('No data available')));
- table.appendChild(emptyRow);
- }
-
- return E('div', { 'class': 'stats-table-container', 'style': 'margin-bottom: 10px;' }, [
- E('h3', { 'style': 'margin-bottom: 1.5em;' }, title),
- table
- ]);
- },
-
- // Create a simple chart using DOM elements
- createChart: function(id, title, data, labels, colors) {
- var container = E('div', { 'class': 'chart-container', 'style': 'height: 250px; margin-bottom: 10px;' });
- var chartTitle = E('h3', { 'style': 'margin-bottom: 1.5em;' }, title);
-
- container.appendChild(chartTitle);
-
- // Simple bar chart implementation
- var chartData = E('div', { 'class': 'chart-data', 'style': 'display: flex; height: 180px; margin-top: 5px; align-items: flex-end;' });
-
- if (data && data.length > 0) {
- var maxValue = Math.max.apply(null, data);
-
- for (var i = 0; i < data.length; i++) {
- var value = data[i];
- var barHeight = maxValue > 0 ? (value / maxValue * 160) : 0;
-
- var barContainer = E('div', {
- 'style': 'flex: 1; text-align: center; padding: 0 2px; display: flex; flex-direction: column; align-items: center;'
- });
-
- // Add value at top of bar
- var valueLabel = E('div', { 'style': 'font-size: 10px; margin-bottom: 5px;' },
- (typeof value === 'number') ?
- (value > 1000000 ? (value / 1000000).toFixed(1) + 'M' :
- value > 1000 ? (value / 1000).toFixed(1) + 'K' : value) : '0');
-
- var bar = E('div', {
- 'style': 'background-color: ' + (colors ? colors[i % colors.length] : '#0088cc') +
- '; width: 80%; height: ' + (barHeight > 0 ? barHeight : 1) + 'px;'
- });
-
- var label = E('div', { 'style': 'font-size: 10px; margin-top: 5px; white-space: nowrap;' },
- labels ? labels[i] : '');
-
- barContainer.appendChild(valueLabel);
- barContainer.appendChild(bar);
- barContainer.appendChild(label);
- chartData.appendChild(barContainer);
- }
- } else {
- chartData.appendChild(E('div', { 'style': 'width: 100%; text-align: center; padding-top: 70px;' },
- _('No data available')));
- }
-
- container.appendChild(chartData);
- return container;
- },
-
- // Process CAKE statistics
- processCakeStats: function(data) {
- if (!data || (!data.cake_egress && !data.cake_ingress)) {
- return { tables: [], charts: [] };
- }
-
- var result = { tables: [], charts: [] };
- var self = this;
-
- // Helper function to get tin name based on diffserv mode
- function getTinName(tinIndex, diffservMode) {
- if (diffservMode === 'diffserv3') {
- return ['Bulk', 'Best Effort', 'Voice'][tinIndex] || 'Unknown';
- } else if (diffservMode === 'diffserv4') {
- return ['Bulk', 'Best Effort', 'Video', 'Voice'][tinIndex] || 'Unknown';
- } else if (diffservMode === 'diffserv8') {
- return ['Tin 0', 'Tin 1', 'Tin 2', 'Tin 3', 'Tin 4', 'Tin 5', 'Tin 6', 'Tin 7'][tinIndex] || 'Unknown';
- } else {
- return 'Tin ' + tinIndex;
- }
- }
-
- // Process CAKE egress statistics
- if (data.cake_egress) {
- var egressRows = [];
- var diffservMode = data.cake_egress.options ? data.cake_egress.options.diffserv : 'diffserv4';
-
- if (data.cake_egress.tins) {
- data.cake_egress.tins.forEach(function(tin, index) {
- egressRows.push([
- 'Tin ' + index,
- // Convert threshold_rate from Byte/s to Kbit/s
- bytesToKbits(tin.threshold_rate) + ' Kbit/s',
- formatTime(tin.target_us),
- formatTime(tin.interval_us),
- // Add delay metrics (µs)
- formatTime(tin.peak_delay_us),
- formatTime(tin.avg_delay_us),
- formatTime(tin.base_delay_us),
- formatSize(tin.sent_bytes),
- tin.sent_packets,
- tin.drops,
- tin.ecn_mark
- ]);
- });
- }
-
- // Create table for CAKE egress tins
- if (egressRows.length > 0) {
- result.tables.push(self.createStatsTable(
- _('CAKE Egress Statistics'),
- [_('Tin'), _('Threshold'), _('Target'), _('Interval'), _('Peak Delay'), _('Avg Delay'), _('Sparse Delay'), _('Bytes'), _('Packets'), _('Dropped'), _('ECN Marked')],
- egressRows
- ));
-
- // Create charts for CAKE egress stats
- var tinLabels = egressRows.map(function(row, index) {
- return getTinName(index, diffservMode);
- });
-
- var sentBytes = egressRows.map(function(row) {
- return parseSizeToBytes(row[7]);
- });
-
- var sentPackets = egressRows.map(function(row) { return parseInt(row[8]); });
- var droppedPackets = egressRows.map(function(row) { return parseInt(row[9]); });
-
- result.charts.push(self.createChart(
- 'cake-egress-bytes',
- _('Egress Bytes Sent by Tin'),
- sentBytes,
- tinLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'cake-egress-packets',
- _('Egress Packets Sent by Tin'),
- sentPackets,
- tinLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'cake-egress-dropped',
- _('Egress Dropped Packets by Tin'),
- droppedPackets,
- tinLabels,
- chartColors
- ));
- }
- }
-
- // Process CAKE ingress statistics
- if (data.cake_ingress) {
- var ingressRows = [];
- var diffservMode = data.cake_ingress.options ? data.cake_ingress.options.diffserv : 'diffserv4';
-
- if (data.cake_ingress.tins) {
- data.cake_ingress.tins.forEach(function(tin, index) {
- ingressRows.push([
- 'Tin ' + index,
- // Convert threshold_rate from Byte/s to Kbit/s
- bytesToKbits(tin.threshold_rate) + ' Kbit/s',
- formatTime(tin.target_us),
- formatTime(tin.interval_us),
- // Add delay metrics (µs)
- formatTime(tin.peak_delay_us),
- formatTime(tin.avg_delay_us),
- formatTime(tin.base_delay_us),
- formatSize(tin.sent_bytes),
- tin.sent_packets,
- tin.drops,
- tin.ecn_mark
- ]);
- });
- }
-
- // Create table for CAKE ingress tins
- if (ingressRows.length > 0) {
- result.tables.push(self.createStatsTable(
- _('CAKE Ingress Statistics'),
- [_('Tin'), _('Threshold'), _('Target'), _('Interval'), _('Peak Delay'), _('Avg Delay'), _('Sparse Delay'), _('Bytes'), _('Packets'), _('Dropped'), _('ECN Marked')],
- ingressRows
- ));
-
- // Create charts for CAKE ingress stats
- var tinLabels = ingressRows.map(function(row, index) {
- return getTinName(index, diffservMode);
- });
-
- var sentBytes = ingressRows.map(function(row) {
- return parseSizeToBytes(row[7]);
- });
-
- var sentPackets = ingressRows.map(function(row) { return parseInt(row[8]); });
- var droppedPackets = ingressRows.map(function(row) { return parseInt(row[9]); });
-
- result.charts.push(self.createChart(
- 'cake-ingress-bytes',
- _('Ingress Bytes Sent by Tin'),
- sentBytes,
- tinLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'cake-ingress-packets',
- _('Ingress Packets Sent by Tin'),
- sentPackets,
- tinLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'cake-ingress-dropped',
- _('Ingress Dropped Packets by Tin'),
- droppedPackets,
- tinLabels,
- chartColors
- ));
- }
- }
-
- return result;
- },
-
- // Process HFSC statistics
- processHfscStats: function(data) {
- if (!data || (!data.egress_leaf_qdiscs && !data.ingress_leaf_qdiscs)) {
- return { tables: [], charts: [] };
- }
-
- var result = { tables: [], charts: [] };
- var self = this;
-
- // Process egress leaf qdiscs
- if (data.egress_leaf_qdiscs && data.egress_leaf_qdiscs.length > 0) {
- var egressRows = [];
-
- // Process all qdiscs first and collect data
- var classData = {};
-
- data.egress_leaf_qdiscs.forEach(function(qdisc) {
- if (!qdisc.parent) return;
-
- var classId = qdisc.parent;
- var classDesc = '';
- var sortOrder = 999; // Default high value for unknown classes
-
- // Determine class description based on ID and skip those that don't match
- if (classId.includes('1:11')) {
- classDesc = _('High Priority (Realtime)');
- sortOrder = 5;
- }
- else if (classId.includes('1:12')) {
- classDesc = _('Fast Non-Realtime');
- sortOrder = 4;
- }
- else if (classId.includes('1:13')) {
- classDesc = _('Normal');
- sortOrder = 3;
- }
- else if (classId.includes('1:14')) {
- classDesc = _('Low Priority');
- sortOrder = 2;
- }
- else if (classId.includes('1:15')) {
- classDesc = _('Bulk');
- sortOrder = 1;
- }
- else return; // Skip this qdisc if it doesn't match any of the expected classes
-
- classData[classId] = {
- classId: classId,
- classDesc: classDesc,
- sortOrder: sortOrder,
- bytes: qdisc.bytes || 0,
- packets: qdisc.packets || 0,
- drops: qdisc.drops || 0,
- overlimits: qdisc.overlimits || 0
- };
- });
-
- // Convert to array and sort based on sortOrder
- var sortedClassData = Object.values(classData).sort(function(a, b) {
- return a.sortOrder - b.sortOrder;
- });
-
- // Create rows from sorted data
- sortedClassData.forEach(function(item) {
- egressRows.push([
- item.classId,
- item.classDesc,
- formatSize(item.bytes),
- item.packets,
- item.drops,
- item.overlimits
- ]);
- });
-
- // Create table for HFSC egress classes
- result.tables.push(self.createStatsTable(
- _('HFSC Egress Class Statistics'),
- [_('Class ID'), _('Description'), _('Bytes'), _('Packets'), _('Drops'), _('Overlimits')],
- egressRows
- ));
-
- // Create charts for HFSC egress classes
- var classLabels = sortedClassData.map(function(item) { return item.classDesc; });
- var sentBytes = sortedClassData.map(function(item) {
- return parseSizeToBytes(formatSize(item.bytes));
- });
- var sentPackets = sortedClassData.map(function(item) { return item.packets; });
- var droppedPackets = sortedClassData.map(function(item) { return item.drops; });
-
- result.charts.push(self.createChart(
- 'hfsc-egress-bytes',
- _('Egress Bytes Sent by Class'),
- sentBytes,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'hfsc-egress-packets',
- _('Egress Packets Sent by Class'),
- sentPackets,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'hfsc-egress-dropped',
- _('Egress Dropped Packets by Class'),
- droppedPackets,
- classLabels,
- chartColors
- ));
- }
-
- // Process ingress leaf qdiscs
- if (data.ingress_leaf_qdiscs && data.ingress_leaf_qdiscs.length > 0) {
- var ingressRows = [];
-
- // Process all qdiscs first and collect data
- var classData = {};
-
- data.ingress_leaf_qdiscs.forEach(function(qdisc) {
- if (!qdisc.parent) return;
-
- var classId = qdisc.parent;
- var classDesc = '';
- var sortOrder = 999; // Default high value for unknown classes
-
- // Determine class description based on ID and skip those that don't match
- if (classId.includes('1:11')) {
- classDesc = _('High Priority (Realtime)');
- sortOrder = 5;
- }
- else if (classId.includes('1:12')) {
- classDesc = _('Fast Non-Realtime');
- sortOrder = 4;
- }
- else if (classId.includes('1:13')) {
- classDesc = _('Normal');
- sortOrder = 3;
- }
- else if (classId.includes('1:14')) {
- classDesc = _('Low Priority');
- sortOrder = 2;
- }
- else if (classId.includes('1:15')) {
- classDesc = _('Bulk');
- sortOrder = 1;
- }
- else return; // Skip this qdisc if it doesn't match any of the expected classes
-
- classData[classId] = {
- classId: classId,
- classDesc: classDesc,
- sortOrder: sortOrder,
- bytes: qdisc.bytes || 0,
- packets: qdisc.packets || 0,
- drops: qdisc.drops || 0,
- overlimits: qdisc.overlimits || 0
- };
- });
-
- // Convert to array and sort based on sortOrder
- var sortedClassData = Object.values(classData).sort(function(a, b) {
- return a.sortOrder - b.sortOrder;
- });
-
- // Create rows from sorted data
- sortedClassData.forEach(function(item) {
- ingressRows.push([
- item.classId,
- item.classDesc,
- formatSize(item.bytes),
- item.packets,
- item.drops,
- item.overlimits
- ]);
- });
-
- // Create table for HFSC ingress classes
- result.tables.push(self.createStatsTable(
- _('HFSC Ingress Class Statistics'),
- [_('Class ID'), _('Description'), _('Bytes'), _('Packets'), _('Drops'), _('Overlimits')],
- ingressRows
- ));
-
- // Create charts for HFSC ingress classes
- var classLabels = sortedClassData.map(function(item) { return item.classDesc; });
- var sentBytes = sortedClassData.map(function(item) {
- return parseSizeToBytes(formatSize(item.bytes));
- });
- var sentPackets = sortedClassData.map(function(item) { return item.packets; });
- var droppedPackets = sortedClassData.map(function(item) { return item.drops; });
-
- result.charts.push(self.createChart(
- 'hfsc-ingress-bytes',
- _('Ingress Bytes Sent by Class'),
- sentBytes,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'hfsc-ingress-packets',
- _('Ingress Packets Sent by Class'),
- sentPackets,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'hfsc-ingress-dropped',
- _('Ingress Dropped Packets by Class'),
- droppedPackets,
- classLabels,
- chartColors
- ));
- }
-
- return result;
- },
-
- // Process Hybrid statistics (HFSC + CAKE)
- processHybridStats: function(data) {
- if (!data || (!data.egress_leaf_qdiscs && !data.ingress_leaf_qdiscs)) {
- return { tables: [], charts: [] };
- }
-
- var result = { tables: [], charts: [] };
- var self = this;
-
- // Process egress hybrid statistics
- if (data.egress_leaf_qdiscs && data.egress_leaf_qdiscs.length > 0) {
- var egressRows = [];
-
- // Process all qdiscs first and collect data (hybrid only has 1:11, 1:13, 1:15)
- var classData = {};
-
- data.egress_leaf_qdiscs.forEach(function(qdisc) {
- if (!qdisc.parent) return;
-
- var classId = qdisc.parent;
- var classDesc = '';
- var queueType = '';
- var sortOrder = 999;
-
- // Hybrid class mapping based on setup_hybrid() function
- if (classId.includes('1:11')) {
- classDesc = _('Realtime Gaming');
- queueType = data.gameqdisc || 'pfifo';
- sortOrder = 3;
- }
- else if (classId.includes('1:13')) {
- classDesc = _('Default (CAKE)');
- queueType = 'cake';
- sortOrder = 2;
- }
- else if (classId.includes('1:15')) {
- classDesc = _('Bulk');
- queueType = 'fq_codel';
- sortOrder = 1;
- }
- else return; // Skip unknown classes
-
- classData[classId] = {
- classId: classId,
- classDesc: classDesc,
- queueType: queueType,
- sortOrder: sortOrder,
- bytes: qdisc.bytes || 0,
- packets: qdisc.packets || 0,
- drops: qdisc.drops || 0,
- overlimits: qdisc.overlimits || 0
- };
- });
-
- // Convert to array and sort
- var sortedClassData = Object.values(classData).sort(function(a, b) {
- return b.sortOrder - a.sortOrder; // Higher priority first
- });
-
- // Create rows from sorted data
- sortedClassData.forEach(function(item) {
- egressRows.push([
- item.classId,
- item.classDesc,
- item.queueType,
- formatSize(item.bytes),
- item.packets,
- item.drops,
- item.overlimits
- ]);
- });
-
- // Create table for Hybrid egress classes
- result.tables.push(self.createStatsTable(
- _('Hybrid Egress Class Statistics'),
- [_('Class ID'), _('Description'), _('Queue Type'), _('Bytes'), _('Packets'), _('Drops'), _('Overlimits')],
- egressRows
- ));
-
- // Create charts
- var classLabels = sortedClassData.map(function(item) { return item.classDesc; });
- var sentBytes = sortedClassData.map(function(item) {
- return parseSizeToBytes(formatSize(item.bytes));
- });
- var sentPackets = sortedClassData.map(function(item) { return item.packets; });
- var droppedPackets = sortedClassData.map(function(item) { return item.drops; });
-
- result.charts.push(self.createChart(
- 'hybrid-egress-bytes',
- _('Egress Bytes Sent by Class'),
- sentBytes,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'hybrid-egress-packets',
- _('Egress Packets Sent by Class'),
- sentPackets,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'hybrid-egress-dropped',
- _('Egress Dropped Packets by Class'),
- droppedPackets,
- classLabels,
- chartColors
- ));
- }
-
- // Process ingress hybrid statistics
- if (data.ingress_leaf_qdiscs && data.ingress_leaf_qdiscs.length > 0) {
- var ingressRows = [];
-
- var classData = {};
-
- data.ingress_leaf_qdiscs.forEach(function(qdisc) {
- if (!qdisc.parent) return;
-
- var classId = qdisc.parent;
- var classDesc = '';
- var queueType = '';
- var sortOrder = 999;
-
- // Hybrid class mapping
- if (classId.includes('1:11')) {
- classDesc = _('Realtime Gaming');
- queueType = data.gameqdisc || 'pfifo';
- sortOrder = 3;
- }
- else if (classId.includes('1:13')) {
- classDesc = _('Default (CAKE)');
- queueType = 'cake';
- sortOrder = 2;
- }
- else if (classId.includes('1:15')) {
- classDesc = _('Bulk');
- queueType = 'fq_codel';
- sortOrder = 1;
- }
- else return;
-
- classData[classId] = {
- classId: classId,
- classDesc: classDesc,
- queueType: queueType,
- sortOrder: sortOrder,
- bytes: qdisc.bytes || 0,
- packets: qdisc.packets || 0,
- drops: qdisc.drops || 0,
- overlimits: qdisc.overlimits || 0
- };
- });
-
- var sortedClassData = Object.values(classData).sort(function(a, b) {
- return b.sortOrder - a.sortOrder;
- });
-
- sortedClassData.forEach(function(item) {
- ingressRows.push([
- item.classId,
- item.classDesc,
- item.queueType,
- formatSize(item.bytes),
- item.packets,
- item.drops,
- item.overlimits
- ]);
- });
-
- result.tables.push(self.createStatsTable(
- _('Hybrid Ingress Class Statistics'),
- [_('Class ID'), _('Description'), _('Queue Type'), _('Bytes'), _('Packets'), _('Drops'), _('Overlimits')],
- ingressRows
- ));
-
- var classLabels = sortedClassData.map(function(item) { return item.classDesc; });
- var sentBytes = sortedClassData.map(function(item) {
- return parseSizeToBytes(formatSize(item.bytes));
- });
- var sentPackets = sortedClassData.map(function(item) { return item.packets; });
- var droppedPackets = sortedClassData.map(function(item) { return item.drops; });
-
- result.charts.push(self.createChart(
- 'hybrid-ingress-bytes',
- _('Ingress Bytes Sent by Class'),
- sentBytes,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'hybrid-ingress-packets',
- _('Ingress Packets Sent by Class'),
- sentPackets,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'hybrid-ingress-dropped',
- _('Ingress Dropped Packets by Class'),
- droppedPackets,
- classLabels,
- chartColors
- ));
- }
-
- // Add CAKE details for the 1:13 class if available
- if (data.hybrid_cake_egress && Object.keys(data.hybrid_cake_egress).length > 0) {
- var cakeEgressData = data.hybrid_cake_egress;
- if (cakeEgressData.tins && cakeEgressData.tins.length > 0) {
- var cakeEgressRows = [];
- cakeEgressData.tins.forEach(function(tin, index) {
- cakeEgressRows.push([
- 'Tin ' + index,
- bytesToKbits(tin.threshold_rate) + ' Kbit/s',
- formatTime(tin.target_us),
- formatTime(tin.interval_us),
- formatTime(tin.peak_delay_us),
- formatTime(tin.avg_delay_us),
- formatTime(tin.base_delay_us),
- formatSize(tin.sent_bytes),
- tin.sent_packets,
- tin.drops,
- tin.ecn_mark
- ]);
- });
-
- result.tables.push(self.createStatsTable(
- _('CAKE Statistics for Default Class (Egress)'),
- [_('Tin'), _('Threshold'), _('Target'), _('Interval'), _('Peak Delay'), _('Avg Delay'), _('Sparse Delay'), _('Bytes'), _('Packets'), _('Dropped'), _('ECN Marked')],
- cakeEgressRows
- ));
- }
- }
-
- if (data.hybrid_cake_ingress && Object.keys(data.hybrid_cake_ingress).length > 0) {
- var cakeIngressData = data.hybrid_cake_ingress;
- if (cakeIngressData.tins && cakeIngressData.tins.length > 0) {
- var cakeIngressRows = [];
- cakeIngressData.tins.forEach(function(tin, index) {
- cakeIngressRows.push([
- 'Tin ' + index,
- bytesToKbits(tin.threshold_rate) + ' Kbit/s',
- formatTime(tin.target_us),
- formatTime(tin.interval_us),
- formatTime(tin.peak_delay_us),
- formatTime(tin.avg_delay_us),
- formatTime(tin.base_delay_us),
- formatSize(tin.sent_bytes),
- tin.sent_packets,
- tin.drops,
- tin.ecn_mark
- ]);
- });
-
- result.tables.push(self.createStatsTable(
- _('CAKE Statistics for Default Class (Ingress)'),
- [_('Tin'), _('Threshold'), _('Target'), _('Interval'), _('Peak Delay'), _('Avg Delay'), _('Sparse Delay'), _('Bytes'), _('Packets'), _('Dropped'), _('ECN Marked')],
- cakeIngressRows
- ));
- }
- }
-
- return result;
- },
-
- // Process HTB statistics
- processHtbStats: function(data) {
- if (!data || (!data.egress_leaf_qdiscs && !data.ingress_leaf_qdiscs)) {
- return { tables: [], charts: [] };
- }
-
- var result = { tables: [], charts: [] };
- var self = this;
-
- // Process egress HTB statistics
- if (data.egress_leaf_qdiscs && data.egress_leaf_qdiscs.length > 0) {
- var egressRows = [];
-
- // Process all qdiscs first and collect data
- var classData = {};
-
- data.egress_leaf_qdiscs.forEach(function(qdisc) {
- if (!qdisc.parent) return;
-
- var classId = qdisc.parent;
- var classDesc = '';
- var sortOrder = 999; // Default high value for unknown classes
-
- // Determine class description based on ID and skip those that don't match
- if (classId.includes('1:11')) {
- classDesc = _('Priority');
- sortOrder = 3;
- }
- else if (classId.includes('1:13')) {
- classDesc = _('Best Effort');
- sortOrder = 2;
- }
- else if (classId.includes('1:15')) {
- classDesc = _('Background');
- sortOrder = 1;
- }
- else return; // Skip this qdisc if it doesn't match any of the expected classes
-
- classData[classId] = {
- classId: classId,
- classDesc: classDesc,
- sortOrder: sortOrder,
- bytes: qdisc.bytes || 0,
- packets: qdisc.packets || 0,
- drops: qdisc.drops || 0,
- overlimits: qdisc.overlimits || 0
- };
- });
-
- // Convert to array and sort based on sortOrder
- var sortedClassData = Object.values(classData).sort(function(a, b) {
- return b.sortOrder - a.sortOrder; // Higher priority first
- });
-
- // Create rows from sorted data
- sortedClassData.forEach(function(item) {
- egressRows.push([
- item.classId,
- item.classDesc,
- formatSize(item.bytes),
- item.packets,
- item.drops,
- item.overlimits
- ]);
- });
-
- // Create table for HTB egress classes
- result.tables.push(self.createStatsTable(
- _('HTB Egress Class Statistics'),
- [_('Class ID'), _('Description'), _('Bytes'), _('Packets'), _('Drops'), _('Overlimits')],
- egressRows
- ));
-
- // Create charts for HTB egress classes
- var classLabels = sortedClassData.map(function(item) { return item.classDesc; });
- var sentBytes = sortedClassData.map(function(item) {
- return parseSizeToBytes(formatSize(item.bytes));
- });
- var sentPackets = sortedClassData.map(function(item) { return item.packets; });
- var droppedPackets = sortedClassData.map(function(item) { return item.drops; });
-
- result.charts.push(self.createChart(
- 'htb-egress-bytes',
- _('Egress Bytes Sent by Class'),
- sentBytes,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'htb-egress-packets',
- _('Egress Packets Sent by Class'),
- sentPackets,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'htb-egress-dropped',
- _('Egress Dropped Packets by Class'),
- droppedPackets,
- classLabels,
- chartColors
- ));
- }
-
- // Process ingress HTB statistics
- if (data.ingress_leaf_qdiscs && data.ingress_leaf_qdiscs.length > 0) {
- var ingressRows = [];
-
- var classData = {};
-
- data.ingress_leaf_qdiscs.forEach(function(qdisc) {
- if (!qdisc.parent) return;
-
- var classId = qdisc.parent;
- var classDesc = '';
- var sortOrder = 999;
-
- if (classId.includes('1:11')) {
- classDesc = _('Priority');
- sortOrder = 3;
- }
- else if (classId.includes('1:13')) {
- classDesc = _('Best Effort');
- sortOrder = 2;
- }
- else if (classId.includes('1:15')) {
- classDesc = _('Background');
- sortOrder = 1;
- }
- else return;
-
- classData[classId] = {
- classId: classId,
- classDesc: classDesc,
- sortOrder: sortOrder,
- bytes: qdisc.bytes || 0,
- packets: qdisc.packets || 0,
- drops: qdisc.drops || 0,
- overlimits: qdisc.overlimits || 0
- };
- });
-
- var sortedClassData = Object.values(classData).sort(function(a, b) {
- return b.sortOrder - a.sortOrder;
- });
-
- sortedClassData.forEach(function(item) {
- ingressRows.push([
- item.classId,
- item.classDesc,
- formatSize(item.bytes),
- item.packets,
- item.drops,
- item.overlimits
- ]);
- });
-
- result.tables.push(self.createStatsTable(
- _('HTB Ingress Class Statistics'),
- [_('Class ID'), _('Description'), _('Bytes'), _('Packets'), _('Drops'), _('Overlimits')],
- ingressRows
- ));
-
- var classLabels = sortedClassData.map(function(item) { return item.classDesc; });
- var sentBytes = sortedClassData.map(function(item) {
- return parseSizeToBytes(formatSize(item.bytes));
- });
- var sentPackets = sortedClassData.map(function(item) { return item.packets; });
- var droppedPackets = sortedClassData.map(function(item) { return item.drops; });
-
- result.charts.push(self.createChart(
- 'htb-ingress-bytes',
- _('Ingress Bytes Sent by Class'),
- sentBytes,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'htb-ingress-packets',
- _('Ingress Packets Sent by Class'),
- sentPackets,
- classLabels,
- chartColors
- ));
-
- result.charts.push(self.createChart(
- 'htb-ingress-dropped',
- _('Ingress Dropped Packets by Class'),
- droppedPackets,
- classLabels,
- chartColors
- ));
- }
-
- return result;
- },
-
- render: function(data) {
- var view = this;
- var qosStats = data[0];
- var historicalStats = data[1];
- var rrdData = data[2];
- var autorateStats = data[3];
-
- view.lastData = qosStats;
- if (autorateStats && autorateStats.autorate_enabled) view.autorateData = autorateStats;
-
- // Create a separate container for settings to prevent it from being refreshed
- var mainContainer;
- var existingContainer = document.querySelector('.cbi-map-statistics');
- var existingSettings = document.querySelector('.qosmate-settings-section');
-
- if (!existingContainer) {
- // First time render, create the full layout
- mainContainer = E('div', { 'class': 'cbi-map cbi-map-statistics' });
-
- // Create settings section that will remain stable across refreshes
- var settingsSection = E('div', { 'class': 'cbi-section qosmate-settings-section', 'style': 'margin-bottom: 5px;' });
-
- // Create header for settings
- var settingsHeader = E('h3', {}, _('QoSmate Settings'));
- settingsSection.appendChild(settingsHeader);
-
- // Create completely custom styling independent of themes
- var refreshRow = E('div', { 'style': 'margin-top: 0.5em; margin-left: 0.25em;' });
-
- // Directly inline elements without any theme classes
- refreshRow.appendChild(E('span', {}, _('Refresh Interval')));
- refreshRow.appendChild(document.createTextNode(' '));
-
- // Clean select with no special styling
- var pollSelect = E('select', {
- 'id': 'poll-interval',
- 'change': function(ev) {
- var newInterval = parseInt(ev.target.value, 10);
-
- if (view.pollHandler) {
- poll.remove(view.pollHandler);
- }
-
- view.pollInterval = newInterval;
- view.pollHandler = view.createPollFunction();
- poll.add(view.pollHandler, view.pollInterval);
- }
- });
-
- [2, 5, 10, 15, 30, 60].forEach(function(seconds) {
- var option = E('option', { 'value': seconds }, seconds + ' ' + _('seconds'));
- if (parseInt(view.pollInterval, 10) === seconds) {
- option.selected = true;
- }
- pollSelect.appendChild(option);
- });
-
- refreshRow.appendChild(pollSelect);
- settingsSection.appendChild(refreshRow);
-
- mainContainer.appendChild(settingsSection);
-
- // Create content container that will be refreshed
- var contentContainer = E('div', { 'class': 'qosmate-content-container' });
- mainContainer.appendChild(contentContainer);
-
- // Create persistent autorate container (survives poll rebuilds)
- var autorateContainer = E('div', { 'class': 'qosmate-autorate-container', 'style': 'display: none;' });
-
- // Status panel
- autorateContainer.appendChild(E('div', { 'class': 'cbi-section autorate-status-panel', 'style': 'margin-bottom: 5px;' }));
-
- // Time range selector
- var timeRangeRow = E('div', { 'style': 'margin: 0.5em 0 0.8em 0.25em;' });
- timeRangeRow.appendChild(E('span', {}, _('Time Range') + ' '));
- var flashEnabled = uci.get('qosmate', 'autorate', 'flash_history') === '1';
- var rangeSelect = E('select', {
- 'class': 'autorate-time-range',
- 'disabled': !flashEnabled ? '' : null,
- 'change': function(ev) {
- view.autorateTimeRange = ev.target.value;
- if (view.autorateData) view.updateAutorateUI(view.autorateData);
- }
- });
- [['60m', '60 ' + _('minutes')]].concat(flashEnabled ? [
- ['6h', '6 ' + _('hours')], ['24h', '24 ' + _('hours')],
- ['7d', '7 ' + _('days')], ['30d', '30 ' + _('days')]
- ] : []).forEach(function(opt) {
- var o = E('option', { 'value': opt[0] }, opt[1]);
- if (opt[0] === view.autorateTimeRange) o.selected = true;
- rangeSelect.appendChild(o);
- });
- timeRangeRow.appendChild(rangeSelect);
-
- // Flash history toggle
- var flashCb = E('input', {
- 'type': 'checkbox',
- 'id': 'autorate-flash-history',
- 'checked': flashEnabled ? '' : null,
- 'style': 'position: relative; top: -0.15rem; margin-right: 4px;',
- 'change': function(ev) {
- var enabled = ev.target.checked;
- var val = enabled ? '1' : '0';
- // Apply UCI change immediately (same pattern as connections.js)
- uci.load('qosmate').then(function() {
- uci.set('qosmate', 'autorate', 'flash_history', val);
- return uci.save();
- }).then(function() {
- return uci.apply();
- }).then(function() {
- uci.unload('qosmate');
- return uci.load('qosmate');
- });
- // Update dropdown immediately without waiting for apply
- var sel = document.querySelector('.autorate-time-range');
- if (sel) {
- view.autorateTimeRange = '60m';
- sel.value = '60m';
- while (sel.options.length > 1) sel.remove(1);
- if (enabled) {
- [['6h', '6 ' + _('hours')], ['24h', '24 ' + _('hours')],
- ['7d', '7 ' + _('days')], ['30d', '30 ' + _('days')]].forEach(function(opt) {
- sel.appendChild(E('option', { 'value': opt[0] }, opt[1]));
- });
- sel.disabled = false;
- } else {
- sel.disabled = true;
- }
- }
- }
- });
- var flashLabel = E('label', {
- 'for': 'autorate-flash-history',
- 'style': 'margin-left: 1.5em; font-size: 12px; cursor: pointer;'
- }, [ flashCb, ' ' + _('Enable long-term history') ]);
- timeRangeRow.appendChild(flashLabel);
-
- autorateContainer.appendChild(timeRangeRow);
-
- // Data availability info hint (hidden by default)
- autorateContainer.appendChild(E('div', {
- 'class': 'autorate-data-info',
- 'style': 'display: none; margin: 0 0.25em 0.5em; padding: 0.4em 0.6em; font-size: 12px; color: #888; font-style: italic;'
- }));
-
- // Chart sections
- var chartSection = E('div', { 'class': 'cbi-section', 'style': 'padding: 5px 0;' });
-
- var latencyWrap = E('div', { 'style': 'margin-bottom: 15px;' });
- latencyWrap.appendChild(E('h3', { 'style': 'margin-bottom: 0.3em;' }, _('Latency')));
- latencyWrap.appendChild(E('div', { 'class': 'autorate-latency-legend', 'style': 'margin-bottom: 0.4em; font-size: 11px;' }));
- latencyWrap.appendChild(E('canvas', { 'class': 'autorate-latency-canvas', 'style': 'width: 100%; height: 220px; display: block;' }));
- chartSection.appendChild(latencyWrap);
-
- var ulWrap = E('div', { 'style': 'margin-bottom: 15px;' });
- ulWrap.appendChild(E('h3', { 'style': 'margin-bottom: 0.3em;' }, _('Upload Bandwidth')));
- ulWrap.appendChild(E('div', { 'class': 'autorate-ul-legend', 'style': 'margin-bottom: 0.4em; font-size: 11px;' }));
- ulWrap.appendChild(E('canvas', { 'class': 'autorate-ul-canvas', 'style': 'width: 100%; height: 220px; display: block;' }));
- chartSection.appendChild(ulWrap);
-
- var dlWrap = E('div', { 'style': 'margin-bottom: 15px;' });
- dlWrap.appendChild(E('h3', { 'style': 'margin-bottom: 0.3em;' }, _('Download Bandwidth')));
- dlWrap.appendChild(E('div', { 'class': 'autorate-dl-legend', 'style': 'margin-bottom: 0.4em; font-size: 11px;' }));
- dlWrap.appendChild(E('canvas', { 'class': 'autorate-dl-canvas', 'style': 'width: 100%; height: 220px; display: block;' }));
- chartSection.appendChild(dlWrap);
-
- autorateContainer.appendChild(chartSection);
- mainContainer.appendChild(autorateContainer);
-
- // Setup initial polling using LuCI poll API
- if (!view.pollHandler) {
- view.pollHandler = view.createPollFunction();
- poll.add(view.pollHandler, view.pollInterval);
- }
- } else {
- // Re-use the existing container during subsequent renders
- mainContainer = existingContainer;
- }
-
- return mainContainer;
- },
-
- // New method to update only the content part of the page
- updateContent: function(data) {
- var view = this;
- var qosStats = data[0];
- var historicalStats = data[1];
- var rrdData = data[2];
- var autorateStats = data[3];
-
- // Update autorate charts (persistent container, not rebuilt)
- var autorateEnabled = autorateStats && autorateStats.autorate_enabled;
- if (autorateEnabled) {
- view.autorateData = autorateStats;
- view.updateAutorateUI(autorateStats);
- } else {
- // Hide autorate container if autorate was disabled
- var arContainer = document.querySelector('.qosmate-autorate-container');
- if (arContainer) arContainer.style.display = 'none';
- }
-
- // Save the active tab index before refreshing content
- var activeTab = document.querySelector('.cbi-tab.cbi-tab-active');
- if (activeTab) {
- view.activeTabIndex = parseInt(activeTab.getAttribute('data-tab-index') || 0, 10);
- }
-
- // Get the content container
- var contentContainer = document.querySelector('.qosmate-content-container');
- if (!contentContainer) return;
-
- // Clear the current content
- dom.content(contentContainer, '');
-
- // Add general info section
- if (qosStats) {
- // Create a standard section
- var generalInfo = E('div', { 'class': 'cbi-section', 'style': 'margin-bottom: 5px;' });
-
- // Create header for general info
- var headerSection = E('h3', { 'style': 'margin-bottom: 0.5em;' }, _('General Information'));
- generalInfo.appendChild(headerSection);
-
- // Create completely custom container for info using flexbox for horizontal layout
- var infoContainer = E('div', { 'style': 'display: flex; flex-wrap: wrap; margin-left: 0.25em;' });
-
- // Create simple layout items that will display horizontally
- if (qosStats.root_qdisc) {
- var row = E('div', { 'style': 'margin-right: 1.5em; margin-bottom: 0.3em;' });
- row.appendChild(E('span', { 'style': 'font-weight: bold;' }, _('Root Queueing Discipline:')));
- row.appendChild(document.createTextNode(' '));
- row.appendChild(E('span', {}, qosStats.root_qdisc || '-'));
- infoContainer.appendChild(row);
- }
-
- if (qosStats.wan_interface) {
- var row = E('div', { 'style': 'margin-right: 1.5em; margin-bottom: 0.3em;' });
- row.appendChild(E('span', { 'style': 'font-weight: bold;' }, _('WAN Interface:')));
- row.appendChild(document.createTextNode(' '));
- row.appendChild(E('span', {}, qosStats.wan_interface || '-'));
- infoContainer.appendChild(row);
- }
-
- // A rate of 0 disables that direction, so one of the tabs stays empty on purpose
- var statsUpRate = parseInt(uci.get('qosmate', 'settings', 'UPRATE') || '0');
- var statsDownRate = parseInt(uci.get('qosmate', 'settings', 'DOWNRATE') || '0');
- if (statsUpRate === 0 || statsDownRate === 0) {
- var dirText = statsUpRate === 0 && statsDownRate === 0
- ? _('disabled in both directions (both rates are 0)')
- : (statsDownRate === 0 ? _('egress only (DOWNRATE=0, no ingress statistics)')
- : _('ingress only (UPRATE=0, no egress statistics)'));
- var row = E('div', { 'style': 'margin-right: 1.5em; margin-bottom: 0.3em; color: orange;' });
- row.appendChild(E('span', { 'style': 'font-weight: bold;' }, _('Shaping:')));
- row.appendChild(document.createTextNode(' '));
- row.appendChild(E('span', {}, dirText));
- infoContainer.appendChild(row);
- }
-
- // Add CAKE-specific or HFSC-specific info
- if (qosStats.root_qdisc === 'cake') {
- if (qosStats.priority_queue_ingress) {
- var row = E('div', { 'style': 'margin-right: 1.5em; margin-bottom: 0.3em;' });
- row.appendChild(E('span', { 'style': 'font-weight: bold;' }, _('Priority Queue Type (Ingress):')));
- row.appendChild(document.createTextNode(' '));
- row.appendChild(E('span', {}, qosStats.priority_queue_ingress || '-'));
- infoContainer.appendChild(row);
- }
-
- if (qosStats.priority_queue_egress) {
- var row = E('div', { 'style': 'margin-right: 1.5em; margin-bottom: 0.3em;' });
- row.appendChild(E('span', { 'style': 'font-weight: bold;' }, _('Priority Queue Type (Egress):')));
- row.appendChild(document.createTextNode(' '));
- row.appendChild(E('span', {}, qosStats.priority_queue_egress || '-'));
- infoContainer.appendChild(row);
- }
- } else if (qosStats.root_qdisc === 'hfsc' || qosStats.root_qdisc === 'hybrid') {
- if (qosStats.gameqdisc) {
- var row = E('div', { 'style': 'margin-right: 1.5em; margin-bottom: 0.3em;' });
- row.appendChild(E('span', { 'style': 'font-weight: bold;' }, _('Game Queue Discipline:')));
- row.appendChild(document.createTextNode(' '));
- row.appendChild(E('span', {}, qosStats.gameqdisc || '-'));
- infoContainer.appendChild(row);
- }
- }
-
- generalInfo.appendChild(infoContainer);
- contentContainer.appendChild(generalInfo);
-
- // Create tabbed interface
- var tabsContainer = E('div', { 'class': 'cbi-section', 'style': 'padding: 0; margin-bottom: 5px;' });
- var tabNames = [_('Egress (Upload)'), _('Ingress (Download)')];
- var autorateTabIndex = -1;
- if (autorateEnabled) {
- autorateTabIndex = tabNames.length;
- tabNames.push(_('Autorate'));
- }
- // Reset to first tab if saved index is out of range (e.g. autorate was disabled)
- if (view.activeTabIndex >= tabNames.length) view.activeTabIndex = 0;
- var tabContents = [
- E('div', { 'style': 'padding: 5px 0;' }),
- E('div', { 'style': 'padding: 5px 0; display: none;' })
- ];
-
- // Reference to persistent autorate container
- var autorateContainer = document.querySelector('.qosmate-autorate-container');
-
- // Add tab buttons container
- var tabButtons = E('ul', { 'class': 'cbi-tabmenu', 'style': 'margin-left: 0; padding-left: 1px;' });
-
- tabNames.forEach(function(name, index) {
- var isActive = index === view.activeTabIndex;
- var button = E('li', { 'class': isActive ? 'cbi-tab' : 'cbi-tab-disabled' }, [
- E('a', {
- 'href': '#',
- 'data-tab-index': index,
- 'click': function(ev) {
- ev.preventDefault();
-
- // Store the active tab index
- view.activeTabIndex = parseInt(ev.target.getAttribute('data-tab-index') || ev.target.parentNode.getAttribute('data-tab-index'));
-
- // Update tab button styles
- tabButtons.querySelectorAll('li').forEach(function(tab, i) {
- if (i === view.activeTabIndex) {
- tab.className = 'cbi-tab';
- } else {
- tab.className = 'cbi-tab-disabled';
- }
- });
-
- // Show corresponding tab content and hide others
- var isAutorate = autorateTabIndex >= 0 && view.activeTabIndex === autorateTabIndex;
- tabContents.forEach(function(content, i) {
- content.style.display = (!isAutorate && i === view.activeTabIndex) ? 'block' : 'none';
- });
- if (autorateContainer) {
- autorateContainer.style.display = isAutorate ? 'block' : 'none';
- if (isAutorate && view.autorateData) view.updateAutorateUI(view.autorateData);
- }
- }
- }, name)
- ]);
-
- tabButtons.appendChild(button);
- });
-
- // Set initial display state based on the active tab index
- var isAutorateActive = autorateTabIndex >= 0 && view.activeTabIndex === autorateTabIndex;
- tabContents.forEach(function(content, i) {
- content.style.display = (!isAutorateActive && i === view.activeTabIndex) ? 'block' : 'none';
- });
- if (autorateContainer) {
- autorateContainer.style.display = isAutorateActive ? 'block' : 'none';
- }
-
- tabsContainer.appendChild(tabButtons);
-
- // Process and display statistics based on root qdisc
- if (qosStats.root_qdisc === 'cake') {
- var cakeResults = this.processCakeStats(qosStats);
-
- // Process and display tables in appropriate tabs
- if (cakeResults.tables.length > 0) {
- // Find correct indices for egress and ingress tables
- var egressTable = null;
- var ingressTable = null;
-
- // Find the egress and ingress tables by looking at their titles
- for (var i = 0; i < cakeResults.tables.length; i++) {
- var titleElement = cakeResults.tables[i].querySelector('h3, .table-title');
- if (titleElement) {
- var title = titleElement.textContent || titleElement.innerText;
- if (isEgressHeading(title)) {
- egressTable = cakeResults.tables[i];
- } else if (isIngressHeading(title)) {
- ingressTable = cakeResults.tables[i];
- }
- }
- }
-
- // Egress table section
- if (egressTable) {
- tabContents[0].appendChild(egressTable);
- }
-
- // Ingress table section
- if (ingressTable) {
- tabContents[1].appendChild(ingressTable);
- }
-
- // Process charts
- if (cakeResults.charts.length > 0) {
- var egressCharts = [];
- var ingressCharts = [];
-
- // Categorize charts as egress or ingress based on their titles
- for (var i = 0; i < cakeResults.charts.length; i++) {
- var chartTitle = cakeResults.charts[i].querySelector('h3');
- var titleText = chartTitle ? (chartTitle.textContent || chartTitle.innerText) : '';
-
- if (isEgressHeading(titleText)) {
- egressCharts.push(cakeResults.charts[i]);
- } else if (isIngressHeading(titleText)) {
- ingressCharts.push(cakeResults.charts[i]);
- }
- }
-
- // Create egress charts section
- if (egressCharts.length > 0) {
- var egressChartsContainer = E('div', { 'class': 'cbi-section-node' });
- var egressGrid = E('div', {
- 'style': 'display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;'
- });
-
- egressCharts.forEach(function(chart) {
- egressGrid.appendChild(chart);
- });
-
- egressChartsContainer.appendChild(egressGrid);
- tabContents[0].appendChild(egressChartsContainer);
- }
-
- // Create ingress charts section
- if (ingressCharts.length > 0) {
- var ingressChartsContainer = E('div', { 'class': 'cbi-section-node' });
- var ingressGrid = E('div', {
- 'style': 'display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;'
- });
-
- ingressCharts.forEach(function(chart) {
- ingressGrid.appendChild(chart);
- });
-
- ingressChartsContainer.appendChild(ingressGrid);
- tabContents[1].appendChild(ingressChartsContainer);
- }
- }
- }
- } else if (qosStats.root_qdisc === 'hfsc') {
- var hfscResults = this.processHfscStats(qosStats);
-
- // Process and display tables in appropriate tabs
- if (hfscResults.tables.length > 0) {
- // Find correct indices for egress and ingress tables
- var egressTable = null;
- var ingressTable = null;
-
- // Find the egress and ingress tables by looking at their titles
- for (var i = 0; i < hfscResults.tables.length; i++) {
- var titleElement = hfscResults.tables[i].querySelector('h3, .table-title');
- if (titleElement) {
- var title = titleElement.textContent || titleElement.innerText;
- if (isEgressHeading(title)) {
- egressTable = hfscResults.tables[i];
- } else if (isIngressHeading(title)) {
- ingressTable = hfscResults.tables[i];
- }
- }
- }
-
- // Egress table section
- if (egressTable) {
- tabContents[0].appendChild(egressTable);
- }
-
- // Ingress table section
- if (ingressTable) {
- tabContents[1].appendChild(ingressTable);
- }
-
- // Process charts
- if (hfscResults.charts.length > 0) {
- var egressCharts = [];
- var ingressCharts = [];
-
- // Categorize charts as egress or ingress based on their titles
- for (var i = 0; i < hfscResults.charts.length; i++) {
- var chartTitle = hfscResults.charts[i].querySelector('h3');
- var titleText = chartTitle ? (chartTitle.textContent || chartTitle.innerText) : '';
-
- if (isEgressHeading(titleText)) {
- egressCharts.push(hfscResults.charts[i]);
- } else if (isIngressHeading(titleText)) {
- ingressCharts.push(hfscResults.charts[i]);
- }
- }
-
- // Create egress charts section
- if (egressCharts.length > 0) {
- var egressChartsContainer = E('div', { 'class': 'cbi-section-node' });
- var egressGrid = E('div', {
- 'style': 'display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;'
- });
-
- egressCharts.forEach(function(chart) {
- egressGrid.appendChild(chart);
- });
-
- egressChartsContainer.appendChild(egressGrid);
- tabContents[0].appendChild(egressChartsContainer);
- }
-
- // Create ingress charts section
- if (ingressCharts.length > 0) {
- var ingressChartsContainer = E('div', { 'class': 'cbi-section-node' });
- var ingressGrid = E('div', {
- 'style': 'display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;'
- });
-
- ingressCharts.forEach(function(chart) {
- ingressGrid.appendChild(chart);
- });
-
- ingressChartsContainer.appendChild(ingressGrid);
- tabContents[1].appendChild(ingressChartsContainer);
- }
- }
- }
- } else if (qosStats.root_qdisc === 'hybrid') {
- var hybridResults = this.processHybridStats(qosStats);
-
- // Process and display tables in appropriate tabs
- if (hybridResults.tables.length > 0) {
- // Separate tables by type
- var egressClassTable = null;
- var ingressClassTable = null;
- var cakeEgressTable = null;
- var cakeIngressTable = null;
-
- // Categorize tables by their titles
- for (var i = 0; i < hybridResults.tables.length; i++) {
- var titleElement = hybridResults.tables[i].querySelector('h3, .table-title');
- if (titleElement) {
- var title = titleElement.textContent || titleElement.innerText;
- if (title === _('Hybrid Egress Class Statistics')) {
- egressClassTable = hybridResults.tables[i];
- } else if (title === _('Hybrid Ingress Class Statistics')) {
- ingressClassTable = hybridResults.tables[i];
- } else if (title === _('CAKE Statistics for Default Class (Egress)')) {
- cakeEgressTable = hybridResults.tables[i];
- } else if (title === _('CAKE Statistics for Default Class (Ingress)')) {
- cakeIngressTable = hybridResults.tables[i];
- }
- }
- }
-
- // Add tables to appropriate tabs
- if (egressClassTable) {
- tabContents[0].appendChild(egressClassTable);
- }
- if (cakeEgressTable) {
- tabContents[0].appendChild(cakeEgressTable);
- }
-
- if (ingressClassTable) {
- tabContents[1].appendChild(ingressClassTable);
- }
- if (cakeIngressTable) {
- tabContents[1].appendChild(cakeIngressTable);
- }
-
- // Process charts
- if (hybridResults.charts.length > 0) {
- var egressCharts = [];
- var ingressCharts = [];
-
- // Categorize charts as egress or ingress based on their titles
- for (var i = 0; i < hybridResults.charts.length; i++) {
- var chartTitle = hybridResults.charts[i].querySelector('h3');
- var titleText = chartTitle ? (chartTitle.textContent || chartTitle.innerText) : '';
-
- if (isEgressHeading(titleText)) {
- egressCharts.push(hybridResults.charts[i]);
- } else if (isIngressHeading(titleText)) {
- ingressCharts.push(hybridResults.charts[i]);
- }
- }
-
- // Create egress charts section
- if (egressCharts.length > 0) {
- var egressChartsContainer = E('div', { 'class': 'cbi-section-node' });
- var egressGrid = E('div', {
- 'style': 'display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;'
- });
-
- egressCharts.forEach(function(chart) {
- egressGrid.appendChild(chart);
- });
-
- egressChartsContainer.appendChild(egressGrid);
- tabContents[0].appendChild(egressChartsContainer);
- }
-
- // Create ingress charts section
- if (ingressCharts.length > 0) {
- var ingressChartsContainer = E('div', { 'class': 'cbi-section-node' });
- var ingressGrid = E('div', {
- 'style': 'display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;'
- });
-
- ingressCharts.forEach(function(chart) {
- ingressGrid.appendChild(chart);
- });
-
- ingressChartsContainer.appendChild(ingressGrid);
- tabContents[1].appendChild(ingressChartsContainer);
- }
- }
- }
- } else if (qosStats.root_qdisc === 'htb') {
- var htbResults = this.processHtbStats(qosStats);
-
- // Process and display tables in appropriate tabs
- if (htbResults.tables.length > 0) {
- // Separate tables by type
- var egressClassTable = null;
- var ingressClassTable = null;
-
- // Categorize tables by their titles
- for (var i = 0; i < htbResults.tables.length; i++) {
- var titleElement = htbResults.tables[i].querySelector('h3, .table-title');
- if (titleElement) {
- var title = titleElement.textContent || titleElement.innerText;
- if (title === _('HTB Egress Class Statistics')) {
- egressClassTable = htbResults.tables[i];
- } else if (title === _('HTB Ingress Class Statistics')) {
- ingressClassTable = htbResults.tables[i];
- }
- }
- }
-
- // Add tables to appropriate tabs
- if (egressClassTable) {
- tabContents[0].appendChild(egressClassTable);
- }
- if (ingressClassTable) {
- tabContents[1].appendChild(ingressClassTable);
- }
-
- // Process charts
- if (htbResults.charts.length > 0) {
- var egressCharts = [];
- var ingressCharts = [];
-
- // Categorize charts as egress or ingress based on their titles
- for (var i = 0; i < htbResults.charts.length; i++) {
- var chartTitle = htbResults.charts[i].querySelector('h3');
- var titleText = chartTitle ? (chartTitle.textContent || chartTitle.innerText) : '';
-
- if (isEgressHeading(titleText)) {
- egressCharts.push(htbResults.charts[i]);
- } else if (isIngressHeading(titleText)) {
- ingressCharts.push(htbResults.charts[i]);
- }
- }
-
- // Create egress charts section
- if (egressCharts.length > 0) {
- var egressChartsContainer = E('div', { 'class': 'cbi-section-node' });
- var egressGrid = E('div', {
- 'style': 'display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;'
- });
-
- egressCharts.forEach(function(chart) {
- egressGrid.appendChild(chart);
- });
-
- egressChartsContainer.appendChild(egressGrid);
- tabContents[0].appendChild(egressChartsContainer);
- }
-
- // Create ingress charts section
- if (ingressCharts.length > 0) {
- var ingressChartsContainer = E('div', { 'class': 'cbi-section-node' });
- var ingressGrid = E('div', {
- 'style': 'display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;'
- });
-
- ingressCharts.forEach(function(chart) {
- ingressGrid.appendChild(chart);
- });
-
- ingressChartsContainer.appendChild(ingressGrid);
- tabContents[1].appendChild(ingressChartsContainer);
- }
- }
- }
- }
-
- // Append tab contents to container
- tabContents.forEach(function(content) {
- tabsContainer.appendChild(content);
- });
-
- contentContainer.appendChild(tabsContainer);
- } else {
- contentContainer.appendChild(E('div', { 'class': 'cbi-section' }, [
- E('p', {}, _('No QoS statistics available. Make sure QoSmate is running.'))
- ]));
- }
- },
-
- // Build a DOM legend element from items array [{label, color, dashed}]
- buildChartLegend: function(container, items) {
- dom.content(container, '');
- items.forEach(function(item, i) {
- if (i > 0) container.appendChild(document.createTextNode(' '));
- var lineStyle = 'display: inline-block; width: 18px; height: 0; vertical-align: middle;'
- + ' border-top: 2px ' + (item.dashed ? 'dashed' : 'solid') + ' ' + item.color + ';'
- + ' margin-right: 4px;';
- container.appendChild(E('span', { 'style': 'white-space: nowrap; margin-right: 12px;' }, [
- E('span', { 'style': lineStyle }),
- E('span', {}, item.label)
- ]));
- });
- },
-
- // Update autorate status panel and charts with current data
- updateAutorateUI: function(ar) {
- var cur = ar.current || {};
- var cfg = ar.config || {};
- var range = this.autorateTimeRange || '60m';
-
- // Choose data source: RAM (60m) or flash (longer ranges)
- // RAM format: [ts, ul, dl, a_ul, a_dl, lat, bl, ulp, dlp] (9 fields)
- // Flash format: [ts, avg_ul, avg_dl, avg_a_ul, avg_a_dl, avg_lat, max_lat, avg_bl, avg_ulp, avg_dlp] (10 fields)
- var isFlash = range !== '60m';
- var rangeSec = { '60m': 3600, '6h': 21600, '24h': 86400, '7d': 604800, '30d': 2592000 };
- var maxAge = rangeSec[range] || 3600;
- var rawHistory = isFlash ? (ar.flash_history || []) : (ar.history || []);
-
- // For flash views, replace overlapping flash data with full-resolution RAM data
- // This gives the full 60min of RAM detail and avoids visual artifacts at the boundary
- if (isFlash && ar.history && ar.history.length > 0) {
- var oldestRamTs = ar.history[0][0];
- // Keep only flash entries older than the RAM window
- rawHistory = rawHistory.filter(function(h) { return h[0] < oldestRamTs; });
- // Bridge: extend last flash value to RAM start for seamless visual transition
- if (rawHistory.length > 0) {
- var last = rawHistory[rawHistory.length - 1];
- // Use a timestamp just before RAM start to avoid duplicate-x artifacts
- var bridgeTs = oldestRamTs > last[0] ? (oldestRamTs - 1) : oldestRamTs;
- rawHistory.push([bridgeTs, last[1], last[2], last[3], last[4],
- last[5], last[6], last[7], last[8], last[9]]);
- }
- // Convert RAM [ts,ul,dl,a_ul,a_dl,lat,bl,ulp,dlp] to flash format
- // by duplicating lat as max_lat: [ts,ul,dl,a_ul,a_dl,lat,lat,bl,ulp,dlp]
- rawHistory = rawHistory.concat(ar.history.map(function(h) {
- return [h[0], h[1], h[2], h[3], h[4], h[5], h[5], h[6], h[7], h[8]];
- }));
- }
-
- // Ensure chronological order and collapse duplicate timestamps.
- // Duplicate timestamps can produce crossing/looping visual artifacts in canvas line rendering.
- if (rawHistory.length > 1) {
- rawHistory.sort(function(a, b) { return (+a[0]) - (+b[0]); });
- var normalized = [rawHistory[0]];
- for (var ri = 1; ri < rawHistory.length; ri++) {
- var prev = normalized[normalized.length - 1];
- var curH = rawHistory[ri];
- if ((+prev[0]) === (+curH[0])) normalized[normalized.length - 1] = curH;
- else normalized.push(curH);
- }
- rawHistory = normalized;
- }
-
- // Filter data by requested time range
- if (rawHistory.length > 0) {
- var latestTs = rawHistory[rawHistory.length - 1][0];
- var cutoff = latestTs - maxAge;
- rawHistory = rawHistory.filter(function(h) { return h[0] >= cutoff; });
- }
-
- // Show info hint for long-range aggregation and incomplete history
- var infoEl = document.querySelector('.autorate-data-info');
- if (infoEl) {
- var rangeNote = '';
- var availabilityNote = '';
-
- if (isFlash) {
- rangeNote = _('For ranges above 60 minutes, recent data (last 60 min) is high-resolution, while older points are aggregated and less precise. "Latency (max)" highlights spikes that average latency may hide.');
- }
-
- if (isFlash && rawHistory.length < 2) {
- availabilityNote = _('No hourly history available yet. Data is consolidated once per hour.');
- } else if (isFlash && rawHistory.length > 0) {
- var dataSpanHours = Math.round((rawHistory[rawHistory.length - 1][0] - rawHistory[0][0]) / 3600);
- var requestedHours = Math.round(maxAge / 3600);
- if (dataSpanHours < requestedHours * 0.9) {
- availabilityNote = _('Showing %s of data (requested %s). History grows over time.')
- .format(dataSpanHours <= 24 ? dataSpanHours + 'h' : Math.round(dataSpanHours / 24) + 'd',
- requestedHours <= 24 ? requestedHours + 'h' : Math.round(requestedHours / 24) + 'd');
- }
- }
-
- if (availabilityNote && rangeNote)
- infoEl.textContent = availabilityNote + ' ' + rangeNote;
- else
- infoEl.textContent = availabilityNote || rangeNote;
-
- if (infoEl.textContent)
- infoEl.style.display = '';
- else
- infoEl.style.display = 'none';
- }
-
- // Update status panel
- var panel = document.querySelector('.autorate-status-panel');
- if (panel) {
- var latMs = (cur.latency / 10).toFixed(1);
- var blMs = (cur.baseline / 10).toFixed(1);
- var ulMbps = (cur.ul_rate / 1000).toFixed(1);
- var dlMbps = (cur.dl_rate / 1000).toFixed(1);
- var baseUlMbps = (cfg.base_ul / 1000).toFixed(1);
- var baseDlMbps = (cfg.base_dl / 1000).toFixed(1);
-
- dom.content(panel, [
- E('h3', { 'style': 'margin-bottom: 0.5em;' }, _('Autorate Status')),
- E('div', { 'style': 'display: flex; flex-wrap: wrap; gap: 1.5em; margin-left: 0.25em;' }, [
- E('div', {}, [
- E('span', { 'style': 'font-weight: bold;' }, _('Latency: ')),
- E('span', {}, latMs + ' ms'),
- E('span', { 'style': 'color: #888;' }, ' (' + _('Baseline') + ': ' + blMs + ' ms)')
- ]),
- E('div', {}, [
- E('span', { 'style': 'font-weight: bold;' }, _('Upload: ')),
- E('span', {}, ulMbps + ' / ' + baseUlMbps + ' Mbit/s'),
- E('span', { 'style': 'color: #888;' }, ' (' + (cur.ul_load_pct || 0) + '% ' + _('load') + ')')
- ]),
- E('div', {}, [
- E('span', { 'style': 'font-weight: bold;' }, _('Download: ')),
- E('span', {}, dlMbps + ' / ' + baseDlMbps + ' Mbit/s'),
- E('span', { 'style': 'color: #888;' }, ' (' + (cur.dl_load_pct || 0) + '% ' + _('load') + ')')
- ])
- ])
- ]);
- }
-
- if (rawHistory.length < 2) return;
-
- // Extract time-series from history
- // RAM: [ts, ul, dl, a_ul, a_dl, lat, bl, ulp, dlp]
- // Flash: [ts, avg_ul, avg_dl, avg_a_ul, avg_a_dl, avg_lat, max_lat, avg_bl, avg_ulp, avg_dlp]
- var latData = [], maxLatData = [], blData = [];
- var ulRateData = [], ulAchData = [], dlRateData = [], dlAchData = [];
-
- for (var i = 0; i < rawHistory.length; i++) {
- var h = rawHistory[i];
- var t = h[0];
- if (isFlash) {
- latData.push([t, h[5] / 10]); // avg latency
- maxLatData.push([t, h[6] / 10]); // max latency (spikes)
- blData.push([t, h[7] / 10]); // baseline at index 7 in flash
- ulRateData.push([t, h[1]]);
- ulAchData.push([t, h[3]]);
- dlRateData.push([t, h[2]]);
- dlAchData.push([t, h[4]]);
- } else {
- latData.push([t, h[5] / 10]); // tenths ms -> ms
- blData.push([t, h[6] / 10]);
- ulRateData.push([t, h[1]]);
- ulAchData.push([t, h[3]]);
- dlRateData.push([t, h[2]]);
- dlAchData.push([t, h[4]]);
- }
- }
-
- var decThrMs = cfg.decrease_threshold / 10;
- var incThrMs = cfg.increase_threshold / 10;
- var lastBl = blData.length > 0 ? blData[blData.length - 1][1] : 0;
-
- // Latency legend items (add max latency entry for flash data)
- var latLegendItems = [
- { label: _('Latency'), color: '#2196F3' },
- { label: _('Baseline'), color: '#4CAF50', dashed: true },
- { label: _('Dec. Threshold'), color: '#F44336', dashed: true },
- { label: _('Inc. Threshold'), color: '#FF9800', dashed: true }
- ];
- if (isFlash) latLegendItems.splice(1, 0, { label: _('Latency (max)'), color: 'rgba(244, 67, 54, 0.5)' });
- // Bandwidth legend items (shared for UL and DL)
- var bwLegendItems = [
- { label: _('Rate Limit'), color: '#2196F3' },
- { label: _('Throughput'), color: '#4CAF50' },
- { label: _('Base Rate'), color: '#9E9E9E', dashed: true },
- { label: _('Max'), color: '#F44336', dashed: true },
- { label: _('Min'), color: '#FF9800', dashed: true }
- ];
-
- // Populate DOM legends
- var latLegend = document.querySelector('.autorate-latency-legend');
- if (latLegend) this.buildChartLegend(latLegend, latLegendItems);
- var ulLegend = document.querySelector('.autorate-ul-legend');
- if (ulLegend) this.buildChartLegend(ulLegend, bwLegendItems);
- var dlLegend = document.querySelector('.autorate-dl-legend');
- if (dlLegend) this.buildChartLegend(dlLegend, bwLegendItems);
-
- // Draw latency chart (include max_lat spike series for flash data)
- var latCanvas = document.querySelector('.autorate-latency-canvas');
- if (latCanvas && latCanvas.clientWidth > 0) {
- var latSeries = [
- { data: latData, color: '#2196F3', width: 1.5 },
- { data: blData, color: '#4CAF50', dashed: true, width: 1 }
- ];
- if (isFlash && maxLatData.length > 0)
- latSeries.splice(0, 0, { data: maxLatData, color: 'rgba(244, 67, 54, 0.5)', width: 1, fill: 'rgba(244, 67, 54, 0.08)' });
- TimeSeriesChart.draw(latCanvas, {
- series: latSeries,
- hLines: [
- { value: lastBl + decThrMs, color: '#F44336', dashed: true, width: 1 },
- { value: lastBl + incThrMs, color: '#FF9800', dashed: true, width: 1 }
- ],
- yFmt: function(v) { return v.toFixed(1) + ' ms'; }
- });
- }
-
- // Draw upload bandwidth chart
- var ulCanvas = document.querySelector('.autorate-ul-canvas');
- if (ulCanvas && ulCanvas.clientWidth > 0) {
- TimeSeriesChart.draw(ulCanvas, {
- series: [
- { data: ulAchData, color: '#4CAF50', fill: 'rgba(76, 175, 80, 0.15)', width: 1 },
- { data: ulRateData, color: '#2196F3', width: 2 }
- ],
- hLines: [
- { value: cfg.base_ul, color: '#9E9E9E', dashed: true, width: 1 },
- { value: cfg.max_ul, color: '#F44336', dashed: true, width: 0.5 },
- { value: cfg.min_ul, color: '#FF9800', dashed: true, width: 0.5 }
- ],
- yFmt: function(v) { return v >= 1000 ? (v / 1000).toFixed(1) + ' Mbit/s' : v + ' kbit/s'; }
- });
- }
-
- // Draw download bandwidth chart
- var dlCanvas = document.querySelector('.autorate-dl-canvas');
- if (dlCanvas && dlCanvas.clientWidth > 0) {
- TimeSeriesChart.draw(dlCanvas, {
- series: [
- { data: dlAchData, color: '#4CAF50', fill: 'rgba(76, 175, 80, 0.15)', width: 1 },
- { data: dlRateData, color: '#2196F3', width: 2 }
- ],
- hLines: [
- { value: cfg.base_dl, color: '#9E9E9E', dashed: true, width: 1 },
- { value: cfg.max_dl, color: '#F44336', dashed: true, width: 0.5 },
- { value: cfg.min_dl, color: '#FF9800', dashed: true, width: 0.5 }
- ],
- yFmt: function(v) { return v >= 1000 ? (v / 1000).toFixed(1) + ' Mbit/s' : v + ' kbit/s'; }
- });
- }
- },
-
- handleSaveApply: null,
- handleSave: null,
- handleReset: null
-});
diff --git a/luci-app-qosmate/po/README.md b/luci-app-qosmate/po/README.md
deleted file mode 100644
index 103f680e5..000000000
--- a/luci-app-qosmate/po/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# QoSmate Translations
-
-This directory contains translations for the QoSmate LuCI application.
-
-## Contributing Translations
-
-1. Copy templates/qosmate.pot to xx.po (where xx is your language code)
-2. Translate the strings in your xx.po file
-3. Submit a pull request
-
-## Available Languages
-- English (default)
-- German (de.po) (test)
-
-## Creating/Updating Translations
-Use these commands to update translations:
-
-```bash
-# Update .pot template
-./scripts/i18n-scan.pl htdocs > po/templates/qosmate.pot
-
-# Update existing .po files
-./scripts/i18n-update.pl po/templates/qosmate.pot po/*.po
diff --git a/luci-app-qosmate/po/de.po b/luci-app-qosmate/po/de.po
deleted file mode 100644
index 5b4ca77a8..000000000
--- a/luci-app-qosmate/po/de.po
+++ /dev/null
@@ -1,21 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: QoSmate\n"
-"PO-Revision-Date: 2024-01-09\n"
-"Last-Translator: Your Name\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: htdocs/luci-static/resources/view/qosmate/settings.js:25
-msgid "QoSmate Settings"
-msgstr "QoSmate Einstellungen"
-
-#: htdocs/luci-static/resources/view/qosmate/settings.js:26
-msgid "Configure QoSmate settings."
-msgstr "Konfigurieren Sie die QoSmate-Einstellungen."
-
-#: htdocs/luci-static/resources/view/qosmate/hfsc.js:15
-msgid "HFSC Settings"
-msgstr "HFSC-Einstellungen"
diff --git a/luci-app-qosmate/po/templates/qosmate.pot b/luci-app-qosmate/po/templates/qosmate.pot
deleted file mode 100644
index 61b3765b4..000000000
--- a/luci-app-qosmate/po/templates/qosmate.pot
+++ /dev/null
@@ -1,14 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: htdocs/luci-static/resources/view/qosmate/settings.js:25
-msgid "QoSmate Settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/qosmate/settings.js:26
-msgid "Configure QoSmate settings."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/qosmate/hfsc.js:15
-msgid "HFSC Settings"
-msgstr ""
diff --git a/luci-app-qosmate/po/zh-cn b/luci-app-qosmate/po/zh-cn
deleted file mode 120000
index 8d69574dd..000000000
--- a/luci-app-qosmate/po/zh-cn
+++ /dev/null
@@ -1 +0,0 @@
-zh_Hans
\ No newline at end of file
diff --git a/luci-app-qosmate/po/zh_Hans/qosmate.po b/luci-app-qosmate/po/zh_Hans/qosmate.po
deleted file mode 100644
index 8934c84bb..000000000
--- a/luci-app-qosmate/po/zh_Hans/qosmate.po
+++ /dev/null
@@ -1,1860 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-
-msgid "Settings"
-msgstr "设置"
-
-msgid "Basic Settings"
-msgstr "基础设置"
-
-msgid "HFSC"
-msgstr "HFSC"
-
-msgid "CAKE"
-msgstr "CAKE"
-
-msgid "Advanced"
-msgstr "高级设置"
-
-msgid "Rules"
-msgstr "规则"
-
-msgid "Custom Rules"
-msgstr "自定义规则"
-
-msgid "Connections"
-msgstr "连接"
-
-msgid "QoSmate Settings"
-msgstr "QoSmate 设置"
-
-msgid "Configure QoSmate settings."
-msgstr "配置 QoSmate 设置。"
-
-msgid "Service Status"
-msgstr "服务状态"
-
-msgid "Running"
-msgstr "运行中"
-
-msgid "Stopped"
-msgstr "已停止"
-
-msgid "Service Control"
-msgstr "服务控制"
-
-msgid "Start"
-msgstr "启动"
-
-msgid "Restart"
-msgstr "重启"
-
-msgid "Stop"
-msgstr "停止"
-
-msgid "Auto Setup"
-msgstr "自动设置"
-
-msgid "Start Auto Setup"
-msgstr "开始自动设置"
-
-msgid "This will run a speed test and configure QoSmate automatically."
-msgstr "这将运行速度测试并自动配置 QoSmate。"
-
-msgid "Gaming Device IP (optional)"
-msgstr "游戏设备 IP（可选）"
-
-msgid "Invalid speed test results. Please try again or set values manually."
-msgstr "无效的速度测试结果。请重试或手动设置值。"
-
-msgid "QoSmate settings updated and service restarted."
-msgstr "QoSmate 设置已更新，服务已重启。"
-
-msgid "Failed to start QoSmate"
-msgstr "启动 QoSmate 失败"
-
-msgid "Failed to restart QoSmate"
-msgstr "重启 QoSmate 失败"
-
-msgid "QoSmate stopped"
-msgstr "QoSmate 已停止"
-
-msgid "QoSmate started"
-msgstr "QoSmate 已启用"
-
-msgid "Failed to stop QoSmate"
-msgstr "停止 QoSmate 失败"
-
-msgid "Version Information"
-msgstr "版本信息"
-
-msgid "Unable to fetch"
-msgstr "获取失败"
-
-msgid "Current Version"
-msgstr "当前版本"
-
-msgid "Latest Version"
-msgstr "最新版本"
-
-msgid "A new version is available!"
-msgstr "有新版本可用！"
-
-msgid "QoSmate is up to date."
-msgstr "QoSmate 已是最新"
-
-msgid "Unable to check for updates."
-msgstr "检查更新失败"
-
-msgid "Enable"
-msgstr "启用"
-
-msgid "Enable or disable qosmate"
-msgstr "启用或禁用 QoSmate"
-
-msgid "WAN Interface"
-msgstr "WAN 接口"
-
-msgid "Select the WAN interface"
-msgstr "选择 WAN 接口"
-
-msgid "Download Rate (kbps)"
-msgstr "下载速度 (kbps)"
-
-msgid "Set the download rate in kbps"
-msgstr "设置下载速率（kbps）"
-
-msgid "Upload Rate (kbps)"
-msgstr "上传速度 (kbps)"
-
-msgid "Set the upload rate in kbps"
-msgstr "设置上传速率（kbps）"
-
-msgid "Root Queueing Discipline"
-msgstr "根队列管理策略"
-
-msgid "Select the root queueing discipline"
-msgstr "选择根队列管理策略"
-
-msgid "Please set non-zero values manually."
-msgstr "请手动设置非零值。"
-
-msgid "QoSmate HFSC Settings"
-msgstr "QoSmate HFSC 设置"
-
-msgid "Configure HFSC settings for QoSmate."
-msgstr "配置 QoSmate 的 HFSC 设置。"
-
-msgid "HFSC Settings"
-msgstr "HFSC 设置"
-
-msgid "Link Type"
-msgstr "链路类型"
-
-msgid "Select the link type"
-msgstr "选择链路类型"
-
-msgid "Overhead"
-msgstr "开销"
-
-msgid "Set the overhead"
-msgstr "设置开销"
-
-msgid "Default: 44"
-msgstr "默认值: 44"
-
-msgid "Game Queue Discipline"
-msgstr "游戏队列机制"
-
-msgid "Queueing method for traffic classified as realtime"
-msgstr "分类为实时流量的队列方法"
-
-msgid "Game Upload (kbps)"
-msgstr "游戏上传速率（kbps）"
-
-msgid "Bandwidth reserved for realtime upload traffic"
-msgstr "为实时上传流量保留的带宽"
-
-msgid "Default: 15% of UPRATE + 400"
-msgstr "默认值: 上传速度的 15% + 400"
-
-msgid "Default: 15% of DOWNRATE + 400"
-msgstr "默认值: 下载速度的 15% + 400"
-
-msgid "Game Download (kbps)"
-msgstr "游戏下载速率（kbps）"
-
-msgid "Bandwidth reserved for realtime download traffic"
-msgstr "为实时下载流量保留的带宽"
-
-msgid "Non-Game Queue Discipline"
-msgstr "非游戏队列机制"
-
-msgid "Select the queueing discipline for non-realtime traffic"
-msgstr "为非实时流量选择队列机制"
-
-msgid "Non-Game QDisc Options"
-msgstr "非游戏队列选项"
-
-msgid "Cake options for non-realtime queueing discipline"
-msgstr "非实时队列机制的 Cake 选项"
-
-msgid "Default: besteffort ack-filter"
-msgstr "默认值: besteffort ack-filter"
-
-msgid "Max Delay (ms)"
-msgstr "最大延迟（毫秒）"
-
-msgid "Target max delay for realtime packets after burst (pfifo, bfifo, red)"
-msgstr "突发后实时数据包的目标最大延迟 (pfifo, bfifo, red)"
-
-msgid "PFIFO Min"
-msgstr "PFIFO 最小值"
-
-msgid "Minimum packet count for PFIFO queue"
-msgstr "PFIFO 队列的最小数据包数"
-
-msgid "Avg Packet Size (B)"
-msgstr "平均数据包大小（字节）"
-
-msgid "Used with PFIFOMIN to calculate PFIFO limit"
-msgstr "与 PFIFOMIN 一起使用以计算 PFIFO 限制"
-
-msgid "NETEM Delay (ms)"
-msgstr "NETEM 延迟（毫秒）"
-
-msgid "NETEM delay in milliseconds"
-msgstr "NETEM 的延迟，以毫秒为单位"
-
-msgid "NETEM Jitter (ms)"
-msgstr "NETEM 抖动（毫秒）"
-
-msgid "NETEM jitter in milliseconds"
-msgstr "NETEM 的抖动，以毫秒为单位"
-
-msgid "NETEM Distribution"
-msgstr "NETEM 分布"
-
-msgid "NETEM delay distribution"
-msgstr "NETEM 延迟分布"
-
-msgid "Packet Loss Percentage"
-msgstr "数据包丢失百分比"
-
-msgid "Percentage of packet loss"
-msgstr "数据包丢失百分比"
-
-msgid "Failed to save settings or update QoSmate service:"
-msgstr "保存设置或更新 QoSmate 服务失败："
-
-msgid "QoSmate CAKE Settings"
-msgstr "QoSmate CAKE 设置"
-
-msgid "Configure CAKE settings for QoSmate."
-msgstr "配置 QoSmate 的 CAKE 设置。"
-
-msgid "CAKE Settings"
-msgstr "CAKE 设置"
-
-msgid "Common Link Presets"
-msgstr "常见链路预设"
-
-msgid "Select common link presets"
-msgstr "选择常见链路预设"
-
-msgid "Raw (No overhead compensation)"
-msgstr "原始（无开销补偿）"
-
-msgid "Conservative (48 bytes overhead + ATM)"
-msgstr "保守（48 字节开销 + ATM）"
-
-msgid "Ethernet"
-msgstr "以太网"
-
-msgid "DOCSIS cable"
-msgstr "DOCSIS 电缆"
-
-msgid "PPPoA VC-Mux"
-msgstr "PPPoA VC-Mux"
-
-msgid "PPPoA LLC"
-msgstr "PPPoA LLC"
-
-msgid "PPPoE VC-Mux"
-msgstr "PPPoE VC-Mux"
-
-msgid "PPPoE LLC-SNAP"
-msgstr "PPPoE LLC-SNAP"
-
-msgid "Bridged VC-Mux"
-msgstr "桥接 VC-Mux"
-
-msgid "Bridged LLC-SNAP"
-msgstr "桥接 LLC-SNAP"
-
-msgid "IPoA VC-Mux"
-msgstr "IPoA VC-Mux"
-
-msgid "IPoA LLC-SNAP"
-msgstr "IPoA LLC-SNAP"
-
-msgid "PPPoE PTM"
-msgstr "PPPoE PTM"
-
-msgid "Bridged PTM"
-msgstr "桥接 PTM"
-
-msgid "Default: based on preset"
-msgstr "默认值: 基于预设"
-
-msgid "MPU"
-msgstr "MPU"
-
-msgid "Minimum packet size CAKE will account for"
-msgstr "CAKE 将考虑的最小数据包大小"
-
-msgid "Link Compensation"
-msgstr "链路补偿"
-
-msgid "Set the link compensation"
-msgstr "设置链路补偿"
-
-msgid "Ether VLAN Keyword"
-msgstr "Ether VLAN 关键字"
-
-msgid "Set the Ether VLAN keyword"
-msgstr "设置 Ether VLAN 关键字"
-
-msgid "Priority Queue (Ingress)"
-msgstr "优先级队列（入口）"
-
-msgid "Sets CAKE's diffserv mode for incoming traffic"
-msgstr "为入站流量设置 CAKE 的 diffserv 模式"
-
-msgid "Diffserv 3-tier priority"
-msgstr "Diffserv 3 级优先级"
-
-msgid "Diffserv 4-tier priority"
-msgstr "Diffserv 4 级优先级"
-
-msgid "Diffserv 8-tier priority"
-msgstr "Diffserv 8 级优先级"
-
-msgid "Priority Queue (Egress)"
-msgstr "优先级队列（出口）"
-
-msgid "Sets CAKE's diffserv mode for outgoing traffic"
-msgstr "为出站流量设置 CAKE 的 diffserv 模式"
-
-msgid "Host Isolation"
-msgstr "主机隔离"
-
-msgid "Applies fairness first by host, then by flow(dual-srchost/dual-dsthost)"
-msgstr "首先按主机，然后按流量应用公平性 (dual-srchost/dual-dsthost)"
-
-msgid "NAT (Ingress)"
-msgstr "NAT（入口）"
-
-msgid "Enable NAT lookup for ingress"
-msgstr "为入站启用 NAT 查找"
-
-msgid "NAT (Egress)"
-msgstr "NAT（出口）"
-
-msgid "Enable NAT lookup for egress"
-msgstr "为出站启用 NAT 查找"
-
-msgid "ACK Filter (Egress)"
-msgstr "ACK 过滤器（出口）"
-
-msgid "Set ACK filter for egress. Auto enables filtering if download/upload ratio ≥ 15."
-msgstr "为出口设置 ACK 过滤器。如果下载/上传比率≥15，将自动启用过滤。"
-
-msgid "Auto"
-msgstr "自动"
-
-msgid "Disable"
-msgstr "禁用"
-
-msgid "RTT"
-msgstr "RTT"
-
-msgid "Default: auto"
-msgstr "默认值：自动"
-
-msgid "Set the Round Trip Time"
-msgstr "设置往返时间"
-
-msgid "Autorate (Ingress)"
-msgstr "自动速率（入口）"
-
-msgid "Enable autorate for ingress"
-msgstr "为入站启用自动速率"
-
-msgid "Extra Parameters (Ingress)"
-msgstr "额外参数（入口）"
-
-msgid "Set extra parameters for ingress"
-msgstr "设置入站的额外参数"
-
-msgid "Extra Parameters (Egress)"
-msgstr "额外参数（出口）"
-
-msgid "Set extra parameters for egress"
-msgstr "设置出站的额外参数"
-
-msgid "QoSmate Advanced Settings"
-msgstr "QoSmate 高级设置"
-
-msgid "Configure advanced settings for QoSmate."
-msgstr "配置 QoSmate 的高级设置。"
-
-msgid "Advanced Settings"
-msgstr "高级设置"
-
-msgid "Preserve Config Files"
-msgstr "保留配置文件"
-
-msgid "Preserve configuration files during system upgrade"
-msgstr "系统升级时保留配置文件"
-
-msgid "Wash DSCP Egress"
-msgstr "清除 DSCP（出口）"
-
-msgid "Sets DSCP to CS0 for outgoing packets after classification"
-msgstr "分类后将出口数据包的 DSCP 设置为 CS0"
-
-msgid "Wash DSCP Ingress"
-msgstr "清除 DSCP（入口）"
-
-msgid "Sets DSCP to CS0 for incoming packets before classification"
-msgstr "分类前将入口数据包的 DSCP 设置为 CS0"
-
-msgid "Bandwidth Max Ratio"
-msgstr "带宽最大比例"
-
-msgid "Max download/upload ratio to prevent upstream congestion"
-msgstr "最大下载/上传比例，以防止上游拥塞"
-
-msgid "Default: 20"
-msgstr "默认值：20"
-
-msgid "ACK Rate"
-msgstr "ACK 速率"
-
-msgid "Sets rate limit for TCP ACKs, helps prevent ACK flooding / set to 0 to disable ACK rate limit"
-msgstr "设置 TCP ACK 的速率限制，帮助防止 ACK 泛洪 / 设为 0 以禁用 ACK 速率限制"
-
-msgid "Default: 5% of UPRATE"
-msgstr "默认值：上传速率的 5%"
-
-msgid "Enable UDP Rate Limit"
-msgstr "启用 UDP 速率限制"
-
-msgid "Downgrades UDP traffic exceeding 450 pps to lower priority"
-msgstr "将超过 450 pps 的 UDP 流量降级为低优先级"
-
-msgid "Boost Low-Volume TCP Traffic"
-msgstr "提升小流量 TCP 流量"
-
-msgid "Upgrade DSCP to AF42 for TCP connections with less than 150 packets per second. This can improve responsiveness for interactive TCP services like SSH, web browsing, and instant messaging."
-msgstr "将每秒小于 150 个数据包的 TCP 连接的 DSCP 升级到 AF42。这样可以提高 SSH、网页浏览和即时消息等交互式 TCP 服务的响应速度。"
-
-msgid "UDP Bulk Ports"
-msgstr "UDP 批量端口"
-
-msgid "Specify UDP ports for bulk traffic"
-msgstr "指定用于批量流量的 UDP 端口"
-
-msgid "Default: none"
-msgstr "默认值：无"
-
-msgid "TCP Bulk Ports"
-msgstr "TCP 批量端口"
-
-msgid "Specify TCP ports for bulk traffic"
-msgstr "指定用于批量流量的 TCP 端口"
-
-msgid "TCP MSS"
-msgstr "TCP MSS"
-
-msgid "Nftables Hook"
-msgstr "Nftables 钩子"
-
-msgid "Select the nftables hook point for the dscptag chain"
-msgstr "为 dscptag 链选择 nftables 钩子点"
-
-msgid "Nftables Priority"
-msgstr "Nftables 优先级"
-
-msgid "Set the priority for the nftables chain. Lower values are processed earlier. Default is 0 | mangle is -150."
-msgstr "为 nftables 链选择优先级。数值越低，处理优先级越高。默认为0，mangle表为 -150。"
-
-msgid "Maximum Segment Size for TCP connections. This setting is only active when the upload or download bandwidth is less than 3000 kbit/s. Leave empty to use the default value."
-msgstr "TCP 连接的最大段大小。此设置仅在上传或下载带宽小于 3000 kbit/s 时生效。留空将使用默认值。"
-
-msgid "Default: 536"
-msgstr "默认值：536"
-
-msgid "QoSmate Rules"
-msgstr "QoSmate 规则"
-
-msgid "Configure QoS rules for marking packets with DSCP values."
-msgstr "配置 QoS 规则以标记具有 DSCP 值的数据包。"
-
-msgid "General Settings"
-msgstr "常规设置"
-
-msgid "DSCP Mapping"
-msgstr "DSCP 映射"
-
-msgid "HFSC Mapping:"
-msgstr "HFSC 映射："
-
-msgid "High Priority [Realtime] (1:11)"
-msgstr "高优先级 [实时] (1:11)"
-
-msgid "EF, CS5, CS6, CS7"
-msgstr "EF, CS5, CS6, CS7"
-
-msgid "Fast Non-Realtime (1:12)"
-msgstr "快速非实时 (1:12)"
-
-msgid "CS4, AF41, AF42"
-msgstr "CS4, AF41, AF42"
-
-msgid "Normal (1:13)"
-msgstr "普通 (1:13)"
-
-msgid "CS0"
-msgstr "CS0"
-
-msgid "Low Priority (1:14)"
-msgstr "低优先级 (1:14)"
-
-msgid "CS2"
-msgstr "CS2"
-
-msgid "Bulk (1:15)"
-msgstr "批量 (1:15)"
-
-msgid "CS1"
-msgstr "CS1"
-
-msgid "CAKE Mapping (diffserv4):"
-msgstr "CAKE 映射 (diffserv4)："
-
-msgid "Voice (Highest Priority)"
-msgstr "语音 (最高优先级)"
-
-msgid "CS7, CS6, EF, VA, CS5, CS4"
-msgstr "CS7, CS6, EF, VA, CS5, CS4"
-
-msgid "Video"
-msgstr "视频"
-
-msgid "CS3, AF4x, AF3x, CS2, TOS1"
-msgstr "CS3, AF4x, AF3x, CS2, TOS1"
-
-msgid "Best Effort"
-msgstr "最佳努力"
-
-msgid "CS0, AF1x, AF2x, TOS0"
-msgstr "CS0, AF1x, AF2x, TOS0"
-
-msgid "Bulk (Lowest Priority)"
-msgstr "批量 (最低优先级)"
-
-msgid "CS1, LE"
-msgstr "CS1, LE"
-
-msgid "Name"
-msgstr "名称"
-
-msgid "Protocol"
-msgstr "协议"
-
-msgid "TCP"
-msgstr "TCP"
-
-msgid "UDP"
-msgstr "UDP"
-
-msgid "ICMP"
-msgstr "ICMP"
-
-msgid "Any"
-msgstr "任意"
-
-msgid "Source IP"
-msgstr "源 IP"
-
-msgid "any"
-msgstr "任意"
-
-msgid "Invalid IP address or hostname"
-msgstr "无效的 IP 地址或主机名"
-
-msgid "Source port"
-msgstr "源端口"
-
-msgid "Invalid port or port range"
-msgstr "无效的端口或端口范围"
-
-msgid "Destination IP"
-msgstr "目的 IP"
-
-msgid "Destination port"
-msgstr "目的端口"
-
-msgid "DSCP Class"
-msgstr "DSCP 类别"
-
-msgid "EF - Expedited Forwarding (46)"
-msgstr "EF - 加速转发 (46)"
-
-msgid "CS5 (40)"
-msgstr "CS5 (40)"
-
-msgid "CS6 (48)"
-msgstr "CS6 (48)"
-
-msgid "CS7 (56)"
-msgstr "CS7 (56)"
-
-msgid "CS4 (32)"
-msgstr "CS4 (32)"
-
-msgid "AF41 (34)"
-msgstr "AF41 (34)"
-
-msgid "AF42 (36)"
-msgstr "AF42 (36)"
-
-msgid "CS2 (16)"
-msgstr "CS2 (16)"
-
-msgid "CS1 (8)"
-msgstr "CS1 (8)"
-
-msgid "CS0 - Best Effort (0)"
-msgstr "CS0 - 最佳努力 (0)"
-
-msgid "Enable counter"
-msgstr "启用计数器"
-
-msgid "Custom rules have been saved and applied."
-msgstr "自定义规则已保存并应用。"
-
-msgid "QoSmate Custom Rules"
-msgstr "QoSmate 自定义规则"
-
-msgid "Define custom nftables rules for advanced traffic control."
-msgstr "定义用于高级流量控制的自定义 nftables 规则。"
-
-msgid "Erase Rules"
-msgstr "清除规则"
-
-msgid "Erase Custom Rules"
-msgstr "清除自定义规则"
-
-msgid "Are you sure you want to erase all custom rules? This action cannot be undone."
-msgstr "确定要清除所有自定义规则吗？此操作无法撤销。"
-
-msgid "Custom rules have been erased and changes applied."
-msgstr "自定义规则已清除并应用更改。"
-
-msgid "Custom nftables Rules"
-msgstr "自定义 nftables 规则"
-
-msgid "Enter your custom nftables rules here. The \"table inet qosmate_custom { ... }\" wrapper will be added automatically."
-msgstr "在此处输入您的自定义 nftables 规则。\"table inet qosmate_custom { ... }\" 包装器将被自动添加。"
-
-msgid "Custom rules validation successful."
-msgstr "自定义规则验证成功。"
-
-msgid "Custom rules validation failed. Please check the validation result below."
-msgstr "自定义规则验证失败。请检查下方的验证结果。"
-
-msgid "Validation Result"
-msgstr "验证结果"
-
-msgid "No validation performed yet"
-msgstr "还未进行任何验证"
-
-msgid "Validate Rules"
-msgstr "验证规则"
-
-msgid "Validate"
-msgstr "验证"
-
-msgid "Rules Information"
-msgstr "规则信息"
-
-msgid "Error: Could not find custom rules textarea"
-msgstr "错误：找不到自定义规则文本区域"
-
-msgid "Validating Rules"
-msgstr "正在验证规则"
-
-msgid "Please wait while the rules are being validated..."
-msgstr "请等待规则验证... "
-
-msgid "Finalizing validation results, please wait..."
-msgstr "正在完成验证结果，请稍候..."
-
-msgid "Example rules:"
-msgstr "示例规则："
-
-msgid "Warning:"
-msgstr "警告: "
-
-msgid "Incorrect rules can disrupt network functionality. Use with caution."
-msgstr "不正确的规则可能会破坏网络功能。请谨慎使用。"
-
-msgid "QoSmate Connections"
-msgstr "QoSmate 连接"
-
-msgid "Filter by IP, IP:Port, Port, Protocol or DSCP"
-msgstr "通过 IP、IP:端口、端口、协议或 DSCP 过滤"
-
-msgid "Zoom:"
-msgstr "缩放："
-
-msgid "In:"
-msgstr "入站："
-
-msgid "Out:"
-msgstr "出站："
-
-msgid "Packets"
-msgstr "数据包"
-
-msgid "Avg PPS"
-msgstr "平均 PPS"
-
-msgid "Max PPS"
-msgstr "最大 PPS"
-
-msgid "Avg BPS"
-msgstr "平均 BPS"
-
-msgid "Source"
-msgstr "来源"
-
-msgid "Destination"
-msgstr "目的地"
-
-msgid "DSCP"
-msgstr "DSCP"
-
-msgid "Bytes"
-msgstr "字节"
-
-msgid "(expected IP, IPv6, CIDR, or @setname)"
-msgstr "（预期为 IP、IPv6、CIDR 或 @setname）"
-
-msgid "(use IP addresses instead)"
-msgstr "（请改用 IP 地址）"
-
-msgid "Mbps (based on your"
-msgstr " Mbps（基于您的 "
-
-msgid "Mbps upload)"
-msgstr " Mbps 上传）"
-
-msgid "%s (Backend) / %s (Frontend)"
-msgstr "%s（后端）/ %s（前端）"
-
-msgid "0 = no burst (strict), 1.0 = rate as burst, higher = more burst"
-msgstr "0 = 无突发（严格），1.0 = 以速率为突发，越高突发越多"
-
-msgid "192.168.1.100, !=192.168.1.77, 2001:db8::1"
-msgstr "192.168.1.100, !=192.168.1.77, 2001:db8::1"
-
-msgid "AF11 (10)"
-msgstr "AF11 (10)"
-
-msgid "API LIMIT"
-msgstr "API 限制"
-
-msgid "Active Range"
-msgstr "活跃范围"
-
-msgid "Activity"
-msgstr "活动"
-
-msgid "Add IPv4 address, subnet or range"
-msgstr "添加 IPv4 地址、子网或范围"
-
-msgid "Add IPv6 address, subnet or range"
-msgstr "添加 IPv6 地址、子网或范围"
-
-msgid "Add Rate Limit"
-msgstr "添加速率限制"
-
-msgid "Added for IP:"
-msgstr "已为 IP 添加："
-
-msgid "Additional link compensation (atm, ptm, noatm). Affects overhead calculations."
-msgstr "附加链路补偿（atm、ptm、noatm）。影响开销计算。"
-
-msgid "Adjustment Factor - Decrease (%)"
-msgstr "调整系数 - 下降（%）"
-
-msgid "Adjustment Factor - Increase (%)"
-msgstr "调整系数 - 上升（%）"
-
-msgid "All rules have been erased and changes applied."
-msgstr "所有规则已清除并应用更改。"
-
-msgid "All rules have been saved and applied."
-msgstr "所有规则已保存并应用。"
-
-msgid "Apply and Reload"
-msgstr "应用并刷新"
-
-msgid "Applying Changes"
-msgstr "正在应用更改"
-
-msgid "Auto Setup Results"
-msgstr "自动设置结果"
-
-msgid "Auto setup did not finish within 5 minutes."
-msgstr "自动设置未在 5 分钟内完成。"
-
-msgid "Auto setup did not finish, last error:"
-msgstr "自动设置未完成，最后错误："
-
-msgid "Auto setup failed:"
-msgstr "自动设置失败："
-
-msgid "Auto-detect"
-msgstr "自动检测"
-
-msgid "Autorate"
-msgstr "自动速率"
-
-msgid "Autorate Settings"
-msgstr "自动速率设置"
-
-msgid "Autorate Status"
-msgstr "自动速率状态"
-
-msgid "Avg Delay"
-msgstr "平均延迟"
-
-msgid "Backend"
-msgstr "后端"
-
-msgid "Background"
-msgstr "后台"
-
-msgid "Bandwidth Ratio Warning"
-msgstr "带宽比例警告"
-
-msgid "Base Download Rate (kbps)"
-msgstr "基础下载速率（kbps）"
-
-msgid "Base Rate"
-msgstr "基础速率"
-
-msgid "Base Upload Rate (kbps)"
-msgstr "基础上传速率（kbps）"
-
-msgid "Baseline"
-msgstr "基线"
-
-msgid "Both Directions"
-msgstr "双向"
-
-msgid "Bulk"
-msgstr "批量"
-
-msgid "Burst Factor"
-msgstr "突发系数"
-
-msgid "CAKE - Common Applications Kept Enhanced. Configure CAKE-specific parameters in the CAKE tab."
-msgstr "CAKE - 通用应用保持增强。在 CAKE 标签页中配置 CAKE 专属参数。"
-
-msgid "CAKE Egress Statistics"
-msgstr "CAKE 出口统计"
-
-msgid "CAKE Ingress Statistics"
-msgstr "CAKE 入口统计"
-
-msgid "CAKE Statistics for Default Class (Egress)"
-msgstr "默认类的 CAKE 统计（出口）"
-
-msgid "CAKE Statistics for Default Class (Ingress)"
-msgstr "默认类的 CAKE 统计（入口）"
-
-msgid "CAKE mode active."
-msgstr "CAKE 模式已启用。"
-
-msgid "Cable DOCSIS (25B)"
-msgstr "DOCSIS 电缆 (25B)"
-
-msgid "Cancel"
-msgstr "取消"
-
-msgid "Change Channel"
-msgstr "更改频道"
-
-msgid "Change Update Channel"
-msgstr "更改更新频道"
-
-msgid "Changing Update Channel"
-msgstr "正在更改更新频道"
-
-msgid "Channel"
-msgstr "频道"
-
-msgid "Class ID"
-msgstr "类 ID"
-
-msgid "Component"
-msgstr "组件"
-
-msgid "Components are using different update channels (%s/%s). Continue with %s channel?"
-msgstr "组件使用了不同的更新频道（%s/%s）。是否继续使用 %s 频道？"
-
-msgid "Config"
-msgstr "配置"
-
-msgid "Configure link layer adaptation settings. For detailed information about different link types and overhead calculations, please check the"
-msgstr "配置链路层适配设置。有关不同链路类型和开销计算的详细信息，请查看 "
-
-msgid "Configure per-device bandwidth limits using nftables meters. Limits are applied based on the source IP of devices, making it easy to control traffic for specific devices or subnets."
-msgstr "使用 nftables 计量器为每台设备配置带宽限制。限制根据设备的源 IP 应用，方便控制特定设备或子网的流量。"
-
-msgid "Connections:"
-msgstr "连接数："
-
-msgid "Connections: 0"
-msgstr "连接数：0"
-
-msgid "Connections: Error"
-msgstr "连接数：错误"
-
-msgid "Current Root QDisc is %s - CAKE settings are not used."
-msgstr "当前根队列规则为 %s - 不使用 CAKE 设置。"
-
-msgid "Current Root QDisc is %s - HFSC settings are not used."
-msgstr "当前根队列规则为 %s - 不使用 HFSC 设置。"
-
-msgid "Current Update Channels"
-msgstr "当前更新频道"
-
-msgid "Current limit:"
-msgstr "当前限制："
-
-msgid "DSL ATM/ADSL (44B)"
-msgstr "DSL ATM/ADSL (44B)"
-
-msgid "Debug only"
-msgstr "仅调试"
-
-msgid "Dec. Threshold"
-msgstr "下降阈值"
-
-msgid "Decrease bandwidth when latency delta exceeds this value."
-msgstr "当延迟差超过此值时降低带宽。"
-
-msgid "Default (CAKE)"
-msgstr "默认（CAKE）"
-
-msgid "Default: 24"
-msgstr "默认值：24"
-
-msgid "Default: 30"
-msgstr "默认值：30"
-
-msgid "Default: 450"
-msgstr "默认值：450"
-
-msgid "Default: 45000"
-msgstr "默认值：45000"
-
-msgid "Default: 5"
-msgstr "默认值：5"
-
-msgid "Default: 7"
-msgstr "默认值：7"
-
-msgid "Default: 90000"
-msgstr "默认值：90000"
-
-msgid "Define groups of IP addresses that can be referenced in QoS rules using @setname"
-msgstr "定义 IP 地址组，可在 QoS 规则中通过 @setname 引用"
-
-msgid "Description"
-msgstr "描述"
-
-msgid "Downgrades TCP flows exceeding ~10 seconds worth of data transfer to CS1 (Bulk). Helps prevent large downloads from starving other traffic."
-msgstr "将传输数据量超过约 10 秒的 TCP 流降级为 CS1（批量）。有助于防止大文件下载挤占其他流量。"
-
-msgid "Downgrades the first ~500ms of TCP traffic (except CS1) to CS0 to prevent initial bursts"
-msgstr "将 TCP 流量的前约 500 毫秒（CS1 除外）降级为 CS0，以防止初始突发。"
-
-msgid "Download Bandwidth"
-msgstr "下载带宽"
-
-msgid "Download Limit (Kbit/s)"
-msgstr "下载限制 (Kbit/s)"
-
-msgid "Download Rate"
-msgstr "下载速率"
-
-msgid "Download Speed"
-msgstr "下载速度"
-
-msgid "Download shaping disabled (DOWNRATE=0)"
-msgstr "下载整形已禁用 (DOWNRATE=0)"
-
-msgid "Download:"
-msgstr "下载："
-
-msgid "Dropped"
-msgstr "已丢弃"
-
-msgid "Drops"
-msgstr "丢包数"
-
-msgid "Dynamic"
-msgstr "动态"
-
-msgid "Dynamic Bandwidth (Autorate)"
-msgstr "动态带宽（自动速率）"
-
-msgid "Dynamically adjust bandwidth based on latency measurements. Fine-tune in Advanced tab."
-msgstr "根据延迟测量动态调整带宽。可在\"高级设置\"标签页中微调。"
-
-msgid "ECN Marked"
-msgstr "ECN 标记"
-
-msgid "Edit Rate Limit: %s"
-msgstr "编辑速率限制：%s"
-
-msgid "Egress (Upload)"
-msgstr "出口（上传）"
-
-msgid "Egress Bytes Sent by Class"
-msgstr "各类发送的出口字节数"
-
-msgid "Egress Bytes Sent by Tin"
-msgstr "各 Tin 发送的出口字节数"
-
-msgid "Egress Dropped Packets by Class"
-msgstr "各类丢弃的出口数据包"
-
-msgid "Egress Dropped Packets by Tin"
-msgstr "各 Tin 丢弃的出口数据包"
-
-msgid "Egress Only"
-msgstr "仅出口"
-
-msgid "Egress Packets Sent by Class"
-msgstr "各类发送的出口数据包"
-
-msgid "Egress Packets Sent by Tin"
-msgstr "各 Tin 发送的出口数据包"
-
-msgid "Enable Autorate"
-msgstr "启用自动速率"
-
-msgid "Enable Initial TCP Down-Prioritization"
-msgstr "启用初始 TCP 降优先级"
-
-msgid "Enable Sustained TCP Down-Prioritization"
-msgstr "启用持续 TCP 降优先级"
-
-msgid "Enable long-term history"
-msgstr "启用长期历史记录"
-
-msgid "Enable trace"
-msgstr "启用跟踪"
-
-msgid "Enabled"
-msgstr "已启用"
-
-msgid "Erase"
-msgstr "清除"
-
-msgid "Error displaying connections. System may be overloaded."
-msgstr "显示连接时出错。系统可能过载。"
-
-msgid "Error during validation:"
-msgstr "验证过程中出错："
-
-msgid "Error loading QoS statistics. Please check if the QoSmate service is running."
-msgstr "加载 QoS 统计信息出错。请检查 QoSmate 服务是否正在运行。"
-
-msgid "Error loading initial data: %s"
-msgstr "加载初始数据出错：%s"
-
-msgid "Error: Could not find rules textareas"
-msgstr "错误：找不到规则文本区域"
-
-msgid "Ethernet (HFSC/HTB: 40B, CAKE: 40B override)"
-msgstr "以太网 (HFSC/HTB: 40B, CAKE: 40B 覆盖)"
-
-msgid "Ethernet VLAN keyword for CAKE. Ignored by other QDiscs."
-msgstr "CAKE 的以太网 VLAN 关键字。其他队列规则会忽略此设置。"
-
-msgid "Example (Full Table Rules):"
-msgstr "示例（完整表规则）："
-
-msgid "Example (Inline Rules):"
-msgstr "示例（内联规则）："
-
-msgid "Experimental"
-msgstr "实验性"
-
-msgid "Failed to apply connection limit: %s"
-msgstr "应用连接限制失败：%s"
-
-msgid "Failed to change update channel"
-msgstr "更改更新频道失败"
-
-msgid "Failed to erase custom rules or apply changes:"
-msgstr "清除自定义规则或应用更改失败："
-
-msgid "Failed to restart QoSmate:"
-msgstr "重启 QoSmate 失败："
-
-msgid "Failed to save settings or restart QoSmate:"
-msgstr "保存设置或重启 QoSmate 失败："
-
-msgid "Failed to start QoSmate:"
-msgstr "启动 QoSmate 失败："
-
-msgid "Failed to stop QoSmate:"
-msgstr "停止 QoSmate 失败："
-
-msgid "Failed to update QoSmate"
-msgstr "更新 QoSmate 失败"
-
-msgid "Failed to update settings or restart QoSmate:"
-msgstr "更新设置或重启 QoSmate 失败："
-
-msgid "Family"
-msgstr "协议族"
-
-msgid "Fast Non-Realtime"
-msgstr "快速非实时"
-
-msgid "Filter by: IP IP:Port Port Protocol DSCP"
-msgstr "过滤条件：IP、IP:端口、端口、协议、DSCP"
-
-msgid "Finalizing Validation"
-msgstr "正在完成验证"
-
-msgid "Fine-tune the dynamic bandwidth adjustment algorithm. Enable Autorate in the Settings tab."
-msgstr "微调动态带宽调整算法。请在\"设置\"标签页中启用自动速率。"
-
-msgid "For detailed setup instructions and advanced configuration options, please check the"
-msgstr "有关详细设置说明和高级配置选项，请查看 "
-
-msgid "For ranges above 60 minutes, recent data (last 60 min) is high-resolution, while older points are aggregated and less precise. \"Latency (max)\" highlights spikes that average latency may hide."
-msgstr "对于超过 60 分钟的范围，最近数据（最后 60 分钟）为高分辨率，而较早的数据点会被聚合且精度较低。\"延迟（最大值）\"会突出显示平均延迟可能掩盖的尖峰。"
-
-msgid "Frontend"
-msgstr "前端"
-
-msgid "Game Queue Discipline:"
-msgstr "游戏队列规则："
-
-msgid "Gaming Rules"
-msgstr "游戏规则"
-
-msgid "General"
-msgstr "常规"
-
-msgid "General Information"
-msgstr "基本信息"
-
-msgid "HFSC - Hierarchical Fair Service Curve. Configure realtime traffic settings in the HFSC tab."
-msgstr "HFSC - 分层公平服务曲线。在 HFSC 标签页中配置实时流量设置。"
-
-msgid "HFSC Egress Class Statistics"
-msgstr "HFSC 出口类统计"
-
-msgid "HFSC Ingress Class Statistics"
-msgstr "HFSC 入口类统计"
-
-msgid "HFSC mode active."
-msgstr "HFSC 模式已启用。"
-
-msgid "HTB (Experimental)"
-msgstr "HTB（实验性）"
-
-msgid "HTB - Hierarchical Token Bucket. Simple 3-tier priority system with pre-configured settings - no additional qdisc configuration required."
-msgstr "HTB - 分层令牌桶。简单的 3 级优先级系统，带预配置设置 - 无需额外配置队列规则。"
-
-msgid "HTB Egress Class Statistics"
-msgstr "HTB 出口类统计"
-
-msgid "HTB Ingress Class Statistics"
-msgstr "HTB 入口类统计"
-
-msgid "High Priority (Realtime)"
-msgstr "高优先级（实时）"
-
-msgid "How often to measure latency and adjust bandwidth."
-msgstr "测量延迟并调整带宽的频率。"
-
-msgid "Hybrid"
-msgstr "混合"
-
-msgid "Hybrid - HFSC as shaper, Game Qdisc for realtime traffic, CAKE for default traffic and fq_codel for bulk traffic. Configure realtime class settings in HFSC tab and default class settings in CAKE tab."
-msgstr "混合 - 使用 HFSC 作为整形器，游戏队列规则用于实时流量，CAKE 用于默认流量，fq_codel 用于批量流量。在 HFSC 标签页中配置实时类设置，在 CAKE 标签页中配置默认类设置。"
-
-msgid "Hybrid Egress Class Statistics"
-msgstr "混合出口类统计"
-
-msgid "Hybrid Ingress Class Statistics"
-msgstr "混合入口类统计"
-
-msgid "Hybrid Note:"
-msgstr "混合模式说明："
-
-msgid "Hybrid mode - these settings control default traffic class (normal priority)."
-msgstr "混合模式 - 这些设置控制默认流量类（普通优先级）。"
-
-msgid "Hybrid mode - these settings control realtime traffic (high priority class)."
-msgstr "混合模式 - 这些设置控制实时流量（高优先级类）。"
-
-msgid "ICMPv6"
-msgstr "ICMPv6"
-
-msgid "IP Sets"
-msgstr "IP 集合"
-
-msgid "IP address, range, @setname or ::suffix/::mask"
-msgstr "IP 地址、范围、@setname 或 ::suffix/::mask"
-
-msgid "IPv4"
-msgstr "IPv4"
-
-msgid "IPv4 Addresses"
-msgstr "IPv4 地址"
-
-msgid "IPv6"
-msgstr "IPv6"
-
-msgid "IPv6 Addresses"
-msgstr "IPv6 地址"
-
-msgid "Inc. Threshold"
-msgstr "上升阈值"
-
-msgid "Increase bandwidth when latency delta is below this value."
-msgstr "当延迟差低于此值时提高带宽。"
-
-msgid "Ingress (Download)"
-msgstr "入口（下载）"
-
-msgid "Ingress Bytes Sent by Class"
-msgstr "各类发送的入口字节数"
-
-msgid "Ingress Bytes Sent by Tin"
-msgstr "各 Tin 发送的入口字节数"
-
-msgid "Ingress Dropped Packets by Class"
-msgstr "各类丢弃的入口数据包"
-
-msgid "Ingress Dropped Packets by Tin"
-msgstr "各 Tin 丢弃的入口数据包"
-
-msgid "Ingress Only"
-msgstr "仅入口"
-
-msgid "Ingress Packets Sent by Class"
-msgstr "各类发送的入口数据包"
-
-msgid "Ingress Packets Sent by Tin"
-msgstr "各 Tin 发送的入口数据包"
-
-msgid "Inline Extra Rules"
-msgstr "内联额外规则"
-
-msgid "Interval"
-msgstr "间隔"
-
-msgid "Invalid IP address or CIDR format:"
-msgstr "无效的 IP 地址或 CIDR 格式："
-
-msgid "Invalid IP range:"
-msgstr "无效的 IP 范围："
-
-msgid "Invalid IPv6 suffix format. Use ::suffix/::mask with valid IPv6 segments (e.g. ::1234:5678/::ffff:ffff)"
-msgstr "无效的 IPv6 后缀格式。请使用 ::suffix/::mask 格式并提供有效的 IPv6 段（例如 ::1234:5678/::ffff:ffff）"
-
-msgid "Invalid decimal format"
-msgstr "无效的小数格式"
-
-msgid "Invalid protocol: %s"
-msgstr "无效的协议：%s"
-
-msgid "Invalid rates for HFSC. Please set non-zero values manually."
-msgstr "HFSC 速率无效。请手动设置非零值。"
-
-msgid "Invalid set name format. Must start with @ followed by letters, numbers, or underscore"
-msgstr "无效的集合名称格式。必须以 @ 开头，后跟字母、数字或下划线"
-
-msgid "Invalid set name format:"
-msgstr "无效的集合名称格式："
-
-msgid "Invalid target format:"
-msgstr "无效的目标格式："
-
-msgid "Large download/upload difference detected ("
-msgstr "检测到较大的下载/上传差异（"
-
-msgid "Latency"
-msgstr "延迟"
-
-msgid "Latency (max)"
-msgstr "延迟（最大值）"
-
-msgid "Latency Decrease Threshold (ms)"
-msgstr "延迟下降阈值（毫秒）"
-
-msgid "Latency Increase Threshold (ms)"
-msgstr "延迟上升阈值（毫秒）"
-
-msgid "Latency:"
-msgstr "延迟："
-
-msgid "Leave empty for auto-calculation (100% of configured download rate)."
-msgstr "留空以自动计算（已配置下载速率的 100%）。"
-
-msgid "Leave empty for auto-calculation (100% of configured upload rate)."
-msgstr "留空以自动计算（已配置上传速率的 100%）。"
-
-msgid "Leave empty for auto-calculation (105% of configured download rate)."
-msgstr "留空以自动计算（已配置下载速率的 105%）。"
-
-msgid "Leave empty for auto-calculation (105% of configured upload rate)."
-msgstr "留空以自动计算（已配置上传速率的 105%）。"
-
-msgid "Leave empty for auto-calculation (25% of configured download rate)."
-msgstr "留空以自动计算（已配置下载速率的 25%）。"
-
-msgid "Leave empty for auto-calculation (25% of configured upload rate)."
-msgstr "留空以自动计算（已配置上传速率的 25%）。"
-
-msgid "Limited to %d connections. Some connections may not be shown."
-msgstr "限制显示 %d 个连接。部分连接可能不会显示。"
-
-msgid "Limits"
-msgstr "限制"
-
-msgid "Link Layer Settings"
-msgstr "链路层设置"
-
-msgid "Loading health check status..."
-msgstr "正在加载健康检查状态..."
-
-msgid "Log All Rate Changes"
-msgstr "记录所有速率变化"
-
-msgid "Log every rate change to system log (for debugging). May spam logs."
-msgstr "将每次速率变化记录到系统日志（用于调试）。可能会产生大量日志。"
-
-msgid "Low Priority"
-msgstr "低优先级"
-
-msgid "MAC addresses not supported:"
-msgstr "不支持 MAC 地址："
-
-msgid "Manual Overhead (bytes)"
-msgstr "手动开销（字节）"
-
-msgid "Max"
-msgstr "最大"
-
-msgid "Max Connections:"
-msgstr "最大连接数："
-
-msgid "Max Download Rate (kbps)"
-msgstr "最大下载速率（kbps）"
-
-msgid "Max Upload Rate (kbps)"
-msgstr "最大上传速率（kbps）"
-
-msgid "Maximum Segment Size for TCP connections. This setting is only active when the upload or download bandwidth is less than 3000 kbit/s. Leave empty to use the default value. Valid range: 536-1500"
-msgstr "TCP 连接的最大段大小。此设置仅在上传或下载带宽小于 3000 kbit/s 时生效。留空将使用默认值。有效范围：536-1500"
-
-msgid "Measurement Interval (ms)"
-msgstr "测量间隔（毫秒）"
-
-msgid "Min"
-msgstr "最小"
-
-msgid "Min Download Rate (kbps)"
-msgstr "最小下载速率（kbps）"
-
-msgid "Min Upload Rate (kbps)"
-msgstr "最小上传速率（kbps）"
-
-msgid "Minimum packet unit size. Used primarily by CAKE, ignored by other QDiscs."
-msgstr "最小数据包单元大小。主要由 CAKE 使用，其他队列规则会忽略此设置。"
-
-msgid "Minimum wait time after a rate decrease before next adjustment."
-msgstr "降低速率后到下次调整前的最小等待时间。"
-
-msgid "Minimum wait time after a rate increase before next adjustment."
-msgstr "提高速率后到下次调整前的最小等待时间。"
-
-msgid "Multi-Queue CAKE (cake_mq)"
-msgstr "多队列 CAKE (cake_mq)"
-
-msgid "Multiply current rate by this percentage when decreasing (85 = 15% decrease)."
-msgstr "降低时将当前速率乘以此百分比（85 = 降低 15%）。"
-
-msgid "Multiply current rate by this percentage when increasing (102 = 2% increase)."
-msgstr "上升时将当前速率乘以此百分比（102 = 提升 2%）。"
-
-msgid "Must be a non-negative integer or empty"
-msgstr "必须为非负整数或留空"
-
-msgid "Must be a number"
-msgstr "必须为数字"
-
-msgid "Must be an integer or empty"
-msgstr "必须为整数或留空"
-
-msgid "Must be between 0 and 100000000 Kbit/s"
-msgstr "必须在 0 到 100000000 Kbit/s 之间"
-
-msgid "Must be between 0.0 and 10.0 (0 = no burst)"
-msgstr "必须在 0.0 到 10.0 之间（0 = 无突发）"
-
-msgid "Must be between 536 and 1500"
-msgstr "必须在 536 到 1500 之间"
-
-msgid "NETEM Direction"
-msgstr "NETEM 方向"
-
-msgid "No IFB device is created. TCP bulk detection is off because its thresholds derive from the download rate, CAKE ingress options have no effect, and incoming packets carry no DSCP."
-msgstr "未创建 IFB 设备。TCP 批量检测已关闭，因为其阈值来自下载速率；CAKE 入口选项无效，且入站数据包不带 DSCP。"
-
-msgid "No QoS statistics available. Make sure QoSmate is running."
-msgstr "没有可用的 QoS 统计信息。请确保 QoSmate 正在运行。"
-
-msgid "No data available"
-msgstr "暂无数据"
-
-msgid "No egress qdisc is created, so traffic classification only affects the download queue."
-msgstr "未创建出口队列规则，因此流量分类仅影响下载队列。"
-
-msgid "No hourly history available yet. Data is consolidated once per hour."
-msgstr "暂无小时历史数据。数据每小时整合一次。"
-
-msgid "No shaping active: both rates are 0"
-msgstr "未启用整形：上下行速率均为 0"
-
-msgid "Normal"
-msgstr "普通"
-
-msgid "Not available"
-msgstr "不可用"
-
-msgid "Not available in Hybrid mode (cake_mq requires root qdisc)"
-msgstr "混合模式下不可用（cake_mq 需要作为根队列规则）"
-
-msgid "Not detected"
-msgstr "未检测到"
-
-msgid "Not set"
-msgstr "未设置"
-
-msgid "Not used with %s"
-msgstr "不适用于 %s"
-
-msgid "Note:"
-msgstr "注意："
-
-msgid "Note: Router-based speed tests may underestimate actual speeds. For best results, consider running tests from a LAN device and manually entering the values. These results serve as a starting point."
-msgstr "注意：基于路由器的测速可能低估实际速度。为获得最佳结果，建议从局域网设备运行测速并手动输入数值。这些结果仅作为起点。"
-
-msgid "Note: The \"snapshot\" channel might not be available in the current repository configuration."
-msgstr "注意：在当前仓库配置中，\"snapshot\" 频道可能不可用。"
-
-msgid "Off (default)"
-msgstr "关闭（默认）"
-
-msgid "Only digits and decimal separators allowed"
-msgstr "仅允许数字和小数分隔符"
-
-msgid "Only nftables DSCP marking is applied, no queues are created."
-msgstr "仅应用 nftables DSCP 标记，不创建队列。"
-
-msgid "Overlimits"
-msgstr "超限数"
-
-msgid "Override automatic overhead. For HFSC/HTB: Ethernet=40, DOCSIS=25, ATM=44. CAKE will add this to its preset."
-msgstr "覆盖自动开销。对于 HFSC/HTB：以太网=40、DOCSIS=25、ATM=44。CAKE 会将此值叠加到其预设上。"
-
-msgid "Packages"
-msgstr "软件包"
-
-msgid "Pareto"
-msgstr "Pareto"
-
-msgid "Pareto Normal"
-msgstr "Pareto 正态"
-
-msgid "Pause"
-msgstr "暂停"
-
-msgid "Peak Delay"
-msgstr "峰值延迟"
-
-msgid "Ping Reflectors"
-msgstr "Ping 反射器"
-
-msgid "Please wait while QoSmate is being updated..."
-msgstr "请稍候，QoSmate 正在更新..."
-
-msgid "Please wait while the auto setup is in progress..."
-msgstr "请稍候，自动设置正在进行中..."
-
-msgid "Please wait while the changes are being applied..."
-msgstr "请稍候，正在应用更改..."
-
-msgid "Please wait while the update channel is being changed..."
-msgstr "请稍候，正在更改更新频道..."
-
-msgid "Polling Interval:"
-msgstr "轮询间隔："
-
-msgid "Priority"
-msgstr "优先级"
-
-msgid "Priority Queue Type (Egress):"
-msgstr "优先级队列类型（出口）："
-
-msgid "Priority Queue Type (Ingress):"
-msgstr "优先级队列类型（入口）："
-
-msgid "QoS Configuration"
-msgstr "QoS 配置"
-
-msgid "QoSmate IP Sets"
-msgstr "QoSmate IP 集合"
-
-msgid "QoSmate Rate Limits"
-msgstr "QoSmate 速率限制"
-
-msgid "QoSmate Update"
-msgstr "QoSmate 更新"
-
-msgid "QoSmate restarted"
-msgstr "QoSmate 已重启"
-
-msgid "QoSmate updated successfully."
-msgstr "QoSmate 更新成功。"
-
-msgid "Queue Type"
-msgstr "队列类型"
-
-msgid "Rate Limit"
-msgstr "速率限制"
-
-msgid "Rate Limits"
-msgstr "速率限制"
-
-msgid "Realtime Gaming"
-msgstr "实时游戏"
-
-msgid "Refractory Period - Decrease (s)"
-msgstr "不应期 - 下降（秒）"
-
-msgid "Refractory Period - Increase (s)"
-msgstr "不应期 - 上升（秒）"
-
-msgid "Refresh Interval"
-msgstr "刷新间隔"
-
-msgid "Release (stable)"
-msgstr "Release（稳定版）"
-
-msgid "Resume"
-msgstr "继续"
-
-msgid "Root Queueing Discipline:"
-msgstr "根队列规则："
-
-msgid "Router-based speed tests may underestimate actual speeds. These results serve as a starting point and may require manual adjustment for optimal performance."
-msgstr "基于路由器的测速可能低估实际速度。这些结果仅作为起点，可能需要手动调整以获得最佳性能。"
-
-msgid "Rule already exists for IP:"
-msgstr "IP 已存在规则："
-
-msgid "Rules validation failed. Please check the validation result below."
-msgstr "规则验证失败。请查看下方的验证结果。"
-
-msgid "Rules validation successful."
-msgstr "规则验证成功。"
-
-msgid "Running Auto Setup"
-msgstr "正在运行自动设置"
-
-msgid "Select components to update:"
-msgstr "选择要更新的组件："
-
-msgid "Select the update channel for QoSmate:"
-msgstr "选择 QoSmate 的更新频道："
-
-msgid "Select which direction to apply the NETEM delay/jitter settings"
-msgstr "选择应用 NETEM 延迟/抖动设置的方向"
-
-msgid "Select your connection type for overhead calculation. Used by all QDiscs (HTB, HFSC, Hybrid, CAKE)."
-msgstr "选择用于开销计算的连接类型。适用于所有队列规则（HTB、HFSC、混合、CAKE）。"
-
-msgid "Service"
-msgstr "服务"
-
-msgid "Service Status & Control"
-msgstr "服务状态与控制"
-
-msgid "Service not running - restart to apply"
-msgstr "服务未运行 - 重启以应用"
-
-msgid "Set ACK_FILTER_EGRESS explicitly in the CAKE tab: \"auto\" cannot decide without a download rate."
-msgstr "请在 CAKE 标签页中显式设置 ACK_FILTER_EGRESS：没有下载速率时，\"auto\" 无法自动判断。"
-
-msgid "Set Mode"
-msgstr "设置模式"
-
-msgid "Set Name"
-msgstr "集合名称"
-
-msgid "Set name is required"
-msgstr "集合名称为必填项"
-
-msgid "Set name must contain only letters, numbers, and underscore"
-msgstr "集合名称只能包含字母、数字和下划线"
-
-msgid "Set the download rate in kbps. 0 disables ingress shaping (no IFB device is created)."
-msgstr "以 kbps 为单位设置下载速率。设为 0 将禁用入口整形（不创建 IFB 设备）。"
-
-msgid "Set the upload rate in kbps. 0 disables egress shaping."
-msgstr "以 kbps 为单位设置上传速率。设为 0 将禁用出口整形。"
-
-msgid "Shaping Direction"
-msgstr "整形方向"
-
-msgid "Shaping:"
-msgstr "整形："
-
-msgid "Show Examples"
-msgstr "显示示例"
-
-msgid "Showing %s of data (requested %s). History grows over time."
-msgstr "显示 %s 的数据（请求 %s）。历史数据会随时间增长。"
-
-msgid "Snapshot (latest from main)"
-msgstr "Snapshot（主分支最新版）"
-
-msgid "Software Flow Offloading Status"
-msgstr "软件流量卸载状态"
-
-msgid "Software Flow Offloading active - some limitations apply"
-msgstr "软件流量卸载已启用 - 存在一些限制"
-
-msgid "Space-separated list of IP addresses for latency measurement."
-msgstr "以空格分隔的 IP 地址列表，用于延迟测量。"
-
-msgid "Sparse Delay"
-msgstr "稀疏延迟"
-
-msgid "Speed Test Results"
-msgstr "测速结果"
-
-msgid "Statements only – run inside chain dscptag at hook $NFT_HOOK / priority $NFT_PRIORITY. Do not start with 'table' or 'chain'. Included only if validation passes."
-msgstr "仅限语句 – 在钩子 $NFT_HOOK / 优先级 $NFT_PRIORITY 的 dscptag 链内运行。不要以 'table' 或 'chain' 开头。只有验证通过才会包含。"
-
-msgid "Static"
-msgstr "静态"
-
-msgid "Statistics"
-msgstr "统计信息"
-
-msgid "Target"
-msgstr "目标"
-
-msgid "Target Devices"
-msgstr "目标设备"
-
-msgid "Threshold"
-msgstr "阈值"
-
-msgid "Throughput"
-msgstr "吞吐量"
-
-msgid "Time Range"
-msgstr "时间范围"
-
-msgid "Timeout"
-msgstr "超时"
-
-msgid "Timeout must be in a valid format (e.g., \"10s\", \"1h\", \"2h12m10s\")"
-msgstr "超时格式无效（例如 \"10s\"、\"1h\"、\"2h12m10s\"）"
-
-msgid "Tin"
-msgstr "Tin"
-
-msgid "To change the update channel, go to the Advanced tab"
-msgstr "要更改更新频道，请前往\"高级设置\"标签页"
-
-msgid "To override: Advanced Settings → BWMAXRATIO"
-msgstr "覆盖方法：高级设置 → BWMAXRATIO"
-
-msgid "Traffic FROM device. 0 = unlimited"
-msgstr "来自设备的流量。0 = 不限制"
-
-msgid "Traffic TO device. 0 = unlimited"
-msgstr "发送到设备的流量。0 = 不限制"
-
-msgid "UPDATE AVAILABLE"
-msgstr "有可用更新"
-
-msgid "Unlimited"
-msgstr "不限制"
-
-msgid "Update Channel"
-msgstr "更新频道"
-
-msgid "Update Now"
-msgstr "立即更新"
-
-msgid "Update QoSmate"
-msgstr "更新 QoSmate"
-
-msgid "Update QoSmate Components"
-msgstr "更新 QoSmate 组件"
-
-msgid "Update Settings"
-msgstr "更新设置"
-
-msgid "Update channel change encountered issues: %s"
-msgstr "更改更新频道遇到问题：%s"
-
-msgid "Update channel changed to %s. Reloading page..."
-msgstr "更新频道已更改为 %s。正在刷新页面..."
-
-msgid "Update process encountered issues: %s"
-msgstr "更新过程遇到问题：%s"
-
-msgid "Updating QoSmate"
-msgstr "正在更新 QoSmate"
-
-msgid "Updating QoSmate. Please wait..."
-msgstr "正在更新 QoSmate。请稍候..."
-
-msgid "Upload Bandwidth"
-msgstr "上传带宽"
-
-msgid "Upload Limit (Kbit/s)"
-msgstr "上传限制 (Kbit/s)"
-
-msgid "Upload Rate"
-msgstr "上传速率"
-
-msgid "Upload Speed"
-msgstr "上传速度"
-
-msgid "Upload shaping disabled (UPRATE=0)"
-msgstr "上传整形已禁用 (UPRATE=0)"
-
-msgid "Upload:"
-msgstr "上传："
-
-msgid "Use cake_mq for multi-core CPU scaling. Only effective in pure CAKE mode (not hybrid). Requires kernel support (OpenWrt 25.12+)."
-msgstr "使用 cake_mq 实现多核 CPU 扩展。仅在纯 CAKE 模式（非混合）下有效。需要内核支持（OpenWrt 25.12+）。"
-
-msgid "Uses Realtime (1:11) & Bulk (1:15) classes with their dscp values from HFSC. All other traffic is handled by a single CAKE class (1:13)."
-msgstr "使用 HFSC 中的 Realtime (1:11) 和 Bulk (1:15) 类及其 DSCP 值。其他所有流量由单一 CAKE 类 (1:13) 处理。"
-
-msgid "Version & Updates"
-msgstr "版本与更新"
-
-msgid "WAN Interface:"
-msgstr "WAN 接口："
-
-msgid "Your download speed has been limited to prevent connection issues."
-msgstr "为避免连接问题，您的下载速度已被限制。"
-
-msgid "[CAKE] Conservative (48B + ATM)"
-msgstr "[CAKE] 保守 (48B + ATM)"
-
-msgid "[CAKE] Ethernet (38B native)"
-msgstr "[CAKE] 以太网 (38B 原生)"
-
-msgid "[CAKE] Raw (No overhead)"
-msgstr "[CAKE] 原始（无开销）"
-
-msgid "cake_mq active"
-msgstr "cake_mq 已启用"
-
-msgid "cake_mq is active"
-msgstr "cake_mq 已启用"
-
-msgid "cake_mq not available"
-msgstr "cake_mq 不可用"
-
-msgid "cake_mq not available on this system, using standard cake"
-msgstr "此系统不支持 cake_mq，正在使用标准 cake"
-
-msgid "cake_mq off"
-msgstr "cake_mq 已关闭"
-
-msgid "days"
-msgstr "天"
-
-msgid "disabled in both directions (both rates are 0)"
-msgstr "双向均已禁用（上下行速率均为 0）"
-
-msgid "e.g., 1h"
-msgstr "例如：1h"
-
-msgid "e.g., Guest Network Limit"
-msgstr "例如：访客网络限制"
-
-msgid "egress only (DOWNRATE=0, no ingress statistics)"
-msgstr "仅出口（DOWNRATE=0，无入口统计）"
-
-msgid "forward"
-msgstr "转发"
-
-msgid "hours"
-msgstr "小时"
-
-msgid "ingress only (UPRATE=0, no egress statistics)"
-msgstr "仅入口（UPRATE=0，无出口统计）"
-
-msgid "load"
-msgstr "负载"
-
-msgid "minutes"
-msgstr "分钟"
-
-msgid "no activity"
-msgstr "无活动"
-
-msgid "postrouting"
-msgstr "路由后"
-
-msgid "seconds"
-msgstr "秒"
-
-msgid "✓ Static rules work ✗ Dynamic rules may not work"
-msgstr "✓ 静态规则有效 ✗ 动态规则可能无效"
-
diff --git a/luci-app-qosmate/root/usr/libexec/rpcd/luci.qosmate b/luci-app-qosmate/root/usr/libexec/rpcd/luci.qosmate
deleted file mode 100755
index abd50f70e..000000000
--- a/luci-app-qosmate/root/usr/libexec/rpcd/luci.qosmate
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/env lua
-
-local jsonc = require "luci.jsonc"
-
--- Check if an IP address is private - not needed at the moment
-local function is_private_ip(ip)
- if not ip or ip == "" then
- return false
- end
-
- if ip:match(":") then -- IPv6
- -- Check for ULA (fc00::/7), link-local (fe80::/10), or loopback (::1)
- return ip:match("^f[cd]") or ip:match("^fe80:") or ip == "::1"
- else -- IPv4
- local octets = {ip:match("(%d+)%.(%d+)%.(%d+)%.(%d+)")}
- if not octets[1] then return false end
- local first, second = tonumber(octets[1]), tonumber(octets[2])
- -- Check for private IPv4 ranges: 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16
- return (first == 10) or
- (first == 172 and second >= 16 and second <= 31) or
- (first == 192 and second == 168)
- end
-end
-
--- Parse a single connection line from nf_conntrack
-local function parse_connection(line)
- local conn = {}
- conn.layer3, conn.layer4, conn.protocol, conn.timeout = line:match("(%w+)%s+(%d+)%s+(%w+)%s+(%d+)")
- if not (conn.layer3 and conn.layer4 and conn.protocol and conn.timeout) then
- return nil
- end
-
- if conn.protocol == "icmp" or conn.protocol == "icmpv6" then
- -- Handle ICMP and ICMPv6 protocols
- conn.src, conn.dst, conn.type, conn.code, conn.id =
- line:match("src=(%S+)%s+dst=(%S+)%s+type=(%d+)%s+code=(%d+)%s+id=(%d+)")
- conn.in_packets, conn.in_bytes = line:match("packets=(%d+)%s+bytes=(%d+)")
- conn.out_packets, conn.out_bytes = conn.in_packets, conn.in_bytes
- conn.sport, conn.dport = "-", "-" -- ICMP doesn't use ports
- else
- -- Handle other protocols (e.g., TCP, UDP)
- local src1, dst1, sport1, dport1, packets1, bytes1,
- src2, dst2, sport2, dport2, packets2, bytes2 =
- line:match("src=(%S+)%s+dst=(%S+)%s+sport=(%d+)%s+dport=(%d+)%s+packets=(%d+)%s+bytes=(%d+).*src=(%S+)%s+dst=(%S+)%s+sport=(%d+)%s+dport=(%d+)%s+packets=(%d+)%s+bytes=(%d+)")
-
- -- Always use the first direction as the original
- conn.src, conn.dst, conn.sport, conn.dport = src1, dst1, sport1, dport1
- conn.out_packets, conn.in_packets = tonumber(packets1), tonumber(packets2)
- conn.out_bytes, conn.in_bytes = tonumber(bytes1), tonumber(bytes2)
- end
-
- if not (conn.src and conn.dst) then
- return nil
- end
-
- -- Extract additional connection information
- conn.dscp = math.floor(tonumber(line:match("mark=(%d+)") or "0"))
- conn.use = tonumber(line:match("use=(%d+)") or "0")
- conn.timeout = tonumber(conn.timeout) or 0
-
- -- Determine connection state
- if line:match("%[ASSURED%]") then
- conn.state = "ASSURED"
- elseif line:match("%[UNREPLIED%]") then
- conn.state = "UNREPLIED"
- else
- conn.state = "UNKNOWN"
- end
-
- return conn
-end
-
--- Retrieve all current connections from nf_conntrack
-local function get_connections()
- local conn_list = {}
-
- -- Read MAX_CONNECTIONS from config
- local max_connections = 0
- local config = io.popen("uci get qosmate.advanced.MAX_CONNECTIONS 2>/dev/null")
- if config then
- local value = config:read("*line")
- config:close()
- if value and value ~= "" then
- max_connections = tonumber(value) or 0
- end
- end
-
- local f = io.open("/proc/net/nf_conntrack", "r")
- if not f then
- return {}, max_connections
- end
-
- local count = 0
-
- -- Read connections from nf_conntrack (with early exit if limited)
- for line in f:lines() do
- -- Early exit if we have a limit and reached it
- if max_connections > 0 and count >= max_connections then
- break
- end
-
- local conn = parse_connection(line)
- if conn then
- conn.total_bytes = (conn.in_bytes or 0) + (conn.out_bytes or 0)
- table.insert(conn_list, conn)
- count = count + 1
- end
- end
- f:close()
-
- -- Sort only the connections we actually loaded
- table.sort(conn_list, function(a, b)
- return a.total_bytes > b.total_bytes
- end)
-
- -- Determine max_entries based on system load (only if no manual limit)
- local max_entries = #conn_list
- if max_connections == 0 then
- local load_avg = io.open("/proc/loadavg"):read("*a")
- local load1 = tonumber(load_avg:match("^(%d+%.%d+)")) or 0
-
- -- Apply load-based limits only if no manual limit
- if load1 > 2.0 then
- max_entries = math.min(100, #conn_list)
- elseif load1 > 1.5 then
- max_entries = math.min(500, #conn_list)
- elseif load1 > 0.8 then
- max_entries = math.min(1000, #conn_list)
- end
- end
-
- -- Final connections table
- local connections = {}
- for i = 1, max_entries do
- local conn = conn_list[i]
- if not conn then break end
- local key = string.format("%s:%s:%s:%s:%s:%s",
- conn.layer3, conn.protocol, conn.src, conn.sport, conn.dst, conn.dport)
- connections[key] = conn
- end
-
- return connections, max_connections
-end
-
--- Define RPC methods
-local methods = {
- getConntrackDSCP = {
- call = function()
- local connections, max_connections = get_connections()
- return {result = jsonc.stringify({connections = connections, max_connections = max_connections})}
- end
- }
-}
-
--- Handle RPC calls
-if arg[1] == "list" then
- local rv = {}
- for _, v in pairs(methods) do
- rv[_] = v.args or {}
- end
- print((jsonc.stringify(rv):gsub(":%[%]", ":{}")))
-elseif arg[1] == "call" then
- local args = jsonc.parse(io.stdin:read("*a"))
- local method = methods[arg[2]]
- if method then
- local result = method.call(args)
- print(result.result)
- os.exit(result.code or 0)
- else
- print(jsonc.stringify({error = "Method not found"}))
- os.exit(1)
- end
-end
diff --git a/luci-app-qosmate/root/usr/libexec/rpcd/luci.qosmate_stats b/luci-app-qosmate/root/usr/libexec/rpcd/luci.qosmate_stats
deleted file mode 100755
index 9af5391ec..000000000
--- a/luci-app-qosmate/root/usr/libexec/rpcd/luci.qosmate_stats
+++ /dev/null
@@ -1,491 +0,0 @@
-#!/bin/sh
-
-# QoSmate Statistics Backend for LuCI
-# shellcheck disable=SC2039,SC3043,SC2155,SC3057,SC1091
-
-. /lib/functions.sh
-
-# Set to 1 to enable debug logging, 0 to disable
-DEBUG=0
-
-# Debug logging function
-debug_log() {
- if [ "$DEBUG" -eq 1 ]; then
- echo "$1" >> /tmp/qosmate_debug.log
- fi
-}
-
-# Return a safe unsigned integer for JSON number fields
-json_uint_or_zero() {
- case "$1" in
- ''|*[!0-9]*) printf '0' ;;
- *) printf '%s' "$1" ;;
- esac
-}
-
-# Function to safely get JSON from tc command
-get_tc_json() {
- local output
- # Fix HFSC options format by completely replacing the options object
- output=$("$@" 2>/dev/null) || echo "[]"
-
- # Check if output is empty
- if [ -z "$output" ]; then
- echo "[]"
- return
- fi
-
- # Fix the HFSC options format by replacing the entire options object with a simple default value
- echo "$output" | sed 's/\("kind":"hfsc",[^{]*"options":\){[^}]*}/\1{"default":13}/g'
-}
-
-# Function to filter statistics to only include QoSmate relevant qdiscs
-filter_qosmate_qdiscs() {
- local stats="$1"
- local wan_interface="$2"
- local ifb_interface="$3"
-
- # Filter to only include qdiscs related to QoSmate (on wan_interface and ifb_interface)
- echo "$stats" | jq -c "[.[] | select(.dev == \"$wan_interface\" or .dev == \"$ifb_interface\")]" 2>/dev/null || echo "[]"
-}
-
-# Function to get the statistics based on root qdisc
-get_stats() {
- # Get basic statistics for all qdiscs
- local basic_stats
- basic_stats=$(get_tc_json tc -s -j qdisc show)
-
- debug_log "Basic stats: $basic_stats"
-
- # Get root qdisc type
- local root_qdisc
- root_qdisc=$(uci -q get qosmate.settings.ROOT_QDISC || echo "hfsc")
-
- # Get interface names
- local wan_interface
- wan_interface=$(uci -q get qosmate.settings.WAN || echo "eth1")
-
- local ifb_interface
- ifb_interface="ifb-$wan_interface"
-
- # Filter basic stats to only include QoSmate relevant qdiscs
- local filtered_stats
- filtered_stats=$(filter_qosmate_qdiscs "$basic_stats" "$wan_interface" "$ifb_interface")
- debug_log "Filtered stats: $filtered_stats"
-
- # Process statistics based on qdisc type
- local result
- if [ "$root_qdisc" = "cake" ]; then
- # Extract CAKE statistics for both egress and ingress
- local cake_egress_stats
- cake_egress_stats=$(echo "$filtered_stats" | jq -c "[.[] | select(.kind == \"cake\" and .dev == \"$wan_interface\")]" 2>/dev/null || echo "[]")
- debug_log "Cake egress stats: $cake_egress_stats"
-
- local cake_ingress_stats
- cake_ingress_stats=$(echo "$filtered_stats" | jq -c "[.[] | select(.kind == \"cake\" and .dev == \"$ifb_interface\")]" 2>/dev/null || echo "[]")
- debug_log "Cake ingress stats: $cake_ingress_stats"
-
- # Get the priority queue type (diffserv3/4/8)
- local priority_queue_ingress
- priority_queue_ingress=$(uci -q get qosmate.cake.PRIORITY_QUEUE_INGRESS || echo "diffserv4")
- local priority_queue_egress
- priority_queue_egress=$(uci -q get qosmate.cake.PRIORITY_QUEUE_EGRESS || echo "diffserv4")
-
- # Extract the actual cake qdisc stats for UI compatibility
- local cake_egress
- cake_egress=$(echo "$cake_egress_stats" | jq -c '.[0] // {}' 2>/dev/null || echo "{}")
- local cake_ingress
- cake_ingress=$(echo "$cake_ingress_stats" | jq -c '.[0] // {}' 2>/dev/null || echo "{}")
-
- # Create final JSON output using jq to ensure proper escaping
- result=$(jq -n \
- --arg rq "$root_qdisc" \
- --arg wi "$wan_interface" \
- --arg ii "$ifb_interface" \
- --arg pqi "$priority_queue_ingress" \
- --arg pqe "$priority_queue_egress" \
- --argjson fs "$filtered_stats" \
- --argjson ce "$cake_egress" \
- --argjson ci "$cake_ingress" \
- '{
- root_qdisc: $rq,
- wan_interface: $wi,
- ifb_interface: $ii,
- priority_queue_ingress: $pqi,
- priority_queue_egress: $pqe,
- qdisc_stats: $fs,
- cake_egress: $ce,
- cake_ingress: $ci
- }' 2>/dev/null)
- elif [ "$root_qdisc" = "hfsc" ] || [ "$root_qdisc" = "hybrid" ]; then
- # Extract HFSC root qdiscs and classes (hybrid uses HFSC root)
- local hfsc_egress_qdisc
- hfsc_egress_qdisc=$(get_tc_json tc -s -j qdisc show dev "$wan_interface" | jq -c "[.[] | select(.kind == \"hfsc\")]" 2>/dev/null || echo "[]")
- debug_log "HFSC egress qdisc: $hfsc_egress_qdisc"
-
- local hfsc_egress_classes
- hfsc_egress_classes=$(get_tc_json tc -s -j class show dev "$wan_interface")
- debug_log "HFSC egress classes: $hfsc_egress_classes"
-
- # Process the output to ensure it's valid JSON
- hfsc_egress_classes=$(echo "$hfsc_egress_classes" | jq -c '.' 2>/dev/null || echo "[]")
-
- local hfsc_ingress_qdisc
- hfsc_ingress_qdisc=$(get_tc_json tc -s -j qdisc show dev "$ifb_interface" | jq -c "[.[] | select(.kind == \"hfsc\")]" 2>/dev/null || echo "[]")
- debug_log "HFSC ingress qdisc: $hfsc_ingress_qdisc"
-
- local hfsc_ingress_classes
- hfsc_ingress_classes=$(get_tc_json tc -s -j class show dev "$ifb_interface")
- debug_log "HFSC ingress classes: $hfsc_ingress_classes"
-
- # Process the output to ensure it's valid JSON
- hfsc_ingress_classes=$(echo "$hfsc_ingress_classes" | jq -c '.' 2>/dev/null || echo "[]")
-
- # Get leaf qdisc statistics
- local egress_leaf_qdiscs
- egress_leaf_qdiscs=$(get_tc_json tc -s -j qdisc show dev "$wan_interface")
- debug_log "Egress leaf qdiscs: $egress_leaf_qdiscs"
-
- # Process the output to ensure it's valid JSON and filter non-HFSC qdiscs
- egress_leaf_qdiscs=$(echo "$egress_leaf_qdiscs" | jq -c '[.[] | select(.kind != "hfsc" and .parent != null)]' 2>/dev/null || echo "[]")
-
- local ingress_leaf_qdiscs
- ingress_leaf_qdiscs=$(get_tc_json tc -s -j qdisc show dev "$ifb_interface")
- debug_log "Ingress leaf qdiscs: $ingress_leaf_qdiscs"
-
- # Process the output to ensure it's valid JSON and filter non-HFSC qdiscs
- ingress_leaf_qdiscs=$(echo "$ingress_leaf_qdiscs" | jq -c '[.[] | select(.kind != "hfsc" and .parent != null)]' 2>/dev/null || echo "[]")
-
- # Get game qdisc type (used by both HFSC and hybrid)
- local gameqdisc
- gameqdisc=$(uci -q get qosmate.hfsc.gameqdisc || echo "pfifo")
-
- # Extract the main HFSC qdisc objects for UI compatibility
- local hfsc_egress
- hfsc_egress=$(echo "$hfsc_egress_qdisc" | jq -c '.[0] // {}' 2>/dev/null || echo "{}")
- local hfsc_ingress
- hfsc_ingress=$(echo "$hfsc_ingress_qdisc" | jq -c '.[0] // {}' 2>/dev/null || echo "{}")
-
- # For hybrid mode, also extract CAKE statistics from the 1:13 classes
- local hybrid_cake_egress="{}"
- local hybrid_cake_ingress="{}"
- if [ "$root_qdisc" = "hybrid" ]; then
- # Get CAKE stats from the 1:13 parent classes
- hybrid_cake_egress=$(echo "$egress_leaf_qdiscs" | jq -c '[.[] | select(.kind == "cake" and (.parent == "1:13" or .parent == "1:13:"))] | .[0] // {}' 2>/dev/null || echo "{}")
- hybrid_cake_ingress=$(echo "$ingress_leaf_qdiscs" | jq -c '[.[] | select(.kind == "cake" and (.parent == "1:13" or .parent == "1:13:"))] | .[0] // {}' 2>/dev/null || echo "{}")
- debug_log "Hybrid CAKE egress: $hybrid_cake_egress"
- debug_log "Hybrid CAKE ingress: $hybrid_cake_ingress"
- fi
-
- # Create final JSON output using jq to ensure proper escaping
- result=$(jq -n \
- --arg rq "$root_qdisc" \
- --arg wi "$wan_interface" \
- --arg ii "$ifb_interface" \
- --arg gq "$gameqdisc" \
- --argjson fs "$filtered_stats" \
- --argjson he "$hfsc_egress" \
- --argjson hi "$hfsc_ingress" \
- --argjson hec "$hfsc_egress_classes" \
- --argjson hic "$hfsc_ingress_classes" \
- --argjson elq "$egress_leaf_qdiscs" \
- --argjson ilq "$ingress_leaf_qdiscs" \
- --argjson hce "$hybrid_cake_egress" \
- --argjson hci "$hybrid_cake_ingress" \
- '{
- root_qdisc: $rq,
- wan_interface: $wi,
- ifb_interface: $ii,
- gameqdisc: $gq,
- qdisc_stats: $fs,
- hfsc_egress: $he,
- hfsc_ingress: $hi,
- hfsc_egress_classes: $hec,
- hfsc_ingress_classes: $hic,
- egress_leaf_qdiscs: $elq,
- ingress_leaf_qdiscs: $ilq,
- hybrid_cake_egress: $hce,
- hybrid_cake_ingress: $hci
- }' 2>/dev/null)
- elif [ "$root_qdisc" = "htb" ]; then
- local htb_egress_qdisc
- htb_egress_qdisc=$(get_tc_json tc -s -j qdisc show dev "$wan_interface" | jq -c "[.[] | select(.kind == \"htb\")]" 2>/dev/null || echo "[]")
- debug_log "HTB egress qdisc: $htb_egress_qdisc"
-
- local htb_egress_classes
- htb_egress_classes=$(get_tc_json tc -s -j class show dev "$wan_interface")
- debug_log "HTB egress classes: $htb_egress_classes"
- htb_egress_classes=$(echo "$htb_egress_classes" | jq -c '.' 2>/dev/null || echo "[]")
-
- local htb_ingress_qdisc
- htb_ingress_qdisc=$(get_tc_json tc -s -j qdisc show dev "$ifb_interface" | jq -c "[.[] | select(.kind == \"htb\")]" 2>/dev/null || echo "[]")
- debug_log "HTB ingress qdisc: $htb_ingress_qdisc"
-
- local htb_ingress_classes
- htb_ingress_classes=$(get_tc_json tc -s -j class show dev "$ifb_interface")
- debug_log "HTB ingress classes: $htb_ingress_classes"
- htb_ingress_classes=$(echo "$htb_ingress_classes" | jq -c '.' 2>/dev/null || echo "[]")
-
- local egress_leaf_qdiscs
- egress_leaf_qdiscs=$(get_tc_json tc -s -j qdisc show dev "$wan_interface")
- debug_log "Egress leaf qdiscs: $egress_leaf_qdiscs"
- egress_leaf_qdiscs=$(echo "$egress_leaf_qdiscs" | jq -c '[.[] | select(.kind != "htb" and .parent != null)]' 2>/dev/null || echo "[]")
-
- local ingress_leaf_qdiscs
- ingress_leaf_qdiscs=$(get_tc_json tc -s -j qdisc show dev "$ifb_interface")
- debug_log "Ingress leaf qdiscs: $ingress_leaf_qdiscs"
- ingress_leaf_qdiscs=$(echo "$ingress_leaf_qdiscs" | jq -c '[.[] | select(.kind != "htb" and .parent != null)]' 2>/dev/null || echo "[]")
-
- local htb_egress
- htb_egress=$(echo "$htb_egress_qdisc" | jq -c '.[0] // {}' 2>/dev/null || echo "{}")
- local htb_ingress
- htb_ingress=$(echo "$htb_ingress_qdisc" | jq -c '.[0] // {}' 2>/dev/null || echo "{}")
-
- result=$(jq -n \
- --arg rq "$root_qdisc" \
- --arg wi "$wan_interface" \
- --arg ii "$ifb_interface" \
- --argjson fs "$filtered_stats" \
- --argjson he "$htb_egress" \
- --argjson hi "$htb_ingress" \
- --argjson hec "$htb_egress_classes" \
- --argjson hic "$htb_ingress_classes" \
- --argjson elq "$egress_leaf_qdiscs" \
- --argjson ilq "$ingress_leaf_qdiscs" \
- '{
- root_qdisc: $rq,
- wan_interface: $wi,
- ifb_interface: $ii,
- qdisc_stats: $fs,
- htb_egress: $he,
- htb_ingress: $hi,
- htb_egress_classes: $hec,
- htb_ingress_classes: $hic,
- egress_leaf_qdiscs: $elq,
- ingress_leaf_qdiscs: $ilq
- }' 2>/dev/null)
- fi
-
- echo "$result"
-}
-
-# Function to get historical statistics
-get_historical_stats() {
- # Note: This is currently a placeholder function for future implementation
- # In the future, this could provide historical QoS statistics from a database or log files
- # Currently returns an empty JSON object as no history is being saved
- local history_file="/tmp/qosmate_stats_history.json"
-
- if [ -f "$history_file" ]; then
- cat "$history_file"
- else
- echo "{}"
- fi
-}
-
-# Function to get RRD data if available
-get_rrd_data() {
- # Note: This is currently a placeholder function for future implementation
- # In the future, this could provide Round Robin Database data for generating time-series charts
- # Currently only checks if the RRD directory exists but doesn't actually process any data
- # Check if RRD data is available for QoS
- if [ -d "/tmp/rrd" ]; then
- echo "{\"rrd_available\": true}"
- else
- echo "{\"rrd_available\": false}"
- fi
-}
-
-# Function to get autorate statistics (current state + config + history)
-get_autorate_stats() {
- config_load qosmate
-
- local enabled
- config_get enabled autorate enabled "0"
-
- if [ "$enabled" != "1" ]; then
- echo '{"autorate_enabled":false}'
- return
- fi
-
- # Read current state from daemon's state file
- local current='{"ul_rate":0,"dl_rate":0,"achieved_ul":0,"achieved_dl":0,"latency":0,"baseline":0,"ul_load_pct":0,"dl_load_pct":0}'
- if [ -f "/tmp/qosmate-autorate-state" ]; then
- local _ar_ul=0 _ar_dl=0 _ar_aul=0 _ar_adl=0 _ar_lat=0 _ar_bl=0 _ar_ulp=0 _ar_dlp=0
- local _key _val
- while IFS='=' read -r _key _val; do
- case "$_key" in
- ul_rate) _ar_ul="$_val" ;;
- dl_rate) _ar_dl="$_val" ;;
- achieved_ul) _ar_aul="$_val" ;;
- achieved_dl) _ar_adl="$_val" ;;
- latency) _ar_lat="$_val" ;;
- baseline) _ar_bl="$_val" ;;
- ul_load_pct) _ar_ulp="$_val" ;;
- dl_load_pct) _ar_dlp="$_val" ;;
- esac
- done < "/tmp/qosmate-autorate-state"
- _ar_ul=$(json_uint_or_zero "$_ar_ul")
- _ar_dl=$(json_uint_or_zero "$_ar_dl")
- _ar_aul=$(json_uint_or_zero "$_ar_aul")
- _ar_adl=$(json_uint_or_zero "$_ar_adl")
- _ar_lat=$(json_uint_or_zero "$_ar_lat")
- _ar_bl=$(json_uint_or_zero "$_ar_bl")
- _ar_ulp=$(json_uint_or_zero "$_ar_ulp")
- _ar_dlp=$(json_uint_or_zero "$_ar_dlp")
- current=$(printf '{"ul_rate":%s,"dl_rate":%s,"achieved_ul":%s,"achieved_dl":%s,"latency":%s,"baseline":%s,"ul_load_pct":%s,"dl_load_pct":%s}' \
- "$_ar_ul" "$_ar_dl" "$_ar_aul" "$_ar_adl" "$_ar_lat" "$_ar_bl" "$_ar_ulp" "$_ar_dlp")
- fi
-
- # Read config values (replicate defaults from autorate daemon)
- local uprate downrate
- config_get uprate settings UPRATE "0"
- config_get downrate settings DOWNRATE "0"
-
- local base_ul base_dl min_ul min_dl max_ul max_dl dec_thr inc_thr
- config_get base_ul autorate base_ul_rate ""
- config_get base_dl autorate base_dl_rate ""
- config_get min_ul autorate min_ul_rate ""
- config_get min_dl autorate min_dl_rate ""
- config_get max_ul autorate max_ul_rate ""
- config_get max_dl autorate max_dl_rate ""
- config_get dec_thr autorate latency_decrease_threshold "10"
- config_get inc_thr autorate latency_increase_threshold "5"
-
- : "${base_ul:=$uprate}"
- : "${base_dl:=$downrate}"
- : "${min_ul:=$((uprate * 25 / 100))}"
- : "${min_dl:=$((downrate * 25 / 100))}"
- : "${max_ul:=$((uprate * 105 / 100))}"
- : "${max_dl:=$((downrate * 105 / 100))}"
-
- # Convert thresholds to tenths of ms (matching daemon's internal format)
- dec_thr=$((dec_thr * 10))
- inc_thr=$((inc_thr * 10))
-
- base_ul=$(json_uint_or_zero "$base_ul")
- base_dl=$(json_uint_or_zero "$base_dl")
- min_ul=$(json_uint_or_zero "$min_ul")
- min_dl=$(json_uint_or_zero "$min_dl")
- max_ul=$(json_uint_or_zero "$max_ul")
- max_dl=$(json_uint_or_zero "$max_dl")
- dec_thr=$(json_uint_or_zero "$dec_thr")
- inc_thr=$(json_uint_or_zero "$inc_thr")
-
- local config
- config=$(printf '{"base_ul":%s,"base_dl":%s,"min_ul":%s,"min_dl":%s,"max_ul":%s,"max_dl":%s,"decrease_threshold":%s,"increase_threshold":%s}' \
- "$base_ul" "$base_dl" "$min_ul" "$min_dl" "$max_ul" "$max_dl" "$dec_thr" "$inc_thr")
-
- # Convert RAM CSV history to compact JSON arrays (60 min, 2s resolution)
- # Format: [[ts,ul,dl,a_ul,a_dl,lat,bl,ulp,dlp], ...]
- local history="[]"
- if [ -f "/tmp/qosmate-autorate-history" ] && [ -s "/tmp/qosmate-autorate-history" ]; then
- history=$(awk -F',' '{
- for(i=1; i<=9; i++) {
- gsub(/^[[:space:]]+|[[:space:]]+$/, "", $i)
- if($i !~ /^[0-9]+$/) $i=0
- }
- if(NR>1) printf ","
- printf "[%s,%s,%s,%s,%s,%s,%s,%s,%s]",$1,$2,$3,$4,$5,$6,$7,$8,$9
- }' "/tmp/qosmate-autorate-history")
- history="[${history}]"
- fi
-
- # Convert Flash CSV history to JSON (30 days, 10-min bucket summaries)
- # Format: [[ts,avg_ul,avg_dl,avg_a_ul,avg_a_dl,avg_lat,max_lat,avg_bl,avg_ulp,avg_dlp], ...]
- local flash_history="[]"
- if [ -f "/etc/qosmate.d/autorate_hourly.csv" ] && [ -s "/etc/qosmate.d/autorate_hourly.csv" ]; then
- flash_history=$(awk -F',' '{
- for(i=1; i<=10; i++) {
- gsub(/^[[:space:]]+|[[:space:]]+$/, "", $i)
- if($i !~ /^[0-9]+$/) $i=0
- }
- if(NR>1) printf ","
- printf "[%s,%s,%s,%s,%s,%s,%s,%s,%s,%s]",$1,$2,$3,$4,$5,$6,$7,$8,$9,$10
- }' "/etc/qosmate.d/autorate_hourly.csv")
- flash_history="[${flash_history}]"
- fi
-
- printf '{"autorate_enabled":true,"current":%s,"config":%s,"history":%s,"flash_history":%s}\n' \
- "$current" "$config" "$history" "$flash_history"
-}
-
-# Function to get nftables rule counters for active rules
-get_rule_counters() {
- local nft_output rules_json
- nft_output=$(nft -j list table inet dscptag 2>/dev/null || echo '{"nftables":[]}')
-
- # Parse and aggregate rule counters by name (combine IPv4/IPv6)
- rules_json=$(echo "$nft_output" | jq -c '
- [.nftables[] |
- select(.rule != null and .rule.table == "dscptag") |
- select(.rule.comment != null) |
- select(.rule.comment | startswith("ipv4_") or startswith("ipv6_")) |
- select(.rule.expr[]?.counter != null) |
- .rule |
- {
- rule_name: (if .comment | startswith("ipv4_") then .comment[5:] elif .comment | startswith("ipv6_") then .comment[5:] else .comment end),
- total_packets: (.expr[] | select(.counter != null) | .counter.packets // 0),
- total_bytes: (.expr[] | select(.counter != null) | .counter.bytes // 0),
- ipv4_packets: (if .comment | startswith("ipv4_") then (.expr[] | select(.counter != null) | .counter.packets // 0) else 0 end),
- ipv6_packets: (if .comment | startswith("ipv6_") then (.expr[] | select(.counter != null) | .counter.packets // 0) else 0 end)
- }] |
- group_by(.rule_name) |
- map({
- rule_name: .[0].rule_name,
- total_packets: (map(.total_packets) | add),
- total_bytes: (map(.total_bytes) | add),
- ipv4_packets: (map(.ipv4_packets) | add // 0),
- ipv6_packets: (map(.ipv6_packets) | add // 0)
- })
- ' 2>/dev/null || echo "[]")
-
- jq -n --argjson rules "$rules_json" '{rule_counters: $rules}' 2>/dev/null || echo '{"rule_counters":[]}'
-}
-
-# Function to handle the call command
-handle_call() {
- local method="$1"
-
- # Read and discard input JSON (unused for current methods)
- cat > /dev/null
-
- # Default to getStats if no method specified
- [ -z "$method" ] && method="getStats"
-
- # Process based on method
- case "$method" in
- getStats)
- get_stats
- ;;
- getHistoricalStats)
- get_historical_stats
- ;;
- getRrdData)
- get_rrd_data
- ;;
- getRuleCounters)
- get_rule_counters
- ;;
- getAutorateStats)
- get_autorate_stats
- ;;
- *)
- echo '{"error": "Method not found"}'
- ;;
- esac
-}
-
-# Main function to handle RPC calls
-case "$1" in
- list)
- # List available methods
- echo '{"getStats": {}, "getHistoricalStats": {}, "getRrdData": {}, "getRuleCounters": {}, "getAutorateStats": {}}'
- ;;
- call)
- handle_call "$2"
- ;;
- *)
- echo '{"error": "Invalid call"}'
- ;;
-esac
diff --git a/luci-app-qosmate/root/usr/share/luci/menu.d/luci-app-qosmate.json b/luci-app-qosmate/root/usr/share/luci/menu.d/luci-app-qosmate.json
deleted file mode 100644
index 1e209ff62..000000000
--- a/luci-app-qosmate/root/usr/share/luci/menu.d/luci-app-qosmate.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
- "admin/network/qosmate": {
- "title": "QoSmate",
- "order": 70,
- "action": {
- "type": "firstchild"
- },
- "depends": {
- "acl": [ "luci-app-qosmate" ],
- "uci": { "qosmate": true }
- }
- },
- "admin/network/qosmate/settings": {
- "title": "Settings",
- "order": 10,
- "action": {
- "type": "view",
- "path": "qosmate/settings"
- }
- },
- "admin/network/qosmate/hfsc": {
- "title": "HFSC",
- "order": 20,
- "action": {
- "type": "view",
- "path": "qosmate/hfsc"
- }
- },
- "admin/network/qosmate/cake": {
- "title": "CAKE",
- "order": 30,
- "action": {
- "type": "view",
- "path": "qosmate/cake"
- }
- },
- "admin/network/qosmate/advanced": {
- "title": "Advanced",
- "order": 40,
- "action": {
- "type": "view",
- "path": "qosmate/advanced"
- }
- },
- "admin/network/qosmate/rules": {
- "title": "Rules",
- "order": 50,
- "action": {
- "type": "view",
- "path": "qosmate/rules"
- }
- },
- "admin/network/qosmate/ipsets": {
- "title": "IP Sets",
- "order": 45,
- "action": {
- "type": "view",
- "path": "qosmate/ipsets"
- }
- },
- "admin/network/qosmate/ratelimits": {
- "title": "Rate Limits",
- "order": 55,
- "action": {
- "type": "view",
- "path": "qosmate/ratelimits"
- }
- },
- "admin/network/qosmate/custom_rules": {
- "title": "Custom Rules",
- "order": 60,
- "action": {
- "type": "view",
- "path": "qosmate/custom_rules"
- }
- },
- "admin/network/qosmate/connections": {
- "title": "Connections",
- "order": 70,
- "action": {
- "type": "view",
- "path": "qosmate/connections"
- }
- },
- "admin/network/qosmate/statistics": {
- "title": "Statistics",
- "order": 80,
- "action": {
- "type": "view",
- "path": "qosmate/statistics"
- }
- }
-}
diff --git a/luci-app-qosmate/root/usr/share/rpcd/acl.d/luci-app-qosmate.json b/luci-app-qosmate/root/usr/share/rpcd/acl.d/luci-app-qosmate.json
deleted file mode 100644
index 96fa5ef04..000000000
--- a/luci-app-qosmate/root/usr/share/rpcd/acl.d/luci-app-qosmate.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "luci-app-qosmate": {
- "description": "Grant access to QoSmate configuration",
- "read": {
- "ubus": {
- "luci.qosmate": [ "getConntrackDSCP" ],
- "luci.qosmate_stats": [ "getStats", "getHistoricalStats", "getRrdData", "getRuleCounters", "getAutorateStats" ],
- "luci": [ "getInitList", "setInitAction", "getInitActionStatus", "exec" ]
- },
- "uci": [ "qosmate" ],
- "file": {
- "/etc/qosmate.sh": [ "read" ],
- "/etc/init.d/qosmate": [ "read", "exec" ],
- "/etc/hotplug.d/iface/13-qosmateHotplug": [ "read" ],
- "/etc/config/qosmate": [ "read" ],
- "/tmp/qosmate_auto_setup_output.txt": [ "read" ],
- "/etc/qosmate.d/custom_rules.nft": [ "read" ],
- "/etc/qosmate.d/inline_dscptag.nft": [ "read" ],
- "/tmp/qosmate_custom_rules_validation.txt": [ "read" ],
- "/tmp/qosmate_stats_history.json": [ "read" ],
- "/tmp/qosmate-autorate-state": [ "read" ],
- "/tmp/qosmate-autorate-history": [ "read" ],
- "/tmp/qosmate/cake_type": [ "read" ],
- "/etc/qosmate.d/autorate_hourly.csv": [ "read" ]
- }
- },
- "write": {
- "ubus": {
- "luci": [ "setInitAction", "exec" ]
- },
- "uci": [ "qosmate" ],
- "file": {
- "/etc/qosmate.sh": [ "write" ],
- "/etc/init.d/qosmate": [ "write" ],
- "/etc/hotplug.d/iface/13-qosmateHotplug": [ "write" ],
- "/etc/qosmate.d/custom_rules.nft": [ "write" ],
- "/etc/qosmate.d/inline_dscptag.nft": [ "write" ]
- }
- }
- }
-}
diff --git a/luci-app-tinyfilemanager/.prepare.sh b/luci-app-tinyfilemanager/.prepare.sh
deleted file mode 100755
index ee8149674..000000000
--- a/luci-app-tinyfilemanager/.prepare.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-PKG_NAME="$1"
-CURDIR="$2"
-PKG_BUILD_DIR="$3"
-
-if [ -d "$CURDIR/.git" ]; then
- config="$CURDIR/.git/config"
-else
- config="$(sed "s|^gitdir:\s*|$CURDIR/|;s|$|/config|" "$CURDIR/.git")"
-fi
-[ -n "$(sed -En '/^\[remote /{h;:top;n;/^\[/b;s,(https?://gitcode\.(com|net)),\1,;T top;H;x;s|\n\s*|: |;p;}' "$config")" ] && {
- for d in luasrc ucode htdocs root src; do
- rm -rf "$PKG_BUILD_DIR"/$d
- done
- mkdir -p "$PKG_BUILD_DIR"/htdocs/luci-static/resources/view
- touch "$PKG_BUILD_DIR"/htdocs/luci-static/resources/view/$PKG_NAME.js
- mkdir -p "$PKG_BUILD_DIR"/root/usr/share/luci/menu.d
- touch "$PKG_BUILD_DIR"/root/usr/share/luci/menu.d/$PKG_NAME.json
-}
-exit 0
diff --git a/luci-app-tinyfilemanager/LICENSE b/luci-app-tinyfilemanager/LICENSE
deleted file mode 100644
index f288702d2..000000000
--- a/luci-app-tinyfilemanager/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. ' + - result + '
Real installation
-
-
-
-
-" -#~ msgstr "要启用 SSL 支持可能需先安装 %s
" diff --git a/luci-app-tinyfilemanager/po/zh_Hant/tinyfilemanager.po b/luci-app-tinyfilemanager/po/zh_Hant/tinyfilemanager.po deleted file mode 100644 index 8aae949ec..000000000 --- a/luci-app-tinyfilemanager/po/zh_Hant/tinyfilemanager.po +++ /dev/null @@ -1,222 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2023-03-26 21:32+0100\n" -"Last-Translator: muink
" -#~ msgstr "要啟用 SSL 支援可能需先安裝 %s
" diff --git a/luci-app-tinyfilemanager/root/etc/config/tinyfilemanager b/luci-app-tinyfilemanager/root/etc/config/tinyfilemanager deleted file mode 100644 index fe15fad06..000000000 --- a/luci-app-tinyfilemanager/root/etc/config/tinyfilemanager +++ /dev/null @@ -1,12 +0,0 @@ - -config main - option use_auth '1' - list auth_users 'admin:$2y$10$BewzfQXrlnUihprEgGt7ROMB9NigZcZkkwssIRYznF9fwMuObIZoa' - list auth_users 'user:$2y$10$Fg6Dz8oH9fPoZ2jJan5tZuv6Z4Kp7avtQ9bDfrdRntXtPeiMAZyGO' - list readonly_users 'user' - option date_format 'd.m.o' - option time_format 'H:i:s' - option show_second '0' - option favicon_path '/tinyfilemanager/rootfs/etc/tinyfilemanager/favicon.png' - option online_viewer '0' - diff --git a/luci-app-tinyfilemanager/root/etc/init.d/tinyfilemanager b/luci-app-tinyfilemanager/root/etc/init.d/tinyfilemanager deleted file mode 100755 index 47cfff098..000000000 --- a/luci-app-tinyfilemanager/root/etc/init.d/tinyfilemanager +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2022-2023 muink - -. "${IPKG_INSTROOT}/lib/functions.sh" - -START=99 -USE_PROCD=1 -VERSION='2.6' - -EXTRA_COMMANDS="check" -EXTRA_HELP=\ -" check Check for version updates" - -CONFIG_NAME='tinyfilemanager' -TYPEDSECTION='main' - -WORKDIR="/www/tinyfilemanager" -VARDIR="/var/tinyfilemanager" -CONF="/var/etc/tinyfilemanager.conf" - -HOMEPATH="tinyfilemanager/rootfs" - -if [ "$(uci -q get $CONFIG_NAME.@$TYPEDSECTION[0].proxy_enabled)" == "1" ]; then - export ALL_PROXY=$(uci -q get $CONFIG_NAME.@$TYPEDSECTION[0].proxy_protocol)://$(uci -q get $CONFIG_NAME.@$TYPEDSECTION[0].proxy_server) -fi - - - -validate_section() { - uci_load_validate $CONFIG_NAME $TYPEDSECTION "$1" "$2" \ - 'defconf:string' \ - 'use_auth:bool:0' \ - 'auth_users:list(string)' \ - 'readonly_users:list(string)' \ - 'autologin_user:string' \ - 'global_readonly:bool:0' \ - 'root_path:directory' \ - 'date_format:or("d.m.o", "d-m-o", "d/m/o", "j.n.o", "j-n-o", "j/n/o", "o.m.d", "o-m-d", "o/m/d", "o.n.j", "o-n-j", "o/n/j"):d.m.o' \ - 'time_format:or("H\:i\:s", "G\:i\:s", "A h\:i\:s", "A g\:i\:s", "h\:i\:s A", "g\:i\:s A"):H\:i\:s' \ - 'show_second:bool:0' \ - 'favicon_path:string' \ - 'exclude_items:list(string)' \ - 'online_viewer:or("0", "google", "microsoft"):0' \ - 'max_upload_size:and(uinteger,max(2048))' -} - -init_config() { - local defconf="$(sed -n '/^\/\/Default Configuration/,/^$/p' "$WORKDIR/index.php" | tr '\n' '|' | sed 's,|,\\n,g')" - - sed -n "/\/\/ --- EDIT BELOW CONFIGURATION CAREFULLY ---/,/\/\/ --- EDIT BELOW CAREFULLY OR DO NOT EDIT AT ALL ---/{ \ - s|// --- EDIT BELOW CONFIGURATION CAREFULLY ---|\|; \ - /\/\/ if User has the external config file, try to use it to override the default config above/,/^}/d; \ - /^define(/d; \ - p \ - }" "$WORKDIR/index.php" > "$1" - - sed -Ei "s|(^\\\$root_path =)(.+)|\1 \\\$_SERVER['DOCUMENT_ROOT'].'/$HOMEPATH';|; \ - s|(^\\\$root_url =)(.+)|\1 '$HOMEPATH';|; \ - - s|(^\\\$default_timezone =)(.+)|\1 '$(uci -q get system.@system[0].zonename)';| \ - " "$1" -} - -apply_config() { - [ "$2" == "0" ] || { >&2 echo "section $1 validation failed"; return 1; } - - local _conf="$CONF" - - local auth_users=$(echo "$auth_users"|sed -E "s/('[^']+'|[^' ]+)/'\1'/g; s|:|' => '|g; s|''|'|g; s|' '|',\\\n '|g; s|^| |") - local readonly_users=$(echo "$readonly_users"|sed -E "s/('[^']+'|[^' ]+)/'\1'/g; s|''|'|g; s|' '|',\\\n '|g; s|^| |") - - local exclude_items=$(echo "$exclude_items"|sed -E "s/('[^']+'|[^' ]+)/'\1'/g; s|''|'|g; s|' '|',\\\n '|g; s|^| |") - -[ -n "$defconf" ] && sed -Ei "s|^\\\$CONFIG\s*=.*|\$CONFIG = '$defconf'\;|" "$_conf" -[ "$use_auth" -eq "1" ] && sed -Ei "s|(^\\\$use_auth =)(.+)|\1 true;|" "$_conf" || sed -Ei "s|(^\\\$use_auth =)(.+)|\1 false;|" "$_conf" -[ -n "$autologin_user" ] && sed -Ei "s|\?>|\$luci_autologin_user = '$autologin_user';\ninclude '/usr/share/tinyfilemanager/auto-login-base-luci.php';\n\n?>|" "$_conf" -[ "$global_readonly" -eq "1" ] && sed -Ei "s|(^\\\$global_readonly =)(.+)|\1 true;|" "$_conf" || sed -Ei "s|(^\\\$global_readonly =)(.+)|\1 false;|" "$_conf" -sed -Ei "/^\\\$auth_users /,/\);/{/^ /d}" "$_conf" && sed -Ei "/^\\\$auth_users /a\ $auth_users" "$_conf" -sed -Ei "/^\\\$readonly_users /,/\);/{/^ /d}" "$_conf" && sed -Ei "/^\\\$readonly_users /a\ $readonly_users" "$_conf" -sed -Ei "/^\\\$exclude_items /{s|array\(\);|array(\n);|}" "$_conf" && sed -Ei "/^\\\$exclude_items /a\ $exclude_items" "$_conf" -sed -Ei "s|(^\\\$default_timezone =)(.+)|\1 '$(uci -q get system.@system[0].zonename)';|" "$_conf" -if [ -n "$root_path" ]; then - sed -Ei "s|(^\\\$root_path =)(.+)|\1 \\\$_SERVER['DOCUMENT_ROOT'].'/${HOMEPATH}$root_path';|; \ - s|(^\\\$root_url =)(.+)|\1 '${HOMEPATH}$root_path';| \ - " "$_conf" -fi -sed -Ei "s|(^\\\$datetime_format =)(.+)|\1 '$date_format $time_format';|" "$_conf" -[ "$show_second" -eq "0" ] && sed -Ei "/^\\\$datetime_format =/{s|:s||}" "$_conf" -sed -Ei "s|(^\\\$favicon_path =)(.+)|\1 '$favicon_path';|" "$_conf" -if [ "$online_viewer" == "0" ]; then sed -Ei "s|(^\\\$online_viewer =)(.+)|\1 false;|" "$_conf" -else sed -Ei "s|(^\\\$online_viewer =)(.+)|\1 '$online_viewer';|" "$_conf" -fi -if [ "$(( $max_upload_size +0 ))" == "0" ]; then sed -Ei "s|(^\\\$max_upload_size_bytes =)(.+)|\1 26214400;|" "$_conf" #25M -else sed -Ei "s|(^\\\$max_upload_size_bytes =)(.+)|\1 $(( $max_upload_size * 1024**2 ));|" "$_conf" -fi -} - -start_service() { - mkdir /var/etc 2>/dev/null - touch "$CONF" - ln -s "$CONF" "$WORKDIR/config.php" 2>/dev/null - init_config "$CONF" - - config_load "$CONFIG_NAME" - config_foreach validate_section "$TYPEDSECTION" apply_config - - # CONFIG save - procd_open_instance "config-save" - procd_set_param command "/usr/libexec/tinyfilemanager-config-save" - procd_set_param env CONF=$CONF - procd_set_param respawn - #procd_set_param stdout 1 - #procd_set_param stderr 1 - procd_close_instance -} - -service_triggers() { - procd_add_reload_trigger "$CONFIG_NAME" 'system' -} - -check() { - local owner='prasathmani' - local repo='tinyfilemanager' - mkdir $VARDIR 2>/dev/null - curl -sSL https://api.github.com/repos/$owner/$repo/releases \ - | grep '"tag_name":' | sed "/$VERSION/,\${/$VERSION/b;d}" \ - | sed -E 's|",||g; s|^.+"([^"]+)|\1|g' \ - > "$VARDIR/releaseslist" - [ "$?" != 0 ] || sed -i 'i\master' "$VARDIR/releaseslist" -} - -reload_service() { - restart "$@" -} diff --git a/luci-app-tinyfilemanager/root/etc/nginx/conf.d/tinyfilemanager.locations b/luci-app-tinyfilemanager/root/etc/nginx/conf.d/tinyfilemanager.locations deleted file mode 100644 index f25e5bbe6..000000000 --- a/luci-app-tinyfilemanager/root/etc/nginx/conf.d/tinyfilemanager.locations +++ /dev/null @@ -1,33 +0,0 @@ -location /tinyfilemanager/ { - index index.php; - - location ~ \.php$ { - try_files $uri =404; - - # Mitigate https://httpoxy.org/ vulnerabilities - fastcgi_param HTTP_PROXY ""; - - #error_log /dev/null; - fastcgi_connect_timeout 300s; - fastcgi_read_timeout 300s; - fastcgi_send_timeout 300s; - fastcgi_buffer_size 32k; - fastcgi_buffers 4 32k; - fastcgi_busy_buffers_size 32k; - fastcgi_temp_file_write_size 32k; - client_body_timeout 10s; - send_timeout 60s; # default, increase if experiencing a lot of timeouts. - output_buffers 1 32k; - include fastcgi_params; - - # Only throw it at PHP-FPM if file exists (prevents PHP exploits). - fastcgi_pass 127.0.0.1:1026; # or: unix:/var/run/php-fpm.sock; - # fastcgi_pass unix:/var/run/php8-fpm.sock; - - # SCRIPT_FILENAME parameter is used for PHP FPM determining - # the script name. If it is not set in fastcgi_params file, - # i.e. /etc/nginx/fastcgi_params or in the parent contexts, - # please comment off following line: - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } -} diff --git a/luci-app-tinyfilemanager/root/etc/tinyfilemanager/favicon.png b/luci-app-tinyfilemanager/root/etc/tinyfilemanager/favicon.png deleted file mode 100644 index 5b6aefe9f..000000000 Binary files a/luci-app-tinyfilemanager/root/etc/tinyfilemanager/favicon.png and /dev/null differ diff --git a/luci-app-tinyfilemanager/root/etc/uci-defaults/99_luci-app-tinyfilemanager b/luci-app-tinyfilemanager/root/etc/uci-defaults/99_luci-app-tinyfilemanager deleted file mode 100644 index 9d6b2eec1..000000000 --- a/luci-app-tinyfilemanager/root/etc/uci-defaults/99_luci-app-tinyfilemanager +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# unpack -tar -C /www/tinyfilemanager -xzf /www/tinyfilemanager/index.tgz -rm -f /www/tinyfilemanager/index.tgz - -# uhttpd -uci -q get uhttpd.main.index_page|grep -i 'index.php' >/dev/null || uci add_list uhttpd.main.index_page='index.php' -uci -q get uhttpd.main.interpreter|grep -i '.php=/usr/bin/php-cgi' >/dev/null || uci add_list uhttpd.main.interpreter='.php=/usr/bin/php-cgi' -uci changes uhttpd|grep . >/dev/null && uci commit uhttpd -/etc/init.d/uhttpd reload - -# nginx -[ -n "$(command -v nginx)" ] && /etc/init.d/nginx reload - -exit 0 diff --git a/luci-app-tinyfilemanager/root/usr/libexec/tinyfilemanager-config-save b/luci-app-tinyfilemanager/root/usr/libexec/tinyfilemanager-config-save deleted file mode 100755 index 4dc2b18ff..000000000 --- a/luci-app-tinyfilemanager/root/usr/libexec/tinyfilemanager-config-save +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -CONFIG_NAME='tinyfilemanager' - -while :; do - inotifywait -e modify $CONF 2>/dev/null - - CONFIG="$(sed -En "/^\\\$CONFIG\s*=.*/{s|^.+'(.+)'.*|\1|p}" $CONF)" - if [ -n "$CONFIG" ]; then - uci set $CONFIG_NAME.@$TYPEDSECTION[0].defconf="$CONFIG" - [ -z "$(uci changes $CONFIG_NAME)" ] || uci commit $CONFIG_NAME - fi -done diff --git a/luci-app-tinyfilemanager/root/usr/libexec/tinyfilemanager-update b/luci-app-tinyfilemanager/root/usr/libexec/tinyfilemanager-update deleted file mode 100755 index 42b42e701..000000000 --- a/luci-app-tinyfilemanager/root/usr/libexec/tinyfilemanager-update +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash -# dependent: curl tar -# -# LuCI Tiny File Manager -# Author: muink -# Github: https://github.com/muink/luci-app-tinyfilemanager -# - -# PKGInfo -REPOURL='https://github.com/prasathmani/tinyfilemanager' -PKGNAME='tinyfilemanager' -VERSION="$1"; VERSION="${VERSION:=2.6}" -# -PKG_DIR=$PKGNAME-$VERSION -REF_DIR="assets" -# -INDEXPHP="tinyfilemanager.php" -#CFGSAMPl="config-sample.php" -LANGFILE="translation.json" - - -WORKDIR="/www/$PKGNAME" -mkdir -p "$WORKDIR" 2>/dev/null -cd $WORKDIR - -if [ "$(uci -q get $PKGNAME.@main[0].proxy_enabled)" == "1" ]; then - export ALL_PROXY=$(uci -q get $PKGNAME.@main[0].proxy_protocol)://$(uci -q get $PKGNAME.@main[0].proxy_server) -fi - - - -# Clear Old version -rm -rf * - -# Download Repository -grep -qE "^(master|main)$" <<< "$VERSION" && refs=heads || refs=tags -curl -sSL https://codeload.github.com/prasathmani/tinyfilemanager/tar.gz/refs/$refs/$VERSION | tar -xvz -C /tmp - -# Version Check -if [ -z "$(sed -En "/^\\\$external = array\(/,/^\);/p" /tmp/$PKG_DIR/$INDEXPHP)" ]; then - online=y ver_cc=old # <= 2.5.3 -elif [ -n "$(sed -En "/^\\\$external = array\(/,/^\);/{s,^(.+=\")(http(s)?://.+/)([^/]+\.(css|js))(\".+),\4,p}" /tmp/$PKG_DIR/$INDEXPHP)" ]; then - online=y ver_cc=master -else - online=n ver_cc=offline -fi -[ "$online" = "y" ] && { - -# Preprocessing -sed -Ei "/|\$FM_HIGHLIGHTJS_STYLE|g" /tmp/$PKG_DIR/$INDEXPHP -} -[ "$ver_cc" = "master" ] && { - __highlightjs_style=$(sed -En "s|^\\\$highlightjs_style = *'([^']*)';|\1|p" /tmp/$PKG_DIR/$INDEXPHP) - sed -i "s|' . \$highlightjs_style . '|\$__highlightjs_style|" /tmp/$PKG_DIR/$INDEXPHP -} - -# Download CDN Used -mkdir -p "$REF_DIR" 2>/dev/null -[ "$ver_cc" = "old" ] && refurl=($(sed -En "s,^.+=\"(https?://.+\.(css|js))\".+,\1,p" /tmp/$PKG_DIR/$INDEXPHP | sort -u )) -[ "$ver_cc" = "master" ] && refurl=($(sed -En "/^\\\$external /,/^\);/{s,^.+=\"(http(s)?://.+\.(css|js))\".+,\1, p}" /tmp/$PKG_DIR/$INDEXPHP | sort -u )) -ref= -url= -out= -path= - -# \.(css|js) main ref -for _i in $(seq 0 1 $[ ${#refurl[@]} -1 ]); do - eval "url=${refurl[$_i]}" - out=${url##*/} - path="$REF_DIR/${url#http*://}" - - mkdir -p "${path%/*}" 2>/dev/null - curl -sSLo $out $url - mv -f $out "${path%/*}" -done - -ref=$(for _p in $(find * -type f); do \ - sed -E "s/(,|;)/\1\n/g" $_p | grep -E "\burl\([^\)]+\)" | grep -Ev "\burl\(\"data:image" >/dev/null; \ - [ "$?" == "0" ] && echo $_p; \ - done) - -# ref of main ref -for _i in $ref; do - suburl=($(sed -E "s/(,|;)/\1\n/g" $_i | grep -E "\burl\([^\)]+\)" | grep -Ev "\burl\(\"data:image" | sed -En "s|^[^']+'([^']+)'.+|\1| p")) - hosturl=$(for _ in "${refurl[@]}"; do grep "${_i##*/}" <<< "$_"; done) - - for _j in $(seq 0 1 $[ ${#suburl[@]} -1 ]); do - url="${suburl[$_j]}" - out=${url%%\?*} - path="$REF_DIR/${hosturl#http*://}" - - mkdir -p "${path%/*}/${out%/*}" 2>/dev/null - curl -sSLo ${out##*/} "${hosturl%/*}/$url" - mv -f ${out##*/} "${path%/*}/$out" - done -done - -# Post-processing -[ "$ver_cc" = "old" ] && sed -i "s|\$FM_HIGHLIGHTJS_STYLE||g" /tmp/$PKG_DIR/$INDEXPHP -[ "$ver_cc" = "master" ] && sed -i "s|\$__highlightjs_style|' . \$highlightjs_style . '|" /tmp/$PKG_DIR/$INDEXPHP - -# Hotfix - -# Migrating to Local Reference -sed -Ei "s,^(.+=\")https?://(.+\.(css|js))(\".+),\1$REF_DIR/\2\4," /tmp/$PKG_DIR/$INDEXPHP - -} - -# FixED -[ "$ver_cc" = "master" ] || sed -Ei "/^if \(\\\$use_auth\) \{/,/^}/{/\/\/ Logging In/,/\/\/ Form/{s|(fm_redirect\().+|\1FM_SELF_URL);|g}}" /tmp/$PKG_DIR/$INDEXPHP - -# Clean up and Done -[ -d "/tmp/$PKG_DIR/$REF_DIR" ] && cp -rf "/tmp/$PKG_DIR/$REF_DIR" . -mv -f /tmp/$PKG_DIR/$INDEXPHP ./index.php -#mv -f /tmp/$PKG_DIR/$CFGSAMPl . -mv -f /tmp/$PKG_DIR/$LANGFILE . -find * -type d -exec chmod 755 {} \; -find * -type f -exec chmod 644 {} \; -[ ! -d /www/tinyfilemanager/rootfs ] && ln -s / /www/tinyfilemanager/rootfs -/etc/init.d/tinyfilemanager start - - - -#$(INSTALL_DIR) $(1)/usr/libexec -#$(INSTALL_DIR) $(1)/www/$PKGNAME -#$(INSTALL_BIN) run.sh $(1)/usr/libexec/$PKGNAME -#$(CP) $PKG_DIR/$INDEXPHP $(1)/www/$PKGNAME/index.php -#$(CP) $PKG_DIR/$CFGSAMPl $(1)/www/$PKGNAME/$CFGSAMPl -#$(CP) $PKG_DIR/$LANGFILE $(1)/www/$PKGNAME/$LANGFILE -#$(CP) --parents -rf $REF_DIR/ $(1)/www/$PKGNAME/ diff --git a/luci-app-tinyfilemanager/root/usr/share/luci/menu.d/luci-app-tinyfilemanager.json b/luci-app-tinyfilemanager/root/usr/share/luci/menu.d/luci-app-tinyfilemanager.json deleted file mode 100644 index 8acb24f34..000000000 --- a/luci-app-tinyfilemanager/root/usr/share/luci/menu.d/luci-app-tinyfilemanager.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "admin/nas": { - "title": "NAS", - "order": 44, - "action": { - "type": "firstchild", - "recurse": true - } - }, - "admin/nas/tinyfilemanager": { - "title": "Tiny File Manager", - "order": 10, - "action": { - "type": "firstchild" - }, - "depends": { - "acl": [ "luci-app-tinyfilemanager" ], - "uci": { "tinyfilemanager": true } - } - }, - "admin/nas/tinyfilemanager/tinyfilemanager": { - "title": "Tiny File Manager", - "order": 1, - "action": { - "type": "view", - "path": "tinyfilemanager/main" - } - }, - "admin/nas/tinyfilemanager/config": { - "title": "Config", - "order": 2, - "action": { - "type": "view", - "path": "tinyfilemanager/config" - } - } -} diff --git a/luci-app-tinyfilemanager/root/usr/share/rpcd/acl.d/luci-app-tinyfilemanager.json b/luci-app-tinyfilemanager/root/usr/share/rpcd/acl.d/luci-app-tinyfilemanager.json deleted file mode 100644 index 8d27d1039..000000000 --- a/luci-app-tinyfilemanager/root/usr/share/rpcd/acl.d/luci-app-tinyfilemanager.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "luci-app-tinyfilemanager": { - "description": "Grant access to tinyfilemanager procedures", - "read": { - "file": { - "/usr/libexec/tinyfilemanager-update": [ "exec" ], - "/etc/init.d/tinyfilemanager check": [ "exec" ], - "/etc/init.d/tinyfilemanager reload": [ "exec" ], - "/var/tinyfilemanager/releaseslist": [ "read" ], - "/tmp/tinyfilemanager/releaseslist": [ "read" ] - }, - "uci": [ "tinyfilemanager" ] - }, - "write": { - "uci": [ "tinyfilemanager" ] - } - } -} diff --git a/luci-app-tinyfilemanager/root/usr/share/tinyfilemanager/auto-login-base-luci.php b/luci-app-tinyfilemanager/root/usr/share/tinyfilemanager/auto-login-base-luci.php deleted file mode 100644 index 827c24cd2..000000000 --- a/luci-app-tinyfilemanager/root/usr/share/tinyfilemanager/auto-login-base-luci.php +++ /dev/null @@ -1,49 +0,0 @@ -/dev/null'); - return $out && strpos($out, '"username"') !== false; -} - -// Step 1: luci_sid in URL → validate and auto-login -if (!empty($_GET['luci_sid'])) { - $sid = preg_replace('/[^a-f0-9]/', '', $_GET['luci_sid']); - if (luci_validate_sid($sid)) { - $_SESSION['filemanager']['logged'] = $luci_autologin_user; - $_SESSION['filemanager']['luci_sid'] = $sid; - session_write_close(); - header('Location: /tinyfilemanager/'); - exit; - } else { - unset($_SESSION['filemanager']['logged']); - unset($_SESSION['filemanager']['luci_sid']); - session_write_close(); - http_response_code(403); - die('LuCI session invalid or expired.'); - } -} - -// Step 2: On every request, re-validate stored LuCI session -if (!empty($_SESSION['filemanager']['logged'])) { - $sid = $_SESSION['filemanager']['luci_sid'] ?? ''; - if (!luci_validate_sid($sid)) { - // LuCI session expired → force logout - unset($_SESSION['filemanager']['logged']); - unset($_SESSION['filemanager']['luci_sid']); - session_write_close(); - header('Location: /tinyfilemanager/'); - exit; - } -} - -session_write_close(); - -?> diff --git a/luci-app-vantage/Makefile b/luci-app-vantage/Makefile index 4a95e0001..a879f2f38 100644 --- a/luci-app-vantage/Makefile +++ b/luci-app-vantage/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-vantage PKG_VERSION:=1.0.14 -PKG_RELEASE:=22 +PKG_RELEASE:=23 PKG_LICENSE:=GPL-3.0-or-later LUCI_TITLE:=Vantage dashboard diff --git a/luci-app-vantage/root/usr/share/luci/menu.d/zz-luci-app-vantage.json b/luci-app-vantage/root/usr/share/luci/menu.d/zz-luci-app-vantage.json index 9c4a86673..259d1c91d 100644 --- a/luci-app-vantage/root/usr/share/luci/menu.d/zz-luci-app-vantage.json +++ b/luci-app-vantage/root/usr/share/luci/menu.d/zz-luci-app-vantage.json @@ -1,5 +1,5 @@ { - "admin/dashboard": { + "admin/status/dashboard": { "title": "Dashboard", "order": 1, "action": { diff --git a/luci-app-wrqr/.editorconfig b/luci-app-wrqr/.editorconfig deleted file mode 100644 index 2cab0c307..000000000 --- a/luci-app-wrqr/.editorconfig +++ /dev/null @@ -1,12 +0,0 @@ -root = true - -[*] -charset = utf-8 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true -indent_style = tab - -# Markdown may use trailing spaces for hard line breaks. -[*.md] -trim_trailing_whitespace = false diff --git a/luci-app-wrqr/.gitattributes b/luci-app-wrqr/.gitattributes deleted file mode 100644 index e20643316..000000000 --- a/luci-app-wrqr/.gitattributes +++ /dev/null @@ -1,19 +0,0 @@ -* text=auto eol=lf - -*.sh text eol=lf -*.js text eol=lf -*.json text eol=lf -*.md text eol=lf -Makefile text eol=lf - -*.apk binary -*.ipk binary -*.bin binary -*.img binary -*.gz binary -*.zst binary -*.pem text eol=lf - -# Shared scripts vendored from repo-templates: kept out of the language stats. -scripts/check-readme.sh linguist-vendored -scripts/release-notes.sh linguist-vendored diff --git a/luci-app-wrqr/.gitignore b/luci-app-wrqr/.gitignore deleted file mode 100644 index 2c301d7e8..000000000 --- a/luci-app-wrqr/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/build/ -/dist/ -.DS_Store diff --git a/luci-app-wrqr/LICENSE b/luci-app-wrqr/LICENSE deleted file mode 100644 index d45f1d470..000000000 --- a/luci-app-wrqr/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2026 Nikitid - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/luci-app-wrqr/Makefile b/luci-app-wrqr/Makefile deleted file mode 100644 index 12f3e1684..000000000 --- a/luci-app-wrqr/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=luci-app-wrqr -PKG_VERSION:=0.1.0 -PKG_RELEASE:=1 -PKG_LICENSE:=MIT -PKG_MAINTAINER:=nikitid -PKGARCH:=all - -include $(INCLUDE_DIR)/package.mk - -define Package/luci-app-wrqr - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=Wi-Fi QR codes for Status Overview - DEPENDS:=+luci-base +luci-lib-uqr -endef - -define Package/luci-app-wrqr/description - Display QR codes for active Wi-Fi access points on the LuCI Status Overview. -endef - -define Build/Compile -endef - -define Package/luci-app-wrqr/install - $(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d - $(INSTALL_DATA) ./luci/acl.json $(1)/usr/share/rpcd/acl.d/luci-app-wrqr.json - - $(INSTALL_DIR) $(1)/www/luci-static/resources/wrqr - $(INSTALL_DATA) ./luci/shared.js $(1)/www/luci-static/resources/wrqr/shared.js - - $(INSTALL_DIR) $(1)/www/luci-static/resources/view/status/include - $(INSTALL_DATA) ./luci/overview.js $(1)/www/luci-static/resources/view/status/include/15_wifi-qr.js - - $(INSTALL_DIR) $(1)/usr/share/licenses/luci-app-wrqr - $(INSTALL_DATA) ./LICENSE $(1)/usr/share/licenses/luci-app-wrqr/LICENSE -endef - -define Package/luci-app-wrqr/postinst -#!/bin/sh -[ -n "$${IPKG_INSTROOT:-}" ] && exit 0 -rm -f /tmp/luci-indexcache -rm -rf /tmp/luci-modulecache -exit 0 -endef - -define Package/luci-app-wrqr/prerm -#!/bin/sh -[ -n "$${IPKG_INSTROOT:-}" ] && exit 0 -case "$${1:-}" in upgrade) exit 0 ;; esac -[ "$${PKG_UPGRADE:-0}" = 1 ] && exit 0 -rm -f /tmp/luci-indexcache -rm -rf /tmp/luci-modulecache -exit 0 -endef - -$(eval $(call BuildPackage,luci-app-wrqr)) diff --git a/luci-app-wrqr/README.md b/luci-app-wrqr/README.md deleted file mode 100644 index 9cb86b4b3..000000000 --- a/luci-app-wrqr/README.md +++ /dev/null @@ -1,78 +0,0 @@ -# Wi-Fi QR for OpenWrt - -[Русский](README.ru.md) - -[](https://github.com/Nikitid/luci-app-wrqr/actions/workflows/ci.yml) -[](https://github.com/Nikitid/luci-app-wrqr/releases/latest) -[](LICENSE) - -The `luci-app-wrqr` package adds a widget with Wi-Fi QR codes to the LuCI -**Status -> Overview** page. - - - -## Features - -- one QR code for each distinct active access point; -- identical networks broadcast by several radios share one code; -- disabled, unsupported and non-AP interfaces are left out. - -## Requirements - -- OpenWrt 24.10 (IPK) or OpenWrt 25.12 (APK); -- LuCI. - -## Installation - -### OpenWrt 24.10 - -Download the latest `luci-app-wrqr_*_all.ipk` from -[Releases](https://github.com/Nikitid/luci-app-wrqr/releases) and upload it -through **System -> Software -> Upload Package**. - -### OpenWrt 25.12 - -```sh -wget -O /tmp/nikitid-feed.sh \ - https://raw.githubusercontent.com/Nikitid/openwrt-feed/feed/install.sh -sh /tmp/nikitid-feed.sh luci-app-wrqr -``` - -The installer verifies the publisher key, adds the shared signed Nikitid -application repository and installs only the named package. To update: - -```sh -apk update -apk upgrade luci-app-wrqr -``` - -## How it works - -The widget reads fresh UCI and wireless runtime state on LuCI's normal status -poll. It only reads: it restarts nothing and writes nothing - not Wi-Fi, rpcd, -uhttpd or the router. - -## Development - -```sh -./scripts/ci-check.sh -``` - -Building, signing and releasing: [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md). - -## Documentation - -- [Repository map](docs/MAP.md) - where things live -- [Development](docs/DEVELOPMENT.md) - building, signing and releasing - -## Support - -Questions and bug reports go to -[Issues](https://github.com/Nikitid/luci-app-wrqr/issues/new/choose): pick the form that -fits. Report a vulnerability privately through -[a security advisory](https://github.com/Nikitid/luci-app-wrqr/security/advisories/new). -English or Russian is fine. - -## License - -[MIT](LICENSE) diff --git a/luci-app-wrqr/README.ru.md b/luci-app-wrqr/README.ru.md deleted file mode 100644 index 19ee08ee0..000000000 --- a/luci-app-wrqr/README.ru.md +++ /dev/null @@ -1,78 +0,0 @@ -# Wi-Fi QR для OpenWrt - -[English](README.md) - -[](https://github.com/Nikitid/luci-app-wrqr/actions/workflows/ci.yml) -[](https://github.com/Nikitid/luci-app-wrqr/releases/latest) -[](LICENSE) - -Пакет `luci-app-wrqr` добавляет на страницу LuCI **Status -> Overview** виджет с -QR-кодами для подключения к Wi-Fi. - - - -## Возможности - -- по одному QR-коду на каждую различающуюся активную точку доступа; -- одинаковые сети, вещаемые несколькими радиомодулями, объединяются в один код; -- отключённые, неподдерживаемые и не-AP интерфейсы не показываются. - -## Требования - -- OpenWrt 24.10 (IPK) или OpenWrt 25.12 (APK); -- LuCI. - -## Установка - -### OpenWrt 24.10 - -Скачайте последний `luci-app-wrqr_*_all.ipk` из -[Releases](https://github.com/Nikitid/luci-app-wrqr/releases) и загрузите его -через **System -> Software -> Upload Package**. - -### OpenWrt 25.12 - -```sh -wget -O /tmp/nikitid-feed.sh \ - https://raw.githubusercontent.com/Nikitid/openwrt-feed/feed/install.sh -sh /tmp/nikitid-feed.sh luci-app-wrqr -``` - -Установщик проверяет ключ издателя, подключает общий подписанный репозиторий -приложений Nikitid и ставит только указанный пакет. Обновление: - -```sh -apk update -apk upgrade luci-app-wrqr -``` - -## Как это работает - -Виджет читает свежее состояние UCI и беспроводного стека на обычном опросе -статуса LuCI. Он только читает: ничего не перезапускает и ничего не -записывает - ни Wi-Fi, ни rpcd, ни uhttpd, ни роутер. - -## Разработка - -```sh -./scripts/ci-check.sh -``` - -Сборка, подпись и выпуск: [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md). - -## Документация - -- [Карта репозитория](docs/MAP.md) - где что лежит -- [Разработка](docs/DEVELOPMENT.md) - сборка, подпись и выпуск - -## Поддержка - -Вопросы и сообщения об ошибках - в -[Issues](https://github.com/Nikitid/luci-app-wrqr/issues/new/choose), выберите -подходящую форму. Об уязвимости сообщайте приватно через -[security advisory](https://github.com/Nikitid/luci-app-wrqr/security/advisories/new). -Можно писать по-русски или по-английски. - -## Лицензия - -[MIT](LICENSE) diff --git a/luci-app-wrqr/apk-feed.env b/luci-app-wrqr/apk-feed.env deleted file mode 100644 index b13395b5d..000000000 --- a/luci-app-wrqr/apk-feed.env +++ /dev/null @@ -1,9 +0,0 @@ -# OpenWrt 25.12 build and shared feed identity. -OPENWRT_APK_VERSION=25.12.5 -OPENWRT_APK_TARGET=mediatek/filogic -OPENWRT_APK_ARCH=aarch64_cortex-a53 -OPENWRT_APK_SDK_ARCHIVE=openwrt-sdk-25.12.5-mediatek-filogic_gcc-14.3.0_musl.Linux-x86_64.tar.zst -OPENWRT_APK_SDK_SHA256=ff4a38a397caa2cfe1c39e18f84ddede14878221b3593c3f2c4cfe24e3ec4c25 -OPENWRT_APK_KEY_FILE=keys/nikitid-openwrt-release.pem -OPENWRT_APK_TRUST_SHA256=f27474d9261f1084350cf4ba34ecdff29e533769c36483d8dd85566e30a6a703 -OPENWRT_FEED_REPOSITORY=Nikitid/openwrt-feed diff --git a/luci-app-wrqr/docs/DEVELOPMENT.md b/luci-app-wrqr/docs/DEVELOPMENT.md deleted file mode 100644 index c7a02d86d..000000000 --- a/luci-app-wrqr/docs/DEVELOPMENT.md +++ /dev/null @@ -1,34 +0,0 @@ -# Development - -## Checks - -```sh -./scripts/ci-check.sh -``` - -## Building - -The IPK for OpenWrt 24.10 is written to `dist/` by `scripts/build-ipk.sh`. The -APK for OpenWrt 25.12 needs a compatible SDK: - -```sh -OPENWRT_SDK_DIR=/path/to/openwrt-sdk-25.12.5-mediatek-filogic \ - ./scripts/build-apk.sh -``` - -A release APK is signed with the shared publisher key by -`scripts/build-apk-release.sh`, which reads the key from -`OPENWRT_APK_SIGNING_KEY`. - -The private half of the publisher key is not stored in any repository. This -repository builds and signs only its own package and publishes it as a release -asset; the index is assembled by -[Nikitid/openwrt-feed](https://github.com/Nikitid/openwrt-feed). See -[Joining the shared feed](https://github.com/Nikitid/openwrt-feed/blob/main/docs/MEMBER_INTEGRATION.md). - -## Release - -Push a `vX.Y.Z` tag matching the version in `release.env`. The release workflow -checks the tag, runs `scripts/ci-check.sh`, builds and signs the APK with the -pinned OpenWrt SDK, and publishes the release with notes made by -`scripts/release-notes.sh` from the commit subjects since the previous tag. diff --git a/luci-app-wrqr/docs/MAP.md b/luci-app-wrqr/docs/MAP.md deleted file mode 100644 index aed408c19..000000000 --- a/luci-app-wrqr/docs/MAP.md +++ /dev/null @@ -1,39 +0,0 @@ -# Repository map - -Where things live. The whole application is two files under `luci/`. - -## The shape of it - -One OpenWrt package, `luci-app-wrqr`: a Wi-Fi QR widget on LuCI's Status → -Overview page. It shows one QR code per distinct active access-point -configuration and merges identical networks broadcast by several radios. - -| file | owns | -| --- | --- | -| `luci/overview.js` | the widget: reads UCI and wireless runtime state, renders the codes | -| `luci/shared.js` | the design system and the dictionary | -| `luci/acl.json` | the calls the widget is allowed to make | -| `Makefile`, `release.env`, `apk-feed.env` | packaging and release identity | -| `scripts/` | build, packaging and the checks | - -The widget is read-only by design: it restarts nothing and writes nothing. -Unsupported, disabled and non-AP interfaces are omitted rather than shown in -an error state. - -## Checks - -```sh -./scripts/ci-check.sh -``` - -`scripts/test-overview-ui.js` stubs LuCI and renders the widget - a page that -merely parses can still die at render. - -## Documentation - -| file | for | -| --- | --- | -| `docs/MAP.md` | this file | -| `docs/DEVELOPMENT.md` | building, signing and releasing | -| `README.md` | user-facing, English | -| `README.ru.md` | the Russian version | diff --git a/luci-app-wrqr/docs/images/widget.png b/luci-app-wrqr/docs/images/widget.png deleted file mode 100644 index 05823fbfd..000000000 Binary files a/luci-app-wrqr/docs/images/widget.png and /dev/null differ diff --git a/luci-app-wrqr/keys/nikitid-openwrt-release.pem b/luci-app-wrqr/keys/nikitid-openwrt-release.pem deleted file mode 100644 index 786ed8adb..000000000 --- a/luci-app-wrqr/keys/nikitid-openwrt-release.pem +++ /dev/null @@ -1,4 +0,0 @@ ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4Kze8kPGZESezGw8NMN4gDMgaevH -+Y9IgZbqWeHpW0gCNXNpctIlS1LSlQraDRwRTJlbg0R+uCGyv0/QnduYkg== ------END PUBLIC KEY----- diff --git a/luci-app-wrqr/luci/acl.json b/luci-app-wrqr/luci/acl.json deleted file mode 100644 index 5d75155c2..000000000 --- a/luci-app-wrqr/luci/acl.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "luci-app-wrqr": { - "description": "Read active Wi-Fi access points for the Status Overview QR widget", - "read": { - "ubus": { - "luci-rpc": [ "getWirelessDevices" ], - "uci": [ "get" ] - }, - "uci": [ "wireless" ] - } - } -} diff --git a/luci-app-wrqr/luci/overview.js b/luci-app-wrqr/luci/overview.js deleted file mode 100644 index 99d19aa0d..000000000 --- a/luci-app-wrqr/luci/overview.js +++ /dev/null @@ -1,94 +0,0 @@ -'use strict'; -'require baseclass'; -'require dom'; -'require rpc'; -'require uqr'; -'require wrqr.shared as common'; - -var callWirelessConfig = rpc.declare({ - object: 'uci', - method: 'get', - params: [ 'config' ], - expect: { values: {} } -}); - -var callWirelessStatus = rpc.declare({ - object: 'luci-rpc', - method: 'getWirelessDevices', - expect: {} -}); - -var root = null; -var grid = null; -var lastFingerprint = null; - -function styles() { - return E('style', {}, [ - '.wrqr-grid{display:flex;flex-wrap:wrap;justify-content:center;align-items:flex-start;gap:2.5rem 1rem;max-width:1164px;margin:0 auto}', - '.wrqr-card{display:flex;flex:1 1 190px;flex-direction:column;align-items:center;width:220px;max-width:220px;min-width:0;padding:1rem;box-sizing:border-box;text-align:center}', - '.wrqr-ssid{display:block;width:100%;margin:0 0 .25rem;overflow-wrap:anywhere;text-align:center;font-size:1.15rem}', - '.wrqr-bands{width:100%;min-height:1.4em;margin:0 0 .8rem;text-align:center;color:var(--text-color-medium,#666);font-size:.85rem}', - '.wrqr-code{display:flex;align-items:center;justify-content:center;width:220px;max-width:100%;margin:0 auto;padding:12px;background:#fff;box-sizing:border-box}', - '.wrqr-code svg{display:block;width:100%;height:auto;margin:0 auto}', - '.wrqr-empty{width:100%;margin:.5rem 0;text-align:center;color:var(--text-color-medium,#666)}', - '@media(max-width:700px){.wrqr-grid{gap:2rem 1rem}.wrqr-card{flex-basis:160px;padding:.75rem .25rem}}' - ]); -} - -function card(network) { - var svg = uqr.renderSVG(network.payload, { - pixelSize: 4, - whiteColor: 'white', - blackColor: 'black', - ecc: 'M', - border: 4 - }); - svg = svg.replace(/