update 2025-04-13 14:16:31

luci-app-passwall/luasrc/controller/passwall.lua

@@ -88,7 +88,7 @@ function index()
 	entry({"admin", "services", appname, "check_passwall"}, call("app_check")).leaf = true
 	local coms = require "luci.passwall.com"
 	local com
-	for com, _ in pairs(coms) do
+	for _, com in ipairs(coms.order) do
 		entry({"admin", "services", appname, "check_" .. com}, call("com_check", com)).leaf = true
 		entry({"admin", "services", appname, "update_" .. com}, call("com_update", com)).leaf = true
 	end

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

@@ -14,10 +14,13 @@ s:append(Template(appname .. "/app_update/app_version"))
 
 local k, v
 local com = require "luci.passwall.com"
-for k, v in pairs(com) do
-	o = s:option(Value, k:gsub("%-","_") .. "_file", translatef("%s App Path", v.name))
-	o.default = v.default_path or ("/usr/bin/" .. k)
-	o.rmempty = false
+for _, k in ipairs(com.order) do
+	v = com[k]
+	if k ~= "geoview" then
+		o = s:option(Value, k:gsub("%-","_") .. "_file", translatef("%s App Path", v.name))
+		o.default = v.default_path or ("/usr/bin/" .. k)
+		o.rmempty = false
+	end
 end
 
 o = s:option(DummyValue, "tips", " ")

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

@@ -317,11 +317,13 @@ m:append(Template(appname .. "/rule_list/js"))
 local geo_dir = (uci:get(appname, "@global_rules[0]", "v2ray_location_asset") or "/usr/share/v2ray/"):match("^(.*)/")
 local geosite_path = geo_dir .. "/geosite.dat"
 local geoip_path = geo_dir .. "/geoip.dat"
-if api.is_finded("geoview") and fs.access(geosite_path) and fs.access(geoip_path) then
-	s:tab("geoview", translate("Geo View"))
-	o = s:taboption("geoview", DummyValue, "_geoview_fieldset")
-	o.rawhtml = true
-	o.template = appname .. "/rule_list/geoview"
+if api.finded_com("geoview") and fs.access(geosite_path) and fs.access(geoip_path) then
+	if api.compare_versions(api.get_app_version("geoview"), ">=", "0.1.0") then
+		s:tab("geoview", translate("Geo View"))
+		o = s:taboption("geoview", DummyValue, "_geoview_fieldset")
+		o.rawhtml = true
+		o.template = appname .. "/rule_list/geoview"
+	end
 end
 
 function m.on_before_save(self)

luci-app-passwall/luasrc/passwall/com.lua

@@ -8,6 +8,15 @@ local function gh_pre_release_url(self)
 	return "https://api.github.com/repos/" .. self.repo .. "/releases?per_page=1"
 end
 
+-- 排序顺序定义
+_M.order = {
+	"geoview",
+	"chinadns-ng",
+	"xray",
+	"sing-box",
+	"hysteria"
+}
+
 _M.hysteria = {
 	name = "Hysteria",
 	repo = "HyNetwork/hysteria",
@@ -81,4 +90,18 @@ _M["chinadns-ng"] = {
 	}
 }
 
+_M.geoview = {
+	name = "Geoview",
+	repo = "snowie2000/geoview",
+	get_url = gh_release_url,
+	cmd_version = '-version 2>/dev/null | awk \'NR==1 && $1=="Geoview" {print $2}\'',
+	zipped = false,
+	default_path = "/usr/bin/geoview",
+	match_fmt_str = "linux%%-%s",
+	file_tree = {
+		mipsel = "mipsle",
+		mips64el = "mips64le"
+	}
+}
+
 return _M

luci-app-passwall/luasrc/passwall/util_sing-box.lua

@@ -15,12 +15,21 @@ local geoip_all_tag = {}
 local srss_path = "/tmp/etc/" .. appname .."_tmp/srss/"
 
 local function convert_geofile()
+	if api.compare_versions(local_version:match("[^v]+"), "<", "1.8.0") then
+		api.log("！！！注意：Sing-Box 版本低，Sing-Box 分流无法启用！请在[组件更新]中更新。")
+		return
+	end
 	local geo_dir = (uci:get(appname, "@global_rules[0]", "v2ray_location_asset") or "/usr/share/v2ray/"):match("^(.*)/")
 	local geosite_path = geo_dir .. "/geosite.dat"
 	local geoip_path = geo_dir .. "/geoip.dat"
-	if not api.is_finded("geoview") then
-		api.log("* 注意：缺少 geoview 组件，Sing-Box 分流无法启用！")
+	if not api.finded_com("geoview") then
+		api.log("！！！注意：缺少 Geoview 组件，Sing-Box 分流无法启用！请在[组件更新]中更新。")
 		return
+	else
+		if api.compare_versions(api.get_app_version("geoview"), "<", "0.1.6") then
+			api.log("！！！注意：Geoview 组件版本低，Sing-Box 分流无法启用！请在[组件更新]中更新。")
+			return
+		end
 	end
 	if not fs.access(srss_path) then
 		fs.mkdir(srss_path)

luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm

@@ -189,7 +189,8 @@ local version = {}
 	</div>
 </div>
 
-<%for k, v in pairs(com) do
+<%for _, k in ipairs(com.order) do
+	local v = com[k]
 	version[k] = api.get_app_version(k)%>
 <div class="cbi-value">
 	<label class="cbi-value-title"><%=v.name%>

nikki/files/ucode/hijack.ut

@@ -233,19 +233,19 @@ table inet nikki {
 		{% for (let access_control in router_access_control): %}
 		{% if (access_control['enabled']): %}
 		{% if (length(access_control['user']) == 0 && length(access_control['group']) == 0 && length(access_control['cgroup']) == 0): %}
-		meta l4proto { tcp, udp } {% if (access_control.proxy == '1'): %} meta mark set {{ tproxy_fw_mark }} tproxy to :{{ tproxy_port }} counter accept {% else %} counter return {% endif %}
+		meta l4proto { tcp, udp } {% if (access_control.proxy == '1'): %} meta mark set {{ tproxy_fw_mark }} counter accept {% else %} counter return {% endif %}
 
 		{% else %}
 		{% if (length(access_control['user']) > 0): %}
-		meta l4proto { tcp, udp } meta skuid { {% for (let user in access_control['user']): %} {{ user }}, {% endfor %} } {% if (access_control.proxy == '1'): %} meta mark set {{ tproxy_fw_mark }} tproxy to :{{ tproxy_port }} counter accept {% else %} counter return {% endif %}
+		meta l4proto { tcp, udp } meta skuid { {% for (let user in access_control['user']): %} {{ user }}, {% endfor %} } {% if (access_control.proxy == '1'): %} meta mark set {{ tproxy_fw_mark }} counter accept {% else %} counter return {% endif %}
 
 		{% endif %}
 		{% if (length(access_control['group']) > 0): %}
-		meta l4proto { tcp, udp } meta skgid { {% for (let group in access_control['group']): %} {{ group }}, {% endfor %} } {% if (access_control.proxy == '1'): %} meta mark set {{ tproxy_fw_mark }} tproxy to :{{ tproxy_port }} counter accept {% else %} counter return {% endif %}
+		meta l4proto { tcp, udp } meta skgid { {% for (let group in access_control['group']): %} {{ group }}, {% endfor %} } {% if (access_control.proxy == '1'): %} meta mark set {{ tproxy_fw_mark }} counter accept {% else %} counter return {% endif %}
 
 		{% endif %}
 		{% if (cgroups_version == 2 && length(access_control['cgroup']) > 0): %}
-		meta l4proto { tcp, udp } socket cgroupv2 level 2 { {% for (let cgroup in access_control['cgroup']): %} services/{{ cgroup }}, {% endfor %} } {% if (access_control.proxy == '1'): %} meta mark set {{ tproxy_fw_mark }} tproxy to :{{ tproxy_port }} counter accept {% else %} counter return {% endif %}
+		meta l4proto { tcp, udp } socket cgroupv2 level 2 { {% for (let cgroup in access_control['cgroup']): %} services/{{ cgroup }}, {% endfor %} } {% if (access_control.proxy == '1'): %} meta mark set {{ tproxy_fw_mark }} counter accept {% else %} counter return {% endif %}
 
 		{% endif %}
 		{% endif %}