nikki: sync upstream

last commit: 092393fe55

luci-app-nikki/Makefile

@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.22.0
+PKG_VERSION:=1.22.1
 
 LUCI_TITLE:=LuCI Support for nikki
 LUCI_DEPENDS:=+luci-base +nikki

luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua

@@ -250,6 +250,13 @@ o.validate = port_validate
 o:depends({ use_global_config = true })
 o:depends({ _udp_node_bool = "1" })
 
+o = s:option(DummyValue, "tips", " ")
+o.rawhtml = true
+o.cfgvalue = function(t, n)
+	return string.format('<font color="red">%s</font>',
+	translate("The port settings support single ports and ranges.<br>Separate multiple ports with commas (,).<br>Example: 21,80,443,1000:2000."))
+end
+
 o = s:option(Flag, "use_direct_list", translatef("Use %s", translate("Direct List")))
 o.default = "1"
 o:depends({ _tcp_node_bool = "1" })

luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua

@@ -107,6 +107,13 @@ o:value("1:65535", translate("All"))
 o:value("53", "DNS")
 o.validate = port_validate
 
+o = s:option(DummyValue, "tips", " ")
+o.rawhtml = true
+o.cfgvalue = function(t, n)
+	return string.format('<font color="red">%s</font>',
+	translate("The port settings support single ports and ranges.<br>Separate multiple ports with commas (,).<br>Example: 21,80,443,1000:2000."))
+end
+
 ---- Use nftables
 o = s:option(ListValue, "use_nft", translate("Firewall tools"))
 o.default = "0"

luci-app-passwall/po/zh-cn/passwall.po

@@ -709,6 +709,9 @@ msgstr "UDP 不转发端口"
 msgid "Fill in the ports you don't want to be forwarded by the agent, with the highest priority."
 msgstr "填写你不希望被代理转发的端口，优先级最高。"
 
+msgid "The port settings support single ports and ranges.<br>Separate multiple ports with commas (,).<br>Example: 21,80,443,1000:2000."
+msgstr "以上端口设置支持单端口和端口范围。<br>多个端口用英文逗号(,)隔开。<br>例：21,80,443,1000:2000。"
+
 msgid "TCP Proxy Drop Ports"
 msgstr "TCP 转发屏蔽端口"
 

luci-app-passwall/root/usr/share/passwall/nftables.sh

@@ -41,12 +41,19 @@ factor() {
 	elif echo "$1" | grep -qE '([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}'; then
 		echo "$2 {$1}"
 	else
-		ports=$(echo "$ports" | tr -d ' ' | sed 's/:/-/g')
+		ports=$(echo "$ports" | tr -d ' ' | sed 's/:/-/g' | tr ',' '\n' | awk '!a[$0]++' | grep -v '^$')
-		if echo "$ports" | grep -qE '(^|,)1-65535($|,)'; then
+		[ -z "$ports" ] && { echo ""; return; }
+		if echo "$ports" | grep -q '^1-65535$'; then
 			echo ""
 			return
 		fi
-		echo "$2 {$ports}"
+		local port
+		local port_list=""
+		for port in $ports; do
+			port_list="${port_list},$port"
+		done
+		port_list="${port_list#,}"
+		echo "$2 {$port_list}"
 	fi
 }
 

nikki/Makefile

@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git
-PKG_SOURCE_DATE:=2025-04-13
+PKG_SOURCE_DATE:=2025-04-17
-PKG_SOURCE_VERSION:=8fa4e8122c83ec6ad2330f6115863a83ac5a042e
+PKG_SOURCE_VERSION:=76052b5b26f532b916643edf0b24782fa3195fb2
-PKG_MIRROR_HASH:=9f3e790d459e8c932b4219e75b5733eb16ed92fd0a94e4860e6e1152e1c87846
+PKG_MIRROR_HASH:=346ada947d1408bb81faf19cada29d2a70d71f1accf967221c7e1b362d4fbcab
 
 PKG_LICENSE:=GPL3.0+
 PKG_MAINTAINER:=Joseph Mory <morytyann@gmail.com>
@@ -16,7 +16,7 @@ PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_FLAGS:=no-mips16
 
-PKG_BUILD_VERSION:=alpha-8fa4e81
+PKG_BUILD_VERSION:=alpha-76052b5
 PKG_BUILD_TIME:=$(shell date -u -Iseconds)
 
 GO_PKG:=github.com/metacubex/mihomo

nikki/files/ucode/hijack.ut

@@ -181,6 +181,7 @@ table inet nikki {
 		{% endif %}
 	}
 
+	{% if (router_proxy): %}
 	chain router_dns_hijack {
 		{% for (let access_control in router_access_control): %}
 		{% if (access_control['enabled']): %}
@@ -276,7 +277,9 @@ table inet nikki {
 		{% endif %}
 		{% endfor %}
 	}
+	{% endif %}
 
+	{% if (lan_proxy): %}
 	chain lan_dns_hijack {
 		{% for (let access_control in lan_access_control): %}
 		{% if (access_control['enabled']): %}
@@ -372,6 +375,7 @@ table inet nikki {
 		{% endif %}
 		{% endfor %}
 	}
+	{% endif %}
 
 	{% if (router_proxy): %}
 	chain nat_output {