mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-11-16 21:43:33 +08:00
🦄 Sync 2026-04-02 23:48:06
This commit is contained in:
1 parent
a794220143
commit
c361065f64
35 files changed
+958
-537
No files matched your search
@@ -9,21 +9,6 @@ local CACHE_PATH = api.CACHE_PATH
|
||||
|
||||
local xray_version = api.get_app_version("xray")
|
||||
|
||||
local function get_noise_packets()
|
||||
local noises = {}
|
||||
uci:foreach(appname, "xray_noise_packets", function(n)
|
||||
local noise = (n.enabled == "1") and {
|
||||
type = n.type,
|
||||
packet = n.packet,
|
||||
delay = string.find(n.delay, "-") and n.delay or tonumber(n.delay),
|
||||
applyTo = n.applyTo
|
||||
} or nil
|
||||
table.insert(noises, noise)
|
||||
end)
|
||||
if #noises == 0 then noises = nil end
|
||||
return noises
|
||||
end
|
||||
|
||||
local function get_domain_excluded()
|
||||
local path = string.format("/usr/share/%s/domains_excluded", appname)
|
||||
local content = fs.readfile(path)
|
||||
@@ -146,8 +131,7 @@ function gen_outbound(flag, node, tag, proxy_table)
|
||||
sockopt = {
|
||||
mark = 255,
|
||||
tcpFastOpen = (node.tcp_fast_open == "1") and true or nil,
|
||||
tcpMptcp = (node.tcpMptcp == "1") and true or nil,
|
||||
dialerProxy = (fragment or noise) and "dialerproxy" or nil
|
||||
tcpMptcp = (node.tcpMptcp == "1") and true or nil
|
||||
},
|
||||
network = node.transport,
|
||||
security = node.stream_security,
|
||||
@@ -169,7 +153,7 @@ function gen_outbound(flag, node, tag, proxy_table)
|
||||
return node.tls_CertByName
|
||||
end)(),
|
||||
echConfigList = (node.ech == "1") and node.ech_config or nil,
|
||||
echForceQuery = (node.ech == "1") and (node.ech_ForceQuery or "none") or nil
|
||||
echForceQuery = (node.ech == "1") and (node.ech_ForceQuery or "full") or nil
|
||||
} or nil,
|
||||
realitySettings = (node.stream_security == "reality") and {
|
||||
serverName = node.tls_serverName,
|
||||
@@ -237,58 +221,31 @@ function gen_outbound(flag, node, tag, proxy_table)
|
||||
path = node.xhttp_path or "/",
|
||||
host = node.xhttp_host,
|
||||
extra = (function()
|
||||
local extra_tbl = {}
|
||||
-- Parse xhttp_extra and perform simple fault tolerance.
|
||||
local extra = {}
|
||||
if node.xhttp_extra then
|
||||
local success, parsed = pcall(jsonc.parse, api.base64Decode(node.xhttp_extra))
|
||||
if success and parsed then
|
||||
extra_tbl = parsed.extra or parsed
|
||||
for k, v in pairs(extra_tbl) do
|
||||
if (type(v) == "table" and next(v) == nil) or v == nil then
|
||||
extra_tbl[k] = nil
|
||||
end
|
||||
end
|
||||
local ok, parsed = pcall(jsonc.parse, api.base64Decode(node.xhttp_extra))
|
||||
if ok and type(parsed) == "table" then
|
||||
extra = parsed.extra or parsed
|
||||
end
|
||||
end
|
||||
-- Handling User-Agent
|
||||
if node.user_agent and node.user_agent ~= "" then
|
||||
extra_tbl.headers = extra_tbl.headers or {}
|
||||
if not extra_tbl.headers["User-Agent"] and not extra_tbl.headers["user-agent"] then
|
||||
extra_tbl.headers["User-Agent"] = node.user_agent
|
||||
extra.headers = extra.headers or {}
|
||||
if not extra.headers["User-Agent"] and not extra.headers["user-agent"] then
|
||||
extra.headers["User-Agent"] = node.user_agent
|
||||
end
|
||||
end
|
||||
-- Clean up empty headers
|
||||
if extra_tbl.headers and next(extra_tbl.headers) == nil then
|
||||
extra_tbl.headers = nil
|
||||
end
|
||||
return next(extra_tbl) ~= nil and extra_tbl or nil
|
||||
return api.cleanEmptyTables(extra)
|
||||
end)()
|
||||
} or nil,
|
||||
hysteriaSettings = (node.transport == "hysteria") and {
|
||||
version = 2,
|
||||
auth = node.hysteria2_auth_password,
|
||||
up = (node.hysteria2_up_mbps and tonumber(node.hysteria2_up_mbps)) and tonumber(node.hysteria2_up_mbps) .. "mbps" or nil,
|
||||
down = (node.hysteria2_down_mbps and tonumber(node.hysteria2_down_mbps)) and tonumber(node.hysteria2_down_mbps) .. "mbps" or nil,
|
||||
udphop = (node.hysteria2_hop) and {
|
||||
port = string.gsub(node.hysteria2_hop, ":", "-"),
|
||||
interval = (function()
|
||||
local v = tonumber((node.hysteria2_hop_interval or "30s"):match("^%d+"))
|
||||
return (v and v >= 5) and v or 30
|
||||
end)()
|
||||
} or nil,
|
||||
maxIdleTimeout = (function()
|
||||
local timeoutStr = tostring(node.hysteria2_idle_timeout or "")
|
||||
local timeout = tonumber(timeoutStr:match("^%d+"))
|
||||
if timeout and timeout >= 4 and timeout <= 120 then
|
||||
return timeout
|
||||
end
|
||||
return 30
|
||||
end)(),
|
||||
disablePathMTUDiscovery = (node.hysteria2_disable_mtu_discovery) and true or false
|
||||
auth = node.hysteria2_auth_password
|
||||
} or nil,
|
||||
finalmask = (function()
|
||||
local finalmask
|
||||
if node.transport == "mkcp" then
|
||||
local finalmask = {}
|
||||
local TP = node.transport
|
||||
if TP == "mkcp" then
|
||||
local map = {none = "none", srtp = "header-srtp", utp = "header-utp", ["wechat-video"] = "header-wechat",
|
||||
dtls = "header-dtls", wireguard = "header-wireguard", dns = "header-dns"}
|
||||
local udp = {}
|
||||
@@ -304,36 +261,55 @@ function gen_outbound(flag, node, tag, proxy_table)
|
||||
c.settings = { password = node.mkcp_seed }
|
||||
end
|
||||
udp[#udp+1] = c
|
||||
finalmask = { udp = udp }
|
||||
elseif node.transport == "hysteria" and node.hysteria2_obfs_type and node.hysteria2_obfs_type ~= "" then
|
||||
finalmask = {
|
||||
udp = {{
|
||||
finalmask.udp = udp
|
||||
elseif TP == "hysteria" then
|
||||
if node.hysteria2_obfs_type and node.hysteria2_obfs_type ~= "" then
|
||||
finalmask.udp = {{
|
||||
type = node.hysteria2_obfs_type,
|
||||
settings = node.hysteria2_obfs_password and {
|
||||
password = node.hysteria2_obfs_password
|
||||
} or nil
|
||||
}}
|
||||
end
|
||||
local up = tonumber(node.hysteria2_up_mbps) or 0
|
||||
local down = tonumber(node.hysteria2_down_mbps) or 0
|
||||
finalmask.quicParams = {
|
||||
congestion = (up <= 0 and down <= 0) and "bbr" or "brutal",
|
||||
brutalUp = up > 0 and (up .. "mbps") or nil,
|
||||
brutalDown = down > 0 and (down .. "mbps") or nil,
|
||||
udpHop = (node.hysteria2_hop) and {
|
||||
ports = string.gsub(node.hysteria2_hop, ":", "-"),
|
||||
interval = (function(v)
|
||||
v = tonumber((v or "30s"):match("^%d+"))
|
||||
return (v and v >= 5) and v or 30
|
||||
end)(node.hysteria2_hop_interval)
|
||||
} or nil,
|
||||
maxIdleTimeout = (function(t)
|
||||
t = tonumber(tostring(t or "30"):match("^%d+"))
|
||||
return (t and t >= 4 and t <= 120) and t or 30
|
||||
end)(node.hysteria2_idle_timeout),
|
||||
keepAlivePeriod = (function(t)
|
||||
t = tonumber(tostring(t or "0"):match("^%d+"))
|
||||
return (t and t >= 2 and t <= 60) and t or nil
|
||||
end)(node.hysteria2_keep_alive_period),
|
||||
disablePathMTUDiscovery = tonumber(node.hysteria2_disable_mtu_discovery) == 1
|
||||
}
|
||||
end
|
||||
if fragment and fragment_table and ({raw=1, ws=1, httpupgrade=1, grpc=1, xhttp=1})[TP] then
|
||||
finalmask.tcp = finalmask.tcp or {}
|
||||
finalmask.tcp[#finalmask.tcp+1] = api.clone(fragment_table)
|
||||
end
|
||||
if noise and noise_table and (TP == "mkcp" or (TP == "xhttp" and node.alpn == "h3")) then
|
||||
finalmask.udp = finalmask.udp or {}
|
||||
finalmask.udp[#finalmask.udp+1] = api.clone(noise_table)
|
||||
end
|
||||
if node.finalmask and node.finalmask ~= "" then
|
||||
local ok, fm = pcall(jsonc.parse, api.base64Decode(node.finalmask))
|
||||
if ok and type(fm) == "table" then
|
||||
if not finalmask or not next(finalmask) then
|
||||
finalmask = fm
|
||||
else
|
||||
if type(fm.udp) == "table" then
|
||||
finalmask.udp = finalmask.udp or {}
|
||||
for i = 1, #fm.udp do
|
||||
finalmask.udp[#finalmask.udp+1] = fm.udp[i]
|
||||
end
|
||||
end
|
||||
if type(fm.tcp) == "table" then
|
||||
finalmask.tcp = fm.tcp
|
||||
end
|
||||
end
|
||||
finalmask = fm
|
||||
end
|
||||
end
|
||||
return (finalmask and next(finalmask)) and finalmask or nil
|
||||
return api.cleanEmptyTables(finalmask)
|
||||
end)()
|
||||
} or nil,
|
||||
settings = {
|
||||
@@ -475,6 +451,13 @@ function gen_config_server(node)
|
||||
clients = clients
|
||||
}
|
||||
end
|
||||
elseif node.protocol == "hysteria2" then
|
||||
settings = {
|
||||
version = 2,
|
||||
clients = node.hysteria2_auth_password and {
|
||||
{ auth = node.hysteria2_auth_password }
|
||||
}
|
||||
}
|
||||
elseif node.protocol == "dokodemo-door" then
|
||||
settings = {
|
||||
network = node.d_protocol,
|
||||
@@ -552,6 +535,12 @@ function gen_config_server(node)
|
||||
end
|
||||
end
|
||||
|
||||
if node.protocol == "hysteria2" then
|
||||
node.protocol = "hysteria"
|
||||
node.transport = "hysteria"
|
||||
node.tls = "1"
|
||||
end
|
||||
|
||||
local config = {
|
||||
log = {
|
||||
loglevel = ("1" == node.log) and node.loglevel or "none"
|
||||
@@ -618,8 +607,11 @@ function gen_config_server(node)
|
||||
maxUploadSize = node.xhttp_maxuploadsize,
|
||||
maxConcurrentUploads = node.xhttp_maxconcurrentuploads
|
||||
} or nil,
|
||||
hysteriaSettings = (node.transport == "hysteria") and {
|
||||
version = 2
|
||||
} or nil,
|
||||
finalmask = (function()
|
||||
local finalmask
|
||||
local finalmask = {}
|
||||
if node.transport == "mkcp" then
|
||||
local map = {none = "none", srtp = "header-srtp", utp = "header-utp", ["wechat-video"] = "header-wechat",
|
||||
dtls = "header-dtls", wireguard = "header-wireguard", dns = "header-dns"}
|
||||
@@ -636,27 +628,32 @@ function gen_config_server(node)
|
||||
c.settings = { password = node.mkcp_seed }
|
||||
end
|
||||
udp[#udp+1] = c
|
||||
finalmask = { udp = udp }
|
||||
finalmask.udp = udp
|
||||
elseif node.transport == "hysteria" then
|
||||
if node.hysteria2_obfs_type and node.hysteria2_obfs_type ~= "" then
|
||||
finalmask.udp = {{
|
||||
type = node.hysteria2_obfs_type,
|
||||
settings = node.hysteria2_obfs_password and {
|
||||
password = node.hysteria2_obfs_password
|
||||
} or nil
|
||||
}}
|
||||
end
|
||||
local ignore = tonumber(node.hysteria2_ignore_client_bandwidth) == 1
|
||||
local up = (not ignore) and tonumber(node.hysteria2_up_mbps) or 0
|
||||
local down = (not ignore) and tonumber(node.hysteria2_down_mbps) or 0
|
||||
finalmask.quicParams = {
|
||||
congestion = (up <= 0 and down <= 0) and "bbr" or "brutal",
|
||||
brutalUp = up > 0 and (up .. "mbps") or nil,
|
||||
brutalDown = down > 0 and (down .. "mbps") or nil
|
||||
}
|
||||
end
|
||||
if node.finalmask and node.finalmask ~= "" then
|
||||
local ok, fm = pcall(jsonc.parse, api.base64Decode(node.finalmask))
|
||||
if ok and type(fm) == "table" then
|
||||
if not finalmask or not next(finalmask) then
|
||||
finalmask = fm
|
||||
else
|
||||
if type(fm.udp) == "table" then
|
||||
finalmask.udp = finalmask.udp or {}
|
||||
for i = 1, #fm.udp do
|
||||
finalmask.udp[#finalmask.udp+1] = fm.udp[i]
|
||||
end
|
||||
end
|
||||
if type(fm.tcp) == "table" then
|
||||
finalmask.tcp = fm.tcp
|
||||
end
|
||||
end
|
||||
finalmask = fm
|
||||
end
|
||||
end
|
||||
return (finalmask and next(finalmask)) and finalmask or nil
|
||||
return api.cleanEmptyTables(finalmask)
|
||||
end)(),
|
||||
sockopt = {
|
||||
tcpFastOpen = (node.tcp_fast_open == "1") and true or nil,
|
||||
@@ -751,6 +748,38 @@ function gen_config(var)
|
||||
|
||||
local xray_settings = uci:get_all(appname, "@global_xray[0]") or {}
|
||||
|
||||
if xray_settings.fragment == "1" then
|
||||
local delay = xray_settings.fragment_delay
|
||||
fragment_table = {
|
||||
type = "fragment",
|
||||
settings = {
|
||||
packets = xray_settings.fragment_packets,
|
||||
length = xray_settings.fragment_length,
|
||||
delay = delay and (delay:find("-", 1, true) and delay or tonumber(delay)) or nil,
|
||||
maxSplit = xray_settings.fragment_maxSplit
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
if xray_settings.noise == "1" then
|
||||
local noises = {}
|
||||
uci:foreach(appname, "xray_noise_packets", function(n)
|
||||
if n.enabled == "1" then
|
||||
local noise = {
|
||||
rand = (n.type == "rand" and n.packet) and (n.packet:find("-", 1, true) and n.packet or tonumber(n.packet)) or nil,
|
||||
type = (n.type ~= "rand") and n.type or nil,
|
||||
packet = (n.type ~= "rand") and n.packet or nil,
|
||||
delay = n.delay and (n.delay:find("-", 1, true) and n.delay or tonumber(n.delay)) or nil
|
||||
}
|
||||
table.insert(noises, noise)
|
||||
end
|
||||
end)
|
||||
noise_table = #noises > 0 and {
|
||||
type = "noise",
|
||||
settings = { reset = 0, noise = noises }
|
||||
} or nil
|
||||
end
|
||||
|
||||
local node = node_id and uci:get_all(appname, node_id) or nil
|
||||
local balancers = {}
|
||||
local rules = {}
|
||||
@@ -909,7 +938,7 @@ function gen_config(var)
|
||||
end
|
||||
end
|
||||
if is_new_blc_node then
|
||||
local outboundTag = gen_outbound_get_tag(flag, blc_node_id, blc_node_tag, { fragment = xray_settings.fragment == "1" or nil, noise = xray_settings.record_fragment == "1" or nil, run_socks_instance = not no_run })
|
||||
local outboundTag = gen_outbound_get_tag(flag, blc_node_id, blc_node_tag, { fragment = xray_settings.fragment == "1" or nil, noise = xray_settings.noise == "1" or nil, run_socks_instance = not no_run })
|
||||
if outboundTag then
|
||||
valid_nodes[#valid_nodes + 1] = outboundTag
|
||||
end
|
||||
@@ -934,7 +963,7 @@ function gen_config(var)
|
||||
local fallback_node = get_node_by_id(fallback_node_id)
|
||||
if fallback_node then
|
||||
if fallback_node.protocol ~= "_balancing" then
|
||||
local outboundTag = gen_outbound_get_tag(flag, fallback_node, fallback_node_id, { fragment = xray_settings.fragment == "1" or nil, noise = xray_settings.record_fragment == "1" or nil, run_socks_instance = not no_run })
|
||||
local outboundTag = gen_outbound_get_tag(flag, fallback_node, fallback_node_id, { fragment = xray_settings.fragment == "1" or nil, noise = xray_settings.noise == "1" or nil, run_socks_instance = not no_run })
|
||||
if outboundTag then
|
||||
fallback_node_tag = outboundTag
|
||||
end
|
||||
@@ -964,27 +993,29 @@ function gen_config(var)
|
||||
strategy = strategy
|
||||
})
|
||||
if _node.balancingStrategy == "leastPing" or _node.balancingStrategy == "leastLoad" or fallback_node_tag then
|
||||
local t = api.format_go_time(_node.probeInterval)
|
||||
if t == "0s" then
|
||||
t = "60s"
|
||||
elseif not t:find("[hm]") and tonumber(t:match("%d+")) < 10 then
|
||||
t = "10s"
|
||||
end
|
||||
if _node.balancingStrategy == "leastLoad" then
|
||||
if not burstObservatory then
|
||||
burstObservatory = {
|
||||
subjectSelector = { "blc-" },
|
||||
pingConfig = {
|
||||
destination = _node.useCustomProbeUrl and _node.probeUrl or nil,
|
||||
interval = (api.format_go_time(_node.probeInterval) ~= "0s") and api.format_go_time(_node.probeInterval) or "1m",
|
||||
sampling = 3,
|
||||
timeout = "5s"
|
||||
}
|
||||
burstObservatory = burstObservatory or {
|
||||
subjectSelector = { "blc-" },
|
||||
pingConfig = {
|
||||
destination = _node.useCustomProbeUrl and _node.probeUrl or nil,
|
||||
interval = t,
|
||||
sampling = 3,
|
||||
timeout = "5s"
|
||||
}
|
||||
end
|
||||
}
|
||||
else
|
||||
if not observatory then
|
||||
observatory = {
|
||||
subjectSelector = { "blc-" },
|
||||
probeUrl = _node.useCustomProbeUrl and _node.probeUrl or nil,
|
||||
probeInterval = (api.format_go_time(_node.probeInterval) ~= "0s") and api.format_go_time(_node.probeInterval) or "1m",
|
||||
enableConcurrency = true
|
||||
}
|
||||
end
|
||||
observatory = observatory or {
|
||||
subjectSelector = { "blc-" },
|
||||
probeUrl = _node.useCustomProbeUrl and _node.probeUrl or nil,
|
||||
probeInterval = t,
|
||||
enableConcurrency = true
|
||||
}
|
||||
end
|
||||
end
|
||||
local loopback_outbound = gen_loopback(loopback_tag, loopback_dst)
|
||||
@@ -1731,28 +1762,6 @@ function gen_config(var)
|
||||
}
|
||||
}
|
||||
|
||||
if xray_settings.fragment == "1" or xray_settings.noise == "1" then
|
||||
table.insert(outbounds, {
|
||||
protocol = "freedom",
|
||||
tag = "dialerproxy",
|
||||
settings = {
|
||||
domainStrategy = (direct_dns_query_strategy and direct_dns_query_strategy ~= "") and direct_dns_query_strategy or "UseIP",
|
||||
fragment = (xray_settings.fragment == "1") and {
|
||||
packets = (xray_settings.fragment_packets and xray_settings.fragment_packets ~= "") and xray_settings.fragment_packets,
|
||||
length = (xray_settings.fragment_length and xray_settings.fragment_length ~= "") and xray_settings.fragment_length,
|
||||
interval = (xray_settings.fragment_interval and xray_settings.fragment_interval ~= "") and xray_settings.fragment_interval,
|
||||
maxSplit = (xray_settings.fragment_maxSplit and xray_settings.fragment_maxSplit ~= "") and xray_settings.fragment_maxSplit
|
||||
} or nil,
|
||||
noises = (xray_settings.noise == "1") and get_noise_packets() or nil
|
||||
},
|
||||
streamSettings = {
|
||||
sockopt = {
|
||||
mark = 255
|
||||
}
|
||||
}
|
||||
})
|
||||
end
|
||||
|
||||
local direct_outbound = {
|
||||
protocol = "freedom",
|
||||
tag = "direct",
|
||||
|
||||
Reference in new issue
Block a user