luci-app-passwall: bump to 25.12.13

Author: SakuraFallingMad

applications/luci-app-passwall/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=25.11.14
+PKG_VERSION:=25.12.13
 PKG_RELEASE:=1
 
 PKG_CONFIG_DEPENDS:= \

applications/luci-app-passwall/htdocs/luci-static/resources/view/passwall/Sortable.min.js

@@ -82,7 +82,10 @@ function index()
 	entry({"admin", "services", appname, "copy_node"}, call("copy_node")).leaf = true
 	entry({"admin", "services", appname, "clear_all_nodes"}, call("clear_all_nodes")).leaf = true
 	entry({"admin", "services", appname, "delete_select_nodes"}, call("delete_select_nodes")).leaf = true
+	entry({"admin", "services", appname, "reassign_group"}, call("reassign_group")).leaf = true
 	entry({"admin", "services", appname, "get_node"}, call("get_node")).leaf = true
+	entry({"admin", "services", appname, "save_node_order"}, call("save_node_order")).leaf = true
+	entry({"admin", "services", appname, "save_node_list_opt"}, call("save_node_list_opt")).leaf = true
 	entry({"admin", "services", appname, "update_rules"}, call("update_rules")).leaf = true
 	entry({"admin", "services", appname, "subscribe_del_node"}, call("subscribe_del_node")).leaf = true
 	entry({"admin", "services", appname, "subscribe_del_all"}, call("subscribe_del_all")).leaf = true
@@ -301,7 +304,8 @@ function index_status()
 end
 
 function haproxy_status()
-	local e = luci.sys.call(string.format("/bin/busybox top -bn1 | grep -v grep | grep '%s/bin/' | grep haproxy >/dev/null", appname)) == 0
+	local e = {}
+	e["status"] = luci.sys.call(string.format("/bin/busybox top -bn1 | grep -v grep | grep '%s/bin/' | grep haproxy >/dev/null", appname)) == 0
 	http_write_json(e)
 end
 
@@ -407,6 +411,11 @@ function add_node()
 	local uuid = api.gen_short_uuid()
 	uci:section(appname, "nodes", uuid)
 
+	local group = http.formvalue("group")
+	if group and group ~= "default" then
+		uci:set(appname, uuid, "group", group)
+	end
+
 	if redirect == "1" then
 		api.uci_save(uci, appname)
 		http.redirect(api.url("node_config", uuid))
@@ -420,6 +429,20 @@ function set_node()
 	local protocol = http.formvalue("protocol")
 	local section = http.formvalue("section")
 	uci:set(appname, "@global[0]", protocol .. "_node", section)
+	if protocol == "tcp" then
+		local node_protocol = uci:get(appname, section, "protocol")
+		if node_protocol == "_shunt" then
+			local type = uci:get(appname, section, "type")
+			local dns_shunt = uci:get(appname, "@global[0]", "dns_shunt")
+			local dns_key = (dns_shunt == "smartdns") and "smartdns_dns_mode" or "dns_mode"
+			local dns_mode = uci:get(appname, "@global[0]", dns_key)
+			local new_dns_mode = (type == "Xray") and "xray" or "sing-box"
+			if dns_mode ~= new_dns_mode then
+				uci:set(appname, "@global[0]", dns_key, new_dns_mode)
+				uci:set(appname, "@global[0]", "v2ray_dns_mode", "tcp")
+			end
+		end
+	end
 	api.uci_save(uci, appname, true, true)
 	http.redirect(api.url("log"))
 end
@@ -571,13 +594,12 @@ function delete_select_nodes()
 	end
 end
 
-
 function get_node()
 	local id = http.formvalue("id")
 	local result = {}
-	local show_node_info = api.uci_get_type("@global_other[0]", "show_node_info", "0")
+	local show_node_info = api.uci_get_type("global_other", "show_node_info", "0")
 
-	function add_is_ipv6_key(o)
+	local function add_is_ipv6_key(o)
 		if o and o.address and show_node_info == "1" then
 			local f = api.get_ipv6_full(o.address)
 			if f ~= "" then
@@ -591,14 +613,58 @@ function get_node()
 		result = uci:get_all(appname, id)
 		add_is_ipv6_key(result)
 	else
+		local default_nodes = {}
+		local other_nodes = {}
 		uci:foreach(appname, "nodes", function(t)
 			add_is_ipv6_key(t)
-			result[#result + 1] = t
+			if not t.group or t.group == "" then
+				default_nodes[#default_nodes + 1] = t
+			else
+				other_nodes[#other_nodes + 1] = t
+			end
 		end)
+		for i = 1, #default_nodes do result[#result + 1] = default_nodes[i] end
+		for i = 1, #other_nodes do result[#result + 1] = other_nodes[i] end
 	end
 	http_write_json(result)
 end
 
+function save_node_order()
+	local ids = http.formvalue("ids") or ""
+	local new_order = {}
+	for id in ids:gmatch("([^,]+)") do
+		new_order[#new_order + 1] = id
+	end
+	for idx, name in ipairs(new_order) do
+		luci.sys.call(string.format("uci -q reorder %s.%s=%d", appname, name, idx - 1))
+	end
+	api.sh_uci_commit(appname)
+	http_write_json({ status = "ok" })
+end
+
+function reassign_group()
+	local ids = http.formvalue("ids") or ""
+	local group = http.formvalue("group") or "default"
+	for id in ids:gmatch("([^,]+)") do
+		if group ~="" and group ~= "default" then
+			api.sh_uci_set(appname, id, "group", group)
+		else
+			api.sh_uci_del(appname, id, "group")
+		end
+	end
+	api.sh_uci_commit(appname)
+	http_write_json({ status = "ok" })
+end
+
+function save_node_list_opt()
+	local option = http.formvalue("option") or ""
+	local value = http.formvalue("value") or ""
+	if option ~= "" then
+		api.sh_uci_set(appname, "@global_other[0]", option, value, true)
+	end
+	http_write_json({ status = "ok" })
+end
+
 function update_rules()
 	local update = http.formvalue("update")
 	luci.sys.call("lua /usr/share/passwall/rule_update.lua log '" .. update .. "' > /dev/null 2>&1 &")

applications/luci-app-passwall/htdocs/luci-static/resources/view/passwall/popper.min.js

@@ -9,6 +9,10 @@ if not arg[1] or not m:get(arg[1]) then
 	luci.http.redirect(m.redirect)
 end
 
+if api.is_js_luci() then
+	m:append(Template(appname .. "/cbi/nodes_listvalue_com"))
+end
+
 local fs = api.fs
 local sys = api.sys
 local has_singbox = api.finded_com("sing-box")
@@ -22,11 +26,17 @@ local port_validate = function(self, value, t)
 end
 
 local nodes_table = {}
-local shunt_list = {}
-for k, e in ipairs(api.get_valid_nodes()) do
+for _, e in ipairs(api.get_valid_nodes()) do
 	nodes_table[#nodes_table + 1] = e
 end
 
+local normal_list = {}
+for _, v in pairs(nodes_table) do
+	if v.node_type == "normal" then
+		normal_list[#normal_list + 1] = v
+	end
+end
+
 local dynamicList_write = function(self, section, value)
 	local t = {}
 	local t2 = {}
@@ -188,6 +198,10 @@ o:depends({ _hide_node_option = "1",  ['!reverse'] = true })
 o = s:option(ListValue, "tcp_node", "<a style='color: red'>" .. translate("TCP Node") .. "</a>")
 o.default = ""
 o:depends({ _hide_node_option = false, use_global_config = false })
+if api.is_js_luci() then
+	o.template = appname .. "/cbi/nodes_listvalue"
+end
+o.group = {}
 
 o = s:option(DummyValue, "_tcp_node_bool", "")
 o.template = "passwall/cbi/hidevalue"
@@ -199,14 +213,10 @@ o.default = ""
 o:value("", translate("Close"))
 o:value("tcp", translate("Same as the tcp node"))
 o:depends({ _tcp_node_bool = "1" })
-
-for k, v in pairs(nodes_table) do
-	s.fields["tcp_node"]:value(v.id, v["remark"])
-	s.fields["udp_node"]:value(v.id, v["remark"])
-	if v.protocol and v.protocol == "_shunt" then
-		shunt_list[#shunt_list + 1] = v
-	end
+if api.is_js_luci() then
+	o.template = appname .. "/cbi/nodes_listvalue"
 end
+o.group = {"",""}
 
 o = s:option(DummyValue, "_udp_node_bool", "")
 o.template = "passwall/cbi/hidevalue"
@@ -260,6 +270,8 @@ 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:depends({ use_global_config = true })
+o:depends({ _tcp_node_bool = "1" })
 
 o = s:option(Flag, "use_direct_list", translatef("Use %s", translate("Direct List")))
 o.default = "1"
@@ -333,15 +345,25 @@ o.remove = function(self, section)
 	if id_val == "" then
 		return m:del(section, self.option)
 	end
-	for k, v in pairs(shunt_list) do
+	for _, v in pairs(nodes_table) do
 		if v.id == id_val then
 			local new_val = (v.type == "Xray") and "xray" or "sing-box"
-			return m:set(section, self.option, new_val)
+			m:set(section, self.option, new_val)
+
+			local dns_field = s.fields[v.type == "Xray" and "xray_dns_mode" or "singbox_dns_mode"]
+			local v2ray_dns_mode = dns_field and dns_field:formvalue(section)
+			if v2ray_dns_mode then
+				m:set(section, "v2ray_dns_mode", v2ray_dns_mode)
+			end
+
+			break
 		end
 	end
 end
 
 o = s:option(ListValue, "xray_dns_mode", translate("Request protocol"))
+o.default = "tcp"
+o:value("udp", "UDP")
 o:value("tcp", "TCP")
 o:value("tcp+doh", "TCP + DoH (" .. translate("A/AAAA type") .. ")")
 o:depends("dns_mode", "xray")
@@ -355,6 +377,8 @@ o.write = function(self, section, value)
 end
 
 o = s:option(ListValue, "singbox_dns_mode", translate("Request protocol"))
+o.default = "tcp"
+o:value("udp", "UDP")
 o:value("tcp", "TCP")
 o:value("doh", "DoH")
 o:depends("dns_mode", "sing-box")
@@ -379,53 +403,53 @@ o:value("149.112.112.112", "149.112.112.112 (Quad9-Recommended)")
 o:value("208.67.220.220", "208.67.220.220 (OpenDNS)")
 o:value("208.67.222.222", "208.67.222.222 (OpenDNS)")
 o:depends({dns_mode = "dns2socks"})
+o:depends({xray_dns_mode = "udp"})
 o:depends({xray_dns_mode = "tcp"})
 o:depends({xray_dns_mode = "tcp+doh"})
+o:depends({singbox_dns_mode = "udp"})
 o:depends({singbox_dns_mode = "tcp"})
 
-if has_singbox or has_xray then
-	o = s:option(Value, "remote_dns_doh", translate("Remote DNS DoH"))
-	o:value("https://1.1.1.1/dns-query", "CloudFlare")
-	o:value("https://1.1.1.2/dns-query", "CloudFlare-Security")
-	o:value("https://8.8.4.4/dns-query", "Google 8844")
-	o:value("https://8.8.8.8/dns-query", "Google 8888")
-	o:value("https://9.9.9.9/dns-query", "Quad9-Recommended 9.9.9.9")
-	o:value("https://149.112.112.112/dns-query", "Quad9-Recommended 149.112.112.112")
-	o:value("https://208.67.222.222/dns-query", "OpenDNS")
-	o:value("https://dns.adguard.com/dns-query,176.103.130.130", "AdGuard")
-	o:value("https://doh.libredns.gr/dns-query,116.202.176.26", "LibreDNS")
-	o:value("https://doh.libredns.gr/ads,116.202.176.26", "LibreDNS (No Ads)")
-	o.default = "https://1.1.1.1/dns-query"
-	o.validate = function(self, value, t)
-		if value ~= "" then
-			value = api.trim(value)
-			local flag = 0
-			local util = require "luci.util"
-			local val = util.split(value, ",")
-			local url = val[1]
-			val[1] = nil
-			for i = 1, #val do
-				local v = val[i]
-				if v then
-					if not api.datatypes.ipmask4(v) then
-						flag = 1
-					end
+o = s:option(Value, "remote_dns_doh", translate("Remote DNS DoH"))
+o:value("https://1.1.1.1/dns-query", "1.1.1.1 (CloudFlare)")
+o:value("https://1.1.1.2/dns-query", "1.1.1.2 (CloudFlare-Security)")
+o:value("https://8.8.4.4/dns-query", "8.8.4.4 (Google)")
+o:value("https://8.8.8.8/dns-query", "8.8.8.8 (Google)")
+o:value("https://9.9.9.9/dns-query", "9.9.9.9 (Quad9)")
+o:value("https://149.112.112.112/dns-query", "149.112.112.112 (Quad9)")
+o:value("https://208.67.222.222/dns-query", "208.67.222.222 (OpenDNS)")
+o:value("https://dns.adguard.com/dns-query,94.140.14.14", "94.140.14.14 (AdGuard)")
+o:value("https://doh.libredns.gr/dns-query,116.202.176.26", "116.202.176.26 (LibreDNS)")
+o:value("https://doh.libredns.gr/ads,116.202.176.26", "116.202.176.26 (LibreDNS-NoAds)")
+o.default = "https://1.1.1.1/dns-query"
+o.validate = function(self, value, t)
+	if value ~= "" then
+		value = api.trim(value)
+		local flag = 0
+		local util = require "luci.util"
+		local val = util.split(value, ",")
+		local url = val[1]
+		val[1] = nil
+		for i = 1, #val do
+			local v = val[i]
+			if v then
+				if not api.datatypes.ipmask4(v) then
+					flag = 1
 				end
 			end
-			if flag == 0 then
-				return value
-			end
 		end
-		return nil, translate("DoH request address") .. " " .. translate("Format must be:") .. " URL,IP"
+		if flag == 0 then
+			return value
+		end
 	end
-	o:depends({xray_dns_mode = "tcp+doh"})
-	o:depends({singbox_dns_mode = "doh"})
-
-	o = s:option(Value, "remote_dns_client_ip", translate("EDNS Client Subnet"))
-	o.datatype = "ipaddr"
-	o:depends({dns_mode = "sing-box"})
-	o:depends({dns_mode = "xray"})
+	return nil, translate("DoH request address") .. " " .. translate("Format must be:") .. " URL,IP"
 end
+o:depends({xray_dns_mode = "tcp+doh"})
+o:depends({singbox_dns_mode = "doh"})
+
+o = s:option(Value, "remote_dns_client_ip", translate("EDNS Client Subnet"))
+o.datatype = "ipaddr"
+o:depends({dns_mode = "sing-box"})
+o:depends({dns_mode = "xray"})
 
 o = s:option(ListValue, "chinadns_ng_default_tag", translate("Default DNS"))
 o.default = "none"
@@ -452,20 +476,40 @@ o:value("direct", translate("Direct DNS"))
 o.description = desc .. "</ul>"
 o:depends({dns_shunt = "dnsmasq", tcp_proxy_mode = "proxy", chn_list = "direct"})
 
+local tcp = s.fields["tcp_node"]
+local udp = s.fields["udp_node"]
 for k, v in pairs(nodes_table) do
-	if v.protocol ~= "_shunt" then
-		s.fields["dns_mode"]:depends({ _tcp_node_bool = "1", tcp_node = v.id })
-	end
-end
-for k, v in pairs(shunt_list) do
-	if v.type == "Xray" and has_xray then
-		s.fields["xray_dns_mode"]:depends({ _tcp_node_bool = "1", tcp_node = v.id })
-	end
-	if v.type == "sing-box" and has_singbox then
-		s.fields["singbox_dns_mode"]:depends({ _tcp_node_bool = "1", tcp_node = v.id })
+	if #normal_list == 0 then
+		s.fields["dns_mode"]:depends({ _tcp_node_bool = "1" })
+		break
 	end
-	if has_xray or has_singbox then
-		s.fields["remote_dns_client_ip"]:depends({ tcp_node = v.id })
+	if v.protocol == "_shunt" then
+		if v.type == "Xray" and has_xray then
+			tcp:value(v.id, v["remark"])
+			tcp.group[#tcp.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
+			udp:value(v.id, v["remark"])
+			udp.group[#udp.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
+
+			s.fields["xray_dns_mode"]:depends({ _tcp_node_bool = "1", tcp_node = v.id })
+		end
+		if v.type == "sing-box" and has_singbox then
+			tcp:value(v.id, v["remark"])
+			tcp.group[#tcp.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
+			udp:value(v.id, v["remark"])
+			udp.group[#udp.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
+
+			s.fields["singbox_dns_mode"]:depends({ _tcp_node_bool = "1", tcp_node = v.id })
+		end
+		if has_xray or has_singbox then
+			s.fields["remote_dns_client_ip"]:depends({ tcp_node = v.id })
+		end
+	else
+		tcp:value(v.id, v["remark"])
+		tcp.group[#tcp.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
+		udp:value(v.id, v["remark"])
+		udp.group[#udp.group+1] = (v.group and v.group ~= "") and v.group or translate("default")
+
+		s.fields["dns_mode"]:depends({ _tcp_node_bool = "1", tcp_node = v.id })
 	end
 end