From b36ba45ddc9ae4882a68ef96993a8ea470db45f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 27 Mar 2026 23:46:52 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=A4=20Sync=202026-03-27=2023:46:52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boltbrowser/Makefile | 4 +- luci-app-ssr-plus/Makefile | 2 +- .../model/cbi/shadowsocksr/client-config.lua | 4 +- .../usr/share/shadowsocksr/gen_config.lua | 59 ++++++++++--------- mtproxy/Makefile | 6 +- 5 files changed, 38 insertions(+), 37 deletions(-) diff --git a/boltbrowser/Makefile b/boltbrowser/Makefile index 295bc2abc..470adc7ee 100644 --- a/boltbrowser/Makefile +++ b/boltbrowser/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=boltbrowser -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/br0xen/boltbrowser.git PKG_SOURCE_DATE:=2023-05-31 -PKG_SOURCE_VERSION:=65c868158373a3aa87427c98fbd89da2da2fdc7a +PKG_SOURCE_VERSION:=898a1e52a566bd63350c406118f7c6627f5303e9 PKG_MIRROR_HASH:=skip PKG_LICENSE:=GPL-3.0-or-later diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 609848abb..27eeefa49 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus LUCI_PKGARCH:=all PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=190 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index d1b575cda..d89fa115d 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -288,7 +288,7 @@ end o.cfgvalue = function(self, section) return self.map.uci:get("shadowsocksr", "@server_subscribe[0]", "xray_hy2_type") or "hysteria2" end -o.rmempty = false +o.rmempty = true o.write = function(self, section, value) -- 更新 server_subscribe 的 xray_hy2_type local old_value = self.map.uci:get("shadowsocksr", "@server_subscribe[0]", "xray_hy2_type") @@ -358,7 +358,7 @@ o.cfgvalue = function(self, section) return self.map.uci:get("shadowsocksr", "@server_subscribe[0]", "ss_type") or "ss-rust" end o:depends("type", "ss") -o.rmempty = false +o.rmempty = true o.write = function(self, section, value) -- 更新 server_subscribe 的 ss_type local old_value = self.map.uci:get("shadowsocksr", "@server_subscribe[0]", "ss_type") diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index a5bb7d9cc..8f43b978b 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -452,33 +452,10 @@ end hysteriaSettings = (server.v2ray_protocol == "hysteria2") and { -- hysteria2 version = 2, - auth = server.hy2_auth, - congestion = server.hy2_tcpcongestion or nil, - up = tonumber(server.uplink_capacity) and tonumber(server.uplink_capacity) .. " mbps" or nil, - down = tonumber(server.downlink_capacity) and tonumber(server.downlink_capacity) .. " mbps" or nil, - udphop = (server.flag_port_hopping == "1") and { - port = string.gsub(server.port_range, ":", "-"), - interval = (function() - local v = tonumber((server.hopinterval or "30"):match("^%d+")) - return (v and v >= 5) and v or 30 - end)() - } or nil, - initStreamReceiveWindow = (server.flag_quicparam == "1" and server.initstreamreceivewindow) and tonumber(server.initstreamreceivewindow) or nil, - maxStreamReceiveWindow = (server.flag_quicparam == "1" and server.maxstreamreceivewindow) and tonumber(server.maxstreamreceivewindow) or nil, - initConnectionReceiveWindow = (server.flag_quicparam == "1" and server.initconnreceivewindow) and tonumber(server.initconnreceivewindow) or nil, - maxConnectionReceiveWindow = (server.flag_quicparam == "1" and server.maxconnreceivewindow) and tonumber(server.maxconnreceivewindow) or nil, - maxIdleTimeout = (server.flag_quicparam == "1" and (function() - local timeoutStr = tostring(server.maxidletimeout or "") - local timeout = tonumber(timeoutStr:match("^%d+")) - if timeout and timeout >= 4 and timeout <= 120 then - return timeout - end - end)()) or 30, - keepAlivePeriod = (server.flag_quicparam == "1" and server.keepaliveperiod) and tonumber(server.keepaliveperiod) or nil, - disablePathMTUDiscovery = (server.flag_quicparam == "1" and tostring(server.disablepathmtudiscovery) == "1") and true or nil + auth = server.hy2_auth } or nil, finalmask = (function() - local finalmask + local finalmask = {} if server.transport == "kcp" then local map = {none = "none", srtp = "header-srtp", utp = "header-utp", ["wechat-video"] = "header-wechat", dtls = "header-dtls", wireguard = "header-wireguard", dns = "header-dns"} @@ -495,15 +472,39 @@ end c.settings = { password = server.seed } end udp[#udp+1] = c - finalmask = { udp = udp } - elseif (server.flag_obfs == "1" and (server.v2ray_protocol == "hysteria2" and server.obfs_type and server.obfs_type ~= "")) then - finalmask = { - udp = {{ + finalmask.udp = udp + elseif server.v2ray_protocol == "hysteria2" then + if (server.flag_obfs == "1" and (server.obfs_type and server.obfs_type ~= "")) then + finalmask.udp = {{ type = server.obfs_type, settings = server.salamander and { password = server.salamander } or nil }} + end + local up = tonumber(server.uplink_capacity) or 0 + local down = tonumber(server.downlink_capacity) or 0 + finalmask.quicParams = { + congestion = server.hy2_tcpcongestion or nil, + brutalUp = up > 0 and (up .. "mbps") or nil, + brutalDown = down > 0 and (down .. "mbps") or nil, + udpHop = (server.flag_port_hopping == "1") and { + ports = string.gsub(server.port_range, ":", "-"), + interval = (function(v) + v = tonumber((v or "30"):match("^%d+")) + return (v and v >= 5) and v or 30 + end)(server.hopinterval) + } or nil, + initStreamReceiveWindow = (server.flag_quicparam == "1" and server.initstreamreceivewindow) and tonumber(server.initstreamreceivewindow) or nil, + maxStreamReceiveWindow = (server.flag_quicparam == "1" and server.maxstreamreceivewindow) and tonumber(server.maxstreamreceivewindow) or nil, + initConnectionReceiveWindow = (server.flag_quicparam == "1" and server.initconnreceivewindow) and tonumber(server.initconnreceivewindow) or nil, + maxConnectionReceiveWindow = (server.flag_quicparam == "1" and server.maxconnreceivewindow) and tonumber(server.maxconnreceivewindow) or nil, + maxIdleTimeout = (server.flag_quicparam == "1" and (function(t) + t = tonumber(tostring(t or "30"):match("^%d+")) + return (t and t >= 4 and t <= 120) and t or 30 + end)(server.maxidletimeout) or 30), + keepAlivePeriod = (server.flag_quicparam == "1" and server.keepaliveperiod) and tonumber(server.keepaliveperiod) or nil, + disablePathMTUDiscovery = (server.flag_quicparam == "1" and tostring(server.disablepathmtudiscovery) == "1") and true or nil } end if server.finalmask and server.finalmask ~= "" then diff --git a/mtproxy/Makefile b/mtproxy/Makefile index 24f210b2f..d236ed8d5 100644 --- a/mtproxy/Makefile +++ b/mtproxy/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtproxy -PKG_VERSION:=3.5.0 -PKG_RELEASE:=10 +PKG_VERSION:=3.5.1 +PKG_RELEASE:=11 PKG_MAINTAINER:=Kosntantine Shevlakov PKG_LICENSE:=GPLv2 @@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/GetPageSpeed/MTProxy.git -PKG_SOURCE_VERSION:=b18e84d21e8385e4df0e486fe45b0904947c5903 +PKG_SOURCE_VERSION:=9191e442c46fcc2958e50169f63fd9b02085bb56 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz