From 22b245b6bea6283398a890a3e5f32d4d127e588c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 20:27:54 +0800 Subject: [PATCH] update 2024-03-07 20:27:54 --- homebox/Makefile | 84 +++++++------------ luci-app-netspeedtest/Makefile | 19 ++++- .../luasrc/controller/netspeedtest.lua | 44 +++++----- .../cbi/netspeedtest/speedtestiperf3.lua | 2 +- .../{homebox.lua => speedtestlan.lua} | 6 +- .../model/cbi/netspeedtest/speedtestport.lua | 7 +- .../model/cbi/netspeedtest/speedtestwan.lua | 2 +- .../view/netspeedtest/speedtestiperf3.htm | 41 +++++---- .../{homebox.htm => speedtestlan.htm} | 5 +- .../view/netspeedtest/speedtestport.htm | 72 +++++++--------- .../luasrc/view/netspeedtest/speedtestwan.htm | 37 ++++---- .../po/zh-cn/netspeedtest.po | 75 +++++++++++++---- .../po/zh_Hans/netspeedtest.po | 75 +++++++++++++---- .../root/etc/config/netspeedtest | 15 ++-- .../root/etc/init.d/netspeedtest | 45 ++++++---- 15 files changed, 304 insertions(+), 225 deletions(-) rename luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/{homebox.lua => speedtestlan.lua} (83%) rename luci-app-netspeedtest/luasrc/view/netspeedtest/{homebox.htm => speedtestlan.htm} (94%) diff --git a/homebox/Makefile b/homebox/Makefile index 16eea08b7..9397a2c5c 100644 --- a/homebox/Makefile +++ b/homebox/Makefile @@ -1,85 +1,57 @@ +# SPDX-License-Identifier: GPL-3.0-only +# Copyright (c) 2020-2024 sirpdboy herboy2008@gmail.com +# + include $(TOPDIR)/rules.mk PKG_NAME:=homebox -PKG_VERSION:=0.0.0-dev.2020062901 -PKG_RELEASE:=14 +PKG_VERSION:=0.0.0-dev.2023102203 +PKG_RELEASE:=3 -PKG_SOURCE_URL_FILE:=v$(PKG_VERSION).tar.gz -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/XGHeaven/homebox/archive/refs/tags/ -PKG_HASH:=skip +ifeq ($(ARCH),aarch64) + H_ARCH:=arm64y -PKG_BUILD_DEPENDS:=golang/host homebox/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 +else ifeq ($(ARCH),arm) + H_ARCH:=arm -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/${PKG_NAME} +else ifeq ($(ARCH),i386) + H_ARCH:=386 + +else ifeq ($(ARCH),mips) + H_ARCH:=mips + +else ifeq ($(ARCH),mipsel) + H_ARCH:=mips + +else ifeq ($(ARCH),x86_64) + H_ARCH:=amd64 +endif -include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network - SUBMENU:=Web Servers/Proxies TITLE:=A Toolbox for Home Local Networks URL:=https://github.com/XGHeaven/homebox - DEPENDS:=$(GO_ARCH_DEPENDS) - MENU:=1 + DEPENDS:=@(i386||x86_64||arm||aarch64||mipsel||mips) endef define Package/$(PKG_NAME)/description A Toolbox for Home Local Networks Speed Test endef -GO_PKG_BUILD_VARS += GO111MODULE=auto -TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) -TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) - -define Build/Configure - ( \ - cd $(PKG_BUILD_DIR)/server; \ - $(GO_PKG_VARS) \ - go get -d -modcacherw; \ - ) - ( \ - cd $(PKG_BUILD_DIR)/server; \ - GOPATH=$(PKG_BUILD_DIR)/.go_work/build \ - go install -modcacherw github.com/go-bindata/go-bindata/...@latest; \ - ) +define Build/Prepare + [ ! -f $(PKG_BUILD_DIR)/server_Linux_$(H_ARCH).tar.gz ] && wget https://github.com/XGHeaven/homebox/releases/download/v$(PKG_VERSION)/server-linux-$(H_ARCH).tar.gz -O $(PKG_BUILD_DIR)/server-linux-$(H_ARCH).tar.gz + tar -xzvf $(PKG_BUILD_DIR)/server-linux-$(H_ARCH).tar.gz -C $(PKG_BUILD_DIR) endef define Build/Compile - rm -rf $(PKG_BUILD_DIR)/build/static - mkdir -p $(PKG_BUILD_DIR)/build - $(CP) $(HOST_BUILD_DIR)/build/static $(PKG_BUILD_DIR)/build/ - ( \ - cd $(PKG_BUILD_DIR); \ - $(GO_PKG_VARS) PATH=$(PKG_BUILD_DIR)/.go_work/build/bin:$$$$PATH \ - $(MAKE) build-server; \ - ) endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/server $(1)/usr/bin/homebox + $(INSTALL_BIN) $(PKG_BUILD_DIR)/server-linux-$(H_ARCH) $(1)/usr/bin/homebox endef -define Host/Configure - cd $(HOST_BUILD_DIR)/web && rm -f package-lock.json && npm --cache-min 1440 install -endef - -define Host/Compile - cd $(HOST_BUILD_DIR) && $(MAKE) build-web -endef - -define Host/Install -endef - -define Host/Clean - rm -f $(HOST_BUILD_DIR)/build/static -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,homebox)) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/luci-app-netspeedtest/Makefile b/luci-app-netspeedtest/Makefile index d094b15c1..295118610 100644 --- a/luci-app-netspeedtest/Makefile +++ b/luci-app-netspeedtest/Makefile @@ -1,4 +1,4 @@ - +# # Copyright (C) 2020-2021 sirpdboy # # This is free software, licensed under the GNU General Public License v3. @@ -8,13 +8,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-netspeedtest +PKG_VERSION:=2.2.1 +PKG_RELEASE:=20240307 + LUCI_TITLE:=LuCI Support for netspeedtest -LUCI_DEPENDS:=+python3 +iperf3-ssl +homebox +LUCI_DEPENDS:=+python3 +iperf3-ssl +homebox +ca-bundle LUCI_PKGARCH:=all -PKG_VERSION:=2.1.6 -PKG_RELEASE:=20240301 PKG_MAINTAINER:= + +define Package/$(PKG_NAME)/conffiles +/etc/config/netspeedtest +endef + +define Package/$(PKG_NAME)/postinst +endef + +define Package/$(PKG_NAME)/prerm +endef include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-netspeedtest/luasrc/controller/netspeedtest.lua b/luci-app-netspeedtest/luasrc/controller/netspeedtest.lua index b4288cedf..4c5de50f3 100644 --- a/luci-app-netspeedtest/luasrc/controller/netspeedtest.lua +++ b/luci-app-netspeedtest/luasrc/controller/netspeedtest.lua @@ -3,42 +3,46 @@ module("luci.controller.netspeedtest", package.seeall) 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", "homebox"),_("Net Speedtest"), 90) + 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","homebox"},cbi("netspeedtest/homebox"),_("Lan homebox 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}),_("Wan Speedtest"), 40).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", "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}),_("Wan Speedtest"), 40).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", "test_port"}, call("test_port")) - entry({"admin", "network", "netspeedtest", "checknet"}, call("check_net")) entry({"admin", "network", "iperf3_status"}, call("iperf3_status")) - entry({"admin", "network","test_iperf0"}, post("test_iperf0"), nil) - entry({"admin", "network","test_iperf1"}, post("test_iperf1"), nil) + 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", "speedtestrun"}, call("speedtestrun")) - entry({"admin","network","netspeedtest", "netperfrun"}, call("netperfrun")) entry({"admin", "network", "netspeedtest", "realtime_log"}, call("get_log")) entry({"admin", "network", "netspeedtest", "dellog"},call("dellog")) end + function test_port() local e = {} - local domain = luci.http.formvalue('domain') - local port = luci.http.formvalue('port') + 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 r=="" then + 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.call(string.format("echo -ne '\n$(date +%Y-%m-%d' '%H:%M:%S) server：%s -- port：%s -- TCP：%s Ms' >> /var/log/netspeedtest.log",domain,port,e.ping)) + 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 @@ -46,7 +50,7 @@ end function iperf3_status() local e={} - e.run=sys.call("pgrep iperf3 >/dev/null")==0 + 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 @@ -63,7 +67,6 @@ function testout(cmd, addr) end util:close() end - end function test_iperf0(addr) @@ -80,9 +83,9 @@ function test_iperf1(addr) end function get_log() - local e={} - e.running=sys.call("busybox ps -w | grep netspeedtest | grep -v grep >/dev/null") == 0 - e.log=fs.readfile("/var/log/netspeedtest.log") or "" + local e = {} + e.running = sys.call("busybox ps -w | grep netspeedtest | grep -v grep >/dev/null") == 0 + e.log = fs.readfile("/var/log/netspeedtest.log") or "" luci.http.prepare_content("application/json") luci.http.write_json(e) end @@ -97,6 +100,3 @@ function speedtestrun() testout("/etc/init.d/netspeedtest nstest ") end -function netperfrun() - testout("sh /usr/bin/netperftest") -end diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestiperf3.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestiperf3.lua index 212ca5a85..bed703046 100644 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestiperf3.lua +++ b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestiperf3.lua @@ -6,7 +6,7 @@ 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 = o:section(TypedSection, "netspeedtest", translate('Lan Speedtest Iperf3')) s.addremove=false s.anonymous=true diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/homebox.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestlan.lua similarity index 83% rename from luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/homebox.lua rename to luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestlan.lua index 3083a9fca..77f0c484f 100644 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/homebox.lua +++ b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestlan.lua @@ -3,7 +3,7 @@ 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, "homebox", translate('Lan homebox Web')) +s = m:section(TypedSection, "netspeedtest", translate('Lan Speedtest Web')) s.anonymous = true o=s:option(Flag,"enabled",translate("Enable")) @@ -11,11 +11,11 @@ o.default=0 o = s:option(DummyValue, '', '') o.rawhtml = true -o.template ='netspeedtest/homebox' +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","homebox")) + 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 index cffa91fab..a1c6bec2a 100644 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestport.lua +++ b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestport.lua @@ -8,14 +8,15 @@ t = o:section(TypedSection, "speedtestport", translate('Server Port Latency Test t.addremove=false t.anonymous=true -e = t:option(Value, 'domain', translate('Test server address')) +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, 'port', translate('Test server port')) +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' diff --git a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwan.lua b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwan.lua index a8e294334..7ccfc7186 100644 --- a/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwan.lua +++ b/luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/speedtestwan.lua @@ -4,7 +4,7 @@ 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,"wanspeedtest",translate("Wan Speedtest")) +t=o:section(TypedSection,"speedtestwan",translate("Broadband speed test")) t.anonymous=true e = t:option(DummyValue, '', '') diff --git a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3.htm b/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3.htm index 2898d8426..3bc196a82 100644 --- a/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3.htm +++ b/luci-app-netspeedtest/luasrc/view/netspeedtest/speedtestiperf3.htm @@ -6,10 +6,9 @@ <%+cbi/valueheader%> - + -
- -
+
@@ -56,19 +56,32 @@
- <%: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 ..............run in client mode, connecting to %>
+ <%:-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)%>
+
+