up luci-app-netspeedtest v5.0.2

Author: sirpdboy

luci-app-netspeedtest/Makefile

@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-netspeedtest
 
-PKG_VERSION:=5.0.1
-PKG_RELEASE:=20250512
+PKG_VERSION:=5.0.2
+PKG_RELEASE:=20250513
 
 LUCI_TITLE:=LuCI Support for netspeedtest
 LUCI_DEPENDS:=+speedtest-cli +homebox +iperf3-ssl

luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/homebox.js

@@ -30,7 +30,7 @@ return view.extend({
 
         var iframe = E('iframe', {
             src: window.location.origin + ':' + state.port,
-            style: 'width: 100%; min-height: 80vh; border: none; border-radius: 3px;'
+            style: 'border:none;width: 100%; min-height: 80vh; border: none; border-radius: 3px;overflow:hidden !important;'
         });
 
         function checkProcess() {
@@ -42,7 +42,7 @@ return view.extend({
 
         function controlService(action) {
             var command = action === 'start' 
-                ? 'nohup /usr/bin/homebox > /tmp/homebox.log 2>&1 &' 
+                ? 'nohup /usr/bin/homebox > /tmp/netspeedtest.log 2>&1 &' 
                 : '/usr/bin/killall homebox';
             return fs.exec('/bin/sh', ['-c', command]);
         }

luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/iperf3.js

@@ -12,7 +12,7 @@ var state = {
     port: null
 };
 
-const logPath = '/var/log/iperf3.log';
+const logPath = '/tmp/netspeedtest.log';
 
 function checkProcess() {
     return fs.exec('/bin/pidof', ['iperf3']).then(res => ({
@@ -172,7 +172,7 @@ const statusSection = E('div', { 'class': 'cbi-section' }, [
             return E('div', [
                 statusSection,
                 E('div', { 'class': 'cbi-section' }, [
-                    E('h3', {}, _('Iperf3 Run Log')),
+                    E('h3', {}, _('Run Log')),
                     logTextarea,
                     E('div', { 'style': 'text-align: right; font-size: small;  margin-top: 5px;' },
                         _('Refresh every 5 seconds.')

luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/logs.js

@@ -1,3 +1,4 @@
+/*   Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netspeedtest */
 'use strict';
 'require dom';
 'require fs';
@@ -11,76 +12,87 @@ var logTextarea;
 var log_path;
 
 uci.load('netspeedtest').then(function() {
-	log_path = '/var/log/netspeedtest.log';
+    log_path = '/tmp/netspeedtest.log';
 });
 
 function pollLog() {
-	return Promise.all([
-		fs.read_direct(log_path, 'text').then(function (res) {
-			return res.trim().split(/\n/).join('\n').replace(/\u001b\[33mWARN\u001b\[0m/g, '').replace(/\u001b\[36mINFO\u001b\[0m/g, '').replace(/\u001b\[31mERRO\u001b\[0m/g, '');
-		}),
-	]).then(function (data) {
-		logTextarea.value = data[0] || _('No log data.');
+    return Promise.all([
+        fs.read_direct(log_path, 'text').then(function(res) {
+            return res.trim()
+                .split(/\n/).join('\n')
+                .replace(/\u001b\[33mWARN\u001b\[0m/g, '')
+                .replace(/\u001b\[36mINFO\u001b\[0m/g, '')
+                .replace(/\u001b\[31mERRO\u001b\[0m/g, '');
+        }),
+    ]).then(function(data) {
+        logTextarea.value = data[0] || _('No log data.');
 
-		if (!userScrolled) {
-			logTextarea.scrollTop = logTextarea.scrollHeight;
-		} else {
-			logTextarea.scrollTop = scrollPosition;
-		}
-	});
-};
+        if (!userScrolled) {
+            logTextarea.scrollTop = logTextarea.scrollHeight;
+        } else {
+            logTextarea.scrollTop = scrollPosition;
+        }
+    });
+}
 
 return view.extend({
-	handleCleanLogs: function () {
-		return fs.write(log_path, '')
-			.catch(function (e) { ui.addNotification(null, E('p', e.message)) });
-	},
+    handleCleanLogs: function() {
+        return fs.write(log_path, '')
+            .catch(function(e) { 
+                ui.addNotification(null, E('p', e.message)) 
+            });
+    },
 
-	render: function () {
-		logTextarea = E('textarea', {
-			'class': 'cbi-input-textarea',
-			'wrap': 'off',
-			'readonly': 'readonly',
-			'style': 'width: calc(100% - 20px);height: 535px;margin: 10px;overflow-y: scroll;',
-		});
+    render: function() {
+        logTextarea = E('textarea', {
+            'class': 'cbi-input-textarea',
+            'wrap': 'off',
+            'readonly': 'readonly',
+            'style': 'width: calc(100% - 20px); height: 535px; margin: 10px; overflow-y: scroll;'
+        });
 
-		logTextarea.addEventListener('scroll', function () {
-			userScrolled = true;
-			scrollPosition = logTextarea.scrollTop;
-		});
+        logTextarea.addEventListener('scroll', function() {
+            userScrolled = true;
+            scrollPosition = logTextarea.scrollTop;
+        });
 
-		var log_textarea_wrapper = E('div', { 'id': 'log_textarea' }, logTextarea);
+        var log_textarea_wrapper = E('div', { 'id': 'log_textarea' }, logTextarea);
 
-		setTimeout(function () {
-			poll.add(pollLog);
-		}, 100);
+        setTimeout(function() {
+            poll.add(pollLog);
+        }, 100);
 
-		var clear_logs_button = E('input', { 'class': 'btn cbi-button-action', 'type': 'button', 'style': 'margin-left: 10px; margin-top: 10px;', 'value': _('Clear logs') });
-		clear_logs_button.addEventListener('click', this.handleCleanLogs.bind(this));
+        var clear_logs_button = E('input', {
+            'class': 'btn cbi-button-action',
+            'type': 'button',
+            'style': 'margin-left: 20px; margin-top: 10px;',
+            'value': _('Clear logs')
+        });
+        clear_logs_button.addEventListener('click', this.handleCleanLogs.bind(this));
 
-		return E([
-			E('div', { 'class': 'cbi-map' }, [
-				E('div', { 'class': 'cbi-section' }, [
-					clear_logs_button,
-					log_textarea_wrapper,
-					E('div', { 'style': 'text-align:right' },
-						E('small', {}, _('Refresh every %s seconds.').format(L.env.pollinterval)),
-				E('div', { 'class': 'cbi-section-actions cbi-section-actions-right' })
-			]),
-		E('div', { 'style': 'text-align: right;  font-style: italic;' }, [
+        return E('div', { 'class': 'cbi-map' }, [
+            E('div', { 'class': 'cbi-section' }, [
+                clear_logs_button,
+                log_textarea_wrapper,
+                E('div', { 'style': 'text-align: right' }, [
+                    E('small', {}, _('Refresh every %s seconds.').format(L.env.pollinterval))
+                ]),
+                E('div', { 'class': 'cbi-section-actions cbi-section-actions-right' })
+            ]),
+            E('div', { 'style': 'text-align: right; font-style: italic; margin-top: 10px;' }, [
                 E('span', {}, [
                     _('© github '),
-                    E('a', { 
-                        'href': 'https://github.com/sirpdboy', 
+                    E('a', {
+                        'href': 'https://github.com/sirpdboy',
                         'target': '_blank',
                         'style': 'text-decoration: none;'
                     }, 'by sirpdboy')
-				])
-			])
-		]);
-	}
+                ])
+            ])
+        ]);
+    }
 
     // handleSaveApply: null,
-   //  handleSave: null,
+    // handleSave: null,
     // handleReset: null
-});
+});

luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/openspeedtest.js

@@ -1,3 +1,4 @@
+/*   Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netspeedtest */
 'use strict';
 'require view';
 'require uci';
@@ -22,7 +23,7 @@ return view.extend({
 		s.render = function (section_id) {
 			return E('iframe', {
 				src: '//openspeedtest.com/speedtest',
-				style: 'border:none;width:100%;height:100%;min-height:360px;border:none;overflow:hidden !important;'
+				style: 'width:100%;height:100%;min-height:360px;border:none;overflow:hidden !important;'
 			});
 		};
 

luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/speedtest.js

@@ -1,3 +1,4 @@
+/*   Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netspeedtest */
 'use strict';
 'require view';
 'require poll';
@@ -17,7 +18,7 @@ return view.extend({
 //	handleSaveApply: null,
 //	handleSave: null,
 //	handleReset: null,
-    load: function () {
+	load() {
         return Promise.all([
             L.resolveDefault(fs.stat(SpeedtestCli), {}),
                 L.resolveDefault(fs.read(ResultFile), null),
@@ -26,76 +27,94 @@ return view.extend({
         ]);
     },
 
-    poll_status: function (nodes, res) {
-        var has_ookla = res[0].path,
+poll_status(nodes, res) {
+    var has_ookla = res[0].path,
         result_content = res[1] ? res[1].trim().split("\n") : [];
-        var ookla_stat = nodes.querySelector('#ookla_status'),
+    var ookla_stat = nodes.querySelector('#ookla_status'),
         result_stat = nodes.querySelector('#speedtest_result');
 
-        // Update status indicators
-        ookla_stat.style.color = has_ookla ? 'green' : 'red';
-        dom.content(ookla_stat, [_(has_ookla ? 'Installed' : 'Not Installed')]);
-
-        // Update result display
-        if (result_content.length) {
-            if (result_content[0] == 'Testing') {
-                result_stat.innerHTML = "<span style='color:green;font-weight:bold'>" +
-                    "<img src='/luci-static/resources/icons/loading.gif' height='17' style='vertical-align:middle'/> " +
-                    _('Testing in progress...') +
-                    "</span>";
-            } else if (result_content[0].match(/https?:\S+/)) {
-                result_stat.innerHTML = "<div style='max-width:500px'><a href='" +
-                    result_content[0] + "' target='_blank'><img src='" +
-                    result_content[0] + '.png' + "' style='max-width:100%'></a></div>";
-            } else if (result_content[0] == 'Test failed') {
-                result_stat.innerHTML = "<span style='color:red;font-weight:bold'>" +
-                    _('Test failed.') + "</span>";
-            }
-        } else {
-            result_stat.innerHTML = "<span style='color:gray'>" +
-                _('No test results yet.') + "</span>";
+    // 获取版本号（新增部分）
+    var version_info = '';
+    if (has_ookla) {
+        fs.exec_direct('/usr/bin/speedtest', ['--version'])
+            .then(function(res) {
+                if (res.stdout) {
+                    var version_match = res.stdout.match(/Speedtest (\d+\.\d+\.\d+)/);
+                    if (version_match) {
+                        version_info = ' ver:' + version_match[1];
+                    }
+                }
+                // 更新状态显示（包含版本号）
+                ookla_stat.style.color = 'green';
+                dom.content(ookla_stat, [_(has_ookla ? 'Installed' + version_info : 'Not Installed')]);
+            })
+            .catch(function() {
+                // 如果获取版本失败，仍显示基本状态
+                ookla_stat.style.color = has_ookla ? 'green' : 'red';
+                dom.content(ookla_stat, [_(has_ookla ? 'Installed' : 'Not Installed')]);
+            });
+    } else {
+        // 未安装时的显示保持不变
+        ookla_stat.style.color = 'red';
+        dom.content(ookla_stat, [_('Not Installed')]);
+    }
+  if (result_content.length) {
+        if (result_content[0] == 'Testing') {
+            result_stat.innerHTML = "<span style='color:green;font-weight:bold'>" +
+                "<img src='/luci-static/resources/icons/loading.gif' height='17' style='vertical-align:middle ;margin-left:20px'/> " +
+                _('SpeedTesting in progress...') +
+                "</span>";
+        } else if (result_content[0].match(/https?:\S+/)) {
+            result_stat.innerHTML = "<div style='max-width:500px'><a href='" +
+                result_content[0] + "' target='_blank'><img src='" +
+                result_content[0] + '.png' + "' style='max-width:100%;margin-left:20px'></a></div>";
+        } else if (result_content[0] == 'Test failed') {
+            result_stat.innerHTML = "<span style='color:red;font-weight:bold;margin-left:20px'>" +
+                _('Test failed.') + "</span>";
         }
-    },
+    } else {
+        result_stat.innerHTML = "<span style='color:gray;margin-left:20px'>" +
+            _('No test results yet.') + "</span>";
+    }
+},
 
-    render: function (res) {
+	render(res) {
 	var has_ookla = res[0].path,
 			result_content = res[1] ? res[1].trim().split("\n") : [],
 			result_mtime = res[2] ? res[2].mtime * 1000 : 0,
 			date = new Date();
 
 	var m, s, o;
-        m = new form.Map('netspeedtest', _('WAN Ookla SpeedTest'));
+        m = new form.Map('netspeedtest', _('Wan Ookla SpeedTest'));
 
         // Result display section
         s = m.section(form.TypedSection, '_result');
         s.anonymous = true;
-        s.render = function () {
-            var content;
-            if (result_content.length) {
-                if (result_content[0] == 'Testing') {
-                    content = E('span', { style: 'color:green;font-weight:bold' }, [
-                        E('img', { src: '/luci-static/resources/icons/loading.gif', height: '20' }),
-                        ' ', _('Testing in progress...')
-                    ]);
-                } else if (result_content[0].match(/https?:\S+/)) {
-                    content = E('div', { style: 'max-width:500px' }, [
-                        E('a', { href: result_content[0], target: '_blank' }, [
-                            E('img', { src: result_content[0] + '.png', style: 'max-width:100%' })
-                        ])
-                    ]);
-                } else {
-                    content = E('span', { style: 'color:red;font-weight:bold' },
-                        _('Test failed.'));
-                }
-            } else {
-                content = E('span', { style: 'color:gray' },
-                    _('No test results yet.'));
-            }
-            return E('div', { id: 'speedtest_result' }, content);
-        };
+		s.render = function (section_id) {
+			if (result_content.length) {
+				if (result_content[0] == 'Testing') {
+					return E('div', { 'id': 'speedtest_result' }, [ E('span', { 'style': 'color:yellow;font-weight:bold' }, [
+						E('img', { 'src': L.resource(['icons/loading.gif']), 'height': '20', 'style': 'vertical-align:middle' }, []),
+						_('Testing in progress...')
+					]) ])
+				};
+				if (result_content[0].match(/https?:\S+/)) {
+					return E('div', { 'id': 'speedtest_result' }, [ E('div', { 'style': 'max-width:500px' }, [
+						E('a', { 'href': result_content[0], 'target': '_blank' }, [
+							E('img', { 'src': result_content[0] + '.png', 'style': 'max-width:100%;max-height:100%;vertical-align:middle' }, [])
+					]) ]) ])
+				};
+				if (result_content[0] == 'Test failed') {
+					return E('div', { 'id': 'speedtest_result' }, [ E('span', { 'style': 'color:red;font-weight:bold' }, [ _('Test failed.') ]) ])
+				}
+			} else {
+				return E('div', { 'id': 'speedtest_result' }, [ E('span', { 'style': 'color:red;font-weight:bold;display:none' }, [ _('No result.') ]) ])
+			}
+		};
 
         // Configuration section
         s = m.section(form.NamedSection, 'config', 'netspeedtest');
+		s.anonymous = true;
 
         // Start test button
         o = s.option(form.Button, '_start', _('Start Ookla SpeedTest'));