From bd555aad962596fd90651694f673733888f94c56 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Aug 2026 20:36:54 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Sync=202026-08-18=2020:36:54?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-passwall/Makefile | 2 +- .../cbi/passwall/server/type/1_sing-box.lua | 8 +- .../model/cbi/passwall/server/type/2_xray.lua | 13 +- .../root/usr/share/passwall/subscribe.lua | 6 +- .../root/usr/share/passwall/utils.sh | 2 +- .../references/measuring.md | 51 ++- .../scripts/bench-dispatch.sh | 93 +++++ .../scripts/bench-fullload.mjs | 336 ++++++++++++++++++ luci-theme-aurora/.dev/docs/router.md | 286 ++++++++++----- luci-theme-aurora/Makefile | 2 +- luci-theme-footstrap/Makefile | 2 +- .../luci-static/footstrap/app-icon-192.png | Bin 0 -> 5513 bytes .../luci-static/footstrap/app-icon-512.png | Bin 0 -> 15709 bytes .../footstrap/apple-touch-icon.png | Bin 0 -> 5255 bytes .../luci-static/footstrap/manifest.json | 24 ++ .../htdocs/luci-static/resources/fs-fit.js | 52 ++- .../htdocs/luci-static/resources/fs-router.js | 146 ++++++-- luci-theme-footstrap/styles/base/95-luci.css | 20 +- .../themes/footstrap/partials/head.ut | 28 ++ modeminfo/Makefile | 2 +- .../usr/share/modeminfo/scripts/FIBOCOM.at | 7 +- 21 files changed, 935 insertions(+), 145 deletions(-) create mode 100644 luci-theme-aurora/.claude/skills/aurora-performance/scripts/bench-dispatch.sh create mode 100644 luci-theme-aurora/.claude/skills/aurora-performance/scripts/bench-fullload.mjs create mode 100644 luci-theme-footstrap/htdocs/luci-static/footstrap/app-icon-192.png create mode 100644 luci-theme-footstrap/htdocs/luci-static/footstrap/app-icon-512.png create mode 100644 luci-theme-footstrap/htdocs/luci-static/footstrap/apple-touch-icon.png create mode 100644 luci-theme-footstrap/htdocs/luci-static/footstrap/manifest.json diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index da9d9036..f236ec9b 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.8.12 -PKG_RELEASE:=227 +PKG_RELEASE:=228 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua index 47a4a249..ac8b945b 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua @@ -80,6 +80,12 @@ end o:value("direct", "Direct") o:depends({ custom = false }) +o = s:option(DummyValue, "is_endpoint", "") +o.not_rewrite = true +o.template = m:template_path("/cbi/hidevalue") +o.value = "1" +o:depends({ custom = false, protocol = "wireguard" }) + o = s:option(Value, "port", translate("Listen Port")) o.datatype = "port" o:depends({ custom = false }) @@ -452,7 +458,7 @@ end o = s:option(Flag, "bind_local", translate("Bind Local"), translate("When selected, it can only be accessed localhost.")) o.default = "0" -o:depends({ custom = false }) +o:depends({ custom = false, is_endpoint = "" }) o = s:option(Flag, "accept_lan", translate("Accept LAN Access"), translate("When selected, it can accessed lan , this will not be safe!")) o.default = "0" diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua index 89363d00..01186b1c 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua @@ -11,6 +11,10 @@ if not s1.fields["type"].default then s1.fields["type"].default = type_name end +if not s1.val["type"] then + s1.val["type"] = type_name +end + if s1.val["type"] and s1.val["type"] ~= type_name then return end @@ -62,11 +66,16 @@ o:value("wireguard", "WireGuard") o:value("dokodemo-door", "dokodemo-door") o:depends({ custom = false }) +o = s:option(DummyValue, "is_endpoint", "") +o.not_rewrite = true +o.template = m:template_path("/cbi/hidevalue") +o.value = "1" +o:depends({ custom = false, protocol = "wireguard" }) + o = s:option(Value, "port", translate("Listen Port")) o.datatype = "port" o:depends({ custom = false }) - o = s:option(DynamicList, "users", translate("User")) for i, v in ipairs(user_list) do o:value(v[".name"], v.username) @@ -402,7 +411,7 @@ end --[[acceptProxyProtocol]] o = s:option(Flag, "acceptProxyProtocol", translate("acceptProxyProtocol"), translate("Whether to receive PROXY protocol, when this node want to be fallback or forwarded by proxy, it must be enable, otherwise it cannot be used.")) o.default = "0" -o:depends({ custom = false }) +o:depends({ custom = false, is_endpoint = "" }) --[[Fast Open]] o = s:option(Flag, "tcp_fast_open", "TCP " .. translate("Fast Open")) diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 64de3fa8..9767b8c5 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -2189,9 +2189,7 @@ local execute = function() else fail_list[#fail_list + 1] = value end - if url_is_local then - value.http_code = 0 - else + if not url_is_local then luci.sys.call("rm -f " .. tmp_file) end end @@ -2199,7 +2197,7 @@ local execute = function() if #fail_list > 0 then for index, value in ipairs(fail_list) do - log(string.format('【%s】订阅失败,可能是订阅地址无效,或是网络问题,请诊断![%s]', value.remark, tostring(value.http_code))) + log(string.format('【%s】订阅失败,可能是订阅地址无效,或是网络问题,请诊断![%s]', (value.remark or ""), tostring(value.http_code or 0))) end end update_node(0) diff --git a/luci-app-passwall/root/usr/share/passwall/utils.sh b/luci-app-passwall/root/usr/share/passwall/utils.sh index 72dd3ed8..4f7db842 100755 --- a/luci-app-passwall/root/usr/share/passwall/utils.sh +++ b/luci-app-passwall/root/usr/share/passwall/utils.sh @@ -479,7 +479,7 @@ ln_run() { echolog " - 找不到 ${ln_name},无法启动..." return 1 } - [ "${output}" != "/dev/null" ] && [ -n "$(echo "${output}" | grep -E "default|SOCKS_")" ] && [ "${ln_name}" != "chinadns-ng" ] && { + [ "${output}" != "/dev/null" ] && [ -n "$(echo "${output}" | grep -E "default|socks_")" ] && [ "${ln_name}" != "chinadns-ng" ] && { local persist_log_path=$(config_t_get global persist_log_path) local sys_log=$(config_t_get global sys_log "0") } diff --git a/luci-theme-aurora/.claude/skills/aurora-performance/references/measuring.md b/luci-theme-aurora/.claude/skills/aurora-performance/references/measuring.md index 735f10ed..2cb6e163 100644 --- a/luci-theme-aurora/.claude/skills/aurora-performance/references/measuring.md +++ b/luci-theme-aurora/.claude/skills/aurora-performance/references/measuring.md @@ -61,8 +61,8 @@ HOST=http:// COOKIE_NAME=sysauth_http COOKIE_VALUE= \ node ../.claude/skills/aurora-performance/scripts/bench-router.mjs