From f6cbbb0202586dd9ff4e24ccf373670fe3f855ee Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Wed, 11 Jun 2025 20:47:40 +0800 Subject: [PATCH] update 2025-06-11 20:47:40 --- .../resources/view/ddns-go/config.js | 11 ++--- luci-app-netspeedtest/Makefile | 23 ++-------- netspeedtest/Makefile | 43 +++++++++++++++++++ .../files/99_netspeedtest.defaults | 0 netspeedtest/files/netspeedtest.config | 2 + .../files/netspeedtest.init | 0 .../files/speedtest.lib | 0 7 files changed, 52 insertions(+), 27 deletions(-) create mode 100644 netspeedtest/Makefile rename luci-app-netspeedtest/root/etc/uci-defaults/99_netspeedtest => netspeedtest/files/99_netspeedtest.defaults (100%) create mode 100644 netspeedtest/files/netspeedtest.config rename luci-app-netspeedtest/root/etc/init.d/netspeedtest => netspeedtest/files/netspeedtest.init (100%) rename luci-app-netspeedtest/root/usr/lib/netspeedtest/speedtest => netspeedtest/files/speedtest.lib (100%) diff --git a/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/config.js b/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/config.js index 303c487a0..5e5292369 100644 --- a/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/config.js +++ b/luci-app-ddns-go/htdocs/luci-static/resources/view/ddns-go/config.js @@ -48,13 +48,10 @@ function renderStatus(isRunning, listen_port, noweb) { } if (isRunning && noweb !== '1') { - html += String.format( - ' %s', - window.location.origin, - listen_port, - _('Open Web Interface') - ); - } + const baseUrl = `${window.location.protocol}//${window.location.hostname}`; + const fullUrl = `${baseUrl}:${listen_port}`; + html += String.format(' %s', fullUrl, _('Open Web Interface')); + } return html; } diff --git a/luci-app-netspeedtest/Makefile b/luci-app-netspeedtest/Makefile index e1cf5b9c5..5c1c84c65 100644 --- a/luci-app-netspeedtest/Makefile +++ b/luci-app-netspeedtest/Makefile @@ -9,31 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-netspeedtest -PKG_VERSION:=5.0.3 -PKG_RELEASE:=20250515 +PKG_VERSION:=5.0.4 +PKG_RELEASE:=20250611 LUCI_TITLE:=LuCI Support for netspeedtest -LUCI_DEPENDS:=+speedtest-cli +homebox $(if $(find_package iperf3-ssl),+iperf3-ssl,+iperf3) +LUCI_DEPENDS:=+speedtest-cli +homebox +netspeedtest $(if $(find_package iperf3-ssl),+iperf3-ssl,+iperf3) LUCI_PKGARCH:=all PKG_MAINTAINER:=sirpdboy - -define Package/$(PKG_NAME)/conffiles -/etc/config/netspeedtest -endef - -define Package/$(PKG_NAME)/postinst -#!/bin/sh -if [ -z "$${IPKG_INSTROOT}" ]; then - if ! uci show netspeedtest.config >/dev/null 2>&1; then - uci set netspeedtest.config=netspeedtest - uci set netspeedtest.config.enabled='1' - uci commit netspeedtest - fi -fi -exit 0 -endef - include $(TOPDIR)/feeds/luci/luci.mk diff --git a/netspeedtest/Makefile b/netspeedtest/Makefile new file mode 100644 index 000000000..b2da39103 --- /dev/null +++ b/netspeedtest/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2025 sirpdboy herboy2008@gmail.com https://github.com/sirpdboy/luci-app-netspeedtest +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. + +include $(TOPDIR)/rules.mk + +PKG_NAME:=netspeedtest +PKG_VERSION:=1 +PKG_RELEASE:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Routing netspeedtest for OpenWrt + DEPENDS:=+curl +bash +endef + +define Package/$(PKG_NAME)/description + Routing netspeedtest for OpenWrt @sirpdboy +endef + +define Build/Compile +endef + +define Package/$(PKG_NAME)/conffiles +/etc/config/netspeedtest +endef + +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/etc/config + $(CP) ./files/netspeedtest.config $(1)/etc/config/netspeedtest + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) $(CURDIR)/files/netspeedtest.init $(1)/etc/init.d/netspeedtest + $(INSTALL_DIR) $(1)/usr/lib/netspeedtest + $(INSTALL_BIN) $(CURDIR)/files/speedtest.lib $(1)/usr/lib/netspeedtest/speedtest + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) $(CURDIR)/files/99_netspeedtest.defaults $(1)/etc/uci-defaults/99_netspeedtest +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/luci-app-netspeedtest/root/etc/uci-defaults/99_netspeedtest b/netspeedtest/files/99_netspeedtest.defaults similarity index 100% rename from luci-app-netspeedtest/root/etc/uci-defaults/99_netspeedtest rename to netspeedtest/files/99_netspeedtest.defaults diff --git a/netspeedtest/files/netspeedtest.config b/netspeedtest/files/netspeedtest.config new file mode 100644 index 000000000..fe131baa8 --- /dev/null +++ b/netspeedtest/files/netspeedtest.config @@ -0,0 +1,2 @@ + +config netspeedtest 'config' diff --git a/luci-app-netspeedtest/root/etc/init.d/netspeedtest b/netspeedtest/files/netspeedtest.init similarity index 100% rename from luci-app-netspeedtest/root/etc/init.d/netspeedtest rename to netspeedtest/files/netspeedtest.init diff --git a/luci-app-netspeedtest/root/usr/lib/netspeedtest/speedtest b/netspeedtest/files/speedtest.lib similarity index 100% rename from luci-app-netspeedtest/root/usr/lib/netspeedtest/speedtest rename to netspeedtest/files/speedtest.lib