From 59e8d3b64adb64b2541a02c0b10ed3ad7179e637 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Tue, 13 May 2025 20:45:58 +0800 Subject: [PATCH] update 2025-05-13 20:45:58 --- luci-app-ddns-go/Makefile | 4 +- .../resources/view/ddns-go/ddns-go.js | 6 +- .../luci-static/resources/view/ddns-go/log.js | 8 +- luci-app-fchomo/root/etc/init.d/fchomo | 3 + luci-app-netspeedtest/LICENSE | 21 + luci-app-netspeedtest/Makefile | 17 +- .../resources/view/netspeedtest/homebox.js | 127 ++ .../resources/view/netspeedtest/iperf3.js | 186 ++ .../resources/view/netspeedtest/logs.js | 86 + .../view/netspeedtest/openspeedtest.js | 37 + .../resources/view/netspeedtest/speedtest.js | 132 ++ .../luasrc/controller/netspeedtest.lua | 133 -- .../luasrc/model/cbi/netspeedtest/log.lua | 13 - .../cbi/netspeedtest/speedtestiperf3.lua | 18 - .../model/cbi/netspeedtest/speedtestlan.lua | 21 - .../model/cbi/netspeedtest/speedtestport.lua | 25 - .../model/cbi/netspeedtest/speedtestwan.lua | 21 - .../cbi/netspeedtest/speedtestwanweb.lua | 15 - .../luasrc/view/netspeedtest/log.htm | 53 - .../view/netspeedtest/speedtestiperf3.htm | 93 - .../netspeedtest/speedtestiperf3_status.htm | 27 - .../luasrc/view/netspeedtest/speedtestlan.htm | 32 - .../view/netspeedtest/speedtestport.htm | 81 - .../luasrc/view/netspeedtest/speedtestwan.htm | 99 - .../view/netspeedtest/speedtestwanweb.htm | 10 - .../po/templates/netspeedtest.pot | 122 + luci-app-netspeedtest/po/zh-cn | 1 + .../po/zh-cn/netspeedtest.po | 172 -- .../po/zh_Hans/netspeedtest.po | 206 +- .../root/etc/config/netspeedtest | 15 - .../root/etc/init.d/netspeedtest | 199 +- .../etc/uci-defaults/40_luci-netspeedtest | 37 - .../root/etc/uci-defaults/99_netspeedtest | 6 + .../root/lib/functions/netspeedtest.sh | 98 - luci-app-netspeedtest/root/usr/bin/speedtest | 1975 ----------------- .../root/usr/lib/netspeedtest/speedtest | 37 + .../luci/menu.d/luci-app-netspeedtest.json | 45 + .../rpcd/acl.d/luci-app-netspeedtest.json | 26 +- .../passwall/node_list/link_share_man.htm | 2 + .../root/usr/share/passwall/subscribe.lua | 1 + luci-app-xray/README.md | 4 + luci-app-xray/core/Makefile | 2 +- luci-app-xray/geodata/Makefile | 42 + .../luci/menu.d/luci-app-xray-geodata.json | 17 + .../rpcd/acl.d/luci-app-xray-geodata.json | 10 + .../resources/view/xray/geodata.js | 460 ++++ luci-app-xray/status/Makefile | 2 +- mihomo/Makefile | 4 +- speedtest-cli/Makefile | 61 + 49 files changed, 1572 insertions(+), 3240 deletions(-) create mode 100644 luci-app-netspeedtest/LICENSE create mode 100644 luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/homebox.js create mode 100644 luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/iperf3.js create mode 100644 luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/logs.js create mode 100644 luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/openspeedtest.js create mode 100644 luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/speedtest.js delete mode 100644 luci-app-netspeedtest/luasrc/controller/netspeedtest.lua delete mode 100644 luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/log.lua delete mode 100644 luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestiperf3.lua delete mode 100644 luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestlan.lua delete mode 100644 luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestport.lua delete mode 100644 luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwan.lua delete mode 100644 luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwanweb.lua delete mode 100644 luci-app-netspeedtest/luasrc/view/netspeedtest/log.htm delete mode 100644 luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3.htm delete mode 100644 luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3_status.htm delete mode 100644 luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestlan.htm delete mode 100644 luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestport.htm delete mode 100644 luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestwan.htm delete mode 100644 luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestwanweb.htm create mode 100644 luci-app-netspeedtest/po/templates/netspeedtest.pot create mode 120000 luci-app-netspeedtest/po/zh-cn delete mode 100644 luci-app-netspeedtest/po/zh-cn/netspeedtest.po delete mode 100644 luci-app-netspeedtest/root/etc/config/netspeedtest mode change 100755 => 100644 luci-app-netspeedtest/root/etc/init.d/netspeedtest delete mode 100644 luci-app-netspeedtest/root/etc/uci-defaults/40_luci-netspeedtest create mode 100644 luci-app-netspeedtest/root/etc/uci-defaults/99_netspeedtest delete mode 100644 luci-app-netspeedtest/root/lib/functions/netspeedtest.sh delete mode 100755 luci-app-netspeedtest/root/usr/bin/speedtest create mode 100644 luci-app-netspeedtest/root/usr/lib/netspeedtest/speedtest create mode 100644 luci-app-netspeedtest/root/usr/share/luci/menu.d/luci-app-netspeedtest.json create mode 100644 luci-app-xray/geodata/Makefile create mode 100644 luci-app-xray/geodata/root/usr/share/luci/menu.d/luci-app-xray-geodata.json create mode 100644 luci-app-xray/geodata/root/usr/share/rpcd/acl.d/luci-app-xray-geodata.json create mode 100644 luci-app-xray/geodata/root/www/luci-static/resources/view/xray/geodata.js create mode 100644 speedtest-cli/Makefile diff --git a/luci-app-ddns-go/Makefile b/luci-app-ddns-go/Makefile index ebb927146..c28591432 100644 --- a/luci-app-ddns-go/Makefile +++ b/luci-app-ddns-go/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ddns-go -PKG_VERSION:=1.5.0 -PKG_RELEASE:=20250511 +PKG_VERSION:=1.5.1 +PKG_RELEASE:=20250513 PKG_MAINTAINER:=sirpdboy PKG_CONFIG_DEPENDS:= diff --git a/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/ddns-go.js b/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/ddns-go.js index bfdefc81c..d2b79495d 100644 --- a/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/ddns-go.js +++ b/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/ddns-go.js @@ -9,9 +9,9 @@ 'require poll'; return view.extend({ - handleSaveApply: null, - handleSave: null, - handleReset: null, + //handleSaveApply: null, + //handleSave: null, + //handleReset: null, load: function() { return uci.load('ddns-go'); }, diff --git a/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/log.js b/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/log.js index 9c99b1d2c..babfdbd23 100644 --- a/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/log.js +++ b/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/log.js @@ -109,9 +109,9 @@ return view.extend({ ]); - }, + } - handleSaveApply: null, - handleSave: null, - handleReset: null + //handleSaveApply: null, + //handleSave: null, + //handleReset: null }); diff --git a/luci-app-fchomo/root/etc/init.d/fchomo b/luci-app-fchomo/root/etc/init.d/fchomo index 9e0fabda6..5a330bda6 100755 --- a/luci-app-fchomo/root/etc/init.d/fchomo +++ b/luci-app-fchomo/root/etc/init.d/fchomo @@ -113,6 +113,9 @@ start_service() { # Client if [ "$client_enabled" = "1" ]; then if [ -z "$1" -o "$1" = "mihomo-c" ]; then + # Env variables + export SAFE_PATHS="$RUN_DIR/" + # Generate/Validate client config ucode -S "$SDL_DIR/generate_client.uc" 2>>"$LOG_PATH" | yq -Poy | yq \ '.sniffer["force-domain"][] style="double" diff --git a/luci-app-netspeedtest/LICENSE b/luci-app-netspeedtest/LICENSE new file mode 100644 index 000000000..5335f2c35 --- /dev/null +++ b/luci-app-netspeedtest/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 muink + +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-netspeedtest/Makefile b/luci-app-netspeedtest/Makefile index d708c66da..7c61a6af6 100644 --- a/luci-app-netspeedtest/Makefile +++ b/luci-app-netspeedtest/Makefile @@ -1,20 +1,21 @@ - -# Copyright (C) 2020-2021 sirpdboy +# SPDX-License-Identifier: GPL-3.0-only +# +# Copyright (C) 2021-2025 sirpdboy +# https://github.com/sirpdboy/luci-app-ddns-go +# This is free software, licensed under the Apache License, Version 2.0 . # -# This is free software, licensed under the GNU General Public License v3. -# include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-netspeedtest -PKG_VERSION:=2.3.1 -PKG_RELEASE:=20250302 +PKG_VERSION:=5.0.1 +PKG_RELEASE:=20250512 LUCI_TITLE:=LuCI Support for netspeedtest -LUCI_DEPENDS:=+python3 +iperf3-ssl +homebox +LUCI_DEPENDS:=+speedtest-cli +homebox +iperf3-ssl LUCI_PKGARCH:=all -PKG_MAINTAINER:= +PKG_MAINTAINER:=sirpdboy define Package/$(PKG_NAME)/conffiles diff --git a/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/homebox.js b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/homebox.js new file mode 100644 index 000000000..57cd760e8 --- /dev/null +++ b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/homebox.js @@ -0,0 +1,127 @@ +/* Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netspeedtest */ +'use strict'; +'require view'; +'require fs'; +'require ui'; +'require uci'; +'require form'; +'require poll'; + +return view.extend({ + render: function() { + var state = { + running: false, + port: 3300 + }; + var container = E('div'); + var statusSection = E('div', { 'class': 'cbi-section' }); + var statusIcon = E('span', { 'style': 'margin-right: 5px;' }); + var statusText = E('span'); + var toggleBtn = E('button', { 'class': 'btn cbi-button' }); + + var statusMessage = E('div', { style: 'text-align: center; padding: 2em;' }, [ + E('img', { + src: 'data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMjQiIGhlaWdodD0iMTAyNCIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCI+PHBhdGggZmlsbD0iI2RmMDAwMCIgZD0iTTk0Mi40MjEgMjM0LjYyNGw4MC44MTEtODAuODExLTE1My4wNDUtMTUzLjA0NS04MC44MTEgODAuODExYy03OS45NTctNTEuNjI3LTE3NS4xNDctODEuNTc5LTI3Ny4zNzYtODEuNTc5LTI4Mi43NTIgMC01MTIgMjI5LjI0OC01MTIgNTEyIDAgMTAyLjIyOSAyOS45NTIgMTk3LjQxOSA4MS41NzkgMjc3LjM3NmwtODAuODExIDgwLjgxMSAxNTMuMDQ1IDE1My4wNDUgODAuODExLTgwLjgxMWM3OS45NTcgNTEuNjI3IDE3NS4xNDcgODEuNTc5IDI3Ny4zNzYgODEuNTc5IDI4Mi43NTIgMCA1MTItMjI5LjI0OCA1MTItNTEyIDAtMTAyLjIyOS0yOS45NTItMTk3LjQxOS04MS41NzktMjc3LjM3NnpNMTk0Ljk0NCA1MTJjMC0xNzUuMTA0IDE0MS45NTItMzE3LjA1NiAzMTcuMDU2LTMxNy4wNTYgNDggMCA5My40ODMgMTAuNjY3IDEzNC4yMjkgMjkuNzgxbC00MjEuNTQ3IDQyMS41NDdjLTE5LjA3Mi00MC43ODktMjkuNzM5LTg2LjI3Mi0yOS43MzktMTM0LjI3MnpNNTEyIDgyOS4wNTZjLTQ4IDAtOTMuNDgzLTEwLjY2Ny0xMzQuMjI5LTI5Ljc4MWw0MjEuNTQ3LTQyMS41NDdjMTkuMDcyIDQwLjc4OSAyOS43ODEgODYuMjcyIDI5Ljc4MSAxMzQuMjI5LTAuMDQzIDE3NS4xNDctMTQxLjk5NSAzMTcuMDk5LTMxNy4wOTkgMzE3LjA5OXoiLz48L3N2Zz4=', + style: 'width: 100px; height: 100px; margin-bottom: 1em;' + }), + E('h2', {}, _('Homebox Service Not Running')), + E('p', {}, _('Please enable the Homebox service')) + ]); + + var iframe = E('iframe', { + src: window.location.origin + ':' + state.port, + style: 'width: 100%; min-height: 80vh; border: none; border-radius: 3px;' + }); + + function checkProcess() { + return fs.exec('/bin/pidof', ['homebox']).then(res => ({ + running: res.code === 0, + pid: res.code === 0 ? res.stdout.trim() : null + })); + } + + function controlService(action) { + var command = action === 'start' + ? 'nohup /usr/bin/homebox > /tmp/homebox.log 2>&1 &' + : '/usr/bin/killall homebox'; + return fs.exec('/bin/sh', ['-c', command]); + } + + function updateStatus() { + statusIcon.textContent = state.running ? '✓' : '✗'; + statusIcon.style.color = state.running ? 'green' : 'red'; + statusText.textContent = _('Homebox Server') + (state.running ? _('RUNNING') : _('NOT RUNNING')); + statusText.style.color = state.running ? 'green' : 'red'; + statusText.style.fontWeight = 'bold'; + statusText.style.fontSize = '0.92rem'; + + // 更新按钮状态 + toggleBtn.textContent = state.running ? _('Stop Server') : _('Start Server'); + toggleBtn.className = `btn cbi-button cbi-button-${state.running ? 'reset' : 'apply'}`; + + // Update container content based on state + container.textContent = ''; + if (state.running) { + container.appendChild(iframe); + } else { + container.appendChild(statusMessage); + } + } + + toggleBtn.addEventListener('click', ui.createHandlerFn(this, function() { + var action = state.running ? 'stop' : 'start'; + return controlService(action) + .then(checkProcess) + .then(res => { + state.running = res.running; + updateStatus(); + }); + })); + + // 开始 + statusSection.appendChild(E('div', { 'style': 'margin: 15px' }, [ + E('h3', {}, _('Lan Speedtest Homebox')), + E('div', { 'class': 'cbi-map-descr' }, [statusIcon, statusText]), + E('div', {'class': 'cbi-value', 'style': 'margin-top: 20px'}, [ + E('div', {'class': 'cbi-value-title'}, _('Homebox service control')), + E('div', {'class': 'cbi-value-field'}, toggleBtn), + E('div', { 'style': 'text-align: right; font-style: italic; margin-top: 20px;' }, [ + _('© github '), + E('a', { + 'href': 'https://github.com/sirpdboy/luci-app-netspeedtest', + 'target': '_blank', + 'style': 'text-decoration: none;' + }, 'by sirpdboy') + ]) + ]) + ])); + + // Initial status check + checkProcess().then(res => { + state.running = res.running; + updateStatus(); + toggleBtn.disabled = false; + // Start polling + poll.add(() => { + return checkProcess().then(res => { + if (res.running !== state.running) { + state.running = res.running; + updateStatus(); + toggleBtn.disabled = false; + } + }); + }, 5); + + poll.start(); + }); + + return E('div', {}, [ + statusSection, + container + ]); + } + + // handleSaveApply: null, + // handleSave: null, + // handleReset: null +}); \ No newline at end of file diff --git a/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/iperf3.js b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/iperf3.js new file mode 100644 index 000000000..f708255c9 --- /dev/null +++ b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/iperf3.js @@ -0,0 +1,186 @@ +/* Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netspeedtest */ +'use strict'; +'require view'; +'require fs'; +'require ui'; +'require uci'; +'require form'; +'require poll'; + +var state = { + running: false, + port: null +}; + +const logPath = '/var/log/iperf3.log'; + +function checkProcess() { + return fs.exec('/bin/pidof', ['iperf3']).then(res => ({ + running: res.code === 0, + pid: res.code === 0 ? res.stdout.trim() : null + })); +} + +function pollLog(textarea) { + return fs.read(logPath).then(res => { + const cleanedLog = res ? res.trim() + .replace(/\u001b\[[0-9;]*m/g, '') + .split('\n') + .slice(-50) + .join('\n') : _('Log file is empty'); + + if (textarea) { + textarea.value = cleanedLog; + textarea.scrollTop = textarea.scrollHeight; + } + return cleanedLog; + }).catch(err => { + console.error('Error reading log:', err); + return _('Failed to read log: ') + err.message; + }); +} + +function controlService(action) { + const commands = { + start: `/usr/bin/iperf3 -s -D -p 5201 --logfile ${logPath}`, + stop: '/usr/bin/killall iperf3' + }; + + return (action === 'start' + ? fs.exec('/bin/sh', ['-c', `touch ${logPath} && chmod 644 ${logPath}`]) + : Promise.resolve() + ).then(() => fs.exec('/bin/sh', ['-c', commands[action]])); +} + +return view.extend({ +// handleSaveApply: null, +// handleSave: null, +// handleReset: null, + load: function() { + return Promise.all([ + uci.load('netspeedtest') + ]); + }, + + render: function() { + + // 创建状态元素 + const statusIcon = E('span', { 'style': 'margin-right: 5px;' }); + const btnGroup = E('div', { 'class': 'cbi-value-field', 'style': 'display: flex; gap: 10px;' }); + const statusText = E('span'); + const toggleBtn = E('button', { + 'class': 'btn cbi-button', + 'click': ui.createHandlerFn(this, function() { + const action = state.running ? 'stop' : 'start'; + return controlService(action) + .then(() => checkProcess()) + .then(res => { + state.running = res.running; + updateStatus(); + if (logTextarea) { + pollLog(logTextarea); + } + }) + .catch(err => ui.addNotification(null, E('p', _('Error: ') + err.message), 'error')); + }) + }); + + function updateStatus() { + statusIcon.textContent = state.running ? '✓' : '✗'; + statusIcon.style.color = state.running ? 'green' : 'red'; + statusText.textContent = _('Iperf3 Server ') + (state.running ? _('RUNNING') : _('NOT RUNNING')); + statusText.style.color = state.running ? 'green' : 'red'; + statusText.style['font-weight'] = 'bold'; + statusText.style['font-size'] = '0.92rem'; + toggleBtn.textContent = state.running ? _('Stop Server') : _('Start Server'); + toggleBtn.className = `btn cbi-button cbi-button-${state.running ? 'reset' : 'apply'}`; + } + + // 初始化状态 + statusIcon.textContent = '...'; + statusText.textContent = _('Checking status...'); + toggleBtn.textContent = _('Loading...'); + toggleBtn.disabled = true; + + // 创建日志区域 + let logTextarea; + + logTextarea = E('textarea', { + 'class': 'cbi-input-textarea', + 'wrap': 'off', + 'readonly': 'readonly', + 'style': 'width: calc(100% - 20px);height: 535px;margin: 10px;overflow-y: scroll;', + }); +// 构建UI +const statusSection = E('div', { 'class': 'cbi-section' }, [ + E('div', { 'style': 'margin: 15px' }, [ + E('h3', {}, _('Lan Speedtest Iperf3')), + E('div', { 'class': 'cbi-map-descr' }, [statusIcon, statusText]), + E('div', {'class': 'cbi-value', 'style': 'margin-top: 20px'}, [ + E('div', {'class': 'cbi-value-title'}, _('Iperf3 service control')), + E('div', {'class': 'cbi-value-field'}, toggleBtn), + + E('div', {'class': 'cbi-value-title'}, _('Download iperf3 client')), + E('div', {'class': 'cbi-value-field'}, [ + E('div', { + 'class': 'cbi-value-field', + 'style': 'display: flex;' + }, [ + E('button', { + 'class': 'btn cbi-button cbi-button-save', + 'click': ui.createHandlerFn(this, () => window.open('https://iperf.fr/iperf-download.php', '_blank')) + }, _('Official Website')), + E('button', { + 'class': 'btn cbi-button cbi-button-save', + 'click': ui.createHandlerFn(this, () => window.open('https://github.com/sirpdboy/luci-app-netspeedtest/releases', '_blank')) + }, _('GitHub')) + ]) + ]) + ]), + E('div', { 'style': 'text-align: right; font-style: italic; margin-top: 20px;' }, [ + _('© github '), + E('a', { + 'href': 'https://github.com/sirpdboy/luci-app-netspeedtest', + 'target': '_blank', + 'style': 'text-decoration: none;' + }, 'by sirpdboy') + ]) + ]) +]); + + // 初始化状态检查 + checkProcess().then(res => { + state.running = res.running; + updateStatus(); + toggleBtn.disabled = false; + + // 启动轮询 + poll.add(() => { + return checkProcess().then(res => { + if (res.running !== state.running) { + state.running = res.running; + updateStatus(); + } + }); + }, 5); + }); + + // 如果有日志，启动日志轮询 + poll.add(() => pollLog(logTextarea), 5); + pollLog(logTextarea); + + return E('div', [ + statusSection, + E('div', { 'class': 'cbi-section' }, [ + E('h3', {}, _('Iperf3 Run Log')), + logTextarea, + E('div', { 'style': 'text-align: right; font-size: small; margin-top: 5px;' }, + _('Refresh every 5 seconds.') + ) + ]) + ]); + + return render(); + } + +}); diff --git a/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/logs.js b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/logs.js new file mode 100644 index 000000000..aac549274 --- /dev/null +++ b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/logs.js @@ -0,0 +1,86 @@ +'use strict'; +'require dom'; +'require fs'; +'require poll'; +'require uci'; +'require view'; + +var scrollPosition = 0; +var userScrolled = false; +var logTextarea; +var log_path; + +uci.load('netspeedtest').then(function() { + log_path = '/var/log/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.'); + + 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)) }); + }, + + 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; + }); + + var log_textarea_wrapper = E('div', { 'id': 'log_textarea' }, logTextarea); + + 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)); + + 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;' }, [ + E('span', {}, [ + _('© github '), + E('a', { + 'href': 'https://github.com/sirpdboy', + 'target': '_blank', + 'style': 'text-decoration: none;' + }, 'by sirpdboy') + ]) + ]) + ]); + } + + // handleSaveApply: null, + // handleSave: null, + // handleReset: null +}); diff --git a/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/openspeedtest.js b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/openspeedtest.js new file mode 100644 index 000000000..42bdeae59 --- /dev/null +++ b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/openspeedtest.js @@ -0,0 +1,37 @@ +'use strict'; +'require view'; +'require uci'; +'require ui'; +'require form'; + +return view.extend({ + + load() { + return Promise.all([ + uci.load('netspeedtest') + ]); + }, + + render(res) { + let m, s, o; + + m = new form.Map('netspeedtest', _('OpenSpeedTest')); + + s = m.section(form.NamedSection, '_iframe'); + s.anonymous = true; + 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;' + }); + }; + + return m.render(); + } + + + + // handleSaveApply: null, + // handleSave: null, + // handleReset: null +}); diff --git a/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/speedtest.js b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/speedtest.js new file mode 100644 index 000000000..b9653235c --- /dev/null +++ b/luci-app-netspeedtest/htdocs/luci-static/resources/view/netspeedtest/speedtest.js @@ -0,0 +1,132 @@ +'use strict'; +'require view'; +'require poll'; +'require dom'; +'require fs'; +'require rpc'; +'require uci'; +'require ui'; +'require form'; +// 全局变量 +var TestTimeout = 240 * 1000; // 4 Minutes +var ResultFile = '/tmp/speedtest_result'; +var SpeedtestCli = '/usr/bin/speedtest'; +var SpeedtestScript = '/usr/lib/netspeedtest/speedtest'; + +return view.extend({ +// handleSaveApply: null, +// handleSave: null, +// handleReset: null, + load: function () { + return Promise.all([ + L.resolveDefault(fs.stat(SpeedtestCli), {}), + L.resolveDefault(fs.read(ResultFile), null), + L.resolveDefault(fs.stat(ResultFile), {}), + uci.load('netspeedtest') + ]); + }, + + poll_status: function (nodes, res) { + var has_ookla = res[0].path, + result_content = res[1] ? res[1].trim().split("\n") : []; + 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 = "" + + " " + + _('Testing in progress...') + + ""; + } else if (result_content[0].match(/https?:\S+/)) { + result_stat.innerHTML = "
"; + } else if (result_content[0] == 'Test failed') { + result_stat.innerHTML = "" + + _('Test failed.') + ""; + } + } else { + result_stat.innerHTML = "" + + _('No test results yet.') + ""; + } + }, + + render: function (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')); + + // 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); + }; + + // Configuration section + s = m.section(form.NamedSection, 'config', 'netspeedtest'); + + // Start test button + o = s.option(form.Button, '_start', _('Start Ookla SpeedTest')); + o.inputtitle = _('Click to execute'); + o.inputstyle = 'apply'; + if (result_content.length && result_content[0] == 'Testing' && (date.getTime() - result_mtime) < TestTimeout) + o.readonly = true; + o.onclick = function() { + return fs.exec_direct(SpeedtestScript) + .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.rawhtml = true; + o.cfgvalue = function () { + return E('span', { + id: 'ookla_status', + style: has_ookla ? 'color:green' : 'color:red' + }, _(has_ookla ? 'Installed' : 'Not Installed')); + }; + + return m.render() + .then(L.bind(function(m, nodes) { + poll.add(L.bind(function () { + return Promise.all([ + L.resolveDefault(fs.stat(SpeedtestCli), {}), + L.resolveDefault(fs.read(ResultFile), null) + ]).then(L.bind(this.poll_status, this, nodes)); + }, this), 5); + return nodes; + }, this, m)); + } +}); diff --git a/luci-app-netspeedtest/luasrc/controller/netspeedtest.lua b/luci-app-netspeedtest/luasrc/controller/netspeedtest.lua deleted file mode 100644 index f383a1e9e..000000000 --- a/luci-app-netspeedtest/luasrc/controller/netspeedtest.lua +++ /dev/null @@ -1,133 +0,0 @@ --- Copyright (C) 2020-2025 sirpdboy https://github.com/sirpdboy/netspeedtest - -module("luci.controller.netspeedtest", package.seeall) -local http = require "luci.http" -local fs=require"nixio.fs" -local sys=require "luci.sys" -local uci = luci.model.uci.cursor() -name='netspeedtest' -function index() - - if not nixio.fs.access("/etc/config/netspeedtest") then return end - - local e = entry({"admin","network","netspeedtest"},alias("admin", "network", "netspeedtest", "speedtestlan"),_("Net Speedtest"),90) - e.dependent = false - e.acl_depends = { "luci-app-netspeedtest" } - - entry({"admin", "network", "netspeedtest", "speedtestlan"},cbi("netspeedtest/speedtestlan"),_("Lan Speedtest Web"),20).leaf = true - entry({"admin", "network", "netspeedtest", "speedtestiperf3"},cbi("netspeedtest/speedtestiperf3", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}),_("Lan Speedtest Iperf3"),30).leaf = true - entry({"admin", "network", "netspeedtest", "speedtestwan"},cbi("netspeedtest/speedtestwan", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}),_("Broadband speedtest"), 40).leaf = true - entry({"admin", "network", "netspeedtest", "speedtestwanweb"},cbi("netspeedtest/speedtestwanweb", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}),_("Broadband OpenSpeedtest"), 41).leaf = true - entry({"admin", "network", "netspeedtest", "speedtestport"},cbi("netspeedtest/speedtestport", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}),_("Server Port Latency Test"), 50).leaf = true - entry({"admin", "network", "netspeedtest", "log"}, form("netspeedtest/log"), _("Log"), 60).leaf = true - entry({"admin", "network", "netspeedtest", "test_port"}, call("test_port")) - entry({"admin", "network", "iperf3_status"}, call("iperf3_status")) - entry({"admin", "network", "test_iperf0"}, post("test_iperf0"), nil).leaf = true - entry({"admin", "network", "test_iperf1"}, post("test_iperf1"), nil).leaf = true - entry({"admin", "network", "netspeedtest", "speedtestwanrun"}, call("speedtestwanrun")) - entry({"admin", "network", "netspeedtest", "netcheck"}, call("netcheck")) - entry({"admin", "network", "netspeedtest", "dellog"},call("dellog")) - entry({"admin", "network", "netspeedtest", "getlog"},call("getlog")) -end - -function netcheck() - http.prepare_content("text/plain; charset=utf-8") - local f=io.open("/tmp/netspeedtest.log", "r+") - local fdp=fs.readfile("/tmp/netspeedtestpos") or 0 - f:seek("set",fdp) - local a=f:read(2048000) or "" - fdp=f:seek() - fs.writefile("/tmp/netspeedtestpos",tostring(fdp)) - f:close() - http.write(a) -end - -function speedtestwanrun() - local cli = luci.http.formvalue('cli') - uci:set(name, 'speedtestwan', 'speedtest_cli', cli) - uci:commit(name) - fs.writefile("/tmp/netspeedtestpos","0") - http.prepare_content("application/json") - http.write('') - sys.exec(string.format("/etc/init.d/netspeedtest wantest " ..cli.. " > /tmp/netspeedtest.log 2>&1 &" )) -end - -function test_port() - local e = {} - local domain = luci.http.formvalue('sdomain') - local port = luci.http.formvalue('sport') - local ip=sys.exec("echo "..domain.." | grep -E ^[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ || nslookup "..domain.." 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E ^[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ | sed -n 1p") - ip=sys.exec("echo -n "..ip) - e.ping = luci.sys.exec(string.format("echo -n $(tcping -q -c 1 -i 1 -t 2 -p %s %s 2>&1 | grep -o 'time=[0-9]*.[0-9]*' | awk -F '=' '{print $2}') 2>/dev/null", port, ip)) - e.type = "tcping" - if e.ping=="" then - e.ping=sys.call("echo -n $(ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]*' | awk -F '=' '{print $2}') 2>/dev/null" % ip) - e.type = "ping" - end - if e.ping=="" then e.ping="0" end - sys.exec(string.format('echo -ne "\n 【$(date)】 服务器：%s -- 端口：%s -- TCP延时：%s ms \n">> /var/log/netspeedtest.log',domain,port,e.ping)) - uci:set(name, 'speedtestport', 'sdomain', domain) - uci:set(name, 'speedtestport', 'sport', port) - uci:set(name, 'speedtestport', 'tcpspeed', e.ping.." ms") - uci:commit(name) - luci.http.prepare_content("application/json") - luci.http.write_json(e) -end - - -function iperf3_status() - local e={} - e.run=sys.call("busybox ps -w | grep iperf3 | grep -v grep >/dev/null") == 0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) -end - -function testout(cmd, addr) - luci.http.prepare_content("text/plain") - local util = io.popen(cmd) - if util then - while true do - local ln = util:read("*l") - if not ln then break end - luci.http.write(ln) - luci.http.write("\n") - end - util:close() - end -end - -function test_iperf0(addr) - sys.call("pgrep -f unblockneteasemusic | xargs kill -9 >/dev/null 2>&1 ") - sys.call("/etc/init.d/unblockneteasemusic stop ") - sys.call("/etc/init.d/unblockmusic stop ") - testout("iperf3 -s ", addr) -end - -function test_iperf1(addr) - sys.call("pgrep -f iperf3 | xargs kill -9 >/dev/null 2>&1 ") - sys.call("/etc/init.d/unblockneteasemusic restart") - sys.call("/etc/init.d/unblockmusic restart") -end - -function dellog() - fs.writefile("/var/log/netspeedtest.log","") - http.prepare_content("application/json") - http.write('') -end - - - -function getlog() - logfile="/var/log/netspeedtest.log" - if not fs.access(logfile) then - http.write("") - return - end - local f=io.open(logfile,"r") - local a=f:read("*a") or "" - f:close() - a=string.gsub(a,"\n$","") - http.prepare_content("text/plain; charset=utf-8") - http.write(a) -end - diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/log.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/log.lua deleted file mode 100644 index eac991803..000000000 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/log.lua +++ /dev/null @@ -1,13 +0,0 @@ -local fs = require "nixio.fs" -local uci = require"luci.model.uci".cursor() -local f, t -f = SimpleForm("logview") -f.reset = false -f.submit = false -t=f:field(TextValue,"conf") - -t.rmempty=true -t.rows=20 -t.template="netspeedtest/log" -t.readonly="readonly" -return f diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestiperf3.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestiperf3.lua deleted file mode 100644 index 7dba1d858..000000000 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestiperf3.lua +++ /dev/null @@ -1,18 +0,0 @@ --- Copyright (C) 2020-2025 sirpdboy https://github.com/sirpdboy/netspeedtest -require("luci.util") -local o,s,e - - -o = Map("netspeedtest", "" .. translate("Net Speedtest") .."",translate( "Network speed diagnosis test (including intranet and extranet)
For specific usage, see:") ..translate("GitHub @sirpdboy/netspeedtest") ) -o:section(SimpleSection).template = "netspeedtest/speedtestiperf3_status" - -s = o:section(TypedSection, "speedtestiperf3", translate('Lan Speedtest Iperf3')) -s.addremove=false -s.anonymous=true - -e = s:option(DummyValue, '', '') -e.rawhtml = true -e.template ='netspeedtest/speedtestiperf3' - - -return o diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestlan.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestlan.lua deleted file mode 100644 index 48f85af4e..000000000 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestlan.lua +++ /dev/null @@ -1,21 +0,0 @@ --- Copyright (C) 2020-2025 sirpdboy https://github.com/sirpdboy/netspeedtest -local m, s ,o - -m = Map("netspeedtest", "" .. translate("Net Speedtest") .."",translate( "Network speed diagnosis test (including intranet and extranet)
For specific usage, see:") ..translate("GitHub @sirpdboy/netspeedtest") ) - -s = m:section(TypedSection, "netspeedtest", translate('Lan Speedtest Web')) -s.anonymous = true - -o=s:option(Flag,"enabled",translate("Enable Homebox service")) -o.default=0 - -o = s:option(DummyValue, '', '') -o.rawhtml = true -o.template ='netspeedtest/speedtestlan' - -m.apply_on_parse = true -m.on_after_apply = function(self,map) - io.popen("/etc/init.d/netspeedtest restart") - luci.http.redirect(luci.dispatcher.build_url("admin","network","netspeedtest","speedtestlan")) -end -return m diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestport.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestport.lua deleted file mode 100644 index a8f770049..000000000 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestport.lua +++ /dev/null @@ -1,25 +0,0 @@ --- Copyright (C) 2020-2025 sirpdboy https://github.com/sirpdboy/netspeedtest -require("luci.util") -local o,t,e - -o = Map("netspeedtest", "" .. translate("Net Speedtest") .."",translate( "Network speed diagnosis test (including intranet and extranet)
For specific usage, see:") ..translate("GitHub @sirpdboy/netspeedtest") ) - -t = o:section(TypedSection, "speedtestport", translate('Server Port Latency Test')) -t.addremove=false -t.anonymous=true - -e = t:option(Value, 'sdomain', translate('Test server address')) -e.default = "www.baidu.com" -e.description = translate('Enter the domain name or IP address of the server that needs to be tested') - -e = t:option(Value, 'sport', translate('Test server port')) -e.default = "443" - -e = t:option(Value, 'tcpspeed', translate('Server Port Delay Value')) - -e = t:option(DummyValue, '', '') -e.rawhtml = true -e.template ='netspeedtest/speedtestport' - - -return o diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwan.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwan.lua deleted file mode 100644 index 5671bbd6c..000000000 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwan.lua +++ /dev/null @@ -1,21 +0,0 @@ --- Copyright (C) 2020-2025 sirpdboy https://github.com/sirpdboy/netspeedtest - -require("luci.util") -local o,t,e - -luci.sys.exec("echo '-' >/tmp/netspeedtest.log&&echo 1 > /tmp/netspeedtestpos" ) -o = Map("netspeedtest", "" .. translate("Net Speedtest") .."",translate( "Network speed diagnosis test (including intranet and extranet)
For specific usage, see:") ..translate("GitHub @sirpdboy/netspeedtest") ) - -t=o:section(TypedSection,"speedtestwan",translate("Broadband speedtest")) -t.anonymous=true - -e = t:option(ListValue, 'speedtest_cli', translate('client version selection')) -e:value("0",translate("ookla-speedtest-cli")) -e:value("1",translate("python3-speedtest-cli")) -e.default = "1" - -e=t:option(Button, "restart", translate("speedtest.net Broadband speed test")) -e.inputtitle=translate("Click to execute") -e.template ='netspeedtest/speedtestwan' - -return o diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwanweb.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwanweb.lua deleted file mode 100644 index 21acef20b..000000000 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwanweb.lua +++ /dev/null @@ -1,15 +0,0 @@ --- Copyright (C) 2020-2025 sirpdboy https://github.com/sirpdboy/netspeedtest -require("luci.util") -local o,t,e - -luci.sys.exec("echo '-' >/tmp/netspeedtest.log&&echo 1 > /tmp/netspeedtestpos" ) -o = Map("netspeedtest", "" .. translate("Net Speedtest") .."",translate( "Network speed diagnosis test (including intranet and extranet)
For specific usage, see:") ..translate("GitHub @sirpdboy/netspeedtest") ) - -t=o:section(TypedSection,"speedtestwan",translate("Broadband OpenSpeedtest")) -t.anonymous=true - -e = t:option(DummyValue, '', '') -e.rawhtml = true -e.template ='netspeedtest/speedtestwanweb' - -return o diff --git a/luci-app-netspeedtest/luasrc/view/netspeedtest/log.htm b/luci-app-netspeedtest/luasrc/view/netspeedtest/log.htm deleted file mode 100644 index 580ec1e98..000000000 --- a/luci-app-netspeedtest/luasrc/view/netspeedtest/log.htm +++ /dev/null @@ -1,53 +0,0 @@ -<%+cbi/valueheader%> - -<%:Reverse%> - - - -<%+cbi/valuefooter%> \ No newline at end of file diff --git a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3.htm b/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3.htm deleted file mode 100644 index 9a8d3654a..000000000 --- a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3.htm +++ /dev/null @@ -1,93 +0,0 @@ -<%# - Copyright 2020-2025 sirpdboy Wich - https://github.com/sirpdboy/netspeedtest - Licensed to the public under the Apache License 2.0. --%> - - -<%+cbi/valueheader%> - - -
-
- -
- - -
- <%:The speed measurement terminal must be in the same LAN as the router that starts the speed measurement%>
- <%:Operation steps: start router speed measurement service download test client run speed measurement client input IP address of router speed measurement service%> -
-
-
-
-
- -
- - -
-
-
- -
- <%:-c, --client host ................run in client mode, connecting to host%>
- <%:-s, --server .....................run in server mode%>
- <%:-u, --udp ........................use UDP rather than TCP%>
- <%:-b, --bandwidth ..[KMG]...target bandwidth in bits/sec (0 for unlimited)%>
- <%:-t, --time ...............time in seconds to transmit for (default 10 secs)%>
- <%:-i, --interval ...........seconds between periodic bandwidth reports%>
- <%:-P, --parallel ...........number of parallel client streams to run%>
- <%:-R, --reverse ....................run in reverse mode (server sends, client receives)%>
-
-
- -
- -<%+cbi/valuefooter%> diff --git a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3_status.htm b/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3_status.htm deleted file mode 100644 index ceb5616f5..000000000 --- a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3_status.htm +++ /dev/null @@ -1,27 +0,0 @@ - - - - -
- <%:Iperf3 Status%> -

- <%:Collecting data...%> -

-
\ No newline at end of file diff --git a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestlan.htm b/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestlan.htm deleted file mode 100644 index 88e1864b0..000000000 --- a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestlan.htm +++ /dev/null @@ -1,32 +0,0 @@ -<%# - Copyright 2020-2025 sirpdboy Wich - https://github.com/sirpdboy/netspeedtest - Licensed to the public under the Apache License 2.0. --%> -<% - - local running = luci.sys.exec("busybox ps -w | grep homebox | grep -v grep >/dev/null && echo -ne '1' ") -%> -<%+cbi/valueheader%> - -
-<% if running == "1" then %> - - - -<% else %> - -
- -

<%:The homebox service is not running.%>

-

<%:Please enable the Homebox service%>

-
-<% end %> -
-<%+cbi/valuefooter%> diff --git a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestport.htm b/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestport.htm deleted file mode 100644 index 59e4ab32b..000000000 --- a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestport.htm +++ /dev/null @@ -1,81 +0,0 @@ -<%# - Copyright 2020-2025 sirpdboy Wich - https://github.com/sirpdboy/netspeedtest - Licensed to the public under the Apache License 2.0. --%> - -<%+cbi/valueheader%> - - - - -
- - -
-<%+cbi/valuefooter%> diff --git a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestwan.htm b/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestwan.htm deleted file mode 100644 index 6eee4fa81..000000000 --- a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestwan.htm +++ /dev/null @@ -1,99 +0,0 @@ -<%# - Copyright 2020-2025 sirpdboy Wich - https://github.com/sirpdboy/netspeedtest - Licensed to the public under the Apache License 2.0. --%> - -<%+cbi/valueheader%> -<%local fs=require"nixio.fs"%> - - - -<%+cbi/valuefooter%> diff --git a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestwanweb.htm b/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestwanweb.htm deleted file mode 100644 index c154fb7c8..000000000 --- a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestwanweb.htm +++ /dev/null @@ -1,10 +0,0 @@ -<%# - Copyright 2020-2025 sirpdboy Wich - https://github.com/sirpdboy/netspeedtest - Licensed to the public under the Apache License 2.0. --%> - -<%+cbi/valueheader%> -
Provided by OpenSpeedtest.com
- -<%+cbi/valuefooter%> diff --git a/luci-app-netspeedtest/po/templates/netspeedtest.pot b/luci-app-netspeedtest/po/templates/netspeedtest.pot new file mode 100644 index 000000000..1a06a1180 --- /dev/null +++ b/luci-app-netspeedtest/po/templates/netspeedtest.pot @@ -0,0 +1,122 @@ +# +# Copyright (C) 2021-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netspeedtest +# This is free software, licensed under the GNU General Public License v3. +# +msgid "" +msgstr "" +"Project-Id-Version: LuCi Chinese Translation\n" +"Report-Msgid-Bugs-To: \n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.0.6\n" + +msgid "NetSpeedtest" +msgstr "" + +msgid "A tool for testing network speed in multiple aspects" +msgstr "" + +msgid "Lan Speedtest Iperf3" +msgstr "" + +msgid "Lan Speedtest Homebox" +msgstr "" + +msgid "Wan Ookla SpeedTest" +msgstr "" + +msgid "Wan OpenSpeedTest" +msgstr "" + +msgid "Log" +msgstr "" + +msgid "Start Server" +msgstr "" + +msgid "Stop Server" +msgstr "" + +msgid "Loading..." +msgstr "" + +msgid "RUNNING" +msgstr "" + +msgid "NOT RUNNING" +msgstr "" + +msgid "Iperf3 Server" +msgstr "" + +msgid "Command failed" +msgstr "" + +msgid "Failed to read log file" +msgstr "" + +msgid "No log content available" +msgstr "" + +msgid "Error: " +msgstr "" + +msgid "Iperf3 service control" +msgstr "" + +msgid "Listen Port" +msgstr "" + +msgid "Invalid format. Use [::]:port or ip:port" +msgstr "" + +msgid "Enable Log View" +msgstr "" + +msgid "Download iperf3 client" +msgstr "" + +msgid "Iperf3 Run Log" +msgstr "" + +msgid "Refresh Log" +msgstr "" + +msgid "Official Website" +msgstr "" + +msgid "Please enable the Homebox service" +msgstr "" + +msgid "Homebox service control" +msgstr "" + +msgid "Homebox Server" +msgstr "" + +msgid "Homebox Service Not Running" +msgstr "" + +msgid "Ookla® SpeedTest-CLI" +msgstr "" + +msgid "Start Ookla SpeedTest" +msgstr "" + +msgid "Click to execute" +msgstr "" + +msgid "Testing in progress..." +msgstr "" + +msgid "Test failed." +msgstr "" + +msgid "No test results yet." +msgstr "" + +msgid "Test Script" +msgstr "" diff --git a/luci-app-netspeedtest/po/zh-cn b/luci-app-netspeedtest/po/zh-cn new file mode 120000 index 000000000..8d69574dd --- /dev/null +++ b/luci-app-netspeedtest/po/zh-cn @@ -0,0 +1 @@ +zh_Hans \ No newline at end of file diff --git a/luci-app-netspeedtest/po/zh-cn/netspeedtest.po b/luci-app-netspeedtest/po/zh-cn/netspeedtest.po deleted file mode 100644 index 2af9feaed..000000000 --- a/luci-app-netspeedtest/po/zh-cn/netspeedtest.po +++ /dev/null @@ -1,172 +0,0 @@ -# -# Copyright (C) 2020-2022 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/netspeedtest -# This is free software, licensed under the GNU General Public License v3. -# -msgid "" -msgstr "" -"Project-Id-Version: LuCi Chinese Translation\n" -"Report-Msgid-Bugs-To: \n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" - -msgid "Net Speedtest" -msgstr "网速测试" - -msgid "Network speed diagnosis test (including intranet and extranet)
For specific usage, see:" -msgstr "网络速度诊断测试（包括内网、外网、特定端口服务器测速）
使用说明见:" - -msgid "Lan Speedtest Iperf3" -msgstr "本地iperf3吞吐测速" - -msgid "Lan Speedtest Web" -msgstr "本地测速网页版" - -msgid "Broadband speedtest" -msgstr "宽带测速speedtest" - -msgid "Broadband OpenSpeedtest" -msgstr "宽带测速OpenSpeedtest" - -msgid "Running state" -msgstr "运行状态" - -msgid "Enable Homebox service" -msgstr "启用homebox服务" - -msgid "The Iperf3 service is running." -msgstr "iperf3服务已启动" - -msgid "The Iperf3 service is not running." -msgstr "iperf3服务未启动" - -msgid "Iperf3 Status" -msgstr "iperf3服务状态" - -msgid "The homebox service is running." -msgstr "homebox网页测速服务已启动" - -msgid "The homebox service is not running." -msgstr "homebox网页测速服务未启动" - -msgid "Please enable the Homebox service" -msgstr "请将homebox服务启用" - -msgid "homebox Status" -msgstr "homebox网页测速服务状态" - -msgid "
For specific usage, see:" -msgstr "
具体使用方法参见：" - -msgid "iperfstart" -msgstr "iperf服务启动" - -msgid "iperfstop" -msgstr "iperf服务停止" - -msgid "Select function" -msgstr "选择功能" - -msgid "Execute selected functions" -msgstr "执行选择的功能" - -msgid "client version selection" -msgstr "客户端版本" - -msgid "python3-speedtest-cli" -msgstr "python3网络测试客户端" - -msgid "ookla-speedtest-cli" -msgstr "ookla网络测试客户端" - -msgid "iperf3 instructions" -msgstr "iperf3使用说明" - -msgid "Test speed service started" -msgstr "测试速度服务已经启动" - -msgid "The speed measurement terminal must be in the same LAN as the router that starts the speed measurement" -msgstr "测速终端机必须与启动测速的路由器在同一局域网内" - -msgid "Operation steps: start router speed measurement service download test client run speed measurement client input IP address of router speed measurement service" -msgstr "使用步骤：A.启动路由器测速服务 B.下载测试客户端 C.运行测速客户端 D.输入路由器测速服务IP地址。 " - -msgid "Github download iperf3" -msgstr "Github下载iperf3" - -msgid "Iperf3 speed measurement software download" -msgstr "iperf3测速软件下载" - -msgid "speedtest.net Broadband speed test" -msgstr "speedtest.net宽带网速测试" - - -msgid "Operation execution complete" -msgstr "操作执行完毕" - -msgid "Network speed test, please wait..." -msgstr "网速测试中，请稍侯..." - -msgid "Download from foreign official websites" -msgstr "国外官网" - -msgid "Server Port Latency Test" -msgstr "服务器端口延迟测试" - -msgid "Test server address" -msgstr "测试服务器地址" - -msgid "Test server port" -msgstr "测试服务器端口" - -msgid "Enter the domain name or IP address of the server that needs to be tested" -msgstr "输入需要测试的服务器域名或者IP地址" - -msgid "Test server port delay" -msgstr "测试端口延时" - -msgid "Click to execute" -msgstr "点击执行" - -msgid "Test failed" -msgstr "测试失败" - -msgid "Waiting (executing)..." -msgstr "努力执行中" - -msgid "Server Port Delay Value" -msgstr "服务器端口延时值" - -msgid "iperf3 commands reference" -msgstr "iperf3命令参考" - -msgid "-b, --bandwidth ..[KMG]...target bandwidth in bits/sec (0 for unlimited)" -msgstr "-b, --bandwidth ..[KMG]...目标带宽（以位/秒为单位）（0表示无限制）" - -msgid "-t, --time ...............time in seconds to transmit for (default 10 secs)" -msgstr "-t, --time ...............传输时间（以秒为单位）（默认为10秒）" - -msgid "-i, --interval ...........seconds between periodic bandwidth reports" -msgstr "-i, --interval ...........测试报告之间的秒数" - -msgid "-P, --parallel ...........number of parallel client streams to run" -msgstr "-P, --parallel ...........多线程运行的数量" - -msgid "-R, --reverse ....................run in reverse mode (server sends, client receives)" -msgstr "-R, --reverse ....................反向模式运行（服务器发送，客户端接收）" - -msgid "-c, --client host ................run in client mode, connecting to host" -msgstr "-c, --client host ................客户端模式下运行，连接到host" - -msgid "-s, --server .....................run in server mode" -msgstr "-s, --server .....................服务器模式下运行" - -msgid "-u, --udp ........................use UDP rather than TCP" -msgstr "-u, --udp ........................测试传输使用UDP而不是TCP" - -msgid "Perform OK" -msgstr "执行完成" - diff --git a/luci-app-netspeedtest/po/zh_Hans/netspeedtest.po b/luci-app-netspeedtest/po/zh_Hans/netspeedtest.po index 2af9feaed..b6aea559c 100644 --- a/luci-app-netspeedtest/po/zh_Hans/netspeedtest.po +++ b/luci-app-netspeedtest/po/zh_Hans/netspeedtest.po @@ -1,5 +1,5 @@ # -# Copyright (C) 2020-2022 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/netspeedtest +# Copyright (C) 2020-2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/netspeedtest # This is free software, licensed under the GNU General Public License v3. # msgid "" @@ -13,160 +13,110 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.6\n" -msgid "Net Speedtest" +msgid "NetSpeedtest" msgstr "网速测试" -msgid "Network speed diagnosis test (including intranet and extranet)
For specific usage, see:" -msgstr "网络速度诊断测试（包括内网、外网、特定端口服务器测速）
使用说明见:" +msgid "A tool for testing network speed in multiple aspects" +msgstr "一个用于从多方面测试本地和宽带网络速度的工具" msgid "Lan Speedtest Iperf3" msgstr "本地iperf3吞吐测速" -msgid "Lan Speedtest Web" -msgstr "本地测速网页版" +msgid "Lan Speedtest Homebox" +msgstr "本地homebox网页测速" -msgid "Broadband speedtest" -msgstr "宽带测速speedtest" +msgid "Wan Ookla SpeedTest" +msgstr "宽带Ookla网速测速" -msgid "Broadband OpenSpeedtest" -msgstr "宽带测速OpenSpeedtest" +msgid "Wan OpenSpeedTest" +msgstr "宽带OpenSpeedTest测速" -msgid "Running state" -msgstr "运行状态" +msgid "Log" +msgstr "日志" -msgid "Enable Homebox service" -msgstr "启用homebox服务" +msgid "Start Server" +msgstr "启动服务" -msgid "The Iperf3 service is running." -msgstr "iperf3服务已启动" +msgid "Stop Server" +msgstr "停止服务" -msgid "The Iperf3 service is not running." -msgstr "iperf3服务未启动" +msgid "Loading..." +msgstr "装载中..." -msgid "Iperf3 Status" -msgstr "iperf3服务状态" +msgid "RUNNING" +msgstr "运行中" -msgid "The homebox service is running." -msgstr "homebox网页测速服务已启动" +msgid "NOT RUNNING" +msgstr "未运行" -msgid "The homebox service is not running." -msgstr "homebox网页测速服务未启动" +msgid "Iperf3 Server" +msgstr "Iperf3服务端" + +msgid "Command failed" +msgstr "命令无效" + +msgid "Failed to read log file" +msgstr "读取日志失败" + +msgid "No log content available" +msgstr "没有日志记录" + +msgid "Error: " +msgstr "错误: " + +msgid "Iperf3 service control" +msgstr "Iperf3 服务控制" + +msgid "Listen Port" +msgstr "监听端口" + +msgid "Invalid format. Use [::]:port or ip:port" +msgstr "格式错误.如 [::]:端口 或 ip:端口" + +msgid "Enable Log View" +msgstr "开启日志显示" + +msgid "Download iperf3 client" +msgstr "下载iperf3客户端" + +msgid "Iperf3 Run Log" +msgstr "Iperf3运行日志" + +msgid "Refresh Log" +msgstr "刷新日志" + +msgid "Official Website" +msgstr "官方网站" msgid "Please enable the Homebox service" msgstr "请将homebox服务启用" -msgid "homebox Status" -msgstr "homebox网页测速服务状态" +msgid "Homebox service control" +msgstr "Homebox服务控制" -msgid "
For specific usage, see:" -msgstr "
具体使用方法参见：" +msgid "Homebox Server" +msgstr "Homebox服务端" -msgid "iperfstart" -msgstr "iperf服务启动" +msgid "Homebox Service Not Running" +msgstr "Homebox服务端未运行" -msgid "iperfstop" -msgstr "iperf服务停止" +msgid "Ookla® SpeedTest-CLI" +msgstr "" -msgid "Select function" -msgstr "选择功能" - -msgid "Execute selected functions" -msgstr "执行选择的功能" - -msgid "client version selection" -msgstr "客户端版本" - -msgid "python3-speedtest-cli" -msgstr "python3网络测试客户端" - -msgid "ookla-speedtest-cli" -msgstr "ookla网络测试客户端" - -msgid "iperf3 instructions" -msgstr "iperf3使用说明" - -msgid "Test speed service started" -msgstr "测试速度服务已经启动" - -msgid "The speed measurement terminal must be in the same LAN as the router that starts the speed measurement" -msgstr "测速终端机必须与启动测速的路由器在同一局域网内" - -msgid "Operation steps: start router speed measurement service download test client run speed measurement client input IP address of router speed measurement service" -msgstr "使用步骤：A.启动路由器测速服务 B.下载测试客户端 C.运行测速客户端 D.输入路由器测速服务IP地址。 " - -msgid "Github download iperf3" -msgstr "Github下载iperf3" - -msgid "Iperf3 speed measurement software download" -msgstr "iperf3测速软件下载" - -msgid "speedtest.net Broadband speed test" -msgstr "speedtest.net宽带网速测试" - - -msgid "Operation execution complete" -msgstr "操作执行完毕" - -msgid "Network speed test, please wait..." -msgstr "网速测试中，请稍侯..." - -msgid "Download from foreign official websites" -msgstr "国外官网" - -msgid "Server Port Latency Test" -msgstr "服务器端口延迟测试" - -msgid "Test server address" -msgstr "测试服务器地址" - -msgid "Test server port" -msgstr "测试服务器端口" - -msgid "Enter the domain name or IP address of the server that needs to be tested" -msgstr "输入需要测试的服务器域名或者IP地址" - -msgid "Test server port delay" -msgstr "测试端口延时" +msgid "Start Ookla SpeedTest" +msgstr "开始宽带测速" msgid "Click to execute" msgstr "点击执行" -msgid "Test failed" -msgstr "测试失败" +msgid "Testing in progress..." +msgstr "测试正在进行中..." -msgid "Waiting (executing)..." -msgstr "努力执行中" +msgid "Test failed." +msgstr "测速失败" -msgid "Server Port Delay Value" -msgstr "服务器端口延时值" - -msgid "iperf3 commands reference" -msgstr "iperf3命令参考" - -msgid "-b, --bandwidth ..[KMG]...target bandwidth in bits/sec (0 for unlimited)" -msgstr "-b, --bandwidth ..[KMG]...目标带宽（以位/秒为单位）（0表示无限制）" - -msgid "-t, --time ...............time in seconds to transmit for (default 10 secs)" -msgstr "-t, --time ...............传输时间（以秒为单位）（默认为10秒）" - -msgid "-i, --interval ...........seconds between periodic bandwidth reports" -msgstr "-i, --interval ...........测试报告之间的秒数" - -msgid "-P, --parallel ...........number of parallel client streams to run" -msgstr "-P, --parallel ...........多线程运行的数量" - -msgid "-R, --reverse ....................run in reverse mode (server sends, client receives)" -msgstr "-R, --reverse ....................反向模式运行（服务器发送，客户端接收）" - -msgid "-c, --client host ................run in client mode, connecting to host" -msgstr "-c, --client host ................客户端模式下运行，连接到host" - -msgid "-s, --server .....................run in server mode" -msgstr "-s, --server .....................服务器模式下运行" - -msgid "-u, --udp ........................use UDP rather than TCP" -msgstr "-u, --udp ........................测试传输使用UDP而不是TCP" - -msgid "Perform OK" -msgstr "执行完成" +msgid "No test results yet." +msgstr "还没有测试结果" +msgid "Test Script" +msgstr "测速脚本" \ No newline at end of file diff --git a/luci-app-netspeedtest/root/etc/config/netspeedtest b/luci-app-netspeedtest/root/etc/config/netspeedtest deleted file mode 100644 index 6a77ef242..000000000 --- a/luci-app-netspeedtest/root/etc/config/netspeedtest +++ /dev/null @@ -1,15 +0,0 @@ -config netspeedtest 'netspeedtest' - option enabled '0' - option port '3300' - -config homebox 'homebox' - option enabled '0' - option port '3300' - -config speedtestiperf3 'speedtestiperf3' - -config speedtestwan 'speedtestwan' - -config speedtestport 'speedtestport' - option sport '443' - option sdomain 'www.taobao.com' \ No newline at end of file diff --git a/luci-app-netspeedtest/root/etc/init.d/netspeedtest b/luci-app-netspeedtest/root/etc/init.d/netspeedtest old mode 100755 new mode 100644 index db75bbe8b..25d337f83 --- a/luci-app-netspeedtest/root/etc/init.d/netspeedtest +++ b/luci-app-netspeedtest/root/etc/init.d/netspeedtest @@ -1,161 +1,72 @@ #!/bin/sh /etc/rc.common +# Copyright (C) 2021-2025 sirpdboy -# -# Copyright (C) 2020-2025 sirpdboy https://github.com/sirpdboy/netspeedtest - -# This is free software, licensed under the Apache License, Version 2.0 . -# +. "${IPKG_INSTROOT}/lib/functions.sh" START=99 USE_PROCD=1 -PROG=/usr/bin/homebox -EXTRA_COMMANDS="wantest" +EXTRA_COMMANDS="download_ookla ookla_verify" +EXTRA_HELP=\ +" download_ookla Download Ookla Speedtest-CLI + ookla_verify Verify Ookla Speedtest-CLI integrity" -TMP_T=/var/netspeedtest_nstest.tmp -BINSPEEDTEST='/usr/bin/speedtest' -LOCK=/var/lock/netspeedtest_nstest.lock -LOGD=/etc/netspeedtest -LOG=/var/log/netspeedtest.log -LOGE=$LOGD/netspeedtest.log -LOGT=$LOGD/netspeedtestpos -[ -d "$LOGD" ] || mkdir -p $LOGD -[ -f "$LOGE" ] || echo "start" > $LOGE -[ -f "$LOGT" ] || echo "start" > $LOGT -[ -f "$LOG" ] || echo "start" > $LOG - -MAX_LOG=500 -limit_log() { - local logf=$1 - local max=$2 - [ ! -f "$logf" ] && return - sc=${max:-$MAX_LOG} - local count=$(grep -c "" $logf) - if [ $count -gt $sc ];then - let count=count-$sc - sed -i "1,$count d" $logf - fi -} - - -echone() { - echo -ne $* >> $LOG -} - - -wantest() { - [ -f $LOCK ] && exit - limit_log $LOG 500 - touch $LOCK - TESTMODE=$1 - BINTEMP=$(git_bin_handle $TESTMODE) - case $TESTMODE in - 0) - echo -ne "\n —————ookla-speedtest测速—————\n" | tee -a $LOG - $BINTEMP | tee $TMP_T - RESULT=$(cat $TMP_T | grep 'URL' | cut -c15-) - if [ -n "$RESULT" ] ;then - echo -ne "\n 测服信息:`cat $TMP_T | grep 'Server'| cut -c10- | awk -F: '{printf $2$3}'` 线路:`cat $TMP_T | grep 'ISP' | awk -F: '{printf $2}' ` 延时：`cat $TMP_T | grep 'Latency' | awk -F: '{printf $2}' | awk -F '(' '{printf $1}'`" >> $LOG - echo -ne "\n 下行速率:`cat $TMP_T | grep 'Download' |awk -F: '{printf $2}' | awk -F '(' '{printf $1}'` --" >> $LOG - echo -ne "-- 上行速率:`cat $TMP_T | grep 'Upload' |awk -F: '{printf $2}' | awk -F '(' '{printf $1}'`" >> $LOG - echo -ne "\n 测速结果图片链接:`cat $TMP_T | grep 'URL' | cut -c15-`" >> $LOG - else - echo -ne "\n 因客户端在LUCI下运行错误，测试失败！" | tee -a $LOG - echo -ne "\n 请SSH运行：/etc/init.d/netspeedtest wantest 0 测试,完成后，在日志中有测试结果！" | tee -a $LOG - fi - echo -ne "\n 测试时间: `date +%Y-%m-%d' '%H:%M:%S`" | tee -a $LOG - echo -ne "\n ————————————————————\n" | tee -a $LOG - ;; - *) - echo -ne "\n —————python3-speedtest测速—————\n" | tee -a $LOG - $BINTEMP | tee $TMP_T - echo -ne "\n 测服信息:$(cat $TMP_T | grep 'Hosted by'| cut -c10- | awk -F: '{printf $1}') 延时：$(cat $TMP_T | grep 'Hosted by' | awk -F: '{printf $2}')" >> $LOG - echo -ne "\n 下行速率:$(cat $TMP_T | grep 'Download:' |awk -F: '{printf $2}' ) --" >> $LOG - echo -ne "-- 上行速率:$(cat $TMP_T | grep 'Upload:' |awk -F: '{printf $2}' )" >> $LOG - echo -ne "\n 测试结果图片链接:$(cat $TMP_T | grep 'results:' | cut -c16- )" >> $LOG - echo -ne "\n 测试时间:`date +%Y-%m-%d" "%H:%M:%S`" | tee -a $LOG - echo -ne "\n ————————————————————\n" | tee -a $LOG - - ;; - esac - rm -f $LOCK -} -getcpucore(){ -#i386, x86_64, arm32, arm32hf, and arm64. - cputype=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]') - [ -n "$(echo $cputype | grep -E "linux.*armv.*")" ] && cpucore="armel" - [ -n "$(echo $cputype | grep -E "linux.*armv7.*")" ] && [ -n "$(cat /proc/cpuinfo | grep vfp)" ] && [ ! -d /jffs/clash ] && cpucore="armhf" - [ -n "$(echo $cputype | grep -E "linux.*aarch64.*|linux.*armv8.*")" ] && cpucore="aarch64" - [ -n "$(echo $cputype | grep -E "linux.*86.*")" ] && cpucore="i386" - [ -n "$(echo $cputype | grep -E "linux.*86_64.*")" ] && cpucore="x86_64" -echo $cpucore -} - -git_bin_handle() -{ -case $1 in - - 0) - TMPDIR=/var/netspeedtest - BINSPEEDTEST=$TMPDIR/speedtest - [ ! -d $TMPDIR ] && mkdir -p $TMPDIR 2>/dev/null - if [ -x "$BINSPEEDTEST" ]; then - chmod 755 $BINSPEEDTEST >/dev/null 2>&1 - echo "$BINSPEEDTEST --accept-gdpr --accept-license --progress=no" - else - ooklaurl=`curl --connect-timeout 5 -m 60 -sSL 'https://www.speedtest.net/apps/cli' | grep 'Download for Linux' | sed 's|<|\n<|g' | sed -n '/Download for Linux/,/<\/div>/p' | sed -En "s|.*$(getcpucore)|\1|p" ` - [ -n "$ooklaurl" ] && curl -sSL $ooklaurl | tar -xvz -C /tmp >/dev/null 2>&1 || return - mv /tmp/speedtest $BINSPEEDTEST >/dev/null 2>&1 - chmod 755 $BINSPEEDTEST >/dev/null 2>&1 - [ -x "$BINSPEEDTEST" ] && echo "$BINSPEEDTEST --accept-gdpr --accept-license --progress=no" - fi - ;; - *) - BINSPEEDTEST='/usr/bin/speedtest' - [ -x "$BINSPEEDTEST" ] && echo "$BINSPEEDTEST --share" - ;; - esac -} - -speedtest_start(){ -case $1 in - 0) - speedtest_start_ookla $2 ;; - *) - speedtest_start_cli $2 ;; - esac -} - -tcptest(){ - NDATA=`date +%Y-%m-%d' '%H:%M:%S` - echo -ne "\n $NDATA 服务器：$1 ---- 端口：$2 ---- TCP延时：$3 ms \n" >> $LOG -} +# +OOKLA_SPEEDTEST='/usr/bin/speedtest' +# uci +CONFIG='netspeedtest' +NAMEDDSECTION='config' get_config() { - config_get_bool enabled $1 enabled 1 - config_get_bool logger $1 logger 1 + config_load netspeedtest + config_get "proxy_enabled" "config" "proxy_enabled" "0" } -homebox_prepare() { - pgrep -f homebox | xargs kill -9 >/dev/null 2>&1 - killall homebox - killall homebox + +download_ookla() { + local url arch=$1 + [ -z "$arch" ] && return 1 + + [ "$(uci -q get $CONFIG.$NAMEDDSECTION.proxy_enabled)" == "1" ] && \ + export ALL_PROXY=$(uci -q get $CONFIG.$NAMEDDSECTION.proxy_protocol)://$(uci -q get $CONFIG.$NAMEDDSECTION.proxy_server) + + UA='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36' + url=$( \ + curl --connect-timeout 10 --retry 3 -sSL 'https://www.speedtest.net/apps/cli' \ + --user-agent "$UA" \ + | grep "Download for Linux" \ + | sed 's|<|\n<|g' \ + | sed -n '/Download for Linux/,/<\/div>/p' \ + | sed -En "s|.*${arch}|\1|p" \ + ) + [ -z "$url" ] && return 1 + + [ -n "$url" ] && curl -sSL $url --user-agent "$UA" | tar -xvz -C /tmp + mkdir -p ${OOKLA_SPEEDTEST%/*} 2>/dev/null + cp -f /tmp/speedtest $OOKLA_SPEEDTEST + chmod 755 $OOKLA_SPEEDTEST + ookla_verify || rm -f $OOKLA_SPEEDTEST + unset ALL_PROXY +} + +ookla_verify() { + if [ -x "$OOKLA_SPEEDTEST" ]; then + return 0 + else + return 1 + fi } start_service() { - config_load netspeedtest - config_foreach get_config netspeedtest - [ "x$enabled" != "x1" ] && { - homebox_prepare - exit - } - procd_open_instance - procd_set_param command $PROG - [ "x$logger" == x1 ] && procd_set_param stderr 1 - # procd_set_param respawn - procd_close_instance + ookla_verify + +} +service_triggers() { + procd_add_reload_trigger "netspeedtest" } -service_triggers() { - procd_add_reload_trigger "netspeedtest" +reload_service() { + stop + sleep 1 + start } diff --git a/luci-app-netspeedtest/root/etc/uci-defaults/40_luci-netspeedtest b/luci-app-netspeedtest/root/etc/uci-defaults/40_luci-netspeedtest deleted file mode 100644 index 065ba626f..000000000 --- a/luci-app-netspeedtest/root/etc/uci-defaults/40_luci-netspeedtest +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -chmod +x /etc/init.d/netspeedtest >/dev/null 2>&1 -[ -f "/etc/config/netspeedtest" ] || { -cat >/etc/config/netspeedtest <<-EOF -config netspeedtest 'netspeedtest' - option enabled '0' - option port '3300' - -config homebox 'homebox' - option enabled '0' - option port '3300' - -config speedtestiperf3 'speedtestiperf3' - -config speedtestwan 'speedtestwan' - -config speedtestport 'speedtestport' - option sport '443' - option sdomain 'www.taobao.com' -EOF -} -[ `uci -q get netspeedtest.global` ] && uci set netspeedtest.global=global -[ `uci -q get netspeedtest.netspeedtest` ] || uci set netspeedtest.netspeedtest=netspeedtest -[ `uci -q get netspeedtest.speedtestiperf3` ] || uci set netspeedtest.speedtestiperf3=speedtestiperf3 -[ `uci -q get netspeedtest.speedtestport` ] || uci set netspeedtest.speedtestport=speedtestport -[ `uci -q get netspeedtest.speedtestwan` ] || uci set netspeedtest.speedtestport=speedtestwan -LOGD=/etc/netspeedtest -LOG=/var/log/netspeedtest.log -LOGE=$LOGD/netspeedtest.log -LOGT=$LOGD/netspeedtestpos -[ -d "$LOGD" ] || mkdir -p $LOGD -[ -f "$LOGE" ] || echo "start" > $LOGE -[ -f "$LOGT" ] || echo "1" > $LOGT -[ -f "$LOG" ] || echo "start" > $LOG - -rm -rf /tmp/luci-modulecache /tmp/luci-indexcache* -exit 0 diff --git a/luci-app-netspeedtest/root/etc/uci-defaults/99_netspeedtest b/luci-app-netspeedtest/root/etc/uci-defaults/99_netspeedtest new file mode 100644 index 000000000..680dc7961 --- /dev/null +++ b/luci-app-netspeedtest/root/etc/uci-defaults/99_netspeedtest @@ -0,0 +1,6 @@ +#!/bin/sh +touch /etc/config/netspeedtest +uci -q batch <<-EOF >/dev/null + set netspeedtest.config=netspeedtest + commit netspeedtest +EOF diff --git a/luci-app-netspeedtest/root/lib/functions/netspeedtest.sh b/luci-app-netspeedtest/root/lib/functions/netspeedtest.sh deleted file mode 100644 index dda4a852f..000000000 --- a/luci-app-netspeedtest/root/lib/functions/netspeedtest.sh +++ /dev/null @@ -1,98 +0,0 @@ -################################################################################ -# (netspeedtest) functions.sh -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# Copyright (C) 2019-2025 The Sirpdboy Team -# . /lib/netspeedtest/functions.sh -################################################################################ - -# tmp speedtest -TMP_TEST=/var/netspeedtest.tmp -MAX_LOG=200 -LOG=/var/log/netspeedtest.log -limit_log() { - local logf=$1 - local max=$2 - [ ! -f "$logf" ] && return - sc=${max:-$MAX_LOG} - local count=$(grep -c "" $logf) - if [ $count -gt $sc ];then - let count=count-$sc - sed -i "1,$count d" $logf - fi -} - -init_log() { - local logf=$1 - [ ! -f "$logf" ] && echo "" > $logf -} - -echone() { - echo -ne $* >> $LOG -} - - -git_bin_handle() -{ -case $1 in - - 0) - TMPDIR=/var/netspeedtest - BINSPEEDTEST=$TMPDIR/speedtest - [ ! -d $TMPDIR ] && mkdir -p $TMPDIR 2>/dev/null - if [ -x "$BINSPEEDTEST" ]; then - chmod 755 $BINSPEEDTEST >/dev/null 2>&1 - echo "$BINSPEEDTEST --accept-gdpr --accept-license --progress=no" - else - ooklaurl=`curl --connect-timeout 5 -m 60 -sSL 'https://www.speedtest.net/apps/cli' | grep 'Download for Linux' | sed 's|<|\n<|g' | sed -n '/Download for Linux/,/<\/div>/p' | sed -En "s|.*x86_64|\1|p" ` - [ -n "$ooklaurl" ] && curl -sSL $ooklaurl | tar -xvz -C /tmp >/dev/null 2>&1 || return - mv /tmp/speedtest $BINSPEEDTEST >/dev/null 2>&1 - chmod 755 $BINSPEEDTEST >/dev/null 2>&1 - [ -x "$BINSPEEDTEST" ] && echo "$BINSPEEDTEST --accept-gdpr --accept-license --progress=no" - fi - ;; - *) - BINSPEEDTEST='/usr/bin/speedtest' - [ -x "$BINSPEEDTEST" ] && echo "$BINSPEEDTEST --share" - ;; - esac -} - -speedtest_start(){ -case $1 in - 0) - speedtest_start_ookla $2 ;; - *) - speedtest_start_cli $2 ;; - esac -} - -speedtest_start_ookla(){ - echone "\n ookla-speedtest测速" - info=$($1 > $TMP_TEST ) >/dev/null 2>&1 - echone "\n info:$info ----------------- " - echone "\n 测服信息:`cat $TMP_TEST | grep 'Server'| cut -c10- | awk -F: '{printf $2$3}'` 线路:`cat $TMP_TEST | grep 'ISP' | awk -F: '{printf $2}' ` 延时：`cat $TMP_TEST | grep 'Latency' | awk -F: '{printf $2}' | awk -F '(' '{printf $1}'`" - echone "\n 下行速率:`cat $TMP_TEST | grep 'Download' |awk -F: '{printf $2}' | awk -F '(' '{printf $1}'` --" - echone "-- 上行速率:`cat $TMP_TEST | grep 'Upload' |awk -F: '{printf $2}' | awk -F '(' '{printf $1}'`" - echo -ne "\n 测速结果图片链接:`cat $TMP_TEST | grep 'URL' | cut -c15-`" >> $LOG - echone "\n 测试时间: `date +%Y-%m-%d' '%H:%M:%S`" - echone "\n ————————————————————————————\n" - cat $TMP_TEST | grep 'URL' | cut -c15- > /var/speedtesturl.tmp - echo -ne "`cat $TMP_TEST | grep 'URL' | cut -c15- `" -} - -speedtest_start_cli(){ - echone "\n python3-speedtest测速" - info=$($1 > $TMP_TEST ) >/dev/null 2>&1 - echone "\n 测服信息:`cat $TMP_TEST | grep 'Hosted by'| cut -c10- | awk -F: '{printf $1}'` 延时：`cat $TMP_TEST | grep 'Hosted by' | awk -F: '{printf $2}'`" - echone "\n 下行速率:`cat $TMP_TEST | grep 'Download:' |awk -F: '{printf $2}' ` --" - echone "-- 上行速率:`cat $TMP_TEST | grep 'Upload:' |awk -F: '{printf $2}' `" - echo -ne "\n 测速结果图片链接:`cat $TMP_TEST | grep 'results' | cut -c16-`" >> $LOG - echone "\n 测试时间: `date +%Y-%m-%d' '%H:%M:%S`" - echone "\n ————————————————————————————\n" - cat $TMP_TEST | grep 'results:' | cut -c16- > /var/speedtesturl.tmp - echo -ne "`cat $TMP_TEST | grep 'results:' | cut -c16-`" -} diff --git a/luci-app-netspeedtest/root/usr/bin/speedtest b/luci-app-netspeedtest/root/usr/bin/speedtest deleted file mode 100755 index 723867c7f..000000000 --- a/luci-app-netspeedtest/root/usr/bin/speedtest +++ /dev/null @@ -1,1975 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# Copyright 2012 Matt Martz -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import csv -import datetime -import errno -import math -import os -import platform -import re -import signal -import socket -import sys -import threading -import timeit -import xml.parsers.expat - -try: - import gzip - GZIP_BASE = gzip.GzipFile -except ImportError: - gzip = None - GZIP_BASE = object - -__version__ = '2.1.4b2' - - -class FakeShutdownEvent(object): - """Class to fake a threading.Event.isSet so that users of this module - are not required to register their own threading.Event() - """ - - @staticmethod - def isSet(): - "Dummy method to always return false""" - return False - - is_set = isSet - - -# Some global variables we use -DEBUG = False -_GLOBAL_DEFAULT_TIMEOUT = object() -PY25PLUS = sys.version_info[:2] >= (2, 5) -PY26PLUS = sys.version_info[:2] >= (2, 6) -PY32PLUS = sys.version_info[:2] >= (3, 2) -PY310PLUS = sys.version_info[:2] >= (3, 10) - -# Begin import game to handle Python 2 and Python 3 -try: - import json -except ImportError: - try: - import simplejson as json - except ImportError: - json = None - -try: - import xml.etree.ElementTree as ET - try: - from xml.etree.ElementTree import _Element as ET_Element - except ImportError: - pass -except ImportError: - from xml.dom import minidom as DOM - from xml.parsers.expat import ExpatError - ET = None - -try: - from urllib2 import (urlopen, Request, HTTPError, URLError, - AbstractHTTPHandler, ProxyHandler, - HTTPDefaultErrorHandler, HTTPRedirectHandler, - HTTPErrorProcessor, OpenerDirector) -except ImportError: - from urllib.request import (urlopen, Request, HTTPError, URLError, - AbstractHTTPHandler, ProxyHandler, - HTTPDefaultErrorHandler, HTTPRedirectHandler, - HTTPErrorProcessor, OpenerDirector) - -try: - from httplib import HTTPConnection, BadStatusLine -except ImportError: - from http.client import HTTPConnection, BadStatusLine - -try: - from httplib import HTTPSConnection -except ImportError: - try: - from http.client import HTTPSConnection - except ImportError: - HTTPSConnection = None - -try: - from httplib import FakeSocket -except ImportError: - FakeSocket = None - -try: - from Queue import Queue -except ImportError: - from queue import Queue - -try: - from urlparse import urlparse -except ImportError: - from urllib.parse import urlparse - -try: - from urlparse import parse_qs -except ImportError: - try: - from urllib.parse import parse_qs - except ImportError: - from cgi import parse_qs - -try: - from hashlib import md5 -except ImportError: - from md5 import md5 - -try: - from argparse import ArgumentParser as ArgParser - from argparse import SUPPRESS as ARG_SUPPRESS - PARSER_TYPE_INT = int - PARSER_TYPE_STR = str - PARSER_TYPE_FLOAT = float -except ImportError: - from optparse import OptionParser as ArgParser - from optparse import SUPPRESS_HELP as ARG_SUPPRESS - PARSER_TYPE_INT = 'int' - PARSER_TYPE_STR = 'string' - PARSER_TYPE_FLOAT = 'float' - -try: - from cStringIO import StringIO - BytesIO = None -except ImportError: - try: - from StringIO import StringIO - BytesIO = None - except ImportError: - from io import StringIO, BytesIO - -try: - import __builtin__ -except ImportError: - import builtins - from io import TextIOWrapper, FileIO - - class _Py3Utf8Output(TextIOWrapper): - """UTF-8 encoded wrapper around stdout for py3, to override - ASCII stdout - """ - def __init__(self, f, **kwargs): - buf = FileIO(f.fileno(), 'w') - super(_Py3Utf8Output, self).__init__( - buf, - encoding='utf8', - errors='strict' - ) - - def write(self, s): - super(_Py3Utf8Output, self).write(s) - self.flush() - - _py3_print = getattr(builtins, 'print') - try: - _py3_utf8_stdout = _Py3Utf8Output(sys.stdout) - _py3_utf8_stderr = _Py3Utf8Output(sys.stderr) - except OSError: - # sys.stdout/sys.stderr is not a compatible stdout/stderr object - # just use it and hope things go ok - _py3_utf8_stdout = sys.stdout - _py3_utf8_stderr = sys.stderr - - def to_utf8(v): - """No-op encode to utf-8 for py3""" - return v - - def print_(*args, **kwargs): - """Wrapper function for py3 to print, with a utf-8 encoded stdout""" - if kwargs.get('file') == sys.stderr: - kwargs['file'] = _py3_utf8_stderr - else: - kwargs['file'] = kwargs.get('file', _py3_utf8_stdout) - _py3_print(*args, **kwargs) -else: - del __builtin__ - - def to_utf8(v): - """Encode value to utf-8 if possible for py2""" - try: - return v.encode('utf8', 'strict') - except AttributeError: - return v - - def print_(*args, **kwargs): - """The new-style print function for Python 2.4 and 2.5. - - Taken from https://pypi.python.org/pypi/six/ - - Modified to set encoding to UTF-8 always, and to flush after write - """ - fp = kwargs.pop("file", sys.stdout) - if fp is None: - return - - def write(data): - if not isinstance(data, basestring): - data = str(data) - # If the file has an encoding, encode unicode with it. - encoding = 'utf8' # Always trust UTF-8 for output - if (isinstance(fp, file) and - isinstance(data, unicode) and - encoding is not None): - errors = getattr(fp, "errors", None) - if errors is None: - errors = "strict" - data = data.encode(encoding, errors) - fp.write(data) - fp.flush() - want_unicode = False - sep = kwargs.pop("sep", None) - if sep is not None: - if isinstance(sep, unicode): - want_unicode = True - elif not isinstance(sep, str): - raise TypeError("sep must be None or a string") - end = kwargs.pop("end", None) - if end is not None: - if isinstance(end, unicode): - want_unicode = True - elif not isinstance(end, str): - raise TypeError("end must be None or a string") - if kwargs: - raise TypeError("invalid keyword arguments to print()") - if not want_unicode: - for arg in args: - if isinstance(arg, unicode): - want_unicode = True - break - if want_unicode: - newline = unicode("\n") - space = unicode(" ") - else: - newline = "\n" - space = " " - if sep is None: - sep = space - if end is None: - end = newline - for i, arg in enumerate(args): - if i: - write(sep) - write(arg) - write(end) - -# Exception "constants" to support Python 2 through Python 3 -try: - import ssl - try: - CERT_ERROR = (ssl.CertificateError,) - except AttributeError: - CERT_ERROR = tuple() - - HTTP_ERRORS = ( - (HTTPError, URLError, socket.error, ssl.SSLError, BadStatusLine) + - CERT_ERROR - ) -except ImportError: - ssl = None - HTTP_ERRORS = (HTTPError, URLError, socket.error, BadStatusLine) - -if PY32PLUS: - etree_iter = ET.Element.iter -elif PY25PLUS: - etree_iter = ET_Element.getiterator - -if PY26PLUS: - thread_is_alive = threading.Thread.is_alive -else: - thread_is_alive = threading.Thread.isAlive - - -def event_is_set(event): - try: - return event.is_set() - except AttributeError: - return event.isSet() - - -class SpeedtestException(Exception): - """Base exception for this module""" - - -class SpeedtestCLIError(SpeedtestException): - """Generic exception for raising errors during CLI operation""" - - -class SpeedtestHTTPError(SpeedtestException): - """Base HTTP exception for this module""" - - -class SpeedtestConfigError(SpeedtestException): - """Configuration XML is invalid""" - - -class SpeedtestServersError(SpeedtestException): - """Servers XML is invalid""" - - -class ConfigRetrievalError(SpeedtestHTTPError): - """Could not retrieve config.php""" - - -class ServersRetrievalError(SpeedtestHTTPError): - """Could not retrieve speedtest-servers.php""" - - -class InvalidServerIDType(SpeedtestException): - """Server ID used for filtering was not an integer""" - - -class NoMatchedServers(SpeedtestException): - """No servers matched when filtering""" - - -class SpeedtestMiniConnectFailure(SpeedtestException): - """Could not connect to the provided speedtest mini server""" - - -class InvalidSpeedtestMiniServer(SpeedtestException): - """Server provided as a speedtest mini server does not actually appear - to be a speedtest mini server - """ - - -class ShareResultsConnectFailure(SpeedtestException): - """Could not connect to speedtest.net API to POST results""" - - -class ShareResultsSubmitFailure(SpeedtestException): - """Unable to successfully POST results to speedtest.net API after - connection - """ - - -class SpeedtestUploadTimeout(SpeedtestException): - """testlength configuration reached during upload - Used to ensure the upload halts when no additional data should be sent - """ - - -class SpeedtestBestServerFailure(SpeedtestException): - """Unable to determine best server""" - - -class SpeedtestMissingBestServer(SpeedtestException): - """get_best_server not called or not able to determine best server""" - - -def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT, - source_address=None): - """Connect to *address* and return the socket object. - - Convenience function. Connect to *address* (a 2-tuple ``(host, - port)``) and return the socket object. Passing the optional - *timeout* parameter will set the timeout on the socket instance - before attempting to connect. If no *timeout* is supplied, the - global default timeout setting returned by :func:`getdefaulttimeout` - is used. If *source_address* is set it must be a tuple of (host, port) - for the socket to bind as a source address before making the connection. - An host of '' or port 0 tells the OS to use the default. - - Largely vendored from Python 2.7, modified to work with Python 2.4 - """ - - host, port = address - err = None - for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM): - af, socktype, proto, canonname, sa = res - sock = None - try: - sock = socket.socket(af, socktype, proto) - if timeout is not _GLOBAL_DEFAULT_TIMEOUT: - sock.settimeout(float(timeout)) - if source_address: - sock.bind(source_address) - sock.connect(sa) - return sock - - except socket.error: - err = get_exception() - if sock is not None: - sock.close() - - if err is not None: - raise err - else: - raise socket.error("getaddrinfo returns an empty list") - - -class SpeedtestHTTPConnection(HTTPConnection): - """Custom HTTPConnection to support source_address across - Python 2.4 - Python 3 - """ - def __init__(self, *args, **kwargs): - source_address = kwargs.pop('source_address', None) - timeout = kwargs.pop('timeout', 10) - - self._tunnel_host = None - - HTTPConnection.__init__(self, *args, **kwargs) - - self.source_address = source_address - self.timeout = timeout - - def connect(self): - """Connect to the host and port specified in __init__.""" - try: - self.sock = socket.create_connection( - (self.host, self.port), - self.timeout, - self.source_address - ) - except (AttributeError, TypeError): - self.sock = create_connection( - (self.host, self.port), - self.timeout, - self.source_address - ) - - if self._tunnel_host: - self._tunnel() - - -if HTTPSConnection: - class SpeedtestHTTPSConnection(HTTPSConnection): - """Custom HTTPSConnection to support source_address across - Python 2.4 - Python 3 - """ - default_port = 443 - - def __init__(self, *args, **kwargs): - source_address = kwargs.pop('source_address', None) - timeout = kwargs.pop('timeout', 10) - - self._tunnel_host = None - - HTTPSConnection.__init__(self, *args, **kwargs) - - self.timeout = timeout - self.source_address = source_address - - def connect(self): - "Connect to a host on a given (SSL) port." - try: - self.sock = socket.create_connection( - (self.host, self.port), - self.timeout, - self.source_address - ) - except (AttributeError, TypeError): - self.sock = create_connection( - (self.host, self.port), - self.timeout, - self.source_address - ) - - if self._tunnel_host: - self._tunnel() - - if ssl: - try: - kwargs = {} - if hasattr(ssl, 'SSLContext'): - if self._tunnel_host: - kwargs['server_hostname'] = self._tunnel_host - else: - kwargs['server_hostname'] = self.host - self.sock = self._context.wrap_socket(self.sock, **kwargs) - except AttributeError: - self.sock = ssl.wrap_socket(self.sock) - try: - self.sock.server_hostname = self.host - except AttributeError: - pass - elif FakeSocket: - # Python 2.4/2.5 support - try: - self.sock = FakeSocket(self.sock, socket.ssl(self.sock)) - except AttributeError: - raise SpeedtestException( - 'This version of Python does not support HTTPS/SSL ' - 'functionality' - ) - else: - raise SpeedtestException( - 'This version of Python does not support HTTPS/SSL ' - 'functionality' - ) - - -def _build_connection(connection, source_address, timeout, context=None): - """Cross Python 2.4 - Python 3 callable to build an ``HTTPConnection`` or - ``HTTPSConnection`` with the args we need - - Called from ``http(s)_open`` methods of ``SpeedtestHTTPHandler`` or - ``SpeedtestHTTPSHandler`` - """ - def inner(host, **kwargs): - kwargs.update({ - 'source_address': source_address, - 'timeout': timeout - }) - if context: - kwargs['context'] = context - return connection(host, **kwargs) - return inner - - -class SpeedtestHTTPHandler(AbstractHTTPHandler): - """Custom ``HTTPHandler`` that can build a ``HTTPConnection`` with the - args we need for ``source_address`` and ``timeout`` - """ - def __init__(self, debuglevel=0, source_address=None, timeout=10): - AbstractHTTPHandler.__init__(self, debuglevel) - self.source_address = source_address - self.timeout = timeout - - def http_open(self, req): - return self.do_open( - _build_connection( - SpeedtestHTTPConnection, - self.source_address, - self.timeout - ), - req - ) - - http_request = AbstractHTTPHandler.do_request_ - - -class SpeedtestHTTPSHandler(AbstractHTTPHandler): - """Custom ``HTTPSHandler`` that can build a ``HTTPSConnection`` with the - args we need for ``source_address`` and ``timeout`` - """ - def __init__(self, debuglevel=0, context=None, source_address=None, - timeout=10): - AbstractHTTPHandler.__init__(self, debuglevel) - self._context = context - self.source_address = source_address - self.timeout = timeout - - def https_open(self, req): - return self.do_open( - _build_connection( - SpeedtestHTTPSConnection, - self.source_address, - self.timeout, - context=self._context, - ), - req - ) - - https_request = AbstractHTTPHandler.do_request_ - - -def build_opener(source_address=None, timeout=10): - """Function similar to ``urllib2.build_opener`` that will build - an ``OpenerDirector`` with the explicit handlers we want, - ``source_address`` for binding, ``timeout`` and our custom - `User-Agent` - """ - - printer('Timeout set to %d' % timeout, debug=True) - - if source_address: - source_address_tuple = (source_address, 0) - printer('Binding to source address: %r' % (source_address_tuple,), - debug=True) - else: - source_address_tuple = None - - handlers = [ - ProxyHandler(), - SpeedtestHTTPHandler(source_address=source_address_tuple, - timeout=timeout), - SpeedtestHTTPSHandler(source_address=source_address_tuple, - timeout=timeout), - HTTPDefaultErrorHandler(), - HTTPRedirectHandler(), - HTTPErrorProcessor() - ] - - opener = OpenerDirector() - opener.addheaders = [('User-agent', build_user_agent())] - - for handler in handlers: - opener.add_handler(handler) - - return opener - - -class GzipDecodedResponse(GZIP_BASE): - """A file-like object to decode a response encoded with the gzip - method, as described in RFC 1952. - - Largely copied from ``xmlrpclib``/``xmlrpc.client`` and modified - to work for py2.4-py3 - """ - def __init__(self, response): - # response doesn't support tell() and read(), required by - # GzipFile - if not gzip: - raise SpeedtestHTTPError('HTTP response body is gzip encoded, ' - 'but gzip support is not available') - IO = BytesIO or StringIO - self.io = IO() - while 1: - chunk = response.read(1024) - if len(chunk) == 0: - break - self.io.write(chunk) - self.io.seek(0) - gzip.GzipFile.__init__(self, mode='rb', fileobj=self.io) - - def close(self): - try: - gzip.GzipFile.close(self) - finally: - self.io.close() - - -def get_exception(): - """Helper function to work with py2.4-py3 for getting the current - exception in a try/except block - """ - return sys.exc_info()[1] - - - - - -def build_user_agent(): - """Build a Mozilla/5.0 compatible User-Agent string""" - - ua_tuple = ( - 'Mozilla/5.0', - '(%s; U; %s; en-us)' % (platform.platform(), - platform.architecture()[0]), - 'Python/%s' % platform.python_version(), - '(KHTML, like Gecko)', - 'speedtest-cli/%s' % __version__ - ) - user_agent = ' '.join(ua_tuple) - printer('User-Agent: %s' % user_agent, debug=True) - return user_agent - - -def build_request(url, data=None, headers=None, bump='0', secure=False): - """Build a urllib2 request object - - This function automatically adds a User-Agent header to all requests - - """ - - if not headers: - headers = {} - - if url[0] == ':': - scheme = ('http', 'https')[bool(secure)] - schemed_url = '%s%s' % (scheme, url) - else: - schemed_url = url - - if '?' in url: - delim = '&' - else: - delim = '?' - - # WHO YOU GONNA CALL? CACHE BUSTERS! - final_url = '%s%sx=%s.%s' % (schemed_url, delim, - int(timeit.time.time() * 1000), - bump) - - headers.update({ - 'Cache-Control': 'no-cache', - }) - - printer('%s %s' % (('GET', 'POST')[bool(data)], final_url), - debug=True) - - return Request(final_url, data=data, headers=headers) - - -def catch_request(request, opener=None): - """Helper function to catch common exceptions encountered when - establishing a connection with a HTTP/HTTPS request - - """ - - if opener: - _open = opener.open - else: - _open = urlopen - - try: - uh = _open(request) - if request.get_full_url() != uh.geturl(): - printer('Redirected to %s' % uh.geturl(), debug=True) - return uh, False - except HTTP_ERRORS: - e = get_exception() - return None, e - - -def get_response_stream(response): - """Helper function to return either a Gzip reader if - ``Content-Encoding`` is ``gzip`` otherwise the response itself - - """ - - try: - getheader = response.headers.getheader - except AttributeError: - getheader = response.getheader - - if getheader('content-encoding') == 'gzip': - return GzipDecodedResponse(response) - - return response - - -def get_attributes_by_tag_name(dom, tag_name): - """Retrieve an attribute from an XML document and return it in a - consistent format - - Only used with xml.dom.minidom, which is likely only to be used - with python versions older than 2.5 - """ - elem = dom.getElementsByTagName(tag_name)[0] - return dict(list(elem.attributes.items())) - - -def print_dots(shutdown_event): - """Built in callback function used by Thread classes for printing - status - """ - def inner(current, total, start=False, end=False): - if event_is_set(shutdown_event): - return - - sys.stdout.write('.') - if current + 1 == total and end is True: - sys.stdout.write('\n') - sys.stdout.flush() - return inner - - -def do_nothing(*args, **kwargs): - pass - - -class HTTPDownloader(threading.Thread): - """Thread class for retrieving a URL""" - - def __init__(self, i, request, start, timeout, opener=None, - shutdown_event=None): - threading.Thread.__init__(self) - self.request = request - self.result = [0] - self.starttime = start - self.timeout = timeout - self.i = i - if opener: - self._opener = opener.open - else: - self._opener = urlopen - - if shutdown_event: - self._shutdown_event = shutdown_event - else: - self._shutdown_event = FakeShutdownEvent() - - def run(self): - try: - if (timeit.default_timer() - self.starttime) <= self.timeout: - f = self._opener(self.request) - while (not event_is_set(self._shutdown_event) and - (timeit.default_timer() - self.starttime) <= - self.timeout): - self.result.append(len(f.read(10240))) - if self.result[-1] == 0: - break - f.close() - except IOError: - pass - except HTTP_ERRORS: - pass - - -class HTTPUploaderData(object): - """File like object to improve cutting off the upload once the timeout - has been reached - """ - - def __init__(self, length, start, timeout, shutdown_event=None): - self.length = length - self.start = start - self.timeout = timeout - - if shutdown_event: - self._shutdown_event = shutdown_event - else: - self._shutdown_event = FakeShutdownEvent() - - self._data = None - - self.total = [0] - - def pre_allocate(self): - chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' - multiplier = int(round(int(self.length) / 36.0)) - IO = BytesIO or StringIO - try: - self._data = IO( - ('content1=%s' % - (chars * multiplier)[0:int(self.length) - 9] - ).encode() - ) - except MemoryError: - raise SpeedtestCLIError( - 'Insufficient memory to pre-allocate upload data. Please ' - 'use --no-pre-allocate' - ) - - @property - def data(self): - if not self._data: - self.pre_allocate() - return self._data - - def read(self, n=10240): - if ((timeit.default_timer() - self.start) <= self.timeout and - not event_is_set(self._shutdown_event)): - chunk = self.data.read(n) - self.total.append(len(chunk)) - return chunk - else: - raise SpeedtestUploadTimeout() - - def __len__(self): - return self.length - - -class HTTPUploader(threading.Thread): - """Thread class for putting a URL""" - - def __init__(self, i, request, start, size, timeout, opener=None, - shutdown_event=None): - threading.Thread.__init__(self) - self.request = request - self.request.data.start = self.starttime = start - self.size = size - self.result = 0 - self.timeout = timeout - self.i = i - - if opener: - self._opener = opener.open - else: - self._opener = urlopen - - if shutdown_event: - self._shutdown_event = shutdown_event - else: - self._shutdown_event = FakeShutdownEvent() - - def run(self): - request = self.request - try: - if ((timeit.default_timer() - self.starttime) <= self.timeout and - not event_is_set(self._shutdown_event)): - try: - f = self._opener(request) - except TypeError: - # PY24 expects a string or buffer - # This also causes issues with Ctrl-C, but we will concede - # for the moment that Ctrl-C on PY24 isn't immediate - request = build_request(self.request.get_full_url(), - data=request.data.read(self.size)) - f = self._opener(request) - f.read(11) - f.close() - self.result = sum(self.request.data.total) - else: - self.result = 0 - except (IOError, SpeedtestUploadTimeout): - self.result = sum(self.request.data.total) - except HTTP_ERRORS: - self.result = 0 - - -class SpeedtestResults(object): - """Class for holding the results of a speedtest, including: - - Download speed - Upload speed - Ping/Latency to test server - Data about server that the test was run against - - Additionally this class can return a result data as a dictionary or CSV, - as well as submit a POST of the result data to the speedtest.net API - to get a share results image link. - """ - - def __init__(self, download=0, upload=0, ping=0, server=None, client=None, - opener=None, secure=False): - self.download = download - self.upload = upload - self.ping = ping - if server is None: - self.server = {} - else: - self.server = server - self.client = client or {} - - self._share = None - # datetime.datetime.utcnow() is deprecated starting from 3.12 - # but datetime.UTC is supported starting from 3.11 - if sys.version_info.major >= 3 and sys.version_info.minor >= 11: - self.timestamp = '%sZ' % datetime.datetime.now(datetime.UTC).isoformat() - else: - self.timestamp = '%sZ' % datetime.datetime.utcnow().isoformat() - self.bytes_received = 0 - self.bytes_sent = 0 - - if opener: - self._opener = opener - else: - self._opener = build_opener() - - self._secure = secure - - def __repr__(self): - return repr(self.dict()) - - def share(self): - """POST data to the speedtest.net API to obtain a share results - link - """ - - if self._share: - return self._share - - download = int(round(self.download / 1000.0, 0)) - ping = int(round(self.ping, 0)) - upload = int(round(self.upload / 1000.0, 0)) - - # Build the request to send results back to speedtest.net - # We use a list instead of a dict because the API expects parameters - # in a certain order - api_data = [ - 'recommendedserverid=%s' % self.server['id'], - 'ping=%s' % ping, - 'screenresolution=', - 'promo=', - 'download=%s' % download, - 'screendpi=', - 'upload=%s' % upload, - 'testmethod=http', - 'hash=%s' % md5(('%s-%s-%s-%s' % - (ping, upload, download, '297aae72')) - .encode()).hexdigest(), - 'touchscreen=none', - 'startmode=pingselect', - 'accuracy=1', - 'bytesreceived=%s' % self.bytes_received, - 'bytessent=%s' % self.bytes_sent, - 'serverid=%s' % self.server['id'], - ] - - headers = {'Referer': 'http://c.speedtest.net/flash/speedtest.swf'} - request = build_request('://www.speedtest.net/api/api.php', - data='&'.join(api_data).encode(), - headers=headers, secure=self._secure) - f, e = catch_request(request, opener=self._opener) - if e: - raise ShareResultsConnectFailure(e) - - response = f.read() - code = f.code - f.close() - - if int(code) != 200: - raise ShareResultsSubmitFailure('Could not submit results to ' - 'speedtest.net') - - qsargs = parse_qs(response.decode()) - resultid = qsargs.get('resultid') - if not resultid or len(resultid) != 1: - raise ShareResultsSubmitFailure('Could not submit results to ' - 'speedtest.net') - - self._share = 'http://www.speedtest.net/result/%s.png' % resultid[0] - - return self._share - - def dict(self): - """Return dictionary of result data""" - - return { - 'download': self.download, - 'upload': self.upload, - 'ping': self.ping, - 'server': self.server, - 'timestamp': self.timestamp, - 'bytes_sent': self.bytes_sent, - 'bytes_received': self.bytes_received, - 'share': self._share, - 'client': self.client, - } - - @staticmethod - def csv_header(delimiter=','): - """Return CSV Headers""" - - row = ['Server ID', 'Sponsor', 'Server Name', 'Timestamp', 'Distance', - 'Ping', 'Download', 'Upload', 'Share', 'IP Address'] - out = StringIO() - writer = csv.writer(out, delimiter=delimiter, lineterminator='') - writer.writerow([to_utf8(v) for v in row]) - return out.getvalue() - - def csv(self, delimiter=','): - """Return data in CSV format""" - - data = self.dict() - out = StringIO() - writer = csv.writer(out, delimiter=delimiter, lineterminator='') - row = [data['server']['id'], data['server']['sponsor'], - data['server']['name'], data['timestamp'], - data['server']['d'], data['ping'], data['download'], - data['upload'], self._share or '', self.client['ip']] - writer.writerow([to_utf8(v) for v in row]) - return out.getvalue() - - def json(self, pretty=False): - """Return data in JSON format""" - - kwargs = {} - if pretty: - kwargs.update({ - 'indent': 4, - 'sort_keys': True - }) - return json.dumps(self.dict(), **kwargs) - - -def parse_custom_server_response(response): - """Parse the custom server response format and return a list of servers.""" - servers = [] - server_blocks = re.findall(r'{(.*?)}', response, re.DOTALL) - for block in server_blocks: - server = {} - for line in block.split('\n'): - if '=' in line: - key, value = line.split('=', 1) - key = key.strip() - value = value.strip().strip('"') - if key == 'serverid': - key = 'id' - - server[key] = value - server["url"] = f"http://{server['host']}/speedtest/upload.php" - servers.append(server) - return servers - -class Speedtest(object): - """Class for performing standard speedtest.net testing operations""" - - def __init__(self, config=None, source_address=None, timeout=10, - secure=False, shutdown_event=None): - self.config = {} - - self._source_address = source_address - self._timeout = timeout - self._opener = build_opener(source_address, timeout) - - self._secure = secure - - if shutdown_event: - self._shutdown_event = shutdown_event - else: - self._shutdown_event = FakeShutdownEvent() - - self.get_config() - if config is not None: - self.config.update(config) - - self.servers = [] - self.closest = [] - self._best = {} - - self.results = SpeedtestResults( - client=self.config['client'], - opener=self._opener, - secure=secure, - ) - - @property - def best(self): - if not self._best: - self.get_best_server() - return self._best - - def get_config(self): - """Download the speedtest.net configuration and return only the data - we are interested in - """ - - headers = {} - if gzip: - headers['Accept-Encoding'] = 'gzip' - request = build_request('://www.speedtest.net/speedtest-config.php', - headers=headers, secure=self._secure) - uh, e = catch_request(request, opener=self._opener) - if e: - raise ConfigRetrievalError(e) - configxml_list = [] - - stream = get_response_stream(uh) - - while 1: - try: - configxml_list.append(stream.read(1024)) - except (OSError, EOFError): - raise ConfigRetrievalError(get_exception()) - if len(configxml_list[-1]) == 0: - break - stream.close() - uh.close() - - if int(uh.code) != 200: - return None - - configxml = ''.encode().join(configxml_list) - - printer('Config XML:\n%s' % configxml, debug=True) - - try: - try: - root = ET.fromstring(configxml) - except ET.ParseError: - e = get_exception() - raise SpeedtestConfigError( - 'Malformed speedtest.net configuration: %s' % e - ) - server_config = root.find('server-config').attrib - download = root.find('download').attrib - upload = root.find('upload').attrib - # times = root.find('times').attrib - client = root.find('client').attrib - - except AttributeError: - try: - root = DOM.parseString(configxml) - except ExpatError: - e = get_exception() - raise SpeedtestConfigError( - 'Malformed speedtest.net configuration: %s' % e - ) - server_config = get_attributes_by_tag_name(root, 'server-config') - download = get_attributes_by_tag_name(root, 'download') - upload = get_attributes_by_tag_name(root, 'upload') - # times = get_attributes_by_tag_name(root, 'times') - client = get_attributes_by_tag_name(root, 'client') - - ignore_servers = [ - int(i) for i in server_config['ignoreids'].split(',') if i - ] - - ratio = int(upload['ratio']) - upload_max = int(upload['maxchunkcount']) - up_sizes = [32768, 65536, 131072, 262144, 524288, 1048576, 7340032] - sizes = { - 'upload': up_sizes[ratio - 1:], - 'download': [350, 500, 750, 1000, 1500, 2000, 2500, - 3000, 3500, 4000] - } - - size_count = len(sizes['upload']) - - upload_count = int(math.ceil(upload_max / size_count)) - - counts = { - 'upload': upload_count, - 'download': int(download['threadsperurl']) - } - - threads = { - 'upload': int(upload['threads']), - 'download': int(server_config['threadcount']) * 2 - } - - length = { - 'upload': int(upload['testlength']), - 'download': int(download['testlength']) - } - - self.config.update({ - 'client': client, - 'ignore_servers': ignore_servers, - 'sizes': sizes, - 'counts': counts, - 'threads': threads, - 'length': length, - 'upload_max': upload_count * size_count - }) - - try: - self.lat_lon = (float(client['lat']), float(client['lon'])) - except ValueError: - raise SpeedtestConfigError( - 'Unknown location: lat=%r lon=%r' % - (client.get('lat'), client.get('lon')) - ) - - printer('Config:\n%r' % self.config, debug=True) - - return self.config - - def get_servers(self, servers=None, exclude=None): - """Retrieve the list of speedtest.net servers from the new API URL, - optionally filtered to servers matching those specified in the `servers` argument - """ - if servers is None: - servers = [] - - if exclude is None: - exclude = [] - - self.servers.clear() - - for server_list in (servers, exclude): - for i, s in enumerate(server_list): - try: - server_list[i] = int(s) - except ValueError: - raise InvalidServerIDType( - '%s is an invalid server type, must be int' % s - ) - - url = 'https://www.speedtest.net/api/embed/vz0azjarf5enop8a/config' # New API URL - - headers = {} - if gzip: - headers['Accept-Encoding'] = 'gzip' - - errors = [] - try: - request = build_request(url, headers=headers, secure=self._secure) - uh, e = catch_request(request, opener=self._opener) - - if e: - errors.append('%s' % e) - raise ServersRetrievalError() - - stream = get_response_stream(uh) - - - serversjson_list = [] - while 1: - try: - serversjson_list.append(stream.read(1024)) - except (OSError, EOFError): - raise ServersRetrievalError(get_exception()) - if len(serversjson_list[-1]) == 0: - break - - stream.close() - uh.close() - - if int(uh.code) != 200: - raise ServersRetrievalError() - - serversjson = b''.join(serversjson_list) - - if not serversjson: - raise SpeedtestServersError('Empty server list received') - - printer('Servers JSON:\n%s' % serversjson, debug=True) - servers_response = serversjson.decode('utf-8') - - - try: - elements = parse_custom_server_response(servers_response) - except Exception as e: - raise SpeedtestServersError( - 'Malformed speedtest.net server list: %s' % e - ) - - for server in elements: - if servers and int(server.get('id')) not in servers: - continue - - if (int(server.get('id')) in self.config['ignore_servers'] - or int(server.get('id')) in exclude): - continue - - self.servers.append(server) - - except ServersRetrievalError: - raise - - if (servers or exclude) and not self.servers: - raise NoMatchedServers() - - return self.servers - - def set_mini_server(self, server): - """Instead of querying for a list of servers, set a link to a - speedtest mini server - """ - - urlparts = urlparse(server) - - name, ext = os.path.splitext(urlparts[2]) - if ext: - url = os.path.dirname(server) - else: - url = server - - request = build_request(url) - uh, e = catch_request(request, opener=self._opener) - if e: - raise SpeedtestMiniConnectFailure('Failed to connect to %s' % - server) - else: - text = uh.read() - uh.close() - - extension = re.findall('upload_?[Ee]xtension: "([^"]+)"', - text.decode()) - if not extension: - for ext in ['php', 'asp', 'aspx', 'jsp']: - try: - f = self._opener.open( - '%s/speedtest/upload.%s' % (url, ext) - ) - except Exception: - pass - else: - data = f.read().strip().decode() - if (f.code == 200 and - len(data.splitlines()) == 1 and - re.match('size=[0-9]', data)): - extension = [ext] - break - if not urlparts or not extension: - raise InvalidSpeedtestMiniServer('Invalid Speedtest Mini Server: ' - '%s' % server) - - self.servers = [{ - 'sponsor': 'Speedtest Mini', - 'name': urlparts[1], - 'd': 0, - 'url': '%s/speedtest/upload.%s' % (url.rstrip('/'), extension[0]), - 'latency': 0, - 'id': 0 - }] - - return self.servers - - def get_closest_servers(self, limit=5): - """Limit servers to the closest speedtest.net servers based on - geographic distance - """ - - if not self.servers: - self.get_servers() - - self.closest = self.servers[:limit] - - printer('Closest Servers:\n%r' % self.closest, debug=True) - return self.closest - - def get_best_server(self, servers=None): - """Perform a speedtest.net "ping" to determine which speedtest.net - server has the lowest latency - """ - - if not servers: - if not self.closest: - servers = self.get_closest_servers() - servers = self.closest - - if self._source_address: - source_address_tuple = (self._source_address, 0) - else: - source_address_tuple = None - - user_agent = build_user_agent() - - results = {} - for server in servers: - cum = [] - url = os.path.dirname(server['url']) - stamp = int(timeit.time.time() * 1000) - latency_url = '%s/latency.txt?x=%s' % (url, stamp) - for i in range(0, 3): - this_latency_url = '%s.%s' % (latency_url, i) - printer('%s %s' % ('GET', this_latency_url), - debug=True) - urlparts = urlparse(latency_url) - try: - if urlparts[0] == 'https': - h = SpeedtestHTTPSConnection( - urlparts[1], - source_address=source_address_tuple - ) - else: - h = SpeedtestHTTPConnection( - urlparts[1], - source_address=source_address_tuple - ) - headers = {'User-Agent': user_agent} - path = '%s?%s' % (urlparts[2], urlparts[4]) - start = timeit.default_timer() - h.request("GET", path, headers=headers) - r = h.getresponse() - total = (timeit.default_timer() - start) - except HTTP_ERRORS: - e = get_exception() - printer('ERROR: %r' % e, debug=True) - cum.append(3600) - continue - - text = r.read(9) - if int(r.status) == 200 and text == 'test=test'.encode(): - cum.append(total) - else: - cum.append(3600) - h.close() - - avg = round((sum(cum) / 6) * 1000.0, 3) - results[avg] = server - - try: - fastest = sorted(results.keys())[0] - except IndexError: - raise SpeedtestBestServerFailure('Unable to connect to servers to ' - 'test latency.') - best = results[fastest] - best['latency'] = fastest - - self.results.ping = fastest - self.results.server = best - - self._best.update(best) - printer('Best Server:\n%r' % best, debug=True) - return best - - def download(self, callback=do_nothing, threads=None): - """Test download speed against speedtest.net - - A ``threads`` value of ``None`` will fall back to those dictated - by the speedtest.net configuration - """ - - urls = [] - for size in self.config['sizes']['download']: - for _ in range(0, self.config['counts']['download']): - urls.append('%s/random%sx%s.jpg' % - (os.path.dirname(self.best['url']), size, size)) - - request_count = len(urls) - requests = [] - for i, url in enumerate(urls): - requests.append( - build_request(url, bump=i, secure=self._secure) - ) - - max_threads = threads or self.config['threads']['download'] - in_flight = {'threads': 0} - - def producer(q, requests, request_count): - for i, request in enumerate(requests): - thread = HTTPDownloader( - i, - request, - start, - self.config['length']['download'], - opener=self._opener, - shutdown_event=self._shutdown_event - ) - while in_flight['threads'] >= max_threads: - timeit.time.sleep(0.001) - thread.start() - q.put(thread, True) - in_flight['threads'] += 1 - callback(i, request_count, start=True) - - finished = [] - - def consumer(q, request_count): - _is_alive = thread_is_alive - while len(finished) < request_count: - thread = q.get(True) - while _is_alive(thread): - thread.join(timeout=0.001) - in_flight['threads'] -= 1 - finished.append(sum(thread.result)) - callback(thread.i, request_count, end=True) - - q = Queue(max_threads) - prod_thread = threading.Thread(target=producer, - args=(q, requests, request_count)) - cons_thread = threading.Thread(target=consumer, - args=(q, request_count)) - start = timeit.default_timer() - prod_thread.start() - cons_thread.start() - _is_alive = thread_is_alive - while _is_alive(prod_thread): - prod_thread.join(timeout=0.001) - while _is_alive(cons_thread): - cons_thread.join(timeout=0.001) - - stop = timeit.default_timer() - self.results.bytes_received = sum(finished) - self.results.download = ( - (self.results.bytes_received / (stop - start)) * 8.0 - ) - if self.results.download > 100000: - self.config['threads']['upload'] = 8 - return self.results.download - - def upload(self, callback=do_nothing, pre_allocate=True, threads=None): - """Test upload speed against speedtest.net - - A ``threads`` value of ``None`` will fall back to those dictated - by the speedtest.net configuration - """ - - sizes = [] - - for size in self.config['sizes']['upload']: - for _ in range(0, self.config['counts']['upload']): - sizes.append(size) - - # request_count = len(sizes) - request_count = self.config['upload_max'] - - requests = [] - for i, size in enumerate(sizes): - # We set ``0`` for ``start`` and handle setting the actual - # ``start`` in ``HTTPUploader`` to get better measurements - data = HTTPUploaderData( - size, - 0, - self.config['length']['upload'], - shutdown_event=self._shutdown_event - ) - if pre_allocate: - data.pre_allocate() - - headers = {'Content-length': size} - requests.append( - ( - build_request(self.best['url'], data, secure=self._secure, - headers=headers), - size - ) - ) - - max_threads = threads or self.config['threads']['upload'] - in_flight = {'threads': 0} - - def producer(q, requests, request_count): - for i, request in enumerate(requests[:request_count]): - thread = HTTPUploader( - i, - request[0], - start, - request[1], - self.config['length']['upload'], - opener=self._opener, - shutdown_event=self._shutdown_event - ) - while in_flight['threads'] >= max_threads: - timeit.time.sleep(0.001) - thread.start() - q.put(thread, True) - in_flight['threads'] += 1 - callback(i, request_count, start=True) - - finished = [] - - def consumer(q, request_count): - _is_alive = thread_is_alive - while len(finished) < request_count: - thread = q.get(True) - while _is_alive(thread): - thread.join(timeout=0.001) - in_flight['threads'] -= 1 - finished.append(thread.result) - callback(thread.i, request_count, end=True) - - q = Queue(threads or self.config['threads']['upload']) - prod_thread = threading.Thread(target=producer, - args=(q, requests, request_count)) - cons_thread = threading.Thread(target=consumer, - args=(q, request_count)) - start = timeit.default_timer() - prod_thread.start() - cons_thread.start() - _is_alive = thread_is_alive - while _is_alive(prod_thread): - prod_thread.join(timeout=0.1) - while _is_alive(cons_thread): - cons_thread.join(timeout=0.1) - - stop = timeit.default_timer() - self.results.bytes_sent = sum(finished) - self.results.upload = ( - (self.results.bytes_sent / (stop - start)) * 8.0 - ) - return self.results.upload - - -def ctrl_c(shutdown_event): - """Catch Ctrl-C key sequence and set a SHUTDOWN_EVENT for our threaded - operations - """ - def inner(signum, frame): - shutdown_event.set() - printer('\nCancelling...', error=True) - sys.exit(0) - return inner - - -def version(): - """Print the version""" - - printer('speedtest-cli %s' % __version__) - printer('Python %s' % sys.version.replace('\n', '')) - sys.exit(0) - - -def csv_header(delimiter=','): - """Print the CSV Headers""" - - printer(SpeedtestResults.csv_header(delimiter=delimiter)) - sys.exit(0) - - -def parse_args(): - """Function to handle building and parsing of command line arguments""" - description = ( - 'Command line interface for testing internet bandwidth using ' - 'speedtest.net.\n' - '------------------------------------------------------------' - '--------------\n' - 'https://github.com/sivel/speedtest-cli') - - parser = ArgParser(description=description) - # Give optparse.OptionParser an `add_argument` method for - # compatibility with argparse.ArgumentParser - try: - parser.add_argument = parser.add_option - except AttributeError: - pass - parser.add_argument('--no-download', dest='download', default=True, - action='store_const', const=False, - help='Do not perform download test') - parser.add_argument('--no-upload', dest='upload', default=True, - action='store_const', const=False, - help='Do not perform upload test') - parser.add_argument('--single', default=False, action='store_true', - help='Only use a single connection instead of ' - 'multiple. This simulates a typical file ' - 'transfer.') - parser.add_argument('--bytes', dest='units', action='store_const', - const=('byte', 8), default=('bit', 1), - help='Display values in bytes instead of bits. Does ' - 'not affect the image generated by --share, nor ' - 'output from --json or --csv') - parser.add_argument('--share', action='store_true', - help='Generate and provide a URL to the speedtest.net ' - 'share results image, not displayed with --csv') - parser.add_argument('--simple', action='store_true', default=False, - help='Suppress verbose output, only show basic ' - 'information') - parser.add_argument('--csv', action='store_true', default=False, - help='Suppress verbose output, only show basic ' - 'information in CSV format. Speeds listed in ' - 'bit/s and not affected by --bytes') - parser.add_argument('--csv-delimiter', default=',', type=PARSER_TYPE_STR, - help='Single character delimiter to use in CSV ' - 'output. Default ","') - parser.add_argument('--csv-header', action='store_true', default=False, - help='Print CSV headers') - parser.add_argument('--json', action='store_true', default=False, - help='Suppress verbose output, only show basic ' - 'information in JSON format. Speeds listed in ' - 'bit/s and not affected by --bytes') - parser.add_argument('--list', action='store_true', - help='Display a list of speedtest.net servers ' - 'sorted by distance') - parser.add_argument('--server', type=PARSER_TYPE_INT, action='append', - help='Specify a server ID to test against. Can be ' - 'supplied multiple times') - parser.add_argument('--exclude', type=PARSER_TYPE_INT, action='append', - help='Exclude a server from selection. Can be ' - 'supplied multiple times') - parser.add_argument('--mini', help='URL of the Speedtest Mini server') - parser.add_argument('--source', help='Source IP address to bind to') - parser.add_argument('--timeout', default=10, type=PARSER_TYPE_FLOAT, - help='HTTP timeout in seconds. Default 10') - parser.add_argument('--secure', action='store_true', - help='Use HTTPS instead of HTTP when communicating ' - 'with speedtest.net operated servers') - parser.add_argument('--no-pre-allocate', dest='pre_allocate', - action='store_const', default=True, const=False, - help='Do not pre allocate upload data. Pre allocation ' - 'is enabled by default to improve upload ' - 'performance. To support systems with ' - 'insufficient memory, use this option to avoid a ' - 'MemoryError') - parser.add_argument('--version', action='store_true', - help='Show the version number and exit') - parser.add_argument('--debug', action='store_true', - help=ARG_SUPPRESS, default=ARG_SUPPRESS) - - options = parser.parse_args() - if isinstance(options, tuple): - args = options[0] - else: - args = options - return args - - -def validate_optional_args(args): - """Check if an argument was provided that depends on a module that may - not be part of the Python standard library. - - If such an argument is supplied, and the module does not exist, exit - with an error stating which module is missing. - """ - optional_args = { - 'json': ('json/simplejson python module', json), - 'secure': ('SSL support', HTTPSConnection), - } - - for arg, info in optional_args.items(): - if getattr(args, arg, False) and info[1] is None: - raise SystemExit('%s is not installed. --%s is ' - 'unavailable' % (info[0], arg)) - - -def printer(string, quiet=False, debug=False, error=False, **kwargs): - """Helper function print a string with various features""" - - if debug and not DEBUG: - return - - if debug: - if sys.stdout.isatty(): - out = '\033[1;30mDEBUG: %s\033[0m' % string - else: - out = 'DEBUG: %s' % string - else: - out = string - - if error: - kwargs['file'] = sys.stderr - - if not quiet: - print_(out, **kwargs) - - -def shell(): - """Run the full speedtest.net test""" - - global DEBUG - shutdown_event = threading.Event() - - signal.signal(signal.SIGINT, ctrl_c(shutdown_event)) - - args = parse_args() - - # Print the version and exit - if args.version: - version() - - if not args.download and not args.upload: - raise SpeedtestCLIError('Cannot supply both --no-download and ' - '--no-upload') - - if len(args.csv_delimiter) != 1: - raise SpeedtestCLIError('--csv-delimiter must be a single character') - - if args.csv_header: - csv_header(args.csv_delimiter) - - validate_optional_args(args) - - debug = getattr(args, 'debug', False) - if debug == 'SUPPRESSHELP': - debug = False - if debug: - DEBUG = True - - if args.simple or args.csv or args.json: - quiet = True - else: - quiet = False - - if args.csv or args.json: - machine_format = True - else: - machine_format = False - - # Don't set a callback if we are running quietly - if quiet or debug: - callback = do_nothing - else: - callback = print_dots(shutdown_event) - - printer('Retrieving speedtest.net configuration...', quiet) - try: - speedtest = Speedtest( - source_address=args.source, - timeout=args.timeout, - secure=args.secure - ) - except (ConfigRetrievalError,) + HTTP_ERRORS: - printer('Cannot retrieve speedtest configuration', error=True) - raise SpeedtestCLIError(get_exception()) - - if args.list: - try: - speedtest.get_servers() - except (ServersRetrievalError,) + HTTP_ERRORS: - printer('Cannot retrieve speedtest server list', error=True) - raise SpeedtestCLIError(get_exception()) - - for server in speedtest.servers: - - line = ('%(id)5s) %(sponsor)s (%(name)s, %(country)s)' % server) - try: - printer(line) - except IOError: - e = get_exception() - if e.errno != errno.EPIPE: - raise - sys.exit(0) - - printer('Testing from %(isp)s (%(ip)s)...' % speedtest.config['client'], - quiet) - - if not args.mini: - printer('Retrieving speedtest.net server list...', quiet) - try: - speedtest.get_servers(servers=args.server, exclude=args.exclude) - except NoMatchedServers: - raise SpeedtestCLIError( - 'No matched servers: %s' % - ', '.join('%s' % s for s in args.server) - ) - except (ServersRetrievalError,) + HTTP_ERRORS: - printer('Cannot retrieve speedtest server list', error=True) - raise SpeedtestCLIError(get_exception()) - except InvalidServerIDType: - raise SpeedtestCLIError( - '%s is an invalid server type, must ' - 'be an int' % ', '.join('%s' % s for s in args.server) - ) - - if args.server and len(args.server) == 1: - printer('Retrieving information for the selected server...', quiet) - else: - printer('Selecting best server based on ping...', quiet) - speedtest.get_best_server() - elif args.mini: - speedtest.get_best_server(speedtest.set_mini_server(args.mini)) - - results = speedtest.results - - printer('Hosted by %(sponsor)s (%(name)s): ' - '%(latency)s ms' % results.server, quiet) - - if args.download: - printer('Testing download speed', quiet, - end=('', '\n')[bool(debug)]) - speedtest.download( - callback=callback, - threads=(None, 1)[args.single] - ) - printer('Download: %0.2f M%s/s' % - ((results.download / 1000.0 / 1000.0) / args.units[1], - args.units[0]), - quiet) - else: - printer('Skipping download test', quiet) - - if args.upload: - printer('Testing upload speed', quiet, - end=('', '\n')[bool(debug)]) - speedtest.upload( - callback=callback, - pre_allocate=args.pre_allocate, - threads=(None, 1)[args.single] - ) - printer('Upload: %0.2f M%s/s' % - ((results.upload / 1000.0 / 1000.0) / args.units[1], - args.units[0]), - quiet) - else: - printer('Skipping upload test', quiet) - - printer('Results:\n%r' % results.dict(), debug=True) - - if not args.simple and args.share: - results.share() - - if args.simple: - printer('Ping: %s ms\nDownload: %0.2f M%s/s\nUpload: %0.2f M%s/s' % - (results.ping, - (results.download / 1000.0 / 1000.0) / args.units[1], - args.units[0], - (results.upload / 1000.0 / 1000.0) / args.units[1], - args.units[0])) - elif args.csv: - printer(results.csv(delimiter=args.csv_delimiter)) - elif args.json: - printer(results.json()) - - if args.share and not machine_format: - printer('Share results: %s' % results.share()) - - -def main(): - try: - shell() - except KeyboardInterrupt: - printer('\nCancelling...', error=True) - except (SpeedtestException, SystemExit): - e = get_exception() - # Ignore a successful exit, or argparse exit - if getattr(e, 'code', 1) not in (0, 2): - msg = '%s' % e - if not msg: - msg = '%r' % e - raise SystemExit('ERROR: %s' % msg) - - -if __name__ == '__main__': - main() diff --git a/luci-app-netspeedtest/root/usr/lib/netspeedtest/speedtest b/luci-app-netspeedtest/root/usr/lib/netspeedtest/speedtest new file mode 100644 index 000000000..14fdf2867 --- /dev/null +++ b/luci-app-netspeedtest/root/usr/lib/netspeedtest/speedtest @@ -0,0 +1,37 @@ +#!/bin/bash +mkdir -p /etc/speedtest +export HOME='/etc/speedtest' +SPEEDTEST_CLI='/usr/bin/speedtest' +SPEEDTEST_RESULT='/tmp/speedtest_result' + +[ -n "$(pgrep -f "$SPEEDTEST_CLI")" ] && exit 1 + +echo "Start Testing" > "$SPEEDTEST_RESULT" +LOCAL_IP=$(curl -s -4 --connect-timeout 3 http://ip.3322.net) + +BAIDU_SK="LHHGlmhcb4ENvIXpR9QQ2tBYa6ooUowX hYCENCEx1nXO0Nt46ldexfG9oI49xBGh 0kKZnWWhXEPfzIkklmzAa3dZ" +if [ -n "$LOCAL_IP" ]; then + for SK in $BAIDU_SK + do + INFO=$(curl -sk --connect-timeout 3 "https://api.map.baidu.com/location/ip?ip="$LOCAL_IP"&coor=bd09ll&ak=$SK") + if [ "$(echo $INFO | jsonfilter -e "@['status']")" = 0 ]; then + status=0 + break + fi + done + if [ "$status" = 0 ]; then + lon=$(echo $INFO | jsonfilter -e "@['content']['point']['x']") + lat=$(echo $INFO | jsonfilter -e "@['content']['point']['y']") + server_id=$(curl -sk --connect-timeout 3 "https://www.speedtest.net/api/ios-config.php?lon=$lon&lat=$lat" | grep "server url" | head -n1 | sed 's/.*id="//;s/".*//') + [ -n "$server_id" ] && ARG="-s $server_id" + fi +fi + +RUNTEST=$($SPEEDTEST_CLI --accept-gdpr --accept-license --progress=no $ARG 2>&1) +if [ $(echo $RUNTEST | grep -c "No servers defined") -ge 1 ] || [ $(echo $RUNTEST | grep -c "error") -ge 1 ]; then + RUNTEST=$($SPEEDTEST_CLI --accept-gdpr --accept-license --progress=no 2>&1) +fi + +RESULT=$(echo "$RUNTEST" | grep "Result URL" | awk '{print $NF}') + +[ -n "$RESULT" ] && echo "$RESULT" > "$SPEEDTEST_RESULT" || echo "Test failed" > "$SPEEDTEST_RESULT" diff --git a/luci-app-netspeedtest/root/usr/share/luci/menu.d/luci-app-netspeedtest.json b/luci-app-netspeedtest/root/usr/share/luci/menu.d/luci-app-netspeedtest.json new file mode 100644 index 000000000..1694b5dbc --- /dev/null +++ b/luci-app-netspeedtest/root/usr/share/luci/menu.d/luci-app-netspeedtest.json @@ -0,0 +1,45 @@ +{ + "admin/network/netspeedtest": { + "title": "NetSpeedtest", + "order": 90, + "action": { + "type": "firstchild" + }, + "depends": { + "acl": [ "luci-app-netspeedtest" ], + "uci": { "netspeedtest": true } + } + }, + "admin/network/netspeedtest/iperf3": { + "title": "Lan Speedtest Iperf3", + "order": 1, + "action": { + "type": "view", + "path": "netspeedtest/iperf3" + } + }, + "admin/network/netspeedtest/homebox": { + "title": "Lan Speedtest Homebox", + "order": 2, + "action": { + "type": "view", + "path": "netspeedtest/homebox" + } + }, + "admin/network/netspeedtest/speedtest": { + "title": "Wan Ookla SpeedTest", + "order": 4, + "action": { + "type": "view", + "path": "netspeedtest/speedtest" + } + }, + "admin/network/netspeedtest/openspeedtest": { + "title": "Wan OpenSpeedTest", + "order": 5, + "action": { + "type": "view", + "path": "netspeedtest/openspeedtest" + } + } +} diff --git a/luci-app-netspeedtest/root/usr/share/rpcd/acl.d/luci-app-netspeedtest.json b/luci-app-netspeedtest/root/usr/share/rpcd/acl.d/luci-app-netspeedtest.json index 3e1fcab6b..85c7aa305 100644 --- a/luci-app-netspeedtest/root/usr/share/rpcd/acl.d/luci-app-netspeedtest.json +++ b/luci-app-netspeedtest/root/usr/share/rpcd/acl.d/luci-app-netspeedtest.json @@ -1,11 +1,19 @@ { - "luci-app-netspeedtest": { - "description": "Grant UCI access for luci-app-netspeedtest", - "read": { - "uci": [ "netspeedtest" ] - }, - "write": { - "uci": [ "netspeedtest" ] - } - } + "luci-app-netspeedtest": { + "description": "Grant access to netspeedtest procedures", + "read": { + "file": { + "/etc/init.d/netspeedtest": [ "exec" ], + "/usr/lib/netspeedtest/speedtest": [ "exec" ], + "/tmp/speedtest_result": [ "read" ] + }, + "ubus": { + "service": [ "list" ] + }, + "uci": [ "netspeedtest" ] + }, + "write": { + "uci": [ "netspeedtest" ] + } + } } diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm index f1788d558..9cc4d2d0e 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm @@ -544,6 +544,7 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin params += opt.query("sni", dom_prefix + "tls_serverName"); params += opt.query("alpn", dom_prefix + "tuic_alpn"); params += opt.query("congestion_control", dom_prefix + "tuic_congestion_control"); + params += opt.query("udp_relay_mode", dom_prefix + "tuic_udp_relay_mode"); params += opt.query("allowinsecure", dom_prefix + "tls_allowInsecure"); params += "#" + encodeURI(v_alias.value); @@ -1437,6 +1438,7 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin } } opt.set(dom_prefix + 'tuic_congestion_control', queryParam.congestion_control || 'cubic'); + opt.set(dom_prefix + 'tuic_udp_relay_mode', queryParam.udp_relay_mode || 'native'); opt.set(dom_prefix + 'tuic_alpn', queryParam.alpn || 'default'); opt.set(dom_prefix + 'tls_serverName', queryParam.sni || ''); opt.set(dom_prefix + 'tls_allowInsecure', true); diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index e188502e1..dea40653c 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -1323,6 +1323,7 @@ local function processData(szType, content, add_mode, add_from) result.tls_serverName = params.sni result.tuic_alpn = params.alpn or "default" result.tuic_congestion_control = params.congestion_control or "cubic" + result.tuic_udp_relay_mode = params.udp_relay_mode or "native" params.allowinsecure = params.allowinsecure or params.insecure if params.allowinsecure then if params.allowinsecure == "1" or params.allowinsecure == "0" then diff --git a/luci-app-xray/README.md b/luci-app-xray/README.md index cd334655a..604d29d05 100644 --- a/luci-app-xray/README.md +++ b/luci-app-xray/README.md @@ -49,6 +49,10 @@ Some features are deprecated / unstable so they are placed in preview app. To en * Reboot your router * There will be a new menu option `Xray (preview)` in `Services` +## Changelog since 3.6.0 + +* 2025-05-13 feat: geodata reader + ## Changelog since 3.5.0 * 2024-11-26 chore: bump status version diff --git a/luci-app-xray/core/Makefile b/luci-app-xray/core/Makefile index e7da8d197..ebbe4ba5a 100644 --- a/luci-app-xray/core/Makefile +++ b/luci-app-xray/core/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-xray -PKG_VERSION:=3.5.0 +PKG_VERSION:=3.6.0 PKG_RELEASE:=1 PKG_LICENSE:=MPLv2 diff --git a/luci-app-xray/geodata/Makefile b/luci-app-xray/geodata/Makefile new file mode 100644 index 000000000..6dffe58f2 --- /dev/null +++ b/luci-app-xray/geodata/Makefile @@ -0,0 +1,42 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=luci-app-xray-geodata +PKG_VERSION:=3.6.0 +PKG_RELEASE:=1 + +PKG_LICENSE:=MPLv2 +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=yichya +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SECTION:=Custom + CATEGORY:=Extra packages + TITLE:=LuCI Support for Xray (geodata page) + DEPENDS:=luci-app-xray +xray-geodata + PKGARCH:=all +endef + +define Package/$(PKG_NAME)/description + LuCI Support for Xray (Client-side Rendered) (geodata page). +endef + +define Build/Compile + echo "luci-app-xray $(PKG_VERSION)-$(PKG_RELEASE) `git rev-parse HEAD` `date +%s`" > $(PKG_BUILD_DIR)/version.txt +endef + +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/www/luci-static/resources/view/xray + $(INSTALL_DATA) ./root/www/luci-static/resources/view/xray/geodata.js $(1)/www/luci-static/resources/view/xray/geodata.js + $(INSTALL_DIR) $(1)/usr/share/luci/menu.d + $(INSTALL_DATA) ./root/usr/share/luci/menu.d/luci-app-xray-geodata.json $(1)/usr/share/luci/menu.d/luci-app-xray-geodata.json + $(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d + $(INSTALL_DATA) ./root/usr/share/rpcd/acl.d/luci-app-xray-geodata.json $(1)/usr/share/rpcd/acl.d/luci-app-xray-geodata.json + $(INSTALL_DIR) $(1)/www/xray + $(LN) /usr/share/xray/geoip.dat $(1)/www/xray/geoip.dat + $(LN) /usr/share/xray/geosite.dat $(1)/www/xray/geosite.dat +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/luci-app-xray/geodata/root/usr/share/luci/menu.d/luci-app-xray-geodata.json b/luci-app-xray/geodata/root/usr/share/luci/menu.d/luci-app-xray-geodata.json new file mode 100644 index 000000000..0afad8e02 --- /dev/null +++ b/luci-app-xray/geodata/root/usr/share/luci/menu.d/luci-app-xray-geodata.json @@ -0,0 +1,17 @@ +{ + "admin/services/xray_geodata": { + "title": "Xray (geodata)", + "action": { + "type": "view", + "path": "xray/geodata" + }, + "depends": { + "acl": [ + "luci-app-xray-geodata" + ], + "uci": { + "xray_core": true + } + } + } +} \ No newline at end of file diff --git a/luci-app-xray/geodata/root/usr/share/rpcd/acl.d/luci-app-xray-geodata.json b/luci-app-xray/geodata/root/usr/share/rpcd/acl.d/luci-app-xray-geodata.json new file mode 100644 index 000000000..a13f7c324 --- /dev/null +++ b/luci-app-xray/geodata/root/usr/share/rpcd/acl.d/luci-app-xray-geodata.json @@ -0,0 +1,10 @@ +{ + "luci-app-xray-geodata": { + "description": "Grant access to xray configurations", + "read": { + "uci": [ + "xray_core" + ] + } + } +} \ No newline at end of file diff --git a/luci-app-xray/geodata/root/www/luci-static/resources/view/xray/geodata.js b/luci-app-xray/geodata/root/www/luci-static/resources/view/xray/geodata.js new file mode 100644 index 000000000..ab31d61a5 --- /dev/null +++ b/luci-app-xray/geodata/root/www/luci-static/resources/view/xray/geodata.js @@ -0,0 +1,460 @@ +'use strict'; +'require dom'; +'require uci'; +'require ui'; +'require view'; +'require view.xray.shared as shared'; + +const maxResults = 2048; + +const WireType = { + VARINT: 0, + FIXED64: 1, + LENGTH_DELIMITED: 2, + FIXED32: 5 +}; + +class ProtoReader { + constructor(buffer) { + this.buffer = new Uint8Array(buffer); + this.pos = 0; + } + + readVarint() { + let result = 0; + let shift = 0; + + while (this.pos < this.buffer.length) { + const byte = this.buffer[this.pos++]; + result |= (byte & 0x7F) << shift; + if ((byte & 0x80) === 0) { + return result; + } + shift += 7; + } + throw new Error('Malformed varint'); + } + + readString() { + const length = this.readVarint(); + const value = new TextDecoder().decode( + this.buffer.slice(this.pos, this.pos + length) + ); + this.pos += length; + return value; + } + + readBytes() { + const length = this.readVarint(); + const bytes = this.buffer.slice(this.pos, this.pos + length); + this.pos += length; + return bytes; + } + + readTag() { + const tag = this.readVarint(); + return { + fieldNumber: tag >>> 3, + wireType: tag & 0x7 + }; + } +} + +// Domain Type enum +const DomainType = { + Plain: 0, + Regex: 1, + Domain: 2, + Full: 3 +}; + +function decodeDomainAttribute(reader) { + const attribute = { + key: '', + typedValue: null + }; + + while (reader.pos < reader.buffer.length) { + const tag = reader.readTag(); + + switch (tag.fieldNumber) { + case 1: // key + attribute.key = reader.readString(); + break; + case 2: // bool_value + attribute.typedValue = reader.readVarint() !== 0; + break; + case 3: // int_value + attribute.typedValue = reader.readVarint(); + break; + default: + throw new Error(`Unknown field number: ${tag.fieldNumber}`); + } + } + + return attribute; +} + +function decodeDomain(reader) { + const domain = { + type: DomainType.Plain, + value: '', + attribute: [] + }; + + while (reader.pos < reader.buffer.length) { + const tag = reader.readTag(); + + switch (tag.fieldNumber) { + case 1: // type + domain.type = reader.readVarint(); + break; + case 2: // value + domain.value = reader.readString(); + break; + case 3: // attribute + const attrBytes = reader.readBytes(); + domain.attribute.push( + decodeDomainAttribute(new ProtoReader(attrBytes)) + ); + break; + default: + throw new Error(`Unknown field number: ${tag.fieldNumber}`); + } + } + + return domain; +} + +function decodeCIDR(reader) { + const cidr = { + ip: new Uint8Array(), + prefix: 0 + }; + + while (reader.pos < reader.buffer.length) { + const tag = reader.readTag(); + + switch (tag.fieldNumber) { + case 1: // ip + cidr.ip = reader.readBytes(); + break; + case 2: // prefix + cidr.prefix = reader.readVarint(); + break; + default: + throw new Error(`Unknown field number: ${tag.fieldNumber}`); + } + } + + return cidr; +} + +function decodeGeoIP(reader) { + const geoIP = { + countryCode: '', + cidr: [], + reverseMatch: false + }; + + while (reader.pos < reader.buffer.length) { + const tag = reader.readTag(); + + switch (tag.fieldNumber) { + case 1: // country_code + geoIP.countryCode = reader.readString(); + break; + case 2: // cidr + const cidrBytes = reader.readBytes(); + geoIP.cidr.push( + decodeCIDR(new ProtoReader(cidrBytes)) + ); + break; + case 3: // reverse_match + geoIP.reverseMatch = reader.readVarint() !== 0; + break; + default: + throw new Error(`Unknown field number: ${tag.fieldNumber}`); + } + } + + return geoIP; +} + +function decodeGeoSite(reader) { + const geoSite = { + countryCode: '', + domain: [] + }; + + while (reader.pos < reader.buffer.length) { + const tag = reader.readTag(); + + switch (tag.fieldNumber) { + case 1: // country_code + geoSite.countryCode = reader.readString(); + break; + case 2: // domain + const domainBytes = reader.readBytes(); + geoSite.domain.push( + decodeDomain(new ProtoReader(domainBytes)) + ); + break; + default: + throw new Error(`Unknown field number: ${tag.fieldNumber}`); + } + } + + return geoSite; +} + +function decodeGeoSiteList(buffer) { + const reader = new ProtoReader(buffer); + const geoSiteList = { + entry: [] + }; + + while (reader.pos < reader.buffer.length) { + const tag = reader.readTag(); + + if (tag.fieldNumber === 1) { // entry + const entryBytes = reader.readBytes(); + geoSiteList.entry.push( + decodeGeoSite(new ProtoReader(entryBytes)) + ); + } else { + throw new Error(`Unknown field number: ${tag.fieldNumber}`); + } + } + + return geoSiteList; +} + +function decodeGeoIPList(buffer) { + const reader = new ProtoReader(buffer); + const geoIPList = { + entry: [] + }; + + while (reader.pos < reader.buffer.length) { + const tag = reader.readTag(); + + if (tag.fieldNumber === 1) { // entry + const entryBytes = reader.readBytes(); + geoIPList.entry.push( + decodeGeoIP(new ProtoReader(entryBytes)) + ); + } else { + throw new Error(`Unknown field number: ${tag.fieldNumber}`); + } + } + + return geoIPList; +} + +function matchesCIDR(cidrIp, prefix, queryIp) { + // Check if input IP matches CIDR IP version + if ((cidrIp.length === 4 && queryIp.length !== 4) || (cidrIp.length === 16 && queryIp.length !== 16)) { + return false; + } + + // Compare full bytes first + const prefixBytes = Math.floor(prefix / 8); + for (let i = 0; i < prefixBytes; i++) { + if (cidrIp[i] !== queryIp[i]) return false; + } + + // Compare remaining bits if any + const remainingBits = prefix % 8; + if (remainingBits > 0) { + const mask = 0xFF << (8 - remainingBits); + return (cidrIp[prefixBytes] & mask) === (queryIp[prefixBytes] & mask); + } + + return true; +} + +function renderGeoIPResults(results) { + const container = document.getElementById('geoip-results'); + container.innerHTML = '
'; + + const flatResults = results.flatMap(entry => entry.cidr.map(cidr => ({ entry, cidr }))); + + const table = E('table', { 'class': 'table' }, [ + E('thead', {}, [ + E('tr', { 'class': 'tr table-titles' }, [ + E('th', { 'class': 'th' }, _('Country Code')), + E('th', { 'class': 'th' }, _(`CIDR (${flatResults.length} total)`)) + ]) + ]), + E('tbody', {}, flatResults.slice(0, maxResults).map(({ entry, cidr }, index) => { + const ip = cidr.ip.length === 4 ? Array.from(cidr.ip).join('.') : Array.from(cidr.ip).reduce((arr, byte, i) => { + if (i % 2 === 0) { + arr.push((byte << 8) | cidr.ip[i + 1]); + } + return arr; + }, []).map(part => part.toString(16).padStart(4, '0')).join(':').replace(/\b(?:0+:){2,}/, ':').split(':').map(octet => octet.replace(/\b0+/g, '')).join(':'); + return E('tr', { 'class': `tr cbi-rowstyle-${index % 2 + 1}` }, [ + E('td', { 'class': 'td' }, entry.countryCode), + E('td', { 'class': 'td' }, `${ip}/${cidr.prefix}`) + ]); + })) + ]); + + container.appendChild(table); +} + +function renderGeoSiteResults(results) { + const container = document.getElementById('geosite-results'); + container.innerHTML = '
'; + + const flatResults = results.flatMap(entry => entry.domain.map(domain => ({ entry, domain }))); + + const table = E('table', { 'class': 'table' }, [ + E('thead', {}, [ + E('tr', { 'class': 'tr table-titles' }, [ + E('th', { 'class': 'th' }, _('Country Code')), + E('th', { 'class': 'th' }, _(`Domain (${flatResults.length} total)`)) + ]) + ]), + E('tbody', {}, flatResults.slice(0, maxResults).map(({ entry, domain }, index) => + E('tr', { 'class': `tr cbi-rowstyle-${index % 2 + 1}` }, [ + E('td', { 'class': 'td' }, entry.countryCode), + E('td', { 'class': 'td' }, domain.value) + ]) + )) + ]); + + container.appendChild(table); +} + +return view.extend({ + load: function () { + return Promise.all([ + new Date(), + uci.load(shared.variant), + fetch("/xray/geoip.dat").then(v => v.arrayBuffer()), + fetch("/xray/geosite.dat").then(v => v.arrayBuffer()), + ]); + }, + + render: function (load_result) { + const geoip_result = decodeGeoIPList(load_result[2]); + const geosite_result = decodeGeoSiteList(load_result[3]); + const result = E([], {}, [ + E('div', {}, [ + E('div', { 'class': 'cbi-section', 'data-tab': 'geoip', 'data-tab-title': _('GeoIP') }, [ + E('select', { + 'id': 'geoip-select', + 'change': function () { + const selectedCode = document.getElementById('geoip-select').value; + const results = selectedCode ? geoip_result.entry.filter(entry => entry.countryCode === selectedCode) : []; + renderGeoIPResults(results); + } + }, [ + E('option', { 'value': '' }, _('Filter GeoIP by Country Code')), + ...Array.from(new Set(geoip_result.entry.map(entry => entry.countryCode))) + .sort() + .map(code => { + const count = geoip_result.entry + .find(entry => entry.countryCode === code) + .cidr.length; + return E('option', { 'value': code }, `${code} (${count} items)`); + }) + ]), + E('div', { 'class': 'cbi-section-create' }, [ + E('input', { + 'type': 'text', + 'id': 'geoip-search', + 'class': 'cbi-input-text', + 'placeholder': _('Search GeoIP...') + }), + E('button', { + 'class': 'cbi-button', + 'click': function () { + const query = document.getElementById('geoip-search').value.trim(); + let queryIp = null; + if (query.includes('.')) { + queryIp = query.split('.').map(Number); + } else if (query.includes(':')) { + queryIp = query.split(':').reduce((acc, part, i, arr) => { + if (part === '') { + const padding = new Array((8 - arr.filter(x => x !== '').length) * 2).fill(0); + return acc.concat(padding); + } + const hex = part.padStart(4, '0'); + return acc.concat([parseInt(hex.slice(0, 2), 16), parseInt(hex.slice(2, 4), 16)]); + }, []); + console.log(queryIp); + } + const selectedCode = document.getElementById('geoip-select').value; + const results = geoip_result.entry.map(entry => ({ + ...entry, + cidr: entry.cidr.filter(cidr => { + return queryIp && (selectedCode === '' || entry.countryCode === selectedCode) && matchesCIDR(cidr.ip, cidr.prefix, queryIp); + }) + })).filter(entry => entry.cidr.length > 0); + renderGeoIPResults(results); + } + }, _('Search GeoIP')), + ]), + E('div', { 'id': 'geoip-results', 'class': 'results-container' }), + ]), + E('div', { 'class': 'cbi-section', 'data-tab': 'geosite', 'data-tab-title': _('GeoSite') }, [ + E('select', { + 'id': 'geosite-select', + 'change': function () { + const selectedCode = document.getElementById('geosite-select').value; + const results = selectedCode ? geosite_result.entry.filter(entry => entry.countryCode === selectedCode) : []; + renderGeoSiteResults(results); + } + }, [ + E('option', { 'value': '' }, _('Filter GeoSite by Country Code')), + ...Array.from(new Set(geosite_result.entry.map(entry => entry.countryCode))) + .sort() + .map(code => { + const count = geosite_result.entry + .find(entry => entry.countryCode === code) + .domain.length; + return E('option', { 'value': code }, `${code} (${count} items)`); + }) + ]), + E('div', { 'class': 'cbi-section-create' }, [ + E('input', { + 'type': 'text', + 'id': 'geosite-search', + 'class': 'cbi-input-text', + 'placeholder': _('Search GeoSite...') + }), + E('button', { + 'class': 'cbi-button', + 'click': function () { + const query = document.getElementById('geosite-search').value.toLowerCase(); + const selectedCode = document.getElementById('geosite-select').value; + const results = geosite_result.entry.map(entry => ({ + ...entry, + domain: entry.domain.filter(domain => { + return query && (selectedCode === '' || entry.countryCode === selectedCode) && domain.value.toLowerCase().includes(query); + }) + })).filter(entry => entry.domain.length > 0); + renderGeoSiteResults(results); + } + }, _('Search GeoSite')), + ]), + E('div', { 'id': 'geosite-results', 'class': 'results-container' }) + ]), + ]) + ]); + ui.tabs.initTabGroup(result.lastElementChild.childNodes); + + return E([], [ + E('h2', _('Xray (geodata)')), + E('p', { 'class': 'cbi-map-descr' }, `${_("Only first")} ${maxResults} ${_("results will be shown. Load GeoData files cost")} ${new Date().getTime() - load_result[0].getTime()} ${_("ms")}; ${geoip_result.entry.length} ${_("GeoIP entries")}, ${geosite_result.entry.length} ${_("GeoSite entries")}.`), + result + ]); + }, + + handleSaveApply: null, + handleSave: null, + handleReset: null +}); diff --git a/luci-app-xray/status/Makefile b/luci-app-xray/status/Makefile index f7367d7f0..8b02a4c28 100644 --- a/luci-app-xray/status/Makefile +++ b/luci-app-xray/status/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-xray-status -PKG_VERSION:=3.5.0 +PKG_VERSION:=3.6.0 PKG_RELEASE:=1 PKG_LICENSE:=MPLv2 diff --git a/mihomo/Makefile b/mihomo/Makefile index 0f07dbb94..0abae7a26 100644 --- a/mihomo/Makefile +++ b/mihomo/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mihomo -PKG_VERSION:=1.19.7 +PKG_VERSION:=1.19.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/metacubex/mihomo/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b857289776f6ecfedaaca2cdfd9ed39746fda697bdcbbbb0b1bb172f1fc9462d +PKG_HASH:=47e38ea4220f5b84485b06d980ff06cc9a48cd7bd9bdf1236168adf728a99835 PKG_MAINTAINER:=Anya Lin PKG_LICENSE:=GPL-2.0 diff --git a/speedtest-cli/Makefile b/speedtest-cli/Makefile new file mode 100644 index 000000000..284b8309e --- /dev/null +++ b/speedtest-cli/Makefile @@ -0,0 +1,61 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=speedtest-cli +PKG_VERSION:=1.2.0 +PKG_RELEASE:=1 + +ifeq ($(ARCH),aarch64) + PKG_HASH:=3953d231da3783e2bf8904b6dd72767c5c6e533e163d3742fd0437affa431bd3 +else ifeq ($(ARCH),arm) + ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) + ifeq ($(ARM_CPU_FEATURES),) + ARCH:=armel + PKG_HASH:=629a455a2879224bd0dbd4b36d8c721dda540717937e4660b4d2c966029466bf + else + ARCH:=armhf + PKG_HASH:=e45fcdebbd8a185553535533dd032d6b10bc8c64eee4139b1147b9c09835d08d + endif +else ifeq ($(ARCH),i386) + PKG_HASH:=9ff7e18dbae7ee0e03c66108445a2fb6ceea6c86f66482e1392f55881b772fe8 +else ifeq ($(ARCH),x86_64) + PKG_HASH:=5690596c54ff9bed63fa3732f818a05dbc2db19ad36ed68f21ca5f64d5cfeeb7 +endif + +PKG_SOURCE:=ookla-speedtest-$(PKG_VERSION)-linux-$(ARCH).tgz +PKG_SOURCE_URL:=https://install.speedtest.net/app/cli + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +PKG_MAINTAINER:=sbwml + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SECTION:=net + CATEGORY:=Network + TITLE:=Speedtest CLI by Ookla + DEPENDS:=@(aarch64||arm||i386||x86_64) +ca-bundle + URL:=https://www.speedtest.net/ +endef + +define Package/$(PKG_NAME)/description + The Global Broadband Speed Test +endef + +define Build/Prepare + ( \ + pushd $(PKG_BUILD_DIR) ; \ + $(TAR) -zxf $(DL_DIR)/ookla-speedtest-$(PKG_VERSION)-linux-$(ARCH).tgz -C . ; \ + popd ; \ + ) +endef + +define Build/Compile +endef + +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/speedtest $(1)/usr/bin +endef + +$(eval $(call BuildPackage,$(PKG_NAME)))