OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2025-05-16 00:28:34

This commit is contained in:
kenzok8 2025-05-16 00:28:35 +08:00
parent fc1910ae82
commit c07983cf1c
6 changed files with 193 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
luci-app-netspeedtest/Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-only # SPDX-License-Identifier: GPL-3.0-only
# #
# Copyright (C) 2021-2025 sirpdboy <herboy2008@gmail.com> # Copyright (C) 2021-2025 sirpdboy <herboy2008@gmail.com>
# https://github.com/sirpdboy/luci-app-ddns-go # https://github.com/sirpdboy/luci-app-netspeedtest
# This is free software, licensed under the Apache License, Version 2.0 . # This is free software, licensed under the Apache License, Version 2.0 .
# #
@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-netspeedtest PKG_NAME:=luci-app-netspeedtest
PKG_VERSION:=5.0.2 PKG_VERSION:=5.0.3
PKG_RELEASE:=20250513 PKG_RELEASE:=20250515
LUCI_TITLE:=LuCI Support for netspeedtest LUCI_TITLE:=LuCI Support for netspeedtest
LUCI_DEPENDS:=+speedtest-cli +homebox +iperf3-ssl LUCI_DEPENDS:=+speedtest-cli +homebox $(if $(find_package iperf3-ssl),+iperf3-ssl,+iperf3)
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_MAINTAINER:=sirpdboy <herboy2008@gmail.com> PKG_MAINTAINER:=sirpdboy <herboy2008@gmail.com>
@ -23,9 +23,17 @@ define Package/$(PKG_NAME)/conffiles
endef endef
define Package/$(PKG_NAME)/postinst define Package/$(PKG_NAME)/postinst
#!/bin/sh
if [ -z "$${IPKG_INSTROOT}" ]; then
if ! uci show netspeedtest.config >/dev/null 2>&1; then
uci set netspeedtest.config=netspeedtest
uci set netspeedtest.config.enabled='1'
uci commit netspeedtest
fi
fi
exit 0
endef endef
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk

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

@ -6,7 +6,6 @@
'require uci'; 'require uci';
'require form'; 'require form';
'require poll'; 'require poll';
return view.extend({ return view.extend({
render: function() { render: function() {
var state = { var state = {
@ -33,12 +32,28 @@ return view.extend({
style: 'border:none;width: 100%; min-height: 80vh; border: none; border-radius: 3px;overflow:hidden !important;' style: 'border:none;width: 100%; min-height: 80vh; border: none; border-radius: 3px;overflow:hidden !important;'
}); });
function checkProcess() { async function checkProcess() {
return fs.exec('/bin/pidof', ['homebox']).then(res => ({ try {
running: res.code === 0, // 尝试使用pgrep
pid: res.code === 0 ? res.stdout.trim() : null const res = await fs.exec('/usr/bin/pgrep', ['homebox']);
})); return {
running: res.code === 0,
pid: res.stdout.trim() || null
};
} catch (err) {
// 回退到ps方法
try {
const psRes = await fs.exec('/bin/ps', ['-w', '-C', 'homebox', '-o', 'pid=']);
const pid = psRes.stdout.trim();
return {
running: pid !== '',
pid: pid || null
};
} catch (err) {
return { running: false, pid: null };
} }
}
}
function controlService(action) { function controlService(action) {
var command = action === 'start' var command = action === 'start'

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

@ -14,16 +14,34 @@ var state = {
const logPath = '/tmp/netspeedtest.log'; const logPath = '/tmp/netspeedtest.log';
function checkProcess() { async function checkProcess() {
return fs.exec('/bin/pidof', ['iperf3']).then(res => ({ try {
running: res.code === 0, // 尝试使用pgrep
pid: res.code === 0 ? res.stdout.trim() : null const res = await fs.exec('/usr/bin/pgrep', ['iperf3']);
})); return {
running: res.code === 0,
pid: res.stdout.trim() || null
};
} catch (err) {
// 回退到ps方法
try {
const psRes = await fs.exec('/bin/ps', ['-w', '-C', 'iperf3', '-o', 'pid=']);
const pid = psRes.stdout.trim();
return {
running: pid !== '',
pid: pid || null
};
} catch (err) {
return { running: false, pid: null };
}
}
} }
function pollLog(textarea) { function pollLog(textarea) {
return fs.read(logPath).then(res => { return fs.exec('/bin/cat', [logPath])
const cleanedLog = res ? res.trim() .then(res => {
if (res.code !== 0) throw new Error(res.stderr);
const cleanedLog = res.stdout ? res.stdout.trim()
.replace(/\u001b\[[0-9;]*m/g, '') .replace(/\u001b\[[0-9;]*m/g, '')
.split('\n') .split('\n')
.slice(-50) .slice(-50)
@ -40,18 +58,24 @@ function pollLog(textarea) {
}); });
} }
function controlService(action) { function controlService(action) {
const commands = { const commands = {
start: `/usr/bin/iperf3 -s -D -p 5201 --logfile ${logPath}`, start: `/usr/bin/iperf3 -s -D -p 5201 --logfile ${logPath} 2>&1`,
stop: '/usr/bin/killall iperf3' stop: '/usr/bin/killall -q iperf3'
}; };
return (action === 'start' return (action === 'start'
? fs.exec('/bin/sh', ['-c', `touch ${logPath} && chmod 644 ${logPath}`]) ? fs.exec('/bin/sh', ['-c', `mkdir -p /tmp/netspeedtest && touch ${logPath} && chmod 644 ${logPath}`])
: Promise.resolve() : Promise.resolve()
).then(() => fs.exec('/bin/sh', ['-c', commands[action]])); ).then(() => fs.exec('/bin/sh', ['-c', commands[action]]))
.catch(err => {
console.error('Service control error:', err);
throw err;
});
} }
return view.extend({ return view.extend({
// handleSaveApply: null, // handleSaveApply: null,
// handleSave: null, // handleSave: null,

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

@ -15,118 +15,134 @@ var SpeedtestCli = '/usr/bin/speedtest';
var SpeedtestScript = '/usr/lib/netspeedtest/speedtest'; var SpeedtestScript = '/usr/lib/netspeedtest/speedtest';
return view.extend({ return view.extend({
// handleSaveApply: null, load() {
// handleSave: null,
// handleReset: null,
load() {
return Promise.all([ return Promise.all([
L.resolveDefault(fs.stat(SpeedtestCli), {}), L.resolveDefault(fs.stat(SpeedtestCli), {}),
L.resolveDefault(fs.read(ResultFile), null), L.resolveDefault(fs.read(ResultFile), null),
L.resolveDefault(fs.stat(ResultFile), {}), L.resolveDefault(fs.stat(ResultFile), {}),
uci.load('netspeedtest') uci.load('netspeedtest')
]); ]);
}, },
poll_status(nodes, res) { poll_status(nodes, res) {
var has_ookla = res[0].path, var has_ookla = res[0].path,
result_content = res[1] ? res[1].trim().split("\n") : []; 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'); result_stat = nodes.querySelector('#speedtest_result'),
start_btn = nodes.querySelector('.cbi-button-apply');
// 获取版本号（新增部分） // 更新测试按钮状态
var version_info = ''; if (start_btn) {
if (has_ookla) { if (result_content.length && result_content[0] == 'Testing' &&
fs.exec_direct('/usr/bin/speedtest', ['--version']) (Date.now() - (nodes.result_mtime || 0)) < TestTimeout) {
.then(function(res) { start_btn.disabled = true;
if (res.stdout) { } else {
var version_match = res.stdout.match(/Speedtest (\d+\.\d+\.\d+)/); start_btn.disabled = false;
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(res) { // 获取版本号
var has_ookla = res[0].path, var version_info = '';
result_content = res[1] ? res[1].trim().split("\n") : [], if (has_ookla) {
result_mtime = res[2] ? res[2].mtime * 1000 : 0, fs.exec(SpeedtestCli, ['--version'])
date = new Date(); .then(function(res) {
if (res.stdout) {
// 匹配 "Speedtest by Ookla 1.2.0.84" 这样的格式
var version_match = res.stdout.match(/Speedtest by Ookla (\d+\.\d+\.\d+\.\d+)/) ||
res.stdout.match(/Speedtest (\d+\.\d+\.\d+\.\d+)/);
if (version_match) {
version_info = ' ver:' + version_match[1];
} else {
// 如果上面没匹配到，尝试匹配更简单的版本号格式
version_match = res.stdout.match(/(\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')]);
}
var m, s, o; 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(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;
var m, s, o;
m = new form.Map('netspeedtest', _('Wan Ookla SpeedTest')); m = new form.Map('netspeedtest', _('Wan Ookla SpeedTest'));
// Result display section // Result display section
s = m.section(form.TypedSection, '_result'); s = m.section(form.TypedSection, '_result');
s.anonymous = true; s.anonymous = true;
s.render = function (section_id) { s.render = function (section_id) {
if (result_content.length) { if (result_content.length) {
if (result_content[0] == 'Testing') { if (result_content[0] == 'Testing') {
return E('div', { 'id': 'speedtest_result' }, [ E('span', { 'style': 'color:yellow;font-weight:bold' }, [ 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' }, []), E('img', { 'src': L.resource(['icons/loading.gif']), 'height': '20', 'style': 'vertical-align:middle' }, []),
_('Testing in progress...') _('Testing in progress...')
]) ]) ]) ])
}; };
if (result_content[0].match(/https?:\S+/)) { if (result_content[0].match(/https?:\S+/)) {
return E('div', { 'id': 'speedtest_result' }, [ E('div', { 'style': 'max-width:500px' }, [ return E('div', { 'id': 'speedtest_result' }, [ E('div', { 'style': 'max-width:500px' }, [
E('a', { 'href': result_content[0], 'target': '_blank' }, [ 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' }, []) E('img', { 'src': result_content[0] + '.png', 'style': 'max-width:100%;max-height:100%;vertical-align:middle' }, [])
]) ]) ]) ]) ]) ])
}; };
if (result_content[0] == 'Test failed') { if (result_content[0] == 'Test failed') {
return E('div', { 'id': 'speedtest_result' }, [ E('span', { 'style': 'color:red;font-weight:bold' }, [ _('Test failed.') ]) ]) return E('div', { 'id': 'speedtest_result' }, [ E('span', { 'style': 'color:red;font-weight:bold' }, [ _('Test failed.') ]) ])
} }
} else { } else {
return E('div', { 'id': 'speedtest_result' }, [ E('span', { 'style': 'color:red;font-weight:bold;display:none' }, [ _('No result.') ]) ]) return E('div', { 'id': 'speedtest_result' }, [ E('span', { 'style': 'color:red;font-weight:bold;display:none' }, [ _('No result.') ]) ])
} }
}; };
// Configuration section // Configuration section
s = m.section(form.NamedSection, 'config', 'netspeedtest'); s = m.section(form.NamedSection, 'config', 'netspeedtest');
s.anonymous = true; s.anonymous = true;
// Start test button // Start test button
o = s.option(form.Button, '_start', _('Start Ookla SpeedTest')); o = s.option(form.Button, '_start', _('Start Ookla SpeedTest'));
o.inputtitle = _('Click to execute'); o.inputtitle = _('Click to execute');
o.inputstyle = 'apply'; o.inputstyle = 'apply';
if (result_content.length && result_content[0] == 'Testing' && (date.getTime() - result_mtime) < TestTimeout) if (result_content.length && result_content[0] == 'Testing' && (Date.now() - result_mtime) < TestTimeout) {
o.readonly = true; o.readonly = true;
o.onclick = function() { }
return fs.exec_direct(SpeedtestScript) o.onclick = function() {
.then(function(res) { return window.location = window.location.href.split('#')[0] }) return fs.exec_direct(SpeedtestScript)
.catch(function(e) { ui.addNotification(null, E('p', e.message), 'error') }); .then(function(res) { return window.location = window.location.href.split('#')[0] })
}; .catch(function(e) { ui.addNotification(null, E('p', e.message), 'error') });
};
o = s.option(form.DummyValue, '_ookla_status', _('Ookla® SpeedTest-CLI')); o = s.option(form.DummyValue, '_ookla_status', _('Ookla® SpeedTest-CLI'));
o.rawhtml = true; o.rawhtml = true;
@ -135,15 +151,20 @@ poll_status(nodes, res) {
id: 'ookla_status', id: 'ookla_status',
style: has_ookla ? 'color:green' : 'color:red' style: has_ookla ? 'color:green' : 'color:red'
}, _(has_ookla ? 'Installed' : 'Not Installed')); }, _(has_ookla ? 'Installed' : 'Not Installed'));
}; };
return m.render() return m.render()
.then(L.bind(function(m, nodes) { .then(L.bind(function(m, nodes) {
nodes.result_mtime = result_mtime; // 保存结果文件修改时间
poll.add(L.bind(function () { poll.add(L.bind(function () {
return Promise.all([ return Promise.all([
L.resolveDefault(fs.stat(SpeedtestCli), {}), L.resolveDefault(fs.stat(SpeedtestCli), {}),
L.resolveDefault(fs.read(ResultFile), null) L.resolveDefault(fs.read(ResultFile), null),
]).then(L.bind(this.poll_status, this, nodes)); L.resolveDefault(fs.stat(ResultFile), {})
]).then(L.bind(function(res) {
nodes.result_mtime = res[2] ? res[2].mtime * 1000 : 0;
this.poll_status(nodes, res);
}, this));
}, this), 5); }, this), 5);
return nodes; return nodes;
}, this, m)); }, this, m));

3
luci-app-netspeedtest/root/etc/uci-defaults/99_netspeedtest
View File

@ -1,6 +1,9 @@
#!/bin/sh #!/bin/sh
[ ! -s "/etc/config/netspeedtest" ] && {
touch /etc/config/netspeedtest touch /etc/config/netspeedtest
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set netspeedtest.config=netspeedtest set netspeedtest.config=netspeedtest
commit netspeedtest commit netspeedtest
EOF EOF
}

3
luci-app-passwall/luasrc/passwall/util_sing-box.lua
View File

@ -459,6 +459,9 @@ function gen_outbound(flag, node, tag, proxy_table)
if node.protocol == "anytls" then if node.protocol == "anytls" then
protocol_table = { protocol_table = {
password = (node.password and node.password ~= "") and node.password or "", password = (node.password and node.password ~= "") and node.password or "",
idle_session_check_interval = "30s",
idle_session_timeout = "30s",
min_idle_session = 5,
tls = tls tls = tls
} }
end end