diff --git a/daed/Makefile b/daed/Makefile index 1bc5c8d..814584c 100644 --- a/daed/Makefile +++ b/daed/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=daed -PKG_VERSION:=2025.07.12 +PKG_VERSION:=2025.07.20 DAED_VERSION:=daed-c3588a9 WING_VERSION:=wing-6df3da2 -CORE_VERSION:=core-344666b +CORE_VERSION:=core-635ab7e WING_HASH_SHORT:=$(shell echo $(WING_VERSION) | cut -d- -f2) CORE_HASH_SHORT:=$(shell echo $(CORE_VERSION) | cut -d- -f2) PKG_RELEASE:=1 diff --git a/luci-app-passwall/root/usr/share/passwall/rules/direct_host b/luci-app-passwall/root/usr/share/passwall/rules/direct_host index 966675e..6cea6ae 100644 --- a/luci-app-passwall/root/usr/share/passwall/rules/direct_host +++ b/luci-app-passwall/root/usr/share/passwall/rules/direct_host @@ -60,22 +60,6 @@ gh-proxy.com gitmirror.com ghfast.top -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top # Synology ddns account.synology.com @@ -94,22 +78,6 @@ gh-proxy.com gitmirror.com ghfast.top -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top # Synology ddns account.synology.com @@ -128,22 +96,6 @@ gh-proxy.com gitmirror.com ghfast.top -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top # Synology ddns account.synology.com @@ -162,22 +114,6 @@ gh-proxy.com gitmirror.com ghfast.top -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top # Synology ddns account.synology.com @@ -196,22 +132,6 @@ gh-proxy.com gitmirror.com ghfast.top -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top # Synology ddns account.synology.com @@ -230,121 +150,3 @@ gh-proxy.com gitmirror.com ghfast.top -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top - -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top - -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top - -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top - -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top - -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top - -# Synology ddns -account.synology.com -checkip.dyndns.org -checkip.synology.com -checkipv6.dyndns.org -checkipv6.synology.com -checkport.synology.com -ddns.synology.com - -# google -dl.google.com - -# github proxy -gh-proxy.com -gitmirror.com -ghfast.top diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 64d4f5e..dc454c6 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -2,8 +2,9 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=luci-app-ssr-plus LUCI_PKGARCH:=all +PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=190 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY \ diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua index 50e92e7..672953f 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua @@ -118,6 +118,7 @@ o.inputstyle = "reload" o.description = translate("Update subscribe url list first") o.write = function() uci:commit("shadowsocksr") + luci.sys.exec("rm -rf /tmp/sub_md5_*") luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) end diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index 944016c..db488f9 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -32,7 +32,7 @@ local user_agent = ucic:get_first(name, 'server_subscribe', 'user_agent', 'v2ray -- 读取 ss_type 设置 local ss_type = ucic:get_first(name, 'server_subscribe', 'ss_type', 'ss-rust') -- 根据 ss_type 选择对应的程序 -local ss_program = "" +local ss_program = "sslocal" if ss_type == "ss-rust" then ss_program = "sslocal" -- Rust 版本使用 sslocal elseif ss_type == "ss-libev" then @@ -193,6 +193,11 @@ local function processData(szType, content) -- log(k.."="..v) -- end + -- 如果 hy2 程序未安装则跳过订阅 + if not hy2_type then + return nil + end + result.alias = url.fragment and UrlDecode(url.fragment) or nil result.type = hy2_type result.server = url.host @@ -430,6 +435,11 @@ local function processData(szType, content) log("SS 节点服务器信息格式错误:", host_port) return nil end + + -- 如果 SS 程序未安装则跳过订阅 + if not (v2_ss or has_ss_type) then + return nil + end -- 填充 result result.alias = alias @@ -609,6 +619,11 @@ local function processData(szType, content) else result.server_port = port end + + -- 如果 Tojan 程序未安装则跳过订阅 + if not v2_tj then + return nil + end if v2_tj ~= "trojan" then if params.fp then diff --git a/v2ray-plugin/Makefile b/v2ray-plugin/Makefile index 688c165..091904d 100644 --- a/v2ray-plugin/Makefile +++ b/v2ray-plugin/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-plugin -PKG_VERSION:=5.33.0 +PKG_VERSION:=5.37.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5e7b2f9f7adcee8c2574259a3b1256d974aea87a51906be6d83aad38afded854 +PKG_HASH:=7796924dc2dbd1ec392953467b3ff432cdcd266bf8d1c61b5a693fdc9e9a9230 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE