cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-11-01 16:44:23 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🐶 Sync 2026-10-03 23:38:36

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-10-03 23:38:36 +08:00
1 parent b63935e763
commit d0f1c561e1
187 files changed
+1472 -443
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua
+22 -3
View File
@@ -126,8 +126,9 @@ end
--屏蔽列表
local file_block_host = CACHE_RULES_PATH .. "/block_host"
if not fs.access(file_block_host .. "_ok") then
api.remove(file_block_host)
api.remove(file_block_host .. "*")
end
local block_geosite_flag = fs.access(file_block_host) and fs.access(file_block_host .. "_ok") and fs.access(file_block_host .. "_geo")
if USE_BLOCK_LIST == "1" and not fs.access(file_block_host) then
local block_domain, lookup_block_domain = {}, {}
local geosite_arg = ""
@@ -158,6 +159,7 @@ if USE_BLOCK_LIST == "1" and not fs.access(file_block_host) then
local code, out = get_geosite(geosite_arg, file_block_host)
if code == 0 then
log(" - 解析[屏蔽列表] Geosite 到屏蔽域名表(blocklist)完成")
sys.call("touch " .. file_block_host .. "_geo")
else
log(" - 解析[屏蔽列表] Geosite 到屏蔽域名表(blocklist)失败！[" .. out .. "]")
success = false
@@ -168,6 +170,9 @@ if USE_BLOCK_LIST == "1" and not fs.access(file_block_host) then
end
end
if USE_BLOCK_LIST == "1" and is_file_nonzero(file_block_host) then
if block_geosite_flag then
log(" - [屏蔽列表] Geosite 使用缓存结果，跳过重复解析")
end
tmp_lines = {
"group null",
"group-dnl " .. file_block_host
@@ -222,8 +227,9 @@ end
--直连（白名单）列表
local file_direct_host = CACHE_RULES_PATH .. "/direct_host"
if not fs.access(file_direct_host .. "_ok") then
api.remove(file_direct_host)
api.remove(file_direct_host .. "*")
end
local direct_geosite_flag = fs.access(file_direct_host) and fs.access(file_direct_host .. "_ok") and fs.access(file_direct_host .. "_geo")
if USE_DIRECT_LIST == "1" and not fs.access(file_direct_host) then
local direct_domain, lookup_direct_domain = {}, {}
local geosite_arg = ""
@@ -254,6 +260,7 @@ if USE_DIRECT_LIST == "1" and not fs.access(file_direct_host) then
local code, out = get_geosite(geosite_arg, file_direct_host)
if code == 0 then
log(" - 解析[直连列表] Geosite 到域名白名单(whitelist)完成")
sys.call("touch " .. file_direct_host .. "_geo")
else
log(" - 解析[直连列表] Geosite 到域名白名单(whitelist)失败！[" .. out .. "]")
success = false
@@ -264,6 +271,9 @@ if USE_DIRECT_LIST == "1" and not fs.access(file_direct_host) then
end
end
if USE_DIRECT_LIST == "1" and is_file_nonzero(file_direct_host) then
if direct_geosite_flag then
log(" - [直连列表] Geosite 使用缓存结果，跳过重复解析")
end
local sets = {
setflag .. "psw_white",
setflag .. "psw_white6"
@@ -281,8 +291,9 @@ end
--代理（黑名单）列表
local file_proxy_host = CACHE_RULES_PATH .. "/proxy_host"
if not fs.access(file_proxy_host .. "_ok") then
api.remove(file_proxy_host)
api.remove(file_proxy_host .. "*")
end
local proxy_geosite_flag = fs.access(file_proxy_host) and fs.access(file_proxy_host .. "_ok") and fs.access(file_proxy_host .. "_geo")
if USE_PROXY_LIST == "1" and not fs.access(file_proxy_host) then
local proxy_domain, lookup_proxy_domain = {}, {}
local geosite_arg = ""
@@ -313,6 +324,7 @@ if USE_PROXY_LIST == "1" and not fs.access(file_proxy_host) then
local code, out = get_geosite(geosite_arg, file_proxy_host)
if code == 0 then
log(" - 解析[代理列表] Geosite 到代理域名表(blacklist)完成")
sys.call("touch " .. file_proxy_host .. "_geo")
else
log(" - 解析[代理列表] Geosite 到代理域名表(blacklist)失败！[" .. out .. "]")
success = false
@@ -323,6 +335,9 @@ if USE_PROXY_LIST == "1" and not fs.access(file_proxy_host) then
end
end
if USE_PROXY_LIST == "1" and is_file_nonzero(file_proxy_host) then
if proxy_geosite_flag then
log(" - [代理列表] Geosite 使用缓存结果，跳过重复解析")
end
local sets = {
setflag .. "psw_black",
setflag .. "psw_black6"
@@ -524,6 +539,10 @@ if IS_SHUNT_NODE and not only_global then
end
end
if USE_CACHE and USE_GEOVIEW == "1" and (geosite_direct_arg ~= "" or geosite_proxy_arg ~= "" or geosite_black_arg ~= "") then
log(" - [分流节点] Geosite 使用缓存结果，跳过重复解析")
end
-- 与 chnlist 比对
if is_file_nonzero(shunt_direct_host_tmp) and CHNLIST ~= "0" and is_file_nonzero(RULES_PATH .. "/chnlist") then
local chn_domain_set = {}
luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua
+22 -3
View File
@@ -284,8 +284,9 @@ end
--屏蔽列表
local file_block_host = CACHE_RULES_PATH .. "/block_host"
if not fs.access(file_block_host .. "_ok") then
api.remove(file_block_host)
api.remove(file_block_host .. "*")
end
local block_geosite_flag = fs.access(file_block_host) and fs.access(file_block_host .. "_ok") and fs.access(file_block_host .. "_geo")
if USE_BLOCK_LIST == "1" and not fs.access(file_block_host) then
local block_domain, lookup_block_domain = {}, {}
local geosite_arg = ""
@@ -316,6 +317,7 @@ if USE_BLOCK_LIST == "1" and not fs.access(file_block_host) then
local code, out = get_geosite(geosite_arg, file_block_host)
if code == 0 then
log(" - 解析[屏蔽列表] Geosite 到屏蔽域名表(blocklist)完成")
sys.call("touch " .. file_block_host .. "_geo")
else
log(" - 解析[屏蔽列表] Geosite 到屏蔽域名表(blocklist)失败！[" .. out .. "]")
success = false
@@ -326,6 +328,9 @@ if USE_BLOCK_LIST == "1" and not fs.access(file_block_host) then
end
end
if USE_BLOCK_LIST == "1" and is_file_nonzero(file_block_host) then
if block_geosite_flag then
log(" - [屏蔽列表] Geosite 使用缓存结果，跳过重复解析")
end
local domain_set_name = "psw-block"
tmp_lines = {
string.format("domain-set -name %s -file %s", domain_set_name, file_block_host),
@@ -383,8 +388,9 @@ end
--直连（白名单）列表
local file_direct_host = CACHE_RULES_PATH .. "/direct_host"
if not fs.access(file_direct_host .. "_ok") then
api.remove(file_direct_host)
api.remove(file_direct_host .. "*")
end
local direct_geosite_flag = fs.access(file_direct_host) and fs.access(file_direct_host .. "_ok") and fs.access(file_direct_host .. "_geo")
if USE_DIRECT_LIST == "1" and not fs.access(file_direct_host) then
local direct_domain, lookup_direct_domain = {}, {}
local geosite_arg = ""
@@ -415,6 +421,7 @@ if USE_DIRECT_LIST == "1" and not fs.access(file_direct_host) then
local code, out = get_geosite(geosite_arg, file_direct_host)
if code == 0 then
log(" - 解析[直连列表] Geosite 到域名白名单(whitelist)完成")
sys.call("touch " .. file_direct_host .. "_geo")
else
log(" - 解析[直连列表] Geosite 到域名白名单(whitelist)失败！[" .. out .. "]")
success = false
@@ -425,6 +432,9 @@ if USE_DIRECT_LIST == "1" and not fs.access(file_direct_host) then
end
end
if USE_DIRECT_LIST == "1" and is_file_nonzero(file_direct_host) then
if direct_geosite_flag then
log(" - [直连列表] Geosite 使用缓存结果，跳过重复解析")
end
local domain_set_name = "psw-directlist"
tmp_lines = {
string.format("domain-set -name %s -file %s", domain_set_name, file_direct_host)
@@ -444,8 +454,9 @@ end
--代理（黑名单）列表
local file_proxy_host = CACHE_RULES_PATH .. "/proxy_host"
if not fs.access(file_proxy_host .. "_ok") then
api.remove(file_proxy_host)
api.remove(file_proxy_host .. "*")
end
local proxy_geosite_flag = fs.access(file_proxy_host) and fs.access(file_proxy_host .. "_ok") and fs.access(file_proxy_host .. "_geo")
if USE_PROXY_LIST == "1" and not fs.access(file_proxy_host) then
local proxy_domain, lookup_proxy_domain = {}, {}
local geosite_arg = ""
@@ -476,6 +487,7 @@ if USE_PROXY_LIST == "1" and not fs.access(file_proxy_host) then
local code, out = get_geosite(geosite_arg, file_proxy_host)
if code == 0 then
log(" - 解析[代理列表] Geosite 到代理域名表(blacklist)完成")
sys.call("touch " .. file_proxy_host .. "_geo")
else
log(" - 解析[代理列表] Geosite 到代理域名表(blacklist)失败！[" .. out .. "]")
success = false
@@ -486,6 +498,9 @@ if USE_PROXY_LIST == "1" and not fs.access(file_proxy_host) then
end
end
if USE_PROXY_LIST == "1" and is_file_nonzero(file_proxy_host) then
if proxy_geosite_flag then
log(" - [代理列表] Geosite 使用缓存结果，跳过重复解析")
end
local domain_set_name = "psw-proxylist"
tmp_lines = {
string.format("domain-set -name %s -file %s", domain_set_name, file_proxy_host)
@@ -691,6 +706,10 @@ if IS_SHUNT_NODE and not only_global then
end
end
if USE_CACHE and USE_GEOVIEW == "1" and (geosite_direct_arg ~= "" or geosite_proxy_arg ~= "" or geosite_black_arg ~= "") then
log(" - [分流节点] Geosite 使用缓存结果，跳过重复解析")
end
if is_file_nonzero(shunt_direct_host) then
local domain_set_name = "psw-shunt-direct"
tmp_lines = {