From f920eec7cfe204348a57bbc6dd03fb013a0f729c Mon Sep 17 00:00:00 2001 From: "github-action[bot]" Date: Sun, 7 Dec 2025 19:36:55 +0100 Subject: [PATCH] Update On Sun Dec 7 19:36:54 CET 2025 --- .github/update.log | 1 + clash-nyanpasu/manifest/version.json | 6 +- filebrowser/CHANGELOG.md | 15 + .../src/components/files/CsvViewer.vue | 12 +- .../src/components/files/ListingItem.vue | 11 +- filebrowser/frontend/src/i18n/en.json | 18 +- lede/include/target.mk | 3 + lede/scripts/target-metadata.pl | 1 + lede/target/Config.in | 3 + mieru/test/deploy/singbox/test_client.sh | 48 +- openwrt-packages/ddns-go/Makefile | 4 +- openwrt-packages/filebrowser/Makefile | 4 +- .../cbi/passwall/client/socks_config.lua | 12 +- .../model/cbi/passwall/client/type/ray.lua | 14 +- .../cbi/passwall/client/type/sing-box.lua | 14 +- .../view/passwall/cbi/nodes_multiselect.htm | 47 +- .../view/passwall/node_list/link_add_node.htm | 2 +- .../view/passwall/node_list/node_list.htm | 5 - shadowsocks-rust/Cargo.lock | 99 +- shadowsocks-rust/Cargo.toml | 2 +- .../crates/shadowsocks-service/Cargo.toml | 2 +- .../crates/shadowsocks-service/src/config.rs | 6 +- .../src/local/socks/config.rs | 2 +- shadowsocks-rust/src/config.rs | 4 +- sing-box/adapter/network.go | 4 +- sing-box/adapter/router.go | 1 - sing-box/box.go | 2 +- sing-box/common/dialer/default.go | 2 +- sing-box/common/listener/listener_tcp.go | 2 +- sing-box/common/settings/wifi.go | 9 + sing-box/common/settings/wifi_linux.go | 46 + .../common/settings/wifi_linux_connman.go | 166 +++ sing-box/common/settings/wifi_linux_iwd.go | 188 +++ sing-box/common/settings/wifi_linux_nm.go | 163 +++ sing-box/common/settings/wifi_linux_wpa.go | 225 ++++ sing-box/common/settings/wifi_stub.go | 27 + sing-box/common/settings/wifi_windows.go | 144 +++ sing-box/docs/changelog.md | 2 +- sing-box/docs/configuration/dns/rule.md | 4 +- sing-box/docs/configuration/dns/rule.zh.md | 4 +- sing-box/docs/configuration/route/rule.md | 4 +- sing-box/docs/configuration/route/rule.zh.md | 4 +- sing-box/docs/configuration/shared/dial.md | 10 +- sing-box/docs/configuration/shared/dial.zh.md | 10 +- sing-box/docs/configuration/shared/listen.md | 10 +- .../docs/configuration/shared/listen.zh.md | 10 +- sing-box/experimental/libbox/config.go | 4 + .../experimental/libbox/platform/interface.go | 1 + sing-box/experimental/libbox/service.go | 6 +- sing-box/go.mod | 2 +- sing-box/go.sum | 10 +- sing-box/option/inbound.go | 1 + sing-box/option/outbound.go | 1 + sing-box/route/network.go | 76 +- sing-box/route/router.go | 10 +- small/gn/Makefile | 6 +- small/gn/src/out/last_commit_position.h | 4 +- .../luci-static/resources/view/fchomo/node.js | 30 +- .../resources/view/fchomo/ruleset.js | 22 +- small/luci-app-fchomo/po/templates/fchomo.pot | 554 ++++----- small/luci-app-fchomo/po/zh_Hans/fchomo.po | 569 ++++----- small/luci-app-fchomo/po/zh_Hant/fchomo.po | 569 ++++----- .../model/cbi/passwall/client/node_config.lua | 4 +- .../cbi/passwall/client/node_subscribe.lua | 9 +- .../passwall/client/node_subscribe_config.lua | 9 +- .../cbi/passwall/client/socks_config.lua | 48 +- .../model/cbi/passwall/client/type/ray.lua | 36 +- .../cbi/passwall/client/type/sing-box.lua | 36 +- .../luci-app-passwall/luasrc/passwall/api.lua | 8 +- .../view/passwall/cbi/nodes_multiselect.htm | 284 +++++ .../view/passwall/node_list/link_add_node.htm | 2 +- .../view/passwall/node_list/node_list.htm | 5 - small/luci-app-passwall/po/zh-cn/passwall.po | 6 + .../model/cbi/shadowsocksr/advanced.lua | 4 +- .../luasrc/model/cbi/shadowsocksr/client.lua | 4 +- .../luasrc/model/cbi/shadowsocksr/status.lua | 4 + .../luci-app-ssr-plus/po/zh_Hans/ssr-plus.po | 4 +- .../root/etc/init.d/shadowsocksr | 50 +- .../luci-app-ssr-plus/root/usr/bin/ssr-rules | 1041 ++++++++++++++--- .../root/usr/share/shadowsocksr/update.lua | 4 +- small/v2ray-geodata/Makefile | 4 +- v2rayn/v2rayN/Directory.Build.props | 2 +- v2rayn/v2rayN/Directory.Packages.props | 6 +- v2rayn/v2rayN/ServiceLib/Global.cs | 1 - .../Manager/ActionPrecheckManager.cs | 2 + .../Singbox/SingboxOutboundService.cs | 2 +- .../Common/AppBuilderExtension.cs | 8 +- .../Views/AddGroupServerWindow.axaml | 5 +- .../Views/OptionSettingWindow.axaml | 3 +- .../Views/OptionSettingWindow.axaml.cs | 2 +- .../v2rayN/Views/AddGroupServerWindow.xaml | 7 +- .../.github/workflows/tidy.yml | 10 + v2rayng/AndroidLibXrayLite/go.mod | 2 +- v2rayng/V2rayNG/app/build.gradle.kts | 4 +- yt-dlp/yt_dlp/extractor/_extractors.py | 1 + yt-dlp/yt_dlp/extractor/alibaba.py | 42 + yt-dlp/yt_dlp/extractor/sportdeutschland.py | 36 +- yt-dlp/yt_dlp/extractor/xhamster.py | 51 +- 98 files changed, 3582 insertions(+), 1401 deletions(-) create mode 100644 sing-box/common/settings/wifi.go create mode 100644 sing-box/common/settings/wifi_linux.go create mode 100644 sing-box/common/settings/wifi_linux_connman.go create mode 100644 sing-box/common/settings/wifi_linux_iwd.go create mode 100644 sing-box/common/settings/wifi_linux_nm.go create mode 100644 sing-box/common/settings/wifi_linux_wpa.go create mode 100644 sing-box/common/settings/wifi_stub.go create mode 100644 sing-box/common/settings/wifi_windows.go create mode 100644 small/luci-app-passwall/luasrc/view/passwall/cbi/nodes_multiselect.htm create mode 100644 yt-dlp/yt_dlp/extractor/alibaba.py diff --git a/.github/update.log b/.github/update.log index 4d5e11ded2..3b79ddc308 100644 --- a/.github/update.log +++ b/.github/update.log @@ -1204,3 +1204,4 @@ Update On Wed Dec 3 19:42:45 CET 2025 Update On Thu Dec 4 19:44:01 CET 2025 Update On Fri Dec 5 19:41:34 CET 2025 Update On Sat Dec 6 19:36:39 CET 2025 +Update On Sun Dec 7 19:36:46 CET 2025 diff --git a/clash-nyanpasu/manifest/version.json b/clash-nyanpasu/manifest/version.json index 44a3134202..166cd8379c 100644 --- a/clash-nyanpasu/manifest/version.json +++ b/clash-nyanpasu/manifest/version.json @@ -2,10 +2,10 @@ "manifest_version": 1, "latest": { "mihomo": "v1.19.17", - "mihomo_alpha": "alpha-f44aa22", + "mihomo_alpha": "alpha-6b40072", "clash_rs": "v0.9.2", "clash_premium": "2023-09-05-gdcc8d87", - "clash_rs_alpha": "0.9.2-alpha+sha.81f5ac5" + "clash_rs_alpha": "0.9.2-alpha+sha.53b277f" }, "arch_template": { "mihomo": { @@ -69,5 +69,5 @@ "linux-armv7hf": "clash-armv7-unknown-linux-gnueabihf" } }, - "updated_at": "2025-12-05T22:21:23.531Z" + "updated_at": "2025-12-06T22:21:16.955Z" } diff --git a/filebrowser/CHANGELOG.md b/filebrowser/CHANGELOG.md index 05671b1d3c..58f6ffd50f 100644 --- a/filebrowser/CHANGELOG.md +++ b/filebrowser/CHANGELOG.md @@ -2,6 +2,21 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. +## [2.51.2](https://github.com/filebrowser/filebrowser/compare/v2.51.1...v2.51.2) (2025-12-07) + + +### Bug Fixes + +* **frontend:** add missing i18n strings ([c171599](https://github.com/filebrowser/filebrowser/commit/c1715992bda46517f801c1aa496df8a3b42a4e4d)) + +## [2.51.1](https://github.com/filebrowser/filebrowser/compare/v2.51.0...v2.51.1) (2025-12-07) + + +### Bug Fixes + +* **frontend:** csv viewer i18n strings ([4cbb4b7](https://github.com/filebrowser/filebrowser/commit/4cbb4b73af816104475f15c1d996640b56203602)) +* prevent the right-click from selecting multiple items when the "single-click" option is active ([#5608](https://github.com/filebrowser/filebrowser/issues/5608)) ([152f830](https://github.com/filebrowser/filebrowser/commit/152f8302f7cda21bde37692b175c22c124233f45)) + ## [2.51.0](https://github.com/filebrowser/filebrowser/compare/v2.50.0...v2.51.0) (2025-12-06) diff --git a/filebrowser/frontend/src/components/files/CsvViewer.vue b/filebrowser/frontend/src/components/files/CsvViewer.vue index 4f66fff075..b926d3901b 100644 --- a/filebrowser/frontend/src/components/files/CsvViewer.vue +++ b/filebrowser/frontend/src/components/files/CsvViewer.vue @@ -28,23 +28,25 @@
info - Showing {{ data.rows.length }} rows + + {{ $t("files.showingRows", { count: data.rows.length }) }}
- +
diff --git a/filebrowser/frontend/src/components/files/ListingItem.vue b/filebrowser/frontend/src/components/files/ListingItem.vue index 5db88aba91..d75c2f9816 100644 --- a/filebrowser/frontend/src/components/files/ListingItem.vue +++ b/filebrowser/frontend/src/components/files/ListingItem.vue @@ -265,7 +265,15 @@ const click = (event: Event | KeyboardEvent) => { } if (fileStore.selected.indexOf(props.index) !== -1) { - fileStore.removeSelected(props.index); + if ( + (event as KeyboardEvent).ctrlKey || + (event as KeyboardEvent).metaKey || + fileStore.multiple + ) { + fileStore.removeSelected(props.index); + } else { + fileStore.selected = [props.index]; + } return; } @@ -291,7 +299,6 @@ const click = (event: Event | KeyboardEvent) => { } if ( - !singleClick.value && !(event as KeyboardEvent).ctrlKey && !(event as KeyboardEvent).metaKey && !fileStore.multiple diff --git a/filebrowser/frontend/src/i18n/en.json b/filebrowser/frontend/src/i18n/en.json index 39b09bb81a..9063dcde4e 100644 --- a/filebrowser/frontend/src/i18n/en.json +++ b/filebrowser/frontend/src/i18n/en.json @@ -44,7 +44,9 @@ "openFile": "Open file", "discardChanges": "Discard", "saveChanges": "Save changes", - "editAsText": "Edit as Text" + "editAsText": "Edit as Text", + "increaseFontSize": "Increase font size", + "decreaseFontSize": "Decrease font size" }, "download": { "downloadFile": "Download File", @@ -78,7 +80,14 @@ "sortBySize": "Sort by size", "noPreview": "Preview is not available for this file.", "csvTooLarge": "CSV file is too large for preview (>5MB). Please download to view.", - "csvLoadFailed": "Failed to load CSV file." + "csvLoadFailed": "Failed to load CSV file.", + "showingRows": "Showing {count} row(s)", + "columnSeparator": "Column Separator", + "csvSeparators": { + "comma": "Comma (,)", + "semicolon": "Semicolon (;)", + "both": "Both (,) and (;)" + } }, "help": { "click": "select file or directory", @@ -272,10 +281,5 @@ "minutes": "Minutes", "seconds": "Seconds", "unit": "Time Unit" - }, - "available_csv_separators": { - "comma": "Comma (,)", - "semicolon": "Semicolon (;)", - "both": "Both (,) and (;)" } } diff --git a/lede/include/target.mk b/lede/include/target.mk index de9f9a63e1..d724d8e63d 100644 --- a/lede/include/target.mk +++ b/lede/include/target.mk @@ -299,6 +299,9 @@ ifeq ($(DUMP),1) ifneq ($(CONFIG_PCIEPORTBUS),) FEATURES += pcie endif + ifneq ($(CONFIG_PINCTRL),) + FEATURES += pinctrl + endif ifneq ($(CONFIG_PWM),) FEATURES += pwm endif diff --git a/lede/scripts/target-metadata.pl b/lede/scripts/target-metadata.pl index 79ae50087e..4fa4ba00e1 100755 --- a/lede/scripts/target-metadata.pl +++ b/lede/scripts/target-metadata.pl @@ -33,6 +33,7 @@ sub target_config_features(@) { /^pci$/ and $ret .= "\tselect PCI_SUPPORT\n"; /^pcie$/ and $ret .= "\tselect PCIE_SUPPORT\n"; /^pcmcia$/ and $ret .= "\tselect PCMCIA_SUPPORT\n"; + /^pinctrl$/ and $ret .= "\tselect PINCTRL_SUPPORT\n"; /^powerpc64$/ and $ret .= "\tselect powerpc64\n"; /^pwm$/ and $ret .= "\select PWM_SUPPORT\n"; /^ramdisk$/ and $ret .= "\tselect USES_INITRAMFS\n"; diff --git a/lede/target/Config.in b/lede/target/Config.in index c0f3237ca9..38ff716d69 100644 --- a/lede/target/Config.in +++ b/lede/target/Config.in @@ -32,6 +32,9 @@ config PCIE_SUPPORT config PCMCIA_SUPPORT bool +config PINCTRL_SUPPORT + bool + config PWM_SUPPORT bool diff --git a/mieru/test/deploy/singbox/test_client.sh b/mieru/test/deploy/singbox/test_client.sh index a400d47d83..38266686ea 100755 --- a/mieru/test/deploy/singbox/test_client.sh +++ b/mieru/test/deploy/singbox/test_client.sh @@ -142,27 +142,27 @@ if [[ "$?" -ne 0 ]]; then fi echo "========== END OF CLIENT TCP TEST ==========" -# echo "========== BEGIN OF CLIENT UDP TEST ==========" -# ./mita apply config server_udp.json -# if [[ "$?" -ne 0 ]]; then -# echo "command 'mita apply config server_udp.json' failed" -# exit 1 -# fi -# echo "mieru server config:" -# ./mita describe config -# ./mita start -# if [[ "$?" -ne 0 ]]; then -# echo "command 'mita start' failed" -# exit 1 -# fi -# ./sing-box run -c singbox-config-udp.json & -# sleep 1 -# run_udp_tests 1083 -# print_mieru_server_metrics -# sleep 1 -# ./mita stop -# if [[ "$?" -ne 0 ]]; then -# echo "command 'mita stop' failed" -# exit 1 -# fi -# echo "========== END OF CLIENT UDP TEST ==========" +echo "========== BEGIN OF CLIENT UDP TEST ==========" +./mita apply config server_udp.json +if [[ "$?" -ne 0 ]]; then + echo "command 'mita apply config server_udp.json' failed" + exit 1 +fi +echo "mieru server config:" +./mita describe config +./mita start +if [[ "$?" -ne 0 ]]; then + echo "command 'mita start' failed" + exit 1 +fi +./sing-box run -c singbox-config-udp.json & +sleep 1 +run_udp_tests 1083 +print_mieru_server_metrics +sleep 1 +./mita stop +if [[ "$?" -ne 0 ]]; then + echo "command 'mita stop' failed" + exit 1 +fi +echo "========== END OF CLIENT UDP TEST ==========" diff --git a/openwrt-packages/ddns-go/Makefile b/openwrt-packages/ddns-go/Makefile index 7c9e8195dd..ede4a3e7d4 100644 --- a/openwrt-packages/ddns-go/Makefile +++ b/openwrt-packages/ddns-go/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-go -PKG_VERSION:=6.13.3 +PKG_VERSION:=6.14.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b2b6e48988abec12bba37ac9fb2f9a6777d28125c0ab2ac3be1d8659b8b7b9a5 +PKG_HASH:=684244194035a75f2830c57c6e0e1f4c06a0ca55d2f707acf06eaf6e0162f372 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/openwrt-packages/filebrowser/Makefile b/openwrt-packages/filebrowser/Makefile index 6790dca50a..8d2d08945c 100644 --- a/openwrt-packages/filebrowser/Makefile +++ b/openwrt-packages/filebrowser/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=filebrowser -PKG_VERSION:=2.51.0 +PKG_VERSION:=2.51.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/filebrowser/filebrowser/tar.gz/v${PKG_VERSION}? -PKG_HASH:=83807c5330343a4f1201e0e061725769628d87b9a5bdd9486967a8f880ce6571 +PKG_HASH:=4c8df679613b10364dc6440bb7d63a06c2569d60a224de0e9fa3aeb0ea2b6642 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua index 845d1e96a5..26867b1a0f 100644 --- a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua +++ b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua @@ -95,18 +95,12 @@ o = s:option(MultiValue, "autoswitch_backup_node", translate("List of backup nod o:depends("enable_autoswitch", true) o.widget = "checkbox" o.template = appname .. "/cbi/nodes_multiselect" -local keylist = {} -local vallist = {} -local grouplist = {} +o.group = {} for i, v in pairs(nodes_table) do - keylist[i] = v.id - vallist[i] = v.remark - grouplist[i] = v.group or "" + o:value(v.id, v.remark) + o.group[#o.group+1] = v.group or "" socks_node:value(v.id, v["remark"]) end -o.keylist = keylist -o.vallist = vallist -o.group = grouplist -- 读取旧 DynamicList function o.cfgvalue(self, section) local val = m.uci:get_list(appname, section, "autoswitch_backup_node") diff --git a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua index 50bb8cda81..d3a707e1d2 100644 --- a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua +++ b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua @@ -103,17 +103,11 @@ o = s:option(MultiValue, _n("balancing_node"), translate("Load balancing node li o:depends({ [_n("protocol")] = "_balancing" }) o.widget = "checkbox" o.template = appname .. "/cbi/nodes_multiselect" -local keylist = {} -local vallist = {} -local grouplist = {} -for i, v in ipairs(nodes_table) do - keylist[i] = v.id - vallist[i] = v.remark - grouplist[i] = v.group or "" +o.group = {} +for i, v in pairs(nodes_table) do + o:value(v.id, v.remark) + o.group[#o.group+1] = v.group or "" end -o.keylist = keylist -o.vallist = vallist -o.group = grouplist -- 读取旧 DynamicList function o.cfgvalue(self, section) local val = m.uci:get_list(appname, section, "balancing_node") diff --git a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua index 5550465cd4..5e27be824c 100644 --- a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua +++ b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua @@ -110,17 +110,11 @@ o = s:option(MultiValue, _n("urltest_node"), translate("URLTest node list"), tra o:depends({ [_n("protocol")] = "_urltest" }) o.widget = "checkbox" o.template = appname .. "/cbi/nodes_multiselect" -local keylist = {} -local vallist = {} -local grouplist = {} -for i, v in ipairs(nodes_table) do - keylist[i] = v.id - vallist[i] = v.remark - grouplist[i] = v.group or "" +o.group = {} +for i, v in pairs(nodes_table) do + o:value(v.id, v.remark) + o.group[#o.group+1] = v.group or "" end -o.keylist = keylist -o.vallist = vallist -o.group = grouplist -- 读取旧 DynamicList function o.cfgvalue(self, section) local val = m.uci:get_list(appname, section, "urltest_node") diff --git a/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/cbi/nodes_multiselect.htm b/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/cbi/nodes_multiselect.htm index c078437b62..3f758c712f 100644 --- a/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/cbi/nodes_multiselect.htm +++ b/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/cbi/nodes_multiselect.htm @@ -1,6 +1,5 @@ <%+cbi/valueheader%> <% -local api = require "luci.passwall.api" local cbid = "cbid." .. self.config .. "." .. section .. "." .. self.option -- 读取 MultiValue @@ -32,7 +31,7 @@ local group_order = {} for _, item in ipairs(values) do local g = item.group if not g or g == "" then - g = api.i18n.translate("default") + g = translate("default") end if not groups[g] then groups[g] = {} @@ -42,6 +41,30 @@ for _, item in ipairs(values) do end %> + +
- ▼ - <%=gname%> + + <%=gname%> (0/<%=#items%>) @@ -116,10 +139,10 @@ end if (isSearching) { if (ul.style.display === "none") { ul.style.display = ""; - if (arrow) arrow.textContent = "▼"; + if (arrow) arrow.className = "lv-arrow-down-small"; } else { ul.style.display = "none"; - if (arrow) arrow.textContent = "►"; + if (arrow) arrow.className = "lv-arrow-right"; } return; } @@ -131,17 +154,17 @@ end const garrow = document.getElementById("arrow-" + opt + "-" + gname); if (gname !== g) { if (gul) gul.style.display = "none"; - if (garrow) garrow.textContent = "►"; + if (garrow) arrow.className = "lv-arrow-right"; } }); document.getElementById(listId).parentNode.scrollTop = 0; // 切换当前组 if (ul.style.display === "none") { ul.style.display = ""; - if (arrow) arrow.textContent = "▼"; + if (arrow) arrow.className = "lv-arrow-down-small"; } else { ul.style.display = "none"; - if (arrow) arrow.textContent = "►"; + if (arrow) arrow.className = "lv-arrow-right"; } }; @@ -175,7 +198,7 @@ end group.style.display = ""; if (keyword) { ul.style.display = ""; - arrow.textContent = "▼"; + arrow.className = "lv-arrow-down-small"; } } }); @@ -190,7 +213,7 @@ end const ul = document.getElementById("group-" + opt + "-" + gname); const arrow = document.getElementById("arrow-" + opt + "-" + gname); if (ul) ul.style.display = "none"; - if (arrow) arrow.textContent = "►"; + if (arrow) arrow.className = "lv-arrow-right"; }); } }; @@ -243,7 +266,7 @@ end const ul = document.getElementById("group-" + opt + "-" + gname); const arrow = document.getElementById("arrow-" + opt + "-" + gname); if (ul) ul.style.display = "none"; - if (arrow) arrow.textContent = "►"; + if (arrow) arrow.className = "lv-arrow-right"; }); updateCount(); diff --git a/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm b/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm index 63863ee27e..7c5b03793b 100644 --- a/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm +++ b/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm @@ -321,7 +321,7 @@ local api = require "luci.passwall.api" - +
diff --git a/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm b/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm index 707452e8a0..84a04810e5 100644 --- a/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm +++ b/openwrt-passwall/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm @@ -160,11 +160,6 @@ table td, .table .td { background-color: rgba(131, 191, 255, 0.7) !important; box-shadow: 0 4px 6px rgba(0,0,0,0.1); } - -/* hide save button */ -.cbi-page-actions { - display: none !important; -} <% if api.is_js_luci() then -%> diff --git a/shadowsocks-rust/Cargo.lock b/shadowsocks-rust/Cargo.lock index f6216b773c..e5c66a2d3c 100644 --- a/shadowsocks-rust/Cargo.lock +++ b/shadowsocks-rust/Cargo.lock @@ -140,7 +140,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -151,7 +151,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -820,7 +820,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -927,7 +927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1764,6 +1764,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json5" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfcd7c9a7e6d6270614c3c7ccec2ec6fb0bf7f6da3384042e80e737cde1f941" +dependencies = [ + "serde", + "ucd-trie", +] + [[package]] name = "kqueue" version = "1.1.1" @@ -2003,9 +2013,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "log", @@ -2106,7 +2116,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2259,49 +2269,6 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" -[[package]] -name = "pest" -version = "2.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4" -dependencies = [ - "memchr", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.110", -] - -[[package]] -name = "pest_meta" -version = "2.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a" -dependencies = [ - "pest", - "sha2", -] - [[package]] name = "pin-project" version = "1.1.10" @@ -2780,7 +2747,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2993,17 +2960,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_json5" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34d03f54462862f2a42918391c9526337f53171eaa4d8894562be7f252edd3" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3040,17 +2996,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "shadowsocks" version = "1.23.2" @@ -3133,6 +3078,7 @@ dependencies = [ "futures", "ipnet", "jemallocator", + "json5", "libc", "log", "log4rs", @@ -3143,7 +3089,6 @@ dependencies = [ "rpassword", "rpmalloc", "serde", - "serde_json5", "shadowsocks-service", "snmalloc-rs", "sysexits", @@ -3182,6 +3127,7 @@ dependencies = [ "idna", "ipnet", "iprange", + "json5", "libc", "log", "lru_time_cache", @@ -3195,7 +3141,6 @@ dependencies = [ "rustls-native-certs", "serde", "serde_json", - "serde_json5", "shadowsocks", "smoltcp", "socket2 0.6.1", @@ -3487,7 +3432,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4115,7 +4060,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/shadowsocks-rust/Cargo.toml b/shadowsocks-rust/Cargo.toml index 8514b05345..767c6ca64c 100644 --- a/shadowsocks-rust/Cargo.toml +++ b/shadowsocks-rust/Cargo.toml @@ -219,7 +219,7 @@ tracing-appender = { version = "0.2.3", optional = true, default-features = fals time = { version = "0.3", optional = true } serde = { version = "1.0", features = ["derive"] } -serde_json5 = "0.2" +json5 = "1.2" thiserror = "2.0" base64 = "0.22" diff --git a/shadowsocks-rust/crates/shadowsocks-service/Cargo.toml b/shadowsocks-rust/crates/shadowsocks-service/Cargo.toml index 3a5193d08d..bb243eafc5 100644 --- a/shadowsocks-rust/crates/shadowsocks-service/Cargo.toml +++ b/shadowsocks-rust/crates/shadowsocks-service/Cargo.toml @@ -195,7 +195,7 @@ smoltcp = { version = "0.12", optional = true, default-features = false, feature ] } serde = { version = "1.0", features = ["derive"] } -serde_json5 = "0.2" +json5 = "1.2" serde_json = "1.0" bson = { version = "3.0.0", features = ["serde"], optional = true } diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/config.rs b/shadowsocks-rust/crates/shadowsocks-service/src/config.rs index 74ad2b824e..1ca2819c36 100644 --- a/shadowsocks-rust/crates/shadowsocks-service/src/config.rs +++ b/shadowsocks-rust/crates/shadowsocks-service/src/config.rs @@ -1457,7 +1457,7 @@ macro_rules! impl_from { } impl_from!(::std::io::Error, ErrorKind::IoError, "error while reading file"); -impl_from!(serde_json5::Error, ErrorKind::JsonParsingError, "json parse error"); +impl_from!(json5::Error, ErrorKind::JsonParsingError, "json parse error"); impl_from!(serde_json::Error, ErrorKind::JsonParsingError, "json parse error"); impl Debug for Error { @@ -2565,7 +2565,7 @@ impl Config { /// Load Config from a `str` pub fn load_from_str(s: &str, config_type: ConfigType) -> Result { - let c = serde_json5::from_str::(s)?; + let c = json5::from_str::(s)?; Self::load_from_ssconfig(c, config_type) } @@ -3185,7 +3185,7 @@ impl fmt::Display for Config { }); } - write!(f, "{}", serde_json5::to_string(&jconf).unwrap()) + write!(f, "{}", json5::to_string(&jconf).unwrap()) } } diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/socks/config.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/socks/config.rs index c2dd16dc2d..5378fac980 100644 --- a/shadowsocks-rust/crates/shadowsocks-service/src/local/socks/config.rs +++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/socks/config.rs @@ -66,7 +66,7 @@ impl Socks5AuthConfig { let mut content = String::new(); reader.read_to_string(&mut content)?; - let jconf: SSSocks5AuthConfig = match serde_json5::from_str(&content) { + let jconf: SSSocks5AuthConfig = match json5::from_str(&content) { Ok(c) => c, Err(err) => return Err(io::Error::other(err)), }; diff --git a/shadowsocks-rust/src/config.rs b/shadowsocks-rust/src/config.rs index 4c423275d1..dacfeb3dc2 100644 --- a/shadowsocks-rust/src/config.rs +++ b/shadowsocks-rust/src/config.rs @@ -88,7 +88,7 @@ pub enum ConfigError { IoError(#[from] io::Error), /// JSON parsing error #[error("{0}")] - JsonError(#[from] serde_json5::Error), + JsonError(#[from] json5::Error), /// Invalid value #[error("Invalid value: {0}")] InvalidValue(String), @@ -120,7 +120,7 @@ impl Config { /// Load `Config` from string pub fn load_from_str(s: &str) -> Result { - serde_json5::from_str(s).map_err(ConfigError::from) + json5::from_str(s).map_err(ConfigError::from) } /// Set by command line options diff --git a/sing-box/adapter/network.go b/sing-box/adapter/network.go index 1b26bed680..dd53b2b49c 100644 --- a/sing-box/adapter/network.go +++ b/sing-box/adapter/network.go @@ -10,6 +10,7 @@ import ( type NetworkManager interface { Lifecycle + Initialize(ruleSets []RuleSet) InterfaceFinder() control.InterfaceFinder UpdateInterfaces() error DefaultNetworkInterface() *NetworkInterface @@ -24,9 +25,10 @@ type NetworkManager interface { NetworkMonitor() tun.NetworkUpdateMonitor InterfaceMonitor() tun.DefaultInterfaceMonitor PackageManager() tun.PackageManager + NeedWIFIState() bool WIFIState() WIFIState - ResetNetwork() UpdateWIFIState() + ResetNetwork() } type NetworkOptions struct { diff --git a/sing-box/adapter/router.go b/sing-box/adapter/router.go index 522a0d9d31..3cece2ee0b 100644 --- a/sing-box/adapter/router.go +++ b/sing-box/adapter/router.go @@ -24,7 +24,6 @@ type Router interface { PreMatch(metadata InboundContext, context tun.DirectRouteContext, timeout time.Duration) (tun.DirectRouteDestination, error) ConnectionRouterEx RuleSet(tag string) (RuleSet, bool) - NeedWIFIState() bool Rules() []Rule AppendTracker(tracker ConnectionTracker) ResetNetwork() diff --git a/sing-box/box.go b/sing-box/box.go index d43a3c9579..a84437efa4 100644 --- a/sing-box/box.go +++ b/sing-box/box.go @@ -184,7 +184,7 @@ func New(options Options) (*Box, error) { service.MustRegister[adapter.ServiceManager](ctx, serviceManager) dnsRouter := dns.NewRouter(ctx, logFactory, dnsOptions) service.MustRegister[adapter.DNSRouter](ctx, dnsRouter) - networkManager, err := route.NewNetworkManager(ctx, logFactory.NewLogger("network"), routeOptions) + networkManager, err := route.NewNetworkManager(ctx, logFactory.NewLogger("network"), routeOptions, dnsOptions) if err != nil { return nil, E.Cause(err, "initialize network manager") } diff --git a/sing-box/common/dialer/default.go b/sing-box/common/dialer/default.go index 6373f2d177..23754e0a31 100644 --- a/sing-box/common/dialer/default.go +++ b/sing-box/common/dialer/default.go @@ -143,7 +143,7 @@ func NewDefault(ctx context.Context, options option.DialerOptions) (*DefaultDial } else { dialer.Timeout = C.TCPConnectTimeout } - if options.TCPKeepAlive >= 0 { + if !options.DisableTCPKeepAlive { keepIdle := time.Duration(options.TCPKeepAlive) if keepIdle == 0 { keepIdle = C.TCPKeepAliveInitial diff --git a/sing-box/common/listener/listener_tcp.go b/sing-box/common/listener/listener_tcp.go index e63d643c88..2164ff8e18 100644 --- a/sing-box/common/listener/listener_tcp.go +++ b/sing-box/common/listener/listener_tcp.go @@ -37,7 +37,7 @@ func (l *Listener) ListenTCP() (net.Listener, error) { if l.listenOptions.ReuseAddr { listenConfig.Control = control.Append(listenConfig.Control, control.ReuseAddr()) } - if l.listenOptions.TCPKeepAlive >= 0 { + if !l.listenOptions.DisableTCPKeepAlive { keepIdle := time.Duration(l.listenOptions.TCPKeepAlive) if keepIdle == 0 { keepIdle = C.TCPKeepAliveInitial diff --git a/sing-box/common/settings/wifi.go b/sing-box/common/settings/wifi.go new file mode 100644 index 0000000000..62bef706ba --- /dev/null +++ b/sing-box/common/settings/wifi.go @@ -0,0 +1,9 @@ +package settings + +import "github.com/sagernet/sing-box/adapter" + +type WIFIMonitor interface { + ReadWIFIState() adapter.WIFIState + Start() error + Close() error +} diff --git a/sing-box/common/settings/wifi_linux.go b/sing-box/common/settings/wifi_linux.go new file mode 100644 index 0000000000..9deed3c800 --- /dev/null +++ b/sing-box/common/settings/wifi_linux.go @@ -0,0 +1,46 @@ +package settings + +import ( + "github.com/sagernet/sing-box/adapter" + E "github.com/sagernet/sing/common/exceptions" +) + +type LinuxWIFIMonitor struct { + monitor WIFIMonitor +} + +func NewWIFIMonitor(callback func(adapter.WIFIState)) (WIFIMonitor, error) { + monitors := []func(func(adapter.WIFIState)) (WIFIMonitor, error){ + newNetworkManagerMonitor, + newIWDMonitor, + newWpaSupplicantMonitor, + newConnManMonitor, + } + var errors []error + for _, factory := range monitors { + monitor, err := factory(callback) + if err == nil { + return &LinuxWIFIMonitor{monitor: monitor}, nil + } + errors = append(errors, err) + } + return nil, E.Cause(E.Errors(errors...), "no supported WIFI manager found") +} + +func (m *LinuxWIFIMonitor) ReadWIFIState() adapter.WIFIState { + return m.monitor.ReadWIFIState() +} + +func (m *LinuxWIFIMonitor) Start() error { + if m.monitor != nil { + return m.monitor.Start() + } + return nil +} + +func (m *LinuxWIFIMonitor) Close() error { + if m.monitor != nil { + return m.monitor.Close() + } + return nil +} diff --git a/sing-box/common/settings/wifi_linux_connman.go b/sing-box/common/settings/wifi_linux_connman.go new file mode 100644 index 0000000000..130636bc6e --- /dev/null +++ b/sing-box/common/settings/wifi_linux_connman.go @@ -0,0 +1,166 @@ +package settings + +import ( + "context" + "strings" + "time" + + "github.com/sagernet/sing-box/adapter" + + "github.com/godbus/dbus/v5" +) + +type connmanMonitor struct { + conn *dbus.Conn + callback func(adapter.WIFIState) + cancel context.CancelFunc + signalChan chan *dbus.Signal +} + +func newConnManMonitor(callback func(adapter.WIFIState)) (WIFIMonitor, error) { + conn, err := dbus.ConnectSystemBus() + if err != nil { + return nil, err + } + cmObj := conn.Object("net.connman", "/") + ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) + defer cancel() + call := cmObj.CallWithContext(ctx, "net.connman.Manager.GetServices", 0) + if call.Err != nil { + conn.Close() + return nil, call.Err + } + return &connmanMonitor{conn: conn, callback: callback}, nil +} + +func (m *connmanMonitor) ReadWIFIState() adapter.WIFIState { + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + defer cancel() + + cmObj := m.conn.Object("net.connman", "/") + var services []interface{} + err := cmObj.CallWithContext(ctx, "net.connman.Manager.GetServices", 0).Store(&services) + if err != nil { + return adapter.WIFIState{} + } + + for _, service := range services { + servicePair, ok := service.([]interface{}) + if !ok || len(servicePair) != 2 { + continue + } + + serviceProps, ok := servicePair[1].(map[string]dbus.Variant) + if !ok { + continue + } + + typeVariant, hasType := serviceProps["Type"] + if !hasType { + continue + } + serviceType, ok := typeVariant.Value().(string) + if !ok || serviceType != "wifi" { + continue + } + + stateVariant, hasState := serviceProps["State"] + if !hasState { + continue + } + state, ok := stateVariant.Value().(string) + if !ok || (state != "online" && state != "ready") { + continue + } + + nameVariant, hasName := serviceProps["Name"] + if !hasName { + continue + } + ssid, ok := nameVariant.Value().(string) + if !ok || ssid == "" { + continue + } + + bssidVariant, hasBSSID := serviceProps["BSSID"] + if !hasBSSID { + return adapter.WIFIState{SSID: ssid} + } + bssid, ok := bssidVariant.Value().(string) + if !ok { + return adapter.WIFIState{SSID: ssid} + } + + return adapter.WIFIState{ + SSID: ssid, + BSSID: strings.ToUpper(strings.ReplaceAll(bssid, ":", "")), + } + } + + return adapter.WIFIState{} +} + +func (m *connmanMonitor) Start() error { + if m.callback == nil { + return nil + } + ctx, cancel := context.WithCancel(context.Background()) + m.cancel = cancel + + m.signalChan = make(chan *dbus.Signal, 10) + m.conn.Signal(m.signalChan) + + err := m.conn.AddMatchSignal( + dbus.WithMatchInterface("net.connman.Service"), + dbus.WithMatchSender("net.connman"), + ) + if err != nil { + return err + } + + state := m.ReadWIFIState() + go m.monitorSignals(ctx, m.signalChan, state) + m.callback(state) + + return nil +} + +func (m *connmanMonitor) monitorSignals(ctx context.Context, signalChan chan *dbus.Signal, lastState adapter.WIFIState) { + for { + select { + case <-ctx.Done(): + return + case signal, ok := <-signalChan: + if !ok { + return + } + // godbus Signal.Name uses "interface.member" format (e.g. "net.connman.Service.PropertyChanged"), + // not just the member name. This differs from the D-Bus signal member in the match rule. + if signal.Name == "net.connman.Service.PropertyChanged" { + state := m.ReadWIFIState() + if state != lastState { + lastState = state + m.callback(state) + } + } + } + } +} + +func (m *connmanMonitor) Close() error { + if m.cancel != nil { + m.cancel() + } + if m.signalChan != nil { + m.conn.RemoveSignal(m.signalChan) + close(m.signalChan) + } + if m.conn != nil { + m.conn.RemoveMatchSignal( + dbus.WithMatchInterface("net.connman.Service"), + dbus.WithMatchSender("net.connman"), + ) + return m.conn.Close() + } + return nil +} diff --git a/sing-box/common/settings/wifi_linux_iwd.go b/sing-box/common/settings/wifi_linux_iwd.go new file mode 100644 index 0000000000..22dfe7203a --- /dev/null +++ b/sing-box/common/settings/wifi_linux_iwd.go @@ -0,0 +1,188 @@ +package settings + +import ( + "context" + "strings" + "time" + + "github.com/sagernet/sing-box/adapter" + + "github.com/godbus/dbus/v5" +) + +type iwdMonitor struct { + conn *dbus.Conn + callback func(adapter.WIFIState) + cancel context.CancelFunc + signalChan chan *dbus.Signal +} + +func newIWDMonitor(callback func(adapter.WIFIState)) (WIFIMonitor, error) { + conn, err := dbus.ConnectSystemBus() + if err != nil { + return nil, err + } + iwdObj := conn.Object("net.connman.iwd", "/") + ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) + defer cancel() + call := iwdObj.CallWithContext(ctx, "org.freedesktop.DBus.ObjectManager.GetManagedObjects", 0) + if call.Err != nil { + conn.Close() + return nil, call.Err + } + return &iwdMonitor{conn: conn, callback: callback}, nil +} + +func (m *iwdMonitor) ReadWIFIState() adapter.WIFIState { + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + defer cancel() + + iwdObj := m.conn.Object("net.connman.iwd", "/") + var objects map[dbus.ObjectPath]map[string]map[string]dbus.Variant + err := iwdObj.CallWithContext(ctx, "org.freedesktop.DBus.ObjectManager.GetManagedObjects", 0).Store(&objects) + if err != nil { + return adapter.WIFIState{} + } + + for _, interfaces := range objects { + stationProps, hasStation := interfaces["net.connman.iwd.Station"] + if !hasStation { + continue + } + + stateVariant, hasState := stationProps["State"] + if !hasState { + continue + } + state, ok := stateVariant.Value().(string) + if !ok || state != "connected" { + continue + } + + connectedNetworkVariant, hasNetwork := stationProps["ConnectedNetwork"] + if !hasNetwork { + continue + } + networkPath, ok := connectedNetworkVariant.Value().(dbus.ObjectPath) + if !ok || networkPath == "/" { + continue + } + + networkInterfaces, hasNetworkPath := objects[networkPath] + if !hasNetworkPath { + continue + } + + networkProps, hasNetworkInterface := networkInterfaces["net.connman.iwd.Network"] + if !hasNetworkInterface { + continue + } + + nameVariant, hasName := networkProps["Name"] + if !hasName { + continue + } + ssid, ok := nameVariant.Value().(string) + if !ok { + continue + } + + connectedBSSVariant, hasBSS := stationProps["ConnectedAccessPoint"] + if !hasBSS { + return adapter.WIFIState{SSID: ssid} + } + bssPath, ok := connectedBSSVariant.Value().(dbus.ObjectPath) + if !ok || bssPath == "/" { + return adapter.WIFIState{SSID: ssid} + } + + bssInterfaces, hasBSSPath := objects[bssPath] + if !hasBSSPath { + return adapter.WIFIState{SSID: ssid} + } + + bssProps, hasBSSInterface := bssInterfaces["net.connman.iwd.BasicServiceSet"] + if !hasBSSInterface { + return adapter.WIFIState{SSID: ssid} + } + + addressVariant, hasAddress := bssProps["Address"] + if !hasAddress { + return adapter.WIFIState{SSID: ssid} + } + bssid, ok := addressVariant.Value().(string) + if !ok { + return adapter.WIFIState{SSID: ssid} + } + + return adapter.WIFIState{ + SSID: ssid, + BSSID: strings.ToUpper(strings.ReplaceAll(bssid, ":", "")), + } + } + + return adapter.WIFIState{} +} + +func (m *iwdMonitor) Start() error { + if m.callback == nil { + return nil + } + ctx, cancel := context.WithCancel(context.Background()) + m.cancel = cancel + + m.signalChan = make(chan *dbus.Signal, 10) + m.conn.Signal(m.signalChan) + + err := m.conn.AddMatchSignal( + dbus.WithMatchInterface("org.freedesktop.DBus.Properties"), + dbus.WithMatchSender("net.connman.iwd"), + ) + if err != nil { + return err + } + + state := m.ReadWIFIState() + go m.monitorSignals(ctx, m.signalChan, state) + m.callback(state) + + return nil +} + +func (m *iwdMonitor) monitorSignals(ctx context.Context, signalChan chan *dbus.Signal, lastState adapter.WIFIState) { + for { + select { + case <-ctx.Done(): + return + case signal, ok := <-signalChan: + if !ok { + return + } + if signal.Name == "org.freedesktop.DBus.Properties.PropertiesChanged" { + state := m.ReadWIFIState() + if state != lastState { + lastState = state + m.callback(state) + } + } + } + } +} + +func (m *iwdMonitor) Close() error { + if m.cancel != nil { + m.cancel() + } + if m.signalChan != nil { + m.conn.RemoveSignal(m.signalChan) + close(m.signalChan) + } + if m.conn != nil { + m.conn.RemoveMatchSignal( + dbus.WithMatchInterface("org.freedesktop.DBus.Properties"), + dbus.WithMatchSender("net.connman.iwd"), + ) + return m.conn.Close() + } + return nil +} diff --git a/sing-box/common/settings/wifi_linux_nm.go b/sing-box/common/settings/wifi_linux_nm.go new file mode 100644 index 0000000000..4288d21017 --- /dev/null +++ b/sing-box/common/settings/wifi_linux_nm.go @@ -0,0 +1,163 @@ +package settings + +import ( + "context" + "strings" + "time" + + "github.com/sagernet/sing-box/adapter" + + "github.com/godbus/dbus/v5" +) + +type networkManagerMonitor struct { + conn *dbus.Conn + callback func(adapter.WIFIState) + cancel context.CancelFunc + signalChan chan *dbus.Signal +} + +func newNetworkManagerMonitor(callback func(adapter.WIFIState)) (WIFIMonitor, error) { + conn, err := dbus.ConnectSystemBus() + if err != nil { + return nil, err + } + nmObj := conn.Object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager") + ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) + defer cancel() + var state uint32 + err = nmObj.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager", "State").Store(&state) + if err != nil { + conn.Close() + return nil, err + } + return &networkManagerMonitor{conn: conn, callback: callback}, nil +} + +func (m *networkManagerMonitor) ReadWIFIState() adapter.WIFIState { + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + defer cancel() + + nmObj := m.conn.Object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager") + + var activeConnectionPaths []dbus.ObjectPath + err := nmObj.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager", "ActiveConnections").Store(&activeConnectionPaths) + if err != nil || len(activeConnectionPaths) == 0 { + return adapter.WIFIState{} + } + + for _, connectionPath := range activeConnectionPaths { + connObj := m.conn.Object("org.freedesktop.NetworkManager", connectionPath) + + var devicePaths []dbus.ObjectPath + err = connObj.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager.Connection.Active", "Devices").Store(&devicePaths) + if err != nil || len(devicePaths) == 0 { + continue + } + + for _, devicePath := range devicePaths { + deviceObj := m.conn.Object("org.freedesktop.NetworkManager", devicePath) + + var deviceType uint32 + err = deviceObj.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager.Device", "DeviceType").Store(&deviceType) + if err != nil || deviceType != 2 { + continue + } + + var accessPointPath dbus.ObjectPath + err = deviceObj.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager.Device.Wireless", "ActiveAccessPoint").Store(&accessPointPath) + if err != nil || accessPointPath == "/" { + continue + } + + apObj := m.conn.Object("org.freedesktop.NetworkManager", accessPointPath) + + var ssidBytes []byte + err = apObj.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager.AccessPoint", "Ssid").Store(&ssidBytes) + if err != nil { + continue + } + + var hwAddress string + err = apObj.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager.AccessPoint", "HwAddress").Store(&hwAddress) + if err != nil { + continue + } + + ssid := strings.TrimSpace(string(ssidBytes)) + if ssid == "" { + continue + } + + return adapter.WIFIState{ + SSID: ssid, + BSSID: strings.ToUpper(strings.ReplaceAll(hwAddress, ":", "")), + } + } + } + + return adapter.WIFIState{} +} + +func (m *networkManagerMonitor) Start() error { + if m.callback == nil { + return nil + } + ctx, cancel := context.WithCancel(context.Background()) + m.cancel = cancel + + m.signalChan = make(chan *dbus.Signal, 10) + m.conn.Signal(m.signalChan) + + err := m.conn.AddMatchSignal( + dbus.WithMatchSender("org.freedesktop.NetworkManager"), + dbus.WithMatchInterface("org.freedesktop.DBus.Properties"), + ) + if err != nil { + return err + } + + state := m.ReadWIFIState() + go m.monitorSignals(ctx, m.signalChan, state) + m.callback(state) + + return nil +} + +func (m *networkManagerMonitor) monitorSignals(ctx context.Context, signalChan chan *dbus.Signal, lastState adapter.WIFIState) { + for { + select { + case <-ctx.Done(): + return + case signal, ok := <-signalChan: + if !ok { + return + } + if signal.Name == "org.freedesktop.DBus.Properties.PropertiesChanged" { + state := m.ReadWIFIState() + if state != lastState { + lastState = state + m.callback(state) + } + } + } + } +} + +func (m *networkManagerMonitor) Close() error { + if m.cancel != nil { + m.cancel() + } + if m.signalChan != nil { + m.conn.RemoveSignal(m.signalChan) + close(m.signalChan) + } + if m.conn != nil { + m.conn.RemoveMatchSignal( + dbus.WithMatchSender("org.freedesktop.NetworkManager"), + dbus.WithMatchInterface("org.freedesktop.DBus.Properties"), + ) + return m.conn.Close() + } + return nil +} diff --git a/sing-box/common/settings/wifi_linux_wpa.go b/sing-box/common/settings/wifi_linux_wpa.go new file mode 100644 index 0000000000..51e76c1c3e --- /dev/null +++ b/sing-box/common/settings/wifi_linux_wpa.go @@ -0,0 +1,225 @@ +package settings + +import ( + "bufio" + "context" + "fmt" + "net" + "os" + "path/filepath" + "strings" + "sync" + "sync/atomic" + "time" + + "github.com/sagernet/sing-box/adapter" +) + +var wpaSocketCounter atomic.Uint64 + +type wpaSupplicantMonitor struct { + socketPath string + callback func(adapter.WIFIState) + cancel context.CancelFunc + monitorConn *net.UnixConn + connMutex sync.Mutex +} + +func newWpaSupplicantMonitor(callback func(adapter.WIFIState)) (WIFIMonitor, error) { + socketDirs := []string{"/var/run/wpa_supplicant", "/run/wpa_supplicant"} + for _, socketDir := range socketDirs { + entries, err := os.ReadDir(socketDir) + if err != nil { + continue + } + for _, entry := range entries { + if entry.IsDir() || entry.Name() == "." || entry.Name() == ".." { + continue + } + socketPath := filepath.Join(socketDir, entry.Name()) + id := wpaSocketCounter.Add(1) + localAddr := &net.UnixAddr{Name: fmt.Sprintf("@sing-box-wpa-%d-%d", os.Getpid(), id), Net: "unixgram"} + remoteAddr := &net.UnixAddr{Name: socketPath, Net: "unixgram"} + conn, err := net.DialUnix("unixgram", localAddr, remoteAddr) + if err != nil { + continue + } + conn.Close() + return &wpaSupplicantMonitor{socketPath: socketPath, callback: callback}, nil + } + } + return nil, os.ErrNotExist +} + +func (m *wpaSupplicantMonitor) ReadWIFIState() adapter.WIFIState { + id := wpaSocketCounter.Add(1) + localAddr := &net.UnixAddr{Name: fmt.Sprintf("@sing-box-wpa-%d-%d", os.Getpid(), id), Net: "unixgram"} + remoteAddr := &net.UnixAddr{Name: m.socketPath, Net: "unixgram"} + conn, err := net.DialUnix("unixgram", localAddr, remoteAddr) + if err != nil { + return adapter.WIFIState{} + } + defer conn.Close() + + conn.SetDeadline(time.Now().Add(3 * time.Second)) + + status, err := m.sendCommand(conn, "STATUS") + if err != nil { + return adapter.WIFIState{} + } + + var ssid, bssid string + var connected bool + scanner := bufio.NewScanner(strings.NewReader(status)) + for scanner.Scan() { + line := scanner.Text() + if strings.HasPrefix(line, "wpa_state=") { + state := strings.TrimPrefix(line, "wpa_state=") + connected = state == "COMPLETED" + } else if strings.HasPrefix(line, "ssid=") { + ssid = strings.TrimPrefix(line, "ssid=") + } else if strings.HasPrefix(line, "bssid=") { + bssid = strings.TrimPrefix(line, "bssid=") + } + } + + if !connected || ssid == "" { + return adapter.WIFIState{} + } + + return adapter.WIFIState{ + SSID: ssid, + BSSID: strings.ToUpper(strings.ReplaceAll(bssid, ":", "")), + } +} + +// sendCommand sends a command to wpa_supplicant and returns the response. +// Commands are sent without trailing newlines per the wpa_supplicant control +// interface protocol - the official wpa_ctrl.c sends raw command strings. +func (m *wpaSupplicantMonitor) sendCommand(conn *net.UnixConn, command string) (string, error) { + _, err := conn.Write([]byte(command)) + if err != nil { + return "", err + } + + buf := make([]byte, 4096) + n, err := conn.Read(buf) + if err != nil { + return "", err + } + + response := string(buf[:n]) + if strings.HasPrefix(response, "FAIL") { + return "", os.ErrInvalid + } + + return strings.TrimSpace(response), nil +} + +func (m *wpaSupplicantMonitor) Start() error { + if m.callback == nil { + return nil + } + ctx, cancel := context.WithCancel(context.Background()) + m.cancel = cancel + + state := m.ReadWIFIState() + go m.monitorEvents(ctx, state) + m.callback(state) + + return nil +} + +func (m *wpaSupplicantMonitor) monitorEvents(ctx context.Context, lastState adapter.WIFIState) { + var consecutiveErrors int + var debounceTimer *time.Timer + var debounceMutex sync.Mutex + + localAddr := &net.UnixAddr{Name: fmt.Sprintf("@sing-box-wpa-mon-%d", os.Getpid()), Net: "unixgram"} + remoteAddr := &net.UnixAddr{Name: m.socketPath, Net: "unixgram"} + conn, err := net.DialUnix("unixgram", localAddr, remoteAddr) + if err != nil { + return + } + defer conn.Close() + + m.connMutex.Lock() + m.monitorConn = conn + m.connMutex.Unlock() + + // ATTACH/DETACH commands use os_strcmp() for exact matching in wpa_supplicant, + // so they must be sent without trailing newlines. + // See: https://w1.fi/cgit/hostap/tree/wpa_supplicant/ctrl_iface_unix.c + _, err = conn.Write([]byte("ATTACH")) + if err != nil { + return + } + + buf := make([]byte, 4096) + n, err := conn.Read(buf) + if err != nil || !strings.HasPrefix(string(buf[:n]), "OK") { + return + } + + for { + select { + case <-ctx.Done(): + debounceMutex.Lock() + if debounceTimer != nil { + debounceTimer.Stop() + } + debounceMutex.Unlock() + conn.Write([]byte("DETACH")) + return + default: + } + + conn.SetReadDeadline(time.Now().Add(30 * time.Second)) + n, err := conn.Read(buf) + if err != nil { + if netErr, ok := err.(net.Error); ok && netErr.Timeout() { + continue + } + select { + case <-ctx.Done(): + return + default: + } + consecutiveErrors++ + if consecutiveErrors > 10 { + return + } + time.Sleep(time.Second) + continue + } + consecutiveErrors = 0 + + msg := string(buf[:n]) + if strings.Contains(msg, "CTRL-EVENT-CONNECTED") || strings.Contains(msg, "CTRL-EVENT-DISCONNECTED") { + debounceMutex.Lock() + if debounceTimer != nil { + debounceTimer.Stop() + } + debounceTimer = time.AfterFunc(500*time.Millisecond, func() { + state := m.ReadWIFIState() + if state != lastState { + lastState = state + m.callback(state) + } + }) + debounceMutex.Unlock() + } + } +} + +func (m *wpaSupplicantMonitor) Close() error { + if m.cancel != nil { + m.cancel() + } + m.connMutex.Lock() + if m.monitorConn != nil { + m.monitorConn.Close() + } + m.connMutex.Unlock() + return nil +} diff --git a/sing-box/common/settings/wifi_stub.go b/sing-box/common/settings/wifi_stub.go new file mode 100644 index 0000000000..fd39af9e65 --- /dev/null +++ b/sing-box/common/settings/wifi_stub.go @@ -0,0 +1,27 @@ +//go:build !linux && !windows + +package settings + +import ( + "os" + + "github.com/sagernet/sing-box/adapter" +) + +type stubWIFIMonitor struct{} + +func NewWIFIMonitor(callback func(adapter.WIFIState)) (WIFIMonitor, error) { + return nil, os.ErrInvalid +} + +func (m *stubWIFIMonitor) ReadWIFIState() adapter.WIFIState { + return adapter.WIFIState{} +} + +func (m *stubWIFIMonitor) Start() error { + return nil +} + +func (m *stubWIFIMonitor) Close() error { + return nil +} diff --git a/sing-box/common/settings/wifi_windows.go b/sing-box/common/settings/wifi_windows.go new file mode 100644 index 0000000000..91b0d479c7 --- /dev/null +++ b/sing-box/common/settings/wifi_windows.go @@ -0,0 +1,144 @@ +//go:build windows + +package settings + +import ( + "context" + "fmt" + "strings" + "sync" + "syscall" + + "github.com/sagernet/sing-box/adapter" + "github.com/sagernet/sing/common/winwlanapi" + + "golang.org/x/sys/windows" +) + +type windowsWIFIMonitor struct { + handle windows.Handle + callback func(adapter.WIFIState) + cancel context.CancelFunc + lastState adapter.WIFIState + mutex sync.Mutex +} + +func NewWIFIMonitor(callback func(adapter.WIFIState)) (WIFIMonitor, error) { + handle, err := winwlanapi.OpenHandle() + if err != nil { + return nil, err + } + + interfaces, err := winwlanapi.EnumInterfaces(handle) + if err != nil { + winwlanapi.CloseHandle(handle) + return nil, err + } + if len(interfaces) == 0 { + winwlanapi.CloseHandle(handle) + return nil, fmt.Errorf("no wireless interfaces found") + } + + return &windowsWIFIMonitor{ + handle: handle, + callback: callback, + }, nil +} + +func (m *windowsWIFIMonitor) ReadWIFIState() adapter.WIFIState { + interfaces, err := winwlanapi.EnumInterfaces(m.handle) + if err != nil || len(interfaces) == 0 { + return adapter.WIFIState{} + } + + for _, iface := range interfaces { + if iface.InterfaceState != winwlanapi.InterfaceStateConnected { + continue + } + + guid := iface.InterfaceGUID + attrs, err := winwlanapi.QueryCurrentConnection(m.handle, &guid) + if err != nil { + continue + } + + ssidLength := attrs.AssociationAttributes.SSID.Length + if ssidLength == 0 || ssidLength > winwlanapi.Dot11SSIDMaxLength { + continue + } + + ssid := string(attrs.AssociationAttributes.SSID.SSID[:ssidLength]) + bssid := formatBSSID(attrs.AssociationAttributes.BSSID) + + return adapter.WIFIState{ + SSID: strings.TrimSpace(ssid), + BSSID: bssid, + } + } + + return adapter.WIFIState{} +} + +func formatBSSID(mac winwlanapi.Dot11MacAddress) string { + return fmt.Sprintf("%02X%02X%02X%02X%02X%02X", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]) +} + +func (m *windowsWIFIMonitor) Start() error { + if m.callback == nil { + return nil + } + + ctx, cancel := context.WithCancel(context.Background()) + m.cancel = cancel + + m.lastState = m.ReadWIFIState() + + callbackFunc := func(data *winwlanapi.NotificationData, callbackContext uintptr) uintptr { + if data.NotificationSource != winwlanapi.NotificationSourceACM { + return 0 + } + switch data.NotificationCode { + case winwlanapi.NotificationACMConnectionComplete, + winwlanapi.NotificationACMDisconnected: + m.checkAndNotify() + } + return 0 + } + + callbackPointer := syscall.NewCallback(callbackFunc) + + err := winwlanapi.RegisterNotification(m.handle, winwlanapi.NotificationSourceACM, callbackPointer, 0) + if err != nil { + cancel() + return err + } + + go func() { + <-ctx.Done() + }() + + m.callback(m.lastState) + return nil +} + +func (m *windowsWIFIMonitor) checkAndNotify() { + m.mutex.Lock() + defer m.mutex.Unlock() + + state := m.ReadWIFIState() + if state != m.lastState { + m.lastState = state + if m.callback != nil { + m.callback(state) + } + } +} + +func (m *windowsWIFIMonitor) Close() error { + if m.cancel != nil { + m.cancel() + } + winwlanapi.UnregisterNotification(m.handle) + return winwlanapi.CloseHandle(m.handle) +} diff --git a/sing-box/docs/changelog.md b/sing-box/docs/changelog.md index b65ba9fbfe..1bd5e3b6c9 100644 --- a/sing-box/docs/changelog.md +++ b/sing-box/docs/changelog.md @@ -5,7 +5,7 @@ icon: material/alert-decagram #### 1.13.0-alpha.28 * Update quic-go to v0.57.1 -* Add `tcp_keep_alive` and `tcp_keep_alive_interval` options for dial fields **1** +* Add `disable_tcp_keep_alive`, `tcp_keep_alive` and `tcp_keep_alive_interval` options for dial fields **1** * Update default TCP keep-alive initial period from 10 minutes to 5 minutes * Fixes and improvements diff --git a/sing-box/docs/configuration/dns/rule.md b/sing-box/docs/configuration/dns/rule.md index 524b70a2c2..6407e1bf60 100644 --- a/sing-box/docs/configuration/dns/rule.md +++ b/sing-box/docs/configuration/dns/rule.md @@ -412,7 +412,7 @@ Match default interface address. !!! quote "" - Only supported in graphical clients on Android and Apple platforms. + Only supported in graphical clients on Android and Apple platforms, or on Linux. Match WiFi SSID. @@ -420,7 +420,7 @@ Match WiFi SSID. !!! quote "" - Only supported in graphical clients on Android and Apple platforms. + Only supported in graphical clients on Android and Apple platforms, or on Linux. Match WiFi BSSID. diff --git a/sing-box/docs/configuration/dns/rule.zh.md b/sing-box/docs/configuration/dns/rule.zh.md index bc812c77df..588e0736a4 100644 --- a/sing-box/docs/configuration/dns/rule.zh.md +++ b/sing-box/docs/configuration/dns/rule.zh.md @@ -411,7 +411,7 @@ Available values: `wifi`, `cellular`, `ethernet` and `other`. !!! quote "" - 仅在 Android 与 Apple 平台图形客户端中支持。 + 仅在 Android 与 Apple 平台图形客户端和 Linux 中支持。 匹配 WiFi SSID。 @@ -419,7 +419,7 @@ Available values: `wifi`, `cellular`, `ethernet` and `other`. !!! quote "" - 仅在 Android 与 Apple 平台图形客户端中支持。 + 仅在 Android 与 Apple 平台图形客户端和 Linux 中支持。 匹配 WiFi BSSID。 diff --git a/sing-box/docs/configuration/route/rule.md b/sing-box/docs/configuration/route/rule.md index a6e89d7b64..6bbb00dee8 100644 --- a/sing-box/docs/configuration/route/rule.md +++ b/sing-box/docs/configuration/route/rule.md @@ -430,7 +430,7 @@ Match default interface address. !!! quote "" - Only supported in graphical clients on Android and Apple platforms. + Only supported in graphical clients on Android and Apple platforms, or on Linux. Match WiFi SSID. @@ -438,7 +438,7 @@ Match WiFi SSID. !!! quote "" - Only supported in graphical clients on Android and Apple platforms. + Only supported in graphical clients on Android and Apple platforms, or on Linux. Match WiFi BSSID. diff --git a/sing-box/docs/configuration/route/rule.zh.md b/sing-box/docs/configuration/route/rule.zh.md index a90607d48a..164bf40e50 100644 --- a/sing-box/docs/configuration/route/rule.zh.md +++ b/sing-box/docs/configuration/route/rule.zh.md @@ -427,7 +427,7 @@ icon: material/new-box !!! quote "" - 仅在 Android 与 Apple 平台图形客户端中支持。 + 仅在 Android 与 Apple 平台图形客户端和 Linux 中支持。 匹配 WiFi SSID。 @@ -435,7 +435,7 @@ icon: material/new-box !!! quote "" - 仅在 Android 与 Apple 平台图形客户端中支持。 + 仅在 Android 与 Apple 平台图形客户端和 Linux 中支持。 匹配 WiFi BSSID。 diff --git a/sing-box/docs/configuration/shared/dial.md b/sing-box/docs/configuration/shared/dial.md index 49922e60c0..cf775b6556 100644 --- a/sing-box/docs/configuration/shared/dial.md +++ b/sing-box/docs/configuration/shared/dial.md @@ -4,7 +4,8 @@ icon: material/new-box !!! quote "Changes in sing-box 1.13.0" - :material-plus: [tcp_keep_alive](#tcp_keep_alive) + :material-plus: [disable_tcp_keep_alive](#disable_tcp_keep_alive) + :material-plus: [tcp_keep_alive](#tcp_keep_alive) :material-plus: [tcp_keep_alive_interval](#tcp_keep_alive_interval) !!! quote "Changes in sing-box 1.12.0" @@ -34,6 +35,7 @@ icon: material/new-box "connect_timeout": "", "tcp_fast_open": false, "tcp_multi_path": false, + "disable_tcp_keep_alive": false, "tcp_keep_alive": "", "tcp_keep_alive_interval": "", "udp_fragment": false, @@ -119,6 +121,12 @@ Enable TCP Fast Open. Enable TCP Multi Path. +#### disable_tcp_keep_alive + +!!! question "Since sing-box 1.13.0" + +Disable TCP keep alive. + #### tcp_keep_alive !!! question "Since sing-box 1.13.0" diff --git a/sing-box/docs/configuration/shared/dial.zh.md b/sing-box/docs/configuration/shared/dial.zh.md index 1280897f5e..acd6221370 100644 --- a/sing-box/docs/configuration/shared/dial.zh.md +++ b/sing-box/docs/configuration/shared/dial.zh.md @@ -4,7 +4,8 @@ icon: material/new-box !!! quote "sing-box 1.13.0 中的更改" - :material-plus: [tcp_keep_alive](#tcp_keep_alive) + :material-plus: [disable_tcp_keep_alive](#disable_tcp_keep_alive) + :material-plus: [tcp_keep_alive](#tcp_keep_alive) :material-plus: [tcp_keep_alive_interval](#tcp_keep_alive_interval) !!! quote "sing-box 1.12.0 中的更改" @@ -34,6 +35,7 @@ icon: material/new-box "connect_timeout": "", "tcp_fast_open": false, "tcp_multi_path": false, + "disable_tcp_keep_alive": false, "tcp_keep_alive": "", "tcp_keep_alive_interval": "", "udp_fragment": false, @@ -117,6 +119,12 @@ icon: material/new-box 启用 TCP Multi Path。 +#### disable_tcp_keep_alive + +!!! question "自 sing-box 1.13.0 起" + +禁用 TCP keep alive。 + #### tcp_keep_alive !!! question "自 sing-box 1.13.0 起" diff --git a/sing-box/docs/configuration/shared/listen.md b/sing-box/docs/configuration/shared/listen.md index 5feb2bcc9b..38a3749cf6 100644 --- a/sing-box/docs/configuration/shared/listen.md +++ b/sing-box/docs/configuration/shared/listen.md @@ -4,6 +4,7 @@ icon: material/new-box !!! quote "Changes in sing-box 1.13.0" + :material-plus: [disable_tcp_keep_alive](#disable_tcp_keep_alive) :material-alert: [tcp_keep_alive](#tcp_keep_alive) !!! quote "Changes in sing-box 1.12.0" @@ -33,6 +34,7 @@ icon: material/new-box "netns": "", "tcp_fast_open": false, "tcp_multi_path": false, + "disable_tcp_keep_alive": false, "tcp_keep_alive": "", "tcp_keep_alive_interval": "", "udp_fragment": false, @@ -107,13 +109,19 @@ Enable TCP Fast Open. Enable TCP Multi Path. +#### disable_tcp_keep_alive + +!!! question "Since sing-box 1.13.0" + +Disable TCP keep alive. + #### tcp_keep_alive !!! question "Since sing-box 1.13.0" Default value changed from `10m` to `5m`. -TCP keep-alive initial period. +TCP keep alive initial period. `5m` will be used by default. diff --git a/sing-box/docs/configuration/shared/listen.zh.md b/sing-box/docs/configuration/shared/listen.zh.md index c99aeff5c4..8893f37b3e 100644 --- a/sing-box/docs/configuration/shared/listen.zh.md +++ b/sing-box/docs/configuration/shared/listen.zh.md @@ -4,6 +4,7 @@ icon: material/new-box !!! quote "sing-box 1.13.0 中的更改" + :material-plus: [disable_tcp_keep_alive](#disable_tcp_keep_alive) :material-alert: [tcp_keep_alive](#tcp_keep_alive) !!! quote "Changes in sing-box 1.12.0" @@ -33,6 +34,7 @@ icon: material/new-box "netns": "", "tcp_fast_open": false, "tcp_multi_path": false, + "disable_tcp_keep_alive": false, "tcp_keep_alive": "", "tcp_keep_alive_interval": "", "udp_fragment": false, @@ -107,13 +109,19 @@ icon: material/new-box 启用 TCP Multi Path。 +#### disable_tcp_keep_alive + +!!! question "自 sing-box 1.13.0 起" + +禁用 TCP keep alive。 + #### tcp_keep_alive !!! question "自 sing-box 1.13.0 起" 默认值从 `10m` 更改为 `5m`。 -TCP keep-alive 初始周期。 +TCP keep alive 初始周期。 默认使用 `5m`。 diff --git a/sing-box/experimental/libbox/config.go b/sing-box/experimental/libbox/config.go index 89c512229f..5df7d141b6 100644 --- a/sing-box/experimental/libbox/config.go +++ b/sing-box/experimental/libbox/config.go @@ -107,6 +107,10 @@ func (s *platformInterfaceStub) IncludeAllNetworks() bool { func (s *platformInterfaceStub) ClearDNSCache() { } +func (s *platformInterfaceStub) UsePlatformWIFIMonitor() bool { + return false +} + func (s *platformInterfaceStub) ReadWIFIState() adapter.WIFIState { return adapter.WIFIState{} } diff --git a/sing-box/experimental/libbox/platform/interface.go b/sing-box/experimental/libbox/platform/interface.go index 35b0830b4e..d5b6d3c7d7 100644 --- a/sing-box/experimental/libbox/platform/interface.go +++ b/sing-box/experimental/libbox/platform/interface.go @@ -18,6 +18,7 @@ type Interface interface { UnderNetworkExtension() bool IncludeAllNetworks() bool ClearDNSCache() + UsePlatformWIFIMonitor() bool ReadWIFIState() adapter.WIFIState SystemCertificates() []string process.Searcher diff --git a/sing-box/experimental/libbox/service.go b/sing-box/experimental/libbox/service.go index 8c94b389da..c272825f6b 100644 --- a/sing-box/experimental/libbox/service.go +++ b/sing-box/experimental/libbox/service.go @@ -111,7 +111,7 @@ func (s *BoxService) Close() error { } func (s *BoxService) NeedWIFIState() bool { - return s.instance.Router().NeedWIFIState() + return s.instance.Network().NeedWIFIState() } var ( @@ -224,6 +224,10 @@ func (w *platformInterfaceWrapper) ClearDNSCache() { w.iif.ClearDNSCache() } +func (w *platformInterfaceWrapper) UsePlatformWIFIMonitor() bool { + return true +} + func (w *platformInterfaceWrapper) ReadWIFIState() adapter.WIFIState { wifiState := w.iif.ReadWIFIState() if wifiState == nil { diff --git a/sing-box/go.mod b/sing-box/go.mod index eb6f0ca22c..ebbdf620e6 100644 --- a/sing-box/go.mod +++ b/sing-box/go.mod @@ -29,7 +29,7 @@ require ( github.com/sagernet/gomobile v0.1.8 github.com/sagernet/gvisor v0.0.0-20250811.0-sing-box-mod.1 github.com/sagernet/quic-go v0.57.1-sing-box-mod.1 - github.com/sagernet/sing v0.8.0-beta.6 + github.com/sagernet/sing v0.8.0-beta.6.0.20251207063731-56fd482ce1c6 github.com/sagernet/sing-mux v0.3.3 github.com/sagernet/sing-quic v0.6.0-beta.5 github.com/sagernet/sing-shadowsocks v0.2.8 diff --git a/sing-box/go.sum b/sing-box/go.sum index 1686e14784..10f0568460 100644 --- a/sing-box/go.sum +++ b/sing-box/go.sum @@ -139,8 +139,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus-community/pro-bing v0.4.0 h1:YMbv+i08gQz97OZZBwLyvmmQEEzyfyrrjEaAchdy3R4= github.com/prometheus-community/pro-bing v0.4.0/go.mod h1:b7wRYZtCcPmt4Sz319BykUU241rWLe1VFXyiyWK/dH4= -github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= -github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -162,17 +160,13 @@ github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZN github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM= github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I= github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8= -github.com/sagernet/quic-go v0.55.0-sing-box-mod.2 h1:I79gW4Xl5ciVARHfnp122lDAMhC0AwUCU765Q8Kxdfo= -github.com/sagernet/quic-go v0.55.0-sing-box-mod.2/go.mod h1:IE9naq7Kekj0rPAdWc0GLW1ENR7gAOQV9VRTDlKN8Bk= github.com/sagernet/quic-go v0.57.1-sing-box-mod.1 h1:6fhKbfA0b7L1CVekayV1g87uJFtMXFE0rFXR48SRrWI= github.com/sagernet/quic-go v0.57.1-sing-box-mod.1/go.mod h1:OqILvS182CyOol5zNNo6bguvOGgXzV459+chpRaUC+4= github.com/sagernet/sing v0.6.9/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= -github.com/sagernet/sing v0.8.0-beta.6 h1:GXv1j1xWHihx6ptyOXh0yp4jUqJoNjCqD8d+AI9rnLU= -github.com/sagernet/sing v0.8.0-beta.6/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= +github.com/sagernet/sing v0.8.0-beta.6.0.20251207063731-56fd482ce1c6 h1:EYaDzllFzNYnzQ9xH/ieSAXct4wQ8pD45kgNMo7RPZc= +github.com/sagernet/sing v0.8.0-beta.6.0.20251207063731-56fd482ce1c6/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= github.com/sagernet/sing-mux v0.3.3 h1:YFgt9plMWzH994BMZLmyKL37PdIVaIilwP0Jg+EcLfw= github.com/sagernet/sing-mux v0.3.3/go.mod h1:pht8iFY4c9Xltj7rhVd208npkNaeCxzyXCgulDPLUDA= -github.com/sagernet/sing-quic v0.6.0-beta.4 h1:2k/+Xrv/pjl7AYC7LD9tcB7y1lIgw04LjJjqTI8q5Xk= -github.com/sagernet/sing-quic v0.6.0-beta.4/go.mod h1:FNvKPADzMZprwm7UQCcCGPhYifpb5rxoCOntOupJU+8= github.com/sagernet/sing-quic v0.6.0-beta.5 h1:kZfRLmsPxAgl0usZUgomDurLn7ZZ26lJWIpGow9ZWR4= github.com/sagernet/sing-quic v0.6.0-beta.5/go.mod h1:9D9GANrK33NjWCe1VkU5L5+8MxU39WrduBSmHuHz8GA= github.com/sagernet/sing-shadowsocks v0.2.8 h1:PURj5PRoAkqeHh2ZW205RWzN9E9RtKCVCzByXruQWfE= diff --git a/sing-box/option/inbound.go b/sing-box/option/inbound.go index 64ded9b1c4..42930eccb9 100644 --- a/sing-box/option/inbound.go +++ b/sing-box/option/inbound.go @@ -65,6 +65,7 @@ type ListenOptions struct { RoutingMark FwMark `json:"routing_mark,omitempty"` ReuseAddr bool `json:"reuse_addr,omitempty"` NetNs string `json:"netns,omitempty"` + DisableTCPKeepAlive bool `json:"disable_tcp_keep_alive,omitempty"` TCPKeepAlive badoption.Duration `json:"tcp_keep_alive,omitempty"` TCPKeepAliveInterval badoption.Duration `json:"tcp_keep_alive_interval,omitempty"` TCPFastOpen bool `json:"tcp_fast_open,omitempty"` diff --git a/sing-box/option/outbound.go b/sing-box/option/outbound.go index 3f0651e8a0..b5c52fa2d4 100644 --- a/sing-box/option/outbound.go +++ b/sing-box/option/outbound.go @@ -76,6 +76,7 @@ type DialerOptions struct { ConnectTimeout badoption.Duration `json:"connect_timeout,omitempty"` TCPFastOpen bool `json:"tcp_fast_open,omitempty"` TCPMultiPath bool `json:"tcp_multi_path,omitempty"` + DisableTCPKeepAlive bool `json:"disable_tcp_keep_alive,omitempty"` TCPKeepAlive badoption.Duration `json:"tcp_keep_alive,omitempty"` TCPKeepAliveInterval badoption.Duration `json:"tcp_keep_alive_interval,omitempty"` UDPFragment *bool `json:"udp_fragment,omitempty"` diff --git a/sing-box/route/network.go b/sing-box/route/network.go index 5009ec0b44..52d74c8cfb 100644 --- a/sing-box/route/network.go +++ b/sing-box/route/network.go @@ -8,11 +8,13 @@ import ( "os" "runtime" "strings" + "sync" "syscall" "time" "github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/common/conntrack" + "github.com/sagernet/sing-box/common/settings" "github.com/sagernet/sing-box/common/taskmonitor" C "github.com/sagernet/sing-box/constant" "github.com/sagernet/sing-box/experimental/libbox/platform" @@ -50,11 +52,14 @@ type NetworkManager struct { endpoint adapter.EndpointManager inbound adapter.InboundManager outbound adapter.OutboundManager + needWIFIState bool + wifiMonitor settings.WIFIMonitor wifiState adapter.WIFIState + wifiStateMutex sync.RWMutex started bool } -func NewNetworkManager(ctx context.Context, logger logger.ContextLogger, routeOptions option.RouteOptions) (*NetworkManager, error) { +func NewNetworkManager(ctx context.Context, logger logger.ContextLogger, routeOptions option.RouteOptions, dnsOptions option.DNSOptions) (*NetworkManager, error) { defaultDomainResolver := common.PtrValueOrDefault(routeOptions.DefaultDomainResolver) if routeOptions.AutoDetectInterface && !(C.IsLinux || C.IsDarwin || C.IsWindows) { return nil, E.New("`auto_detect_interface` is only supported on Linux, Windows and macOS") @@ -89,6 +94,7 @@ func NewNetworkManager(ctx context.Context, logger logger.ContextLogger, routeOp endpoint: service.FromContext[adapter.EndpointManager](ctx), inbound: service.FromContext[adapter.InboundManager](ctx), outbound: service.FromContext[adapter.OutboundManager](ctx), + needWIFIState: hasRule(routeOptions.Rules, isWIFIRule) || hasDNSRule(dnsOptions.Rules, isWIFIDNSRule), } if routeOptions.DefaultNetworkStrategy != nil { if routeOptions.DefaultInterface != "" { @@ -183,11 +189,35 @@ func (r *NetworkManager) Start(stage adapter.StartStage) error { } } case adapter.StartStatePostStart: + if r.needWIFIState && !(r.platformInterface != nil && r.platformInterface.UsePlatformWIFIMonitor()) { + wifiMonitor, err := settings.NewWIFIMonitor(r.onWIFIStateChanged) + if err != nil { + if err != os.ErrInvalid { + r.logger.Warn(E.Cause(err, "create WIFI monitor")) + } + } else { + r.wifiMonitor = wifiMonitor + err = r.wifiMonitor.Start() + if err != nil { + r.logger.Warn(E.Cause(err, "start WIFI monitor")) + } + } + } r.started = true } return nil } +func (r *NetworkManager) Initialize(ruleSets []adapter.RuleSet) { + for _, ruleSet := range ruleSets { + metadata := ruleSet.Metadata() + if metadata.ContainsWIFIRule { + r.needWIFIState = true + break + } + } +} + func (r *NetworkManager) Close() error { monitor := taskmonitor.New(r.logger, C.StopTimeout) var err error @@ -219,6 +249,13 @@ func (r *NetworkManager) Close() error { }) monitor.Finish() } + if r.wifiMonitor != nil { + monitor.Start("close WIFI monitor") + err = E.Append(err, r.wifiMonitor.Close(), func(err error) error { + return E.Cause(err, "close WIFI monitor") + }) + monitor.Finish() + } return err } @@ -376,20 +413,39 @@ func (r *NetworkManager) PackageManager() tun.PackageManager { return r.packageManager } +func (r *NetworkManager) NeedWIFIState() bool { + return r.needWIFIState +} + func (r *NetworkManager) WIFIState() adapter.WIFIState { + r.wifiStateMutex.RLock() + defer r.wifiStateMutex.RUnlock() return r.wifiState } -func (r *NetworkManager) UpdateWIFIState() { - if r.platformInterface != nil { - state := r.platformInterface.ReadWIFIState() - if state != r.wifiState { - r.wifiState = state - if state.SSID != "" { - r.logger.Info("updated WIFI state: SSID=", state.SSID, ", BSSID=", state.BSSID) - } - } +func (r *NetworkManager) onWIFIStateChanged(state adapter.WIFIState) { + r.wifiStateMutex.Lock() + if state == r.wifiState { + r.wifiStateMutex.Unlock() + return } + r.wifiState = state + r.wifiStateMutex.Unlock() + if state.SSID != "" { + r.logger.Info("updated WIFI state: SSID=", state.SSID, ", BSSID=", state.BSSID) + } +} + +func (r *NetworkManager) UpdateWIFIState() { + var state adapter.WIFIState + if r.wifiMonitor != nil { + state = r.wifiMonitor.ReadWIFIState() + } else if r.platformInterface != nil && r.platformInterface.UsePlatformWIFIMonitor() { + state = r.platformInterface.ReadWIFIState() + } else { + return + } + r.onWIFIStateChanged(state) } func (r *NetworkManager) ResetNetwork() { diff --git a/sing-box/route/router.go b/sing-box/route/router.go index ae2ecb5502..aca65432bd 100644 --- a/sing-box/route/router.go +++ b/sing-box/route/router.go @@ -38,7 +38,6 @@ type Router struct { pauseManager pause.Manager trackers []adapter.ConnectionTracker platformInterface platform.Interface - needWIFIState bool started bool } @@ -57,7 +56,6 @@ func NewRouter(ctx context.Context, logFactory log.Factory, options option.Route needFindProcess: hasRule(options.Rules, isProcessRule) || hasDNSRule(dnsOptions.Rules, isProcessDNSRule) || options.FindProcess, pauseManager: service.FromContext[pause.Manager](ctx), platformInterface: service.FromContext[platform.Interface](ctx), - needWIFIState: hasRule(options.Rules, isWIFIRule) || hasDNSRule(dnsOptions.Rules, isWIFIDNSRule), } } @@ -113,15 +111,13 @@ func (r *Router) Start(stage adapter.StartStage) error { if cacheContext != nil { cacheContext.Close() } + r.network.Initialize(r.ruleSets) needFindProcess := r.needFindProcess for _, ruleSet := range r.ruleSets { metadata := ruleSet.Metadata() if metadata.ContainsProcessRule { needFindProcess = true } - if metadata.ContainsWIFIRule { - r.needWIFIState = true - } } if needFindProcess { if r.platformInterface != nil { @@ -195,10 +191,6 @@ func (r *Router) RuleSet(tag string) (adapter.RuleSet, bool) { return ruleSet, loaded } -func (r *Router) NeedWIFIState() bool { - return r.needWIFIState -} - func (r *Router) Rules() []adapter.Rule { return r.rules } diff --git a/small/gn/Makefile b/small/gn/Makefile index 49facb6883..23ff7fe17b 100644 --- a/small/gn/Makefile +++ b/small/gn/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git -PKG_SOURCE_DATE:=2025-11-30 -PKG_SOURCE_VERSION:=ab6f8b2124b02000f5ffcabb904622f17de6a1e5 -PKG_MIRROR_HASH:=eaa8e57533acabfb2ddd5981ce0553749ef594bfd801283f58e10d5abacbeb9f +PKG_SOURCE_DATE:=2025-12-07 +PKG_SOURCE_VERSION:=5964f499767097d81dbe034e8b541c3988168073 +PKG_MIRROR_HASH:=06dc546f2808d98c34b05695568d9b6e68bd7150adfacfc7747153971e5ec2ab PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/small/gn/src/out/last_commit_position.h b/small/gn/src/out/last_commit_position.h index 4c183be8c2..0449928967 100644 --- a/small/gn/src/out/last_commit_position.h +++ b/small/gn/src/out/last_commit_position.h @@ -3,7 +3,7 @@ #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ -#define LAST_COMMIT_POSITION_NUM 2304 -#define LAST_COMMIT_POSITION "2304 (ab6f8b2124b0)" +#define LAST_COMMIT_POSITION_NUM 2309 +#define LAST_COMMIT_POSITION "2309 (5964f4997670)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/small/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/node.js b/small/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/node.js index f2ea44111f..57117b104f 100644 --- a/small/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/node.js +++ b/small/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/node.js @@ -1321,12 +1321,24 @@ return view.extend({ .format('https://wiki.metacubex.one/config/proxy-providers/content/', _('Contents'))); so.placeholder = _('Content will not be verified, Please make sure you enter it correctly.'); so.load = function(section_id) { - return L.resolveDefault(hm.readFile(this.section.sectiontype, section_id), ''); + const option = uci.get(data[0], section_id, 'type'); + + if (option === 'file') + return L.resolveDefault(hm.readFile(this.section.sectiontype, section_id), ''); + } + so.write = function(section_id, formvalue) { + const option = uci.get(data[0], section_id, 'type'); + + if (option === 'file') + return hm.writeFile.call(this, this.section.sectiontype, section_id, formvalue); + } + so.remove = function(section_id) { + const option = uci.get(data[0], section_id, 'type'); + const cached_option = this.section.getOption('type').cfgvalue(section_id); + + if (option === 'file' && cached_option === 'file') + return hm.writeFile.call(this, this.section.sectiontype, section_id); } - so.write = L.bind(hm.writeFile, so, so.section.sectiontype); - so.remove = L.bind(hm.writeFile, so, so.section.sectiontype); - so.rmempty = false; - so.retain = true; so.depends('type', 'file'); so.modalonly = true; @@ -1575,13 +1587,13 @@ return view.extend({ so = ss.option(CBIBubblesValue, '_value', _('Value')); so.modalonly = false; - so = ss.option(form.ListValue, 'chain_head_sub', _('Chain head') + _(' (Destination)')); + so = ss.option(form.ListValue, 'chain_head_sub', _('Destination')); so.load = L.bind(hm.loadProviderLabel, so, [['', _('-- Please choose --')]]); so.rmempty = false; so.depends('type', 'provider'); so.modalonly = true; - so = ss.option(form.ListValue, 'chain_head', _('Chain head') + _(' (Destination)')); + so = ss.option(form.ListValue, 'chain_head', _('Destination')); so.load = L.bind(hm.loadNodeLabel, so, [['', _('-- Please choose --')]]); so.rmempty = false; so.validate = function(section_id, value) { @@ -1595,13 +1607,13 @@ return view.extend({ so.depends('type', 'node'); so.modalonly = true; - so = ss.option(form.ListValue, 'chain_tail_group', _('Chain tail') + _(' (Transit)')); + so = ss.option(form.ListValue, 'chain_tail_group', _('Transit')); so.load = L.bind(hm.loadProxyGroupLabel, so, [['', _('-- Please choose --')]]); so.rmempty = false; so.depends({chain_tail: /.+/, '!reverse': true}); so.modalonly = true; - so = ss.option(form.ListValue, 'chain_tail', _('Chain tail') + _(' (Transit)')); + so = ss.option(form.ListValue, 'chain_tail', _('Transit')); so.load = L.bind(hm.loadNodeLabel, so, [['', _('-- Please choose --')]]); so.rmempty = false; so.validate = function(section_id, value) { diff --git a/small/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/ruleset.js b/small/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/ruleset.js index 0add3456b5..a0bc6ce34a 100644 --- a/small/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/ruleset.js +++ b/small/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/ruleset.js @@ -325,12 +325,24 @@ return view.extend({ .format('https://wiki.metacubex.one/config/rule-providers/content/', _('Contents'))); o.placeholder = _('Content will not be verified, Please make sure you enter it correctly.'); o.load = function(section_id) { - return L.resolveDefault(hm.readFile(this.section.sectiontype, section_id), ''); + const option = uci.get(data[0], section_id, 'type'); + + if (option === 'file') + return L.resolveDefault(hm.readFile(this.section.sectiontype, section_id), ''); + } + o.write = function(section_id, formvalue) { + const option = uci.get(data[0], section_id, 'type'); + + if (option === 'file') + return hm.writeFile.call(this, this.section.sectiontype, section_id, formvalue); + } + o.remove = function(section_id) { + const option = uci.get(data[0], section_id, 'type'); + const cached_option = this.section.getOption('type').cfgvalue(section_id); + + if (option === 'file' && cached_option === 'file') + return hm.writeFile.call(this, this.section.sectiontype, section_id); } - o.write = L.bind(hm.writeFile, o, o.section.sectiontype); - o.remove = L.bind(hm.writeFile, o, o.section.sectiontype); - o.rmempty = false; - o.retain = true; o.depends({'type': 'file', 'format': /^(text|yaml)$/}); o.modalonly = true; diff --git a/small/luci-app-fchomo/po/templates/fchomo.pot b/small/luci-app-fchomo/po/templates/fchomo.pot index d133b36fc6..3ab8e17546 100644 --- a/small/luci-app-fchomo/po/templates/fchomo.pot +++ b/small/luci-app-fchomo/po/templates/fchomo.pot @@ -5,11 +5,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8" msgid "%s log" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1578 -#: htdocs/luci-static/resources/view/fchomo/node.js:1584 -msgid "(Destination)" -msgstr "" - #: htdocs/luci-static/resources/fchomo.js:594 #: htdocs/luci-static/resources/view/fchomo/client.js:237 #: htdocs/luci-static/resources/view/fchomo/client.js:267 @@ -17,20 +12,15 @@ msgstr "" msgid "(Imported)" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1600 -#: htdocs/luci-static/resources/view/fchomo/node.js:1606 -msgid "(Transit)" -msgstr "" - #: htdocs/luci-static/resources/view/fchomo/global.js:549 #: htdocs/luci-static/resources/view/fchomo/global.js:555 #: htdocs/luci-static/resources/view/fchomo/node.js:890 #: htdocs/luci-static/resources/view/fchomo/node.js:896 #: htdocs/luci-static/resources/view/fchomo/node.js:904 #: htdocs/luci-static/resources/view/fchomo/node.js:910 -#: htdocs/luci-static/resources/view/fchomo/server.js:762 -#: htdocs/luci-static/resources/view/fchomo/server.js:770 -#: htdocs/luci-static/resources/view/fchomo/server.js:779 +#: htdocs/luci-static/resources/view/fchomo/server.js:822 +#: htdocs/luci-static/resources/view/fchomo/server.js:830 +#: htdocs/luci-static/resources/view/fchomo/server.js:839 msgid "(mTLS)" msgstr "" @@ -41,10 +31,10 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1151 #: htdocs/luci-static/resources/view/fchomo/client.js:1622 #: htdocs/luci-static/resources/view/fchomo/client.js:1623 -#: htdocs/luci-static/resources/view/fchomo/node.js:1579 -#: htdocs/luci-static/resources/view/fchomo/node.js:1587 -#: htdocs/luci-static/resources/view/fchomo/node.js:1601 -#: htdocs/luci-static/resources/view/fchomo/node.js:1609 +#: htdocs/luci-static/resources/view/fchomo/node.js:1591 +#: htdocs/luci-static/resources/view/fchomo/node.js:1597 +#: htdocs/luci-static/resources/view/fchomo/node.js:1611 +#: htdocs/luci-static/resources/view/fchomo/node.js:1617 msgid "-- Please choose --" msgstr "" @@ -79,9 +69,9 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:897 #: htdocs/luci-static/resources/view/fchomo/node.js:911 -#: htdocs/luci-static/resources/view/fchomo/server.js:740 -#: htdocs/luci-static/resources/view/fchomo/server.js:755 -#: htdocs/luci-static/resources/view/fchomo/server.js:780 +#: htdocs/luci-static/resources/view/fchomo/server.js:800 +#: htdocs/luci-static/resources/view/fchomo/server.js:815 +#: htdocs/luci-static/resources/view/fchomo/server.js:840 msgid "Save your configuration before uploading files!" msgstr "" @@ -154,7 +144,7 @@ msgstr "" msgid "Add a provider" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1555 +#: htdocs/luci-static/resources/view/fchomo/node.js:1567 msgid "Add a proxy chain" msgstr "" @@ -170,7 +160,7 @@ msgstr "" msgid "Add a rule set" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:188 +#: htdocs/luci-static/resources/view/fchomo/server.js:199 msgid "Add a server" msgstr "" @@ -178,11 +168,11 @@ msgstr "" msgid "Add a sub rule" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1380 +#: htdocs/luci-static/resources/view/fchomo/node.js:1392 msgid "Add prefix" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1384 +#: htdocs/luci-static/resources/view/fchomo/node.js:1396 msgid "Add suffix" msgstr "" @@ -230,7 +220,7 @@ msgid "Already in updating." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:559 -#: htdocs/luci-static/resources/view/fchomo/server.js:442 +#: htdocs/luci-static/resources/view/fchomo/server.js:502 msgid "Alter ID" msgstr "" @@ -252,7 +242,7 @@ msgstr "" msgid "As the TOP upstream of dnsmasq." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:392 +#: htdocs/luci-static/resources/view/fchomo/server.js:452 msgid "Auth timeout" msgstr "" @@ -264,7 +254,7 @@ msgstr "" msgid "Auto" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:211 +#: htdocs/luci-static/resources/view/fchomo/server.js:222 msgid "Auto configure firewall" msgstr "" @@ -299,12 +289,12 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:740 #: htdocs/luci-static/resources/view/fchomo/node.js:1147 -#: htdocs/luci-static/resources/view/fchomo/node.js:1453 +#: htdocs/luci-static/resources/view/fchomo/node.js:1465 msgid "Bind interface" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1148 -#: htdocs/luci-static/resources/view/fchomo/node.js:1454 +#: htdocs/luci-static/resources/view/fchomo/node.js:1466 msgid "Bind outbound interface.
" msgstr "" @@ -363,20 +353,10 @@ msgid "" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:890 -#: htdocs/luci-static/resources/view/fchomo/server.js:732 +#: htdocs/luci-static/resources/view/fchomo/server.js:792 msgid "Certificate path" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1578 -#: htdocs/luci-static/resources/view/fchomo/node.js:1584 -msgid "Chain head" -msgstr "" - -#: htdocs/luci-static/resources/view/fchomo/node.js:1600 -#: htdocs/luci-static/resources/view/fchomo/node.js:1606 -msgid "Chain tail" -msgstr "" - #: htdocs/luci-static/resources/view/fchomo/global.js:221 #: htdocs/luci-static/resources/view/fchomo/global.js:271 msgid "Check" @@ -405,8 +385,8 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:324 #: htdocs/luci-static/resources/view/fchomo/node.js:377 #: htdocs/luci-static/resources/view/fchomo/node.js:565 -#: htdocs/luci-static/resources/view/fchomo/server.js:291 -#: htdocs/luci-static/resources/view/fchomo/server.js:323 +#: htdocs/luci-static/resources/view/fchomo/server.js:302 +#: htdocs/luci-static/resources/view/fchomo/server.js:389 msgid "Chipher" msgstr "" @@ -424,17 +404,17 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:767 #: htdocs/luci-static/resources/view/fchomo/node.js:891 #: htdocs/luci-static/resources/view/fchomo/node.js:905 -#: htdocs/luci-static/resources/view/fchomo/server.js:561 -#: htdocs/luci-static/resources/view/fchomo/server.js:771 +#: htdocs/luci-static/resources/view/fchomo/server.js:621 +#: htdocs/luci-static/resources/view/fchomo/server.js:831 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:22 msgid "Client" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:770 +#: htdocs/luci-static/resources/view/fchomo/server.js:830 msgid "Client Auth Certificate path" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:762 +#: htdocs/luci-static/resources/view/fchomo/server.js:822 msgid "Client Auth type" msgstr "" @@ -442,7 +422,7 @@ msgstr "" msgid "Client fingerprint" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:374 +#: htdocs/luci-static/resources/view/fchomo/server.js:385 msgid "Client key" msgstr "" @@ -463,12 +443,12 @@ msgstr "" msgid "Complete" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1400 +#: htdocs/luci-static/resources/view/fchomo/node.js:1412 msgid "Configuration Items" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:439 -#: htdocs/luci-static/resources/view/fchomo/server.js:370 +#: htdocs/luci-static/resources/view/fchomo/server.js:430 msgid "Congestion controller" msgstr "" @@ -476,15 +456,15 @@ msgstr "" msgid "Connection check" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:36 +#: htdocs/luci-static/resources/view/fchomo/server.js:35 msgid "Content copied to clipboard!" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:598 #: htdocs/luci-static/resources/view/fchomo/node.js:1322 -#: htdocs/luci-static/resources/view/fchomo/node.js:1336 +#: htdocs/luci-static/resources/view/fchomo/node.js:1348 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:326 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:340 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:352 msgid "Content will not be verified, Please make sure you enter it correctly." msgstr "" @@ -497,7 +477,7 @@ msgstr "" msgid "Contents have been saved." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:38 +#: htdocs/luci-static/resources/view/fchomo/server.js:37 msgid "Copy" msgstr "" @@ -513,7 +493,7 @@ msgstr "" msgid "Custom Direct List" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1371 +#: htdocs/luci-static/resources/view/fchomo/node.js:1383 msgid "Custom HTTP header." msgstr "" @@ -570,6 +550,11 @@ msgstr "" msgid "Default DNS server" msgstr "" +#: htdocs/luci-static/resources/view/fchomo/node.js:1590 +#: htdocs/luci-static/resources/view/fchomo/node.js:1596 +msgid "Destination" +msgstr "" + #: htdocs/luci-static/resources/view/fchomo/node.js:631 msgid "Destination addresses allowed to be forwarded via Wireguard." msgstr "" @@ -578,8 +563,8 @@ msgstr "" msgid "Dial fields" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1593 -#: htdocs/luci-static/resources/view/fchomo/node.js:1615 +#: htdocs/luci-static/resources/view/fchomo/node.js:1603 +#: htdocs/luci-static/resources/view/fchomo/node.js:1623 msgid "Different chain head/tail" msgstr "" @@ -601,7 +586,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:403 #: htdocs/luci-static/resources/view/fchomo/node.js:290 -#: htdocs/luci-static/resources/view/fchomo/server.js:271 +#: htdocs/luci-static/resources/view/fchomo/server.js:282 msgid "Disable" msgstr "" @@ -657,7 +642,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1456 #: htdocs/luci-static/resources/view/fchomo/node.js:883 -#: htdocs/luci-static/resources/view/fchomo/node.js:1440 +#: htdocs/luci-static/resources/view/fchomo/node.js:1452 msgid "Donot verifying server certificate." msgstr "" @@ -682,11 +667,11 @@ msgid "Dual stack" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:924 -#: htdocs/luci-static/resources/view/fchomo/server.js:828 +#: htdocs/luci-static/resources/view/fchomo/server.js:888 msgid "ECH config" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:787 +#: htdocs/luci-static/resources/view/fchomo/server.js:847 msgid "ECH key" msgstr "" @@ -737,11 +722,11 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:686 #: htdocs/luci-static/resources/view/fchomo/node.js:232 #: htdocs/luci-static/resources/view/fchomo/node.js:1292 -#: htdocs/luci-static/resources/view/fchomo/node.js:1476 -#: htdocs/luci-static/resources/view/fchomo/node.js:1565 +#: htdocs/luci-static/resources/view/fchomo/node.js:1488 +#: htdocs/luci-static/resources/view/fchomo/node.js:1577 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:251 -#: htdocs/luci-static/resources/view/fchomo/server.js:179 -#: htdocs/luci-static/resources/view/fchomo/server.js:206 +#: htdocs/luci-static/resources/view/fchomo/server.js:190 +#: htdocs/luci-static/resources/view/fchomo/server.js:217 msgid "Enable" msgstr "" @@ -787,19 +772,19 @@ msgid "Enable statistic" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:719 -#: htdocs/luci-static/resources/view/fchomo/node.js:1422 +#: htdocs/luci-static/resources/view/fchomo/node.js:1434 msgid "" "Enable the SUoT protocol, requires server support. Conflict with Multiplex." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:296 -#: htdocs/luci-static/resources/view/fchomo/server.js:277 +#: htdocs/luci-static/resources/view/fchomo/server.js:288 msgid "" "Enabling obfuscation will make the server incompatible with standard QUIC " "connections, losing the ability to masquerade with HTTP/3." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:524 +#: htdocs/luci-static/resources/view/fchomo/server.js:584 msgid "Encryption method" msgstr "" @@ -822,7 +807,7 @@ msgid "" "if empty." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1534 +#: htdocs/luci-static/resources/view/fchomo/node.js:1546 msgid "Exclude matched node types." msgstr "" @@ -833,7 +818,7 @@ msgid "" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1043 -#: htdocs/luci-static/resources/view/fchomo/node.js:1527 +#: htdocs/luci-static/resources/view/fchomo/node.js:1539 msgid "Exclude nodes that meet keywords or regexps." msgstr "" @@ -842,12 +827,12 @@ msgid "Expand/Collapse result" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1003 -#: htdocs/luci-static/resources/view/fchomo/node.js:1512 +#: htdocs/luci-static/resources/view/fchomo/node.js:1524 msgid "Expected HTTP code. 204 will be used if empty." msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1005 -#: htdocs/luci-static/resources/view/fchomo/node.js:1514 +#: htdocs/luci-static/resources/view/fchomo/node.js:1526 msgid "Expected status" msgstr "" @@ -879,20 +864,20 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:871 #: htdocs/luci-static/resources/view/fchomo/node.js:790 #: htdocs/luci-static/resources/view/fchomo/node.js:875 -#: htdocs/luci-static/resources/view/fchomo/node.js:1593 -#: htdocs/luci-static/resources/view/fchomo/node.js:1615 +#: htdocs/luci-static/resources/view/fchomo/node.js:1603 +#: htdocs/luci-static/resources/view/fchomo/node.js:1623 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:278 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:292 -#: htdocs/luci-static/resources/view/fchomo/server.js:553 -#: htdocs/luci-static/resources/view/fchomo/server.js:584 -#: htdocs/luci-static/resources/view/fchomo/server.js:685 +#: htdocs/luci-static/resources/view/fchomo/server.js:613 +#: htdocs/luci-static/resources/view/fchomo/server.js:644 +#: htdocs/luci-static/resources/view/fchomo/server.js:745 msgid "Expecting: %s" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:980 #: htdocs/luci-static/resources/view/fchomo/node.js:987 -#: htdocs/luci-static/resources/view/fchomo/server.js:895 -#: htdocs/luci-static/resources/view/fchomo/server.js:902 +#: htdocs/luci-static/resources/view/fchomo/server.js:955 +#: htdocs/luci-static/resources/view/fchomo/server.js:962 msgid "Expecting: only support %s." msgstr "" @@ -941,7 +926,7 @@ msgid "Fallback filter" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1038 -#: htdocs/luci-static/resources/view/fchomo/node.js:1521 +#: htdocs/luci-static/resources/view/fchomo/node.js:1533 msgid "Filter nodes that meet keywords or regexps." msgstr "" @@ -957,12 +942,12 @@ msgstr "" msgid "Final DNS server (For poisoned domains)" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:210 +#: htdocs/luci-static/resources/view/fchomo/server.js:221 msgid "Firewall" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:551 -#: htdocs/luci-static/resources/view/fchomo/server.js:434 +#: htdocs/luci-static/resources/view/fchomo/server.js:494 msgid "Flow" msgstr "" @@ -973,8 +958,8 @@ msgid "" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1004 -#: htdocs/luci-static/resources/view/fchomo/node.js:1390 -#: htdocs/luci-static/resources/view/fchomo/node.js:1513 +#: htdocs/luci-static/resources/view/fchomo/node.js:1402 +#: htdocs/luci-static/resources/view/fchomo/node.js:1525 msgid "" "For format see %s." @@ -1014,7 +999,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:891 #: htdocs/luci-static/resources/view/fchomo/node.js:220 #: htdocs/luci-static/resources/view/fchomo/node.js:1282 -#: htdocs/luci-static/resources/view/fchomo/server.js:193 +#: htdocs/luci-static/resources/view/fchomo/server.js:204 msgid "General fields" msgstr "" @@ -1027,8 +1012,9 @@ msgstr "" #: htdocs/luci-static/resources/fchomo.js:510 #: htdocs/luci-static/resources/fchomo.js:512 #: htdocs/luci-static/resources/view/fchomo/global.js:593 -#: htdocs/luci-static/resources/view/fchomo/server.js:657 -#: htdocs/luci-static/resources/view/fchomo/server.js:820 +#: htdocs/luci-static/resources/view/fchomo/server.js:376 +#: htdocs/luci-static/resources/view/fchomo/server.js:717 +#: htdocs/luci-static/resources/view/fchomo/server.js:880 msgid "Generate" msgstr "" @@ -1100,13 +1086,13 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:672 #: htdocs/luci-static/resources/view/fchomo/node.js:969 #: htdocs/luci-static/resources/view/fchomo/node.js:980 -#: htdocs/luci-static/resources/view/fchomo/server.js:895 +#: htdocs/luci-static/resources/view/fchomo/server.js:955 msgid "HTTP" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:265 #: htdocs/luci-static/resources/view/fchomo/node.js:1028 -#: htdocs/luci-static/resources/view/fchomo/node.js:1370 +#: htdocs/luci-static/resources/view/fchomo/node.js:1382 msgid "HTTP header" msgstr "" @@ -1122,7 +1108,7 @@ msgstr "" msgid "HTTP/3" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:285 +#: htdocs/luci-static/resources/view/fchomo/server.js:296 msgid "" "HTTP3 server behavior when authentication fails.
A 404 page will be " "returned if empty." @@ -1130,7 +1116,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:970 #: htdocs/luci-static/resources/view/fchomo/node.js:981 -#: htdocs/luci-static/resources/view/fchomo/server.js:896 +#: htdocs/luci-static/resources/view/fchomo/server.js:956 msgid "HTTPUpgrade" msgstr "" @@ -1142,31 +1128,31 @@ msgstr "" msgid "Handshake mode" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:457 +#: htdocs/luci-static/resources/view/fchomo/server.js:517 msgid "Handshake target that supports TLS 1.3" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:357 +#: htdocs/luci-static/resources/view/fchomo/server.js:417 msgid "Handshake timeout" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:973 -#: htdocs/luci-static/resources/view/fchomo/node.js:1481 +#: htdocs/luci-static/resources/view/fchomo/node.js:1493 msgid "Health check URL" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1002 -#: htdocs/luci-static/resources/view/fchomo/node.js:1511 +#: htdocs/luci-static/resources/view/fchomo/node.js:1523 msgid "Health check expected status" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:982 -#: htdocs/luci-static/resources/view/fchomo/node.js:1491 +#: htdocs/luci-static/resources/view/fchomo/node.js:1503 msgid "Health check interval" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:989 -#: htdocs/luci-static/resources/view/fchomo/node.js:1498 +#: htdocs/luci-static/resources/view/fchomo/node.js:1510 msgid "Health check timeout" msgstr "" @@ -1219,7 +1205,7 @@ msgid "IP override" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1159 -#: htdocs/luci-static/resources/view/fchomo/node.js:1467 +#: htdocs/luci-static/resources/view/fchomo/node.js:1479 msgid "IP version" msgstr "" @@ -1248,7 +1234,7 @@ msgstr "" msgid "Idle session timeout" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:385 +#: htdocs/luci-static/resources/view/fchomo/server.js:445 msgid "Idle timeout" msgstr "" @@ -1260,7 +1246,7 @@ msgstr "" msgid "If Block is selected, uncheck others" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:264 +#: htdocs/luci-static/resources/view/fchomo/server.js:275 msgid "Ignore client bandwidth" msgstr "" @@ -1293,15 +1279,15 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:278 #: htdocs/luci-static/resources/view/fchomo/node.js:284 -#: htdocs/luci-static/resources/view/fchomo/node.js:1428 -#: htdocs/luci-static/resources/view/fchomo/node.js:1434 -#: htdocs/luci-static/resources/view/fchomo/server.js:253 -#: htdocs/luci-static/resources/view/fchomo/server.js:259 +#: htdocs/luci-static/resources/view/fchomo/node.js:1440 +#: htdocs/luci-static/resources/view/fchomo/node.js:1446 +#: htdocs/luci-static/resources/view/fchomo/server.js:264 +#: htdocs/luci-static/resources/view/fchomo/server.js:270 msgid "In Mbps." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1348 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:352 +#: htdocs/luci-static/resources/view/fchomo/node.js:1360 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:364 msgid "In bytes. %s will be used if empty." msgstr "" @@ -1312,14 +1298,14 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:990 #: htdocs/luci-static/resources/view/fchomo/client.js:1019 -#: htdocs/luci-static/resources/view/fchomo/node.js:1499 +#: htdocs/luci-static/resources/view/fchomo/node.js:1511 msgid "In millisecond. %s will be used if empty." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:525 #: htdocs/luci-static/resources/view/fchomo/node.js:532 -#: htdocs/luci-static/resources/view/fchomo/server.js:386 -#: htdocs/luci-static/resources/view/fchomo/server.js:393 +#: htdocs/luci-static/resources/view/fchomo/server.js:446 +#: htdocs/luci-static/resources/view/fchomo/server.js:453 msgid "In seconds." msgstr "" @@ -1327,14 +1313,14 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:425 #: htdocs/luci-static/resources/view/fchomo/global.js:430 #: htdocs/luci-static/resources/view/fchomo/global.js:515 -#: htdocs/luci-static/resources/view/fchomo/node.js:1354 -#: htdocs/luci-static/resources/view/fchomo/node.js:1492 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:358 +#: htdocs/luci-static/resources/view/fchomo/node.js:1366 +#: htdocs/luci-static/resources/view/fchomo/node.js:1504 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:370 msgid "In seconds. %s will be used if empty." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:779 -#: htdocs/luci-static/resources/view/fchomo/server.js:573 +#: htdocs/luci-static/resources/view/fchomo/server.js:633 msgid "" "In the order of one Padding-Length and one Padding-" "Interval, infinite concatenation." @@ -1381,26 +1367,21 @@ msgstr "" msgid "Interface Control" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:352 -msgid "Keep consistent with the %s." -msgstr "" - #: htdocs/luci-static/resources/fchomo.js:142 msgid "Keep default" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:371 -#: htdocs/luci-static/resources/view/fchomo/server.js:317 -#: htdocs/luci-static/resources/view/fchomo/server.js:352 +#: htdocs/luci-static/resources/view/fchomo/server.js:332 msgid "Key" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:904 -#: htdocs/luci-static/resources/view/fchomo/server.js:747 +#: htdocs/luci-static/resources/view/fchomo/server.js:807 msgid "Key path" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:592 +#: htdocs/luci-static/resources/view/fchomo/server.js:652 msgid "Keypairs" msgstr "" @@ -1411,18 +1392,18 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1589 #: htdocs/luci-static/resources/view/fchomo/node.js:227 #: htdocs/luci-static/resources/view/fchomo/node.js:1287 -#: htdocs/luci-static/resources/view/fchomo/node.js:1560 +#: htdocs/luci-static/resources/view/fchomo/node.js:1572 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:246 -#: htdocs/luci-static/resources/view/fchomo/server.js:201 +#: htdocs/luci-static/resources/view/fchomo/server.js:212 msgid "Label" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:996 -#: htdocs/luci-static/resources/view/fchomo/node.js:1505 +#: htdocs/luci-static/resources/view/fchomo/node.js:1517 msgid "Lazy" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:443 +#: htdocs/luci-static/resources/view/fchomo/server.js:503 msgid "" "Legacy protocol support (VMess MD5 Authentication) is provided for " "compatibility purposes only, use of alterId > 1 is not recommended." @@ -1433,15 +1414,15 @@ msgid "Less compatibility and sometimes better performance." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:831 -#: htdocs/luci-static/resources/view/fchomo/server.js:728 +#: htdocs/luci-static/resources/view/fchomo/server.js:788 msgid "List of supported application level protocols, in order of preference." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:221 +#: htdocs/luci-static/resources/view/fchomo/server.js:232 msgid "Listen address" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:198 +#: htdocs/luci-static/resources/view/fchomo/server.js:209 msgid "Listen fields" msgstr "" @@ -1450,7 +1431,7 @@ msgid "Listen interfaces" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1251 -#: htdocs/luci-static/resources/view/fchomo/server.js:226 +#: htdocs/luci-static/resources/view/fchomo/server.js:237 msgid "Listen port" msgstr "" @@ -1500,7 +1481,7 @@ msgstr "" msgid "MTU" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:284 +#: htdocs/luci-static/resources/view/fchomo/server.js:295 msgid "Masquerade" msgstr "" @@ -1537,7 +1518,7 @@ msgid "Max Early Data" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:467 -#: htdocs/luci-static/resources/view/fchomo/server.js:379 +#: htdocs/luci-static/resources/view/fchomo/server.js:439 msgid "Max UDP relay packet size" msgstr "" @@ -1546,7 +1527,7 @@ msgid "Max count of failures" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:283 -#: htdocs/luci-static/resources/view/fchomo/server.js:258 +#: htdocs/luci-static/resources/view/fchomo/server.js:269 msgid "Max download speed" msgstr "" @@ -1555,7 +1536,7 @@ msgid "Max open streams" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:277 -#: htdocs/luci-static/resources/view/fchomo/server.js:252 +#: htdocs/luci-static/resources/view/fchomo/server.js:263 msgid "Max upload speed" msgstr "" @@ -1571,7 +1552,7 @@ msgid "" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:398 -#: htdocs/luci-static/resources/view/fchomo/server.js:344 +#: htdocs/luci-static/resources/view/fchomo/server.js:410 msgid "Maximum padding" msgstr "" @@ -1592,7 +1573,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/log.js:158 #: htdocs/luci-static/resources/view/fchomo/log.js:163 -#: htdocs/luci-static/resources/view/fchomo/server.js:153 +#: htdocs/luci-static/resources/view/fchomo/server.js:164 msgid "Mihomo server" msgstr "" @@ -1606,7 +1587,7 @@ msgid "" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:391 -#: htdocs/luci-static/resources/view/fchomo/server.js:337 +#: htdocs/luci-static/resources/view/fchomo/server.js:403 msgid "Minimum padding" msgstr "" @@ -1633,7 +1614,7 @@ msgid "Multiplex" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:224 -#: htdocs/luci-static/resources/view/fchomo/server.js:197 +#: htdocs/luci-static/resources/view/fchomo/server.js:208 msgid "Multiplex fields" msgstr "" @@ -1646,11 +1627,11 @@ msgstr "" msgid "NOT" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1360 +#: htdocs/luci-static/resources/view/fchomo/node.js:1372 msgid "Name of the Proxy group to download provider." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:364 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:376 msgid "Name of the Proxy group to download rule set." msgstr "" @@ -1671,7 +1652,7 @@ msgid "No add'l params" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:997 -#: htdocs/luci-static/resources/view/fchomo/node.js:1506 +#: htdocs/luci-static/resources/view/fchomo/node.js:1518 msgid "No testing is performed when this provider node is not in use." msgstr "" @@ -1690,17 +1671,17 @@ msgid "Node" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1042 -#: htdocs/luci-static/resources/view/fchomo/node.js:1526 +#: htdocs/luci-static/resources/view/fchomo/node.js:1538 msgid "Node exclude filter" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1047 -#: htdocs/luci-static/resources/view/fchomo/node.js:1533 +#: htdocs/luci-static/resources/view/fchomo/node.js:1545 msgid "Node exclude type" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1037 -#: htdocs/luci-static/resources/view/fchomo/node.js:1520 +#: htdocs/luci-static/resources/view/fchomo/node.js:1532 msgid "Node filter" msgstr "" @@ -1725,24 +1706,24 @@ msgid "Obfs Mode" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:295 -#: htdocs/luci-static/resources/view/fchomo/server.js:276 +#: htdocs/luci-static/resources/view/fchomo/server.js:287 msgid "Obfuscate password" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:289 #: htdocs/luci-static/resources/view/fchomo/node.js:385 -#: htdocs/luci-static/resources/view/fchomo/server.js:270 -#: htdocs/luci-static/resources/view/fchomo/server.js:331 +#: htdocs/luci-static/resources/view/fchomo/server.js:281 +#: htdocs/luci-static/resources/view/fchomo/server.js:397 msgid "Obfuscate type" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:386 -#: htdocs/luci-static/resources/view/fchomo/server.js:332 +#: htdocs/luci-static/resources/view/fchomo/server.js:398 msgid "Obfuscated as ASCII data stream" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:387 -#: htdocs/luci-static/resources/view/fchomo/server.js:333 +#: htdocs/luci-static/resources/view/fchomo/server.js:399 msgid "Obfuscated as low-entropy data stream" msgstr "" @@ -1804,27 +1785,27 @@ msgstr "" msgid "Packet encoding" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:423 +#: htdocs/luci-static/resources/view/fchomo/server.js:483 msgid "Padding scheme" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:777 -#: htdocs/luci-static/resources/view/fchomo/server.js:571 +#: htdocs/luci-static/resources/view/fchomo/server.js:631 msgid "Paddings" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:259 #: htdocs/luci-static/resources/view/fchomo/node.js:332 #: htdocs/luci-static/resources/view/fchomo/node.js:686 -#: htdocs/luci-static/resources/view/fchomo/server.js:243 -#: htdocs/luci-static/resources/view/fchomo/server.js:299 -#: htdocs/luci-static/resources/view/fchomo/server.js:464 +#: htdocs/luci-static/resources/view/fchomo/server.js:254 +#: htdocs/luci-static/resources/view/fchomo/server.js:310 +#: htdocs/luci-static/resources/view/fchomo/server.js:524 msgid "Password" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1335 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:339 -#: htdocs/luci-static/resources/view/fchomo/server.js:511 +#: htdocs/luci-static/resources/view/fchomo/node.js:1347 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:351 +#: htdocs/luci-static/resources/view/fchomo/server.js:571 msgid "Payload" msgstr "" @@ -1856,9 +1837,9 @@ msgid "" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1320 -#: htdocs/luci-static/resources/view/fchomo/node.js:1334 +#: htdocs/luci-static/resources/view/fchomo/node.js:1346 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:324 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:338 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:350 msgid "" "Please type %s." @@ -1875,7 +1856,7 @@ msgid "Please type %s fields of mihomo config.
" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:660 -#: htdocs/luci-static/resources/view/fchomo/server.js:450 +#: htdocs/luci-static/resources/view/fchomo/server.js:510 msgid "Plugin" msgstr "" @@ -1885,9 +1866,9 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:692 #: htdocs/luci-static/resources/view/fchomo/node.js:700 #: htdocs/luci-static/resources/view/fchomo/node.js:706 -#: htdocs/luci-static/resources/view/fchomo/server.js:457 -#: htdocs/luci-static/resources/view/fchomo/server.js:464 -#: htdocs/luci-static/resources/view/fchomo/server.js:470 +#: htdocs/luci-static/resources/view/fchomo/server.js:517 +#: htdocs/luci-static/resources/view/fchomo/server.js:524 +#: htdocs/luci-static/resources/view/fchomo/server.js:530 msgid "Plugin:" msgstr "" @@ -1908,7 +1889,7 @@ msgid "Ports" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:272 -#: htdocs/luci-static/resources/view/fchomo/server.js:226 +#: htdocs/luci-static/resources/view/fchomo/server.js:237 msgid "Ports pool" msgstr "" @@ -1934,8 +1915,8 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:759 #: htdocs/luci-static/resources/view/fchomo/node.js:1149 #: htdocs/luci-static/resources/view/fchomo/node.js:1155 -#: htdocs/luci-static/resources/view/fchomo/node.js:1455 -#: htdocs/luci-static/resources/view/fchomo/node.js:1462 +#: htdocs/luci-static/resources/view/fchomo/node.js:1467 +#: htdocs/luci-static/resources/view/fchomo/node.js:1474 msgid "Priority: Proxy Node > Global." msgstr "" @@ -1973,11 +1954,11 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:937 #: htdocs/luci-static/resources/view/fchomo/node.js:1168 #: htdocs/luci-static/resources/view/fchomo/node.js:1177 -#: htdocs/luci-static/resources/view/fchomo/node.js:1571 +#: htdocs/luci-static/resources/view/fchomo/node.js:1583 msgid "Provider" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1341 +#: htdocs/luci-static/resources/view/fchomo/node.js:1353 msgid "Provider URL" msgstr "" @@ -2000,19 +1981,19 @@ msgid "Proxy MAC-s" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:206 -#: htdocs/luci-static/resources/view/fchomo/node.js:1570 +#: htdocs/luci-static/resources/view/fchomo/node.js:1582 msgid "Proxy Node" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1546 -#: htdocs/luci-static/resources/view/fchomo/node.js:1555 +#: htdocs/luci-static/resources/view/fchomo/node.js:1558 +#: htdocs/luci-static/resources/view/fchomo/node.js:1567 msgid "Proxy chain" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:713 #: htdocs/luci-static/resources/view/fchomo/client.js:1422 -#: htdocs/luci-static/resources/view/fchomo/node.js:1359 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:363 +#: htdocs/luci-static/resources/view/fchomo/node.js:1371 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:375 msgid "Proxy group" msgstr "" @@ -2033,17 +2014,17 @@ msgid "QUIC" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:440 -#: htdocs/luci-static/resources/view/fchomo/server.js:371 +#: htdocs/luci-static/resources/view/fchomo/server.js:431 msgid "QUIC congestion controller." msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:804 -#: htdocs/luci-static/resources/view/fchomo/server.js:174 +#: htdocs/luci-static/resources/view/fchomo/server.js:185 msgid "Quick Reload" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:940 -#: htdocs/luci-static/resources/view/fchomo/server.js:835 +#: htdocs/luci-static/resources/view/fchomo/server.js:895 msgid "REALITY" msgstr "" @@ -2051,31 +2032,31 @@ msgstr "" msgid "REALITY X25519MLKEM768 PQC support" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:872 +#: htdocs/luci-static/resources/view/fchomo/server.js:932 msgid "REALITY certificate issued to" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:840 +#: htdocs/luci-static/resources/view/fchomo/server.js:900 msgid "REALITY handshake server" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:847 +#: htdocs/luci-static/resources/view/fchomo/server.js:907 msgid "REALITY private key" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:945 -#: htdocs/luci-static/resources/view/fchomo/server.js:862 +#: htdocs/luci-static/resources/view/fchomo/server.js:922 msgid "REALITY public key" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:950 -#: htdocs/luci-static/resources/view/fchomo/server.js:866 +#: htdocs/luci-static/resources/view/fchomo/server.js:926 msgid "REALITY short ID" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:767 -#: htdocs/luci-static/resources/view/fchomo/server.js:542 -#: htdocs/luci-static/resources/view/fchomo/server.js:561 +#: htdocs/luci-static/resources/view/fchomo/server.js:602 +#: htdocs/luci-static/resources/view/fchomo/server.js:621 msgid "RTT" msgstr "" @@ -2091,11 +2072,6 @@ msgstr "" msgid "Randomized traffic characteristics" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1585 -#: htdocs/luci-static/resources/view/fchomo/node.js:1607 -msgid "Recommended to use UoT node.
such as %s." -msgstr "" - #: htdocs/luci-static/resources/view/fchomo/global.js:460 msgid "Redir port" msgstr "" @@ -2119,7 +2095,7 @@ msgstr "" #: htdocs/luci-static/resources/fchomo.js:1025 #: htdocs/luci-static/resources/view/fchomo/client.js:805 #: htdocs/luci-static/resources/view/fchomo/global.js:193 -#: htdocs/luci-static/resources/view/fchomo/server.js:175 +#: htdocs/luci-static/resources/view/fchomo/server.js:186 msgid "Reload" msgstr "" @@ -2148,11 +2124,11 @@ msgstr "" msgid "Remove idles" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1388 +#: htdocs/luci-static/resources/view/fchomo/node.js:1400 msgid "Replace name" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1389 +#: htdocs/luci-static/resources/view/fchomo/node.js:1401 msgid "Replace node name." msgstr "" @@ -2162,7 +2138,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1014 #: htdocs/luci-static/resources/view/fchomo/node.js:1021 -#: htdocs/luci-static/resources/view/fchomo/server.js:914 +#: htdocs/luci-static/resources/view/fchomo/server.js:974 msgid "Request path" msgstr "" @@ -2219,7 +2195,7 @@ msgid "Routing GFW" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1154 -#: htdocs/luci-static/resources/view/fchomo/node.js:1461 +#: htdocs/luci-static/resources/view/fchomo/node.js:1473 msgid "Routing mark" msgstr "" @@ -2267,7 +2243,7 @@ msgstr "" msgid "Rule set" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:345 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:357 msgid "Rule set URL" msgstr "" @@ -2312,7 +2288,7 @@ msgid "SUoT version" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:291 -#: htdocs/luci-static/resources/view/fchomo/server.js:272 +#: htdocs/luci-static/resources/view/fchomo/server.js:283 msgid "Salamander" msgstr "" @@ -2324,10 +2300,6 @@ msgstr "" msgid "Same srcaddr and dstaddr requests. Same node" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:351 -msgid "Seed" -msgstr "" - #: htdocs/luci-static/resources/view/fchomo/global.js:509 msgid "Segment maximum size" msgstr "" @@ -2349,10 +2321,10 @@ msgstr "" msgid "Send random ticket of 300s-600s duration for client 0-RTT reuse." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:188 -#: htdocs/luci-static/resources/view/fchomo/server.js:542 -#: htdocs/luci-static/resources/view/fchomo/server.js:733 -#: htdocs/luci-static/resources/view/fchomo/server.js:748 +#: htdocs/luci-static/resources/view/fchomo/server.js:199 +#: htdocs/luci-static/resources/view/fchomo/server.js:602 +#: htdocs/luci-static/resources/view/fchomo/server.js:793 +#: htdocs/luci-static/resources/view/fchomo/server.js:808 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:54 msgid "Server" msgstr "" @@ -2379,17 +2351,17 @@ msgid "Shadowsocks" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:506 -#: htdocs/luci-static/resources/view/fchomo/server.js:405 +#: htdocs/luci-static/resources/view/fchomo/server.js:465 msgid "Shadowsocks chipher" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:501 -#: htdocs/luci-static/resources/view/fchomo/server.js:400 +#: htdocs/luci-static/resources/view/fchomo/server.js:460 msgid "Shadowsocks encrypt" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:514 -#: htdocs/luci-static/resources/view/fchomo/server.js:413 +#: htdocs/luci-static/resources/view/fchomo/server.js:473 msgid "Shadowsocks password" msgstr "" @@ -2405,14 +2377,14 @@ msgstr "" msgid "Simple round-robin all nodes" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1347 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:351 +#: htdocs/luci-static/resources/view/fchomo/node.js:1359 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:363 msgid "Size limit" msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1455 #: htdocs/luci-static/resources/view/fchomo/node.js:882 -#: htdocs/luci-static/resources/view/fchomo/node.js:1439 +#: htdocs/luci-static/resources/view/fchomo/node.js:1451 msgid "Skip cert verify" msgstr "" @@ -2509,6 +2481,20 @@ msgstr "" msgid "System DNS" msgstr "" +#: htdocs/luci-static/resources/fchomo.js:126 +#: htdocs/luci-static/resources/fchomo.js:131 +#: htdocs/luci-static/resources/fchomo.js:132 +#: htdocs/luci-static/resources/fchomo.js:133 +#: htdocs/luci-static/resources/fchomo.js:134 +#: htdocs/luci-static/resources/fchomo.js:135 +#: htdocs/luci-static/resources/fchomo.js:158 +#: htdocs/luci-static/resources/fchomo.js:163 +#: htdocs/luci-static/resources/fchomo.js:164 +#: htdocs/luci-static/resources/fchomo.js:165 +#: htdocs/luci-static/resources/fchomo.js:166 +#: htdocs/luci-static/resources/fchomo.js:167 +#: htdocs/luci-static/resources/fchomo.js:168 +#: htdocs/luci-static/resources/fchomo.js:173 #: htdocs/luci-static/resources/view/fchomo/client.js:517 #: htdocs/luci-static/resources/view/fchomo/client.js:607 msgid "TCP" @@ -2530,20 +2516,31 @@ msgstr "" msgid "TCP-Keep-Alive interval" msgstr "" +#: htdocs/luci-static/resources/fchomo.js:127 +#: htdocs/luci-static/resources/fchomo.js:128 +#: htdocs/luci-static/resources/fchomo.js:129 +#: htdocs/luci-static/resources/fchomo.js:130 +#: htdocs/luci-static/resources/fchomo.js:157 +#: htdocs/luci-static/resources/fchomo.js:159 +#: htdocs/luci-static/resources/fchomo.js:160 +#: htdocs/luci-static/resources/fchomo.js:162 +msgid "TCP/UDP" +msgstr "" + #: htdocs/luci-static/resources/view/fchomo/node.js:1133 -#: htdocs/luci-static/resources/view/fchomo/node.js:1406 +#: htdocs/luci-static/resources/view/fchomo/node.js:1418 msgid "TFO" msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:529 #: htdocs/luci-static/resources/view/fchomo/node.js:673 #: htdocs/luci-static/resources/view/fchomo/node.js:799 -#: htdocs/luci-static/resources/view/fchomo/server.js:696 +#: htdocs/luci-static/resources/view/fchomo/server.js:756 msgid "TLS" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:830 -#: htdocs/luci-static/resources/view/fchomo/server.js:727 +#: htdocs/luci-static/resources/view/fchomo/server.js:787 msgid "TLS ALPN" msgstr "" @@ -2552,7 +2549,7 @@ msgid "TLS SNI" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:222 -#: htdocs/luci-static/resources/view/fchomo/server.js:195 +#: htdocs/luci-static/resources/view/fchomo/server.js:206 msgid "TLS fields" msgstr "" @@ -2565,7 +2562,7 @@ msgstr "" msgid "TURN ports" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:265 +#: htdocs/luci-static/resources/view/fchomo/server.js:276 msgid "" "Tell the client to use the BBR flow control algorithm instead of Hysteria CC." msgstr "" @@ -2576,14 +2573,14 @@ msgid "The %s address used by local machine in the Wireguard network." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:905 -#: htdocs/luci-static/resources/view/fchomo/server.js:748 +#: htdocs/luci-static/resources/view/fchomo/server.js:808 msgid "The %s private key, in PEM format." msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:556 #: htdocs/luci-static/resources/view/fchomo/node.js:891 -#: htdocs/luci-static/resources/view/fchomo/server.js:733 -#: htdocs/luci-static/resources/view/fchomo/server.js:771 +#: htdocs/luci-static/resources/view/fchomo/server.js:793 +#: htdocs/luci-static/resources/view/fchomo/server.js:831 msgid "The %s public key, in PEM format." msgstr "" @@ -2597,7 +2594,7 @@ msgstr "" msgid "The ED25519 available private key or UUID provided by Sudoku server." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:318 +#: htdocs/luci-static/resources/view/fchomo/server.js:333 msgid "The ED25519 master public key or UUID generated by Sudoku." msgstr "" @@ -2606,7 +2603,7 @@ msgid "The default value is 2:00 every day." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:780 -#: htdocs/luci-static/resources/view/fchomo/server.js:574 +#: htdocs/luci-static/resources/view/fchomo/server.js:634 msgid "" "The first padding must have a probability of 100% and at least 35 bytes." msgstr "" @@ -2622,18 +2619,18 @@ msgid "The matching %s will be deemed as poisoned." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:778 -#: htdocs/luci-static/resources/view/fchomo/server.js:572 +#: htdocs/luci-static/resources/view/fchomo/server.js:632 msgid "The server and client can set different padding parameters." msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:600 -#: htdocs/luci-static/resources/view/fchomo/server.js:829 +#: htdocs/luci-static/resources/view/fchomo/server.js:889 msgid "This ECH parameter needs to be added to the HTTPS record of the domain." msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1458 #: htdocs/luci-static/resources/view/fchomo/node.js:885 -#: htdocs/luci-static/resources/view/fchomo/node.js:1442 +#: htdocs/luci-static/resources/view/fchomo/node.js:1454 msgid "" "This is DANGEROUS, your traffic is almost like " "PLAIN TEXT! Use at your own risk!" @@ -2668,20 +2665,25 @@ msgstr "" msgid "Tproxy port" msgstr "" +#: htdocs/luci-static/resources/view/fchomo/node.js:1610 +#: htdocs/luci-static/resources/view/fchomo/node.js:1616 +msgid "Transit" +msgstr "" + #: htdocs/luci-static/resources/view/fchomo/node.js:347 #: htdocs/luci-static/resources/view/fchomo/node.js:962 -#: htdocs/luci-static/resources/view/fchomo/server.js:309 -#: htdocs/luci-static/resources/view/fchomo/server.js:880 +#: htdocs/luci-static/resources/view/fchomo/server.js:320 +#: htdocs/luci-static/resources/view/fchomo/server.js:940 msgid "Transport" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:223 -#: htdocs/luci-static/resources/view/fchomo/server.js:196 +#: htdocs/luci-static/resources/view/fchomo/server.js:207 msgid "Transport fields" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:967 -#: htdocs/luci-static/resources/view/fchomo/server.js:885 +#: htdocs/luci-static/resources/view/fchomo/server.js:945 msgid "Transport type" msgstr "" @@ -2717,17 +2719,22 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1604 #: htdocs/luci-static/resources/view/fchomo/node.js:236 #: htdocs/luci-static/resources/view/fchomo/node.js:1296 -#: htdocs/luci-static/resources/view/fchomo/node.js:1569 +#: htdocs/luci-static/resources/view/fchomo/node.js:1581 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:263 -#: htdocs/luci-static/resources/view/fchomo/server.js:215 +#: htdocs/luci-static/resources/view/fchomo/server.js:226 msgid "Type" msgstr "" +#: htdocs/luci-static/resources/fchomo.js:136 +#: htdocs/luci-static/resources/fchomo.js:137 +#: htdocs/luci-static/resources/fchomo.js:170 +#: htdocs/luci-static/resources/fchomo.js:171 +#: htdocs/luci-static/resources/fchomo.js:172 #: htdocs/luci-static/resources/view/fchomo/client.js:516 #: htdocs/luci-static/resources/view/fchomo/client.js:606 #: htdocs/luci-static/resources/view/fchomo/node.js:713 -#: htdocs/luci-static/resources/view/fchomo/node.js:1416 -#: htdocs/luci-static/resources/view/fchomo/server.js:479 +#: htdocs/luci-static/resources/view/fchomo/node.js:1428 +#: htdocs/luci-static/resources/view/fchomo/server.js:539 msgid "UDP" msgstr "" @@ -2757,8 +2764,9 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:427 #: htdocs/luci-static/resources/view/fchomo/node.js:545 -#: htdocs/luci-static/resources/view/fchomo/server.js:364 -#: htdocs/luci-static/resources/view/fchomo/server.js:428 +#: htdocs/luci-static/resources/view/fchomo/server.js:330 +#: htdocs/luci-static/resources/view/fchomo/server.js:424 +#: htdocs/luci-static/resources/view/fchomo/server.js:488 msgid "UUID" msgstr "" @@ -2788,7 +2796,7 @@ msgid "Unknown error: %s" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:718 -#: htdocs/luci-static/resources/view/fchomo/node.js:1421 +#: htdocs/luci-static/resources/view/fchomo/node.js:1433 msgid "UoT" msgstr "" @@ -2796,8 +2804,8 @@ msgstr "" msgid "Update failed." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1353 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:357 +#: htdocs/luci-static/resources/view/fchomo/node.js:1365 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:369 msgid "Update interval" msgstr "" @@ -2810,8 +2818,8 @@ msgid "Upload bandwidth in Mbps." msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:896 -#: htdocs/luci-static/resources/view/fchomo/server.js:739 -#: htdocs/luci-static/resources/view/fchomo/server.js:779 +#: htdocs/luci-static/resources/view/fchomo/server.js:799 +#: htdocs/luci-static/resources/view/fchomo/server.js:839 msgid "Upload certificate" msgstr "" @@ -2820,16 +2828,16 @@ msgid "Upload initial package" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:910 -#: htdocs/luci-static/resources/view/fchomo/server.js:754 +#: htdocs/luci-static/resources/view/fchomo/server.js:814 msgid "Upload key" msgstr "" #: htdocs/luci-static/resources/view/fchomo/global.js:306 #: htdocs/luci-static/resources/view/fchomo/node.js:899 #: htdocs/luci-static/resources/view/fchomo/node.js:913 -#: htdocs/luci-static/resources/view/fchomo/server.js:742 -#: htdocs/luci-static/resources/view/fchomo/server.js:757 -#: htdocs/luci-static/resources/view/fchomo/server.js:782 +#: htdocs/luci-static/resources/view/fchomo/server.js:802 +#: htdocs/luci-static/resources/view/fchomo/server.js:817 +#: htdocs/luci-static/resources/view/fchomo/server.js:842 msgid "Upload..." msgstr "" @@ -2862,7 +2870,7 @@ msgid "User Authentication" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:254 -#: htdocs/luci-static/resources/view/fchomo/server.js:238 +#: htdocs/luci-static/resources/view/fchomo/server.js:249 msgid "Username" msgstr "" @@ -2889,7 +2897,7 @@ msgid "VMess" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1302 -#: htdocs/luci-static/resources/view/fchomo/node.js:1575 +#: htdocs/luci-static/resources/view/fchomo/node.js:1587 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:306 msgid "Value" msgstr "" @@ -2900,7 +2908,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:418 #: htdocs/luci-static/resources/view/fchomo/node.js:692 -#: htdocs/luci-static/resources/view/fchomo/server.js:470 +#: htdocs/luci-static/resources/view/fchomo/server.js:530 msgid "Version" msgstr "" @@ -2909,7 +2917,7 @@ msgid "Version hint" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:221 -#: htdocs/luci-static/resources/view/fchomo/server.js:194 +#: htdocs/luci-static/resources/view/fchomo/server.js:205 msgid "Vless Encryption fields" msgstr "" @@ -2924,13 +2932,13 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:972 #: htdocs/luci-static/resources/view/fchomo/node.js:983 #: htdocs/luci-static/resources/view/fchomo/node.js:988 -#: htdocs/luci-static/resources/view/fchomo/server.js:887 -#: htdocs/luci-static/resources/view/fchomo/server.js:898 -#: htdocs/luci-static/resources/view/fchomo/server.js:903 +#: htdocs/luci-static/resources/view/fchomo/server.js:947 +#: htdocs/luci-static/resources/view/fchomo/server.js:958 +#: htdocs/luci-static/resources/view/fchomo/server.js:963 msgid "WebSocket" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:154 +#: htdocs/luci-static/resources/view/fchomo/server.js:165 msgid "When used as a server, HomeProxy is a better choice." msgstr "" @@ -2954,7 +2962,7 @@ msgstr "" msgid "WireGuard requires base64-encoded private keys." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:533 +#: htdocs/luci-static/resources/view/fchomo/server.js:593 msgid "XOR mode" msgstr "" @@ -2995,13 +3003,13 @@ msgid "auto" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:444 -#: htdocs/luci-static/resources/view/fchomo/server.js:375 +#: htdocs/luci-static/resources/view/fchomo/server.js:435 msgid "bbr" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:901 -#: htdocs/luci-static/resources/view/fchomo/server.js:744 -#: htdocs/luci-static/resources/view/fchomo/server.js:784 +#: htdocs/luci-static/resources/view/fchomo/server.js:804 +#: htdocs/luci-static/resources/view/fchomo/server.js:844 msgid "certificate" msgstr "" @@ -3016,12 +3024,12 @@ msgid "chacha20-poly1305" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:442 -#: htdocs/luci-static/resources/view/fchomo/server.js:373 +#: htdocs/luci-static/resources/view/fchomo/server.js:433 msgid "cubic" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:485 -#: htdocs/luci-static/resources/view/fchomo/server.js:516 +#: htdocs/luci-static/resources/view/fchomo/server.js:545 +#: htdocs/luci-static/resources/view/fchomo/server.js:576 msgid "decryption" msgstr "" @@ -3029,27 +3037,27 @@ msgstr "" msgid "dnsmasq selects upstream on its own. (may affect CDN accuracy)" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1433 +#: htdocs/luci-static/resources/view/fchomo/node.js:1445 msgid "down" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:732 #: htdocs/luci-static/resources/view/fchomo/node.js:755 -#: htdocs/luci-static/resources/view/fchomo/server.js:520 +#: htdocs/luci-static/resources/view/fchomo/server.js:580 msgid "encryption" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:971 #: htdocs/luci-static/resources/view/fchomo/node.js:982 #: htdocs/luci-static/resources/view/fchomo/node.js:987 -#: htdocs/luci-static/resources/view/fchomo/server.js:886 -#: htdocs/luci-static/resources/view/fchomo/server.js:897 -#: htdocs/luci-static/resources/view/fchomo/server.js:902 +#: htdocs/luci-static/resources/view/fchomo/server.js:946 +#: htdocs/luci-static/resources/view/fchomo/server.js:957 +#: htdocs/luci-static/resources/view/fchomo/server.js:962 msgid "gRPC" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1034 -#: htdocs/luci-static/resources/view/fchomo/server.js:921 +#: htdocs/luci-static/resources/view/fchomo/server.js:981 msgid "gRPC service name" msgstr "" @@ -3061,7 +3069,7 @@ msgstr "" msgid "h2mux" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:685 +#: htdocs/luci-static/resources/view/fchomo/server.js:745 msgid "least one keypair required" msgstr "" @@ -3084,12 +3092,12 @@ msgid "mlkem768x25519plus" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1137 -#: htdocs/luci-static/resources/view/fchomo/node.js:1411 +#: htdocs/luci-static/resources/view/fchomo/node.js:1423 msgid "mpTCP" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:443 -#: htdocs/luci-static/resources/view/fchomo/server.js:374 +#: htdocs/luci-static/resources/view/fchomo/server.js:434 msgid "new_reno" msgstr "" @@ -3111,7 +3119,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:588 #: htdocs/luci-static/resources/view/fchomo/node.js:661 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:302 -#: htdocs/luci-static/resources/view/fchomo/server.js:451 +#: htdocs/luci-static/resources/view/fchomo/server.js:511 msgid "none" msgstr "" @@ -3131,7 +3139,7 @@ msgstr "" msgid "obfs-simple" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1391 +#: htdocs/luci-static/resources/view/fchomo/node.js:1403 msgid "override.proxy-name" msgstr "" @@ -3140,7 +3148,7 @@ msgid "packet addr (v2ray-core v5+)" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:915 -#: htdocs/luci-static/resources/view/fchomo/server.js:759 +#: htdocs/luci-static/resources/view/fchomo/server.js:819 msgid "private key" msgstr "" @@ -3162,7 +3170,7 @@ msgid "rule-set" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:665 -#: htdocs/luci-static/resources/view/fchomo/server.js:452 +#: htdocs/luci-static/resources/view/fchomo/server.js:512 msgid "shadow-tls" msgstr "" @@ -3174,6 +3182,10 @@ msgstr "" msgid "src" msgstr "" +#: htdocs/luci-static/resources/view/fchomo/server.js:329 +msgid "sudoku-keypair" +msgstr "" + #: htdocs/luci-static/resources/view/fchomo/global.js:223 msgid "unchecked" msgstr "" @@ -3190,7 +3202,7 @@ msgstr "" msgid "unique value" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1427 +#: htdocs/luci-static/resources/view/fchomo/node.js:1439 msgid "up" msgstr "" @@ -3198,20 +3210,20 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:463 #: htdocs/luci-static/resources/view/fchomo/node.js:693 #: htdocs/luci-static/resources/view/fchomo/node.js:725 -#: htdocs/luci-static/resources/view/fchomo/server.js:471 +#: htdocs/luci-static/resources/view/fchomo/server.js:531 msgid "v1" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:420 #: htdocs/luci-static/resources/view/fchomo/node.js:694 #: htdocs/luci-static/resources/view/fchomo/node.js:726 -#: htdocs/luci-static/resources/view/fchomo/server.js:472 +#: htdocs/luci-static/resources/view/fchomo/server.js:532 msgid "v2" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:421 #: htdocs/luci-static/resources/view/fchomo/node.js:695 -#: htdocs/luci-static/resources/view/fchomo/server.js:473 +#: htdocs/luci-static/resources/view/fchomo/server.js:533 msgid "v3" msgstr "" diff --git a/small/luci-app-fchomo/po/zh_Hans/fchomo.po b/small/luci-app-fchomo/po/zh_Hans/fchomo.po index 0e04bf0abb..4fd40fb1f3 100644 --- a/small/luci-app-fchomo/po/zh_Hans/fchomo.po +++ b/small/luci-app-fchomo/po/zh_Hans/fchomo.po @@ -12,11 +12,6 @@ msgstr "" msgid "%s log" msgstr "%s 日志" -#: htdocs/luci-static/resources/view/fchomo/node.js:1578 -#: htdocs/luci-static/resources/view/fchomo/node.js:1584 -msgid "(Destination)" -msgstr "(落地)" - #: htdocs/luci-static/resources/fchomo.js:594 #: htdocs/luci-static/resources/view/fchomo/client.js:237 #: htdocs/luci-static/resources/view/fchomo/client.js:267 @@ -24,20 +19,15 @@ msgstr "(落地)" msgid "(Imported)" msgstr "(已导入)" -#: htdocs/luci-static/resources/view/fchomo/node.js:1600 -#: htdocs/luci-static/resources/view/fchomo/node.js:1606 -msgid "(Transit)" -msgstr "(中转)" - #: htdocs/luci-static/resources/view/fchomo/global.js:549 #: htdocs/luci-static/resources/view/fchomo/global.js:555 #: htdocs/luci-static/resources/view/fchomo/node.js:890 #: htdocs/luci-static/resources/view/fchomo/node.js:896 #: htdocs/luci-static/resources/view/fchomo/node.js:904 #: htdocs/luci-static/resources/view/fchomo/node.js:910 -#: htdocs/luci-static/resources/view/fchomo/server.js:762 -#: htdocs/luci-static/resources/view/fchomo/server.js:770 -#: htdocs/luci-static/resources/view/fchomo/server.js:779 +#: htdocs/luci-static/resources/view/fchomo/server.js:822 +#: htdocs/luci-static/resources/view/fchomo/server.js:830 +#: htdocs/luci-static/resources/view/fchomo/server.js:839 msgid "(mTLS)" msgstr "" @@ -48,10 +38,10 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1151 #: htdocs/luci-static/resources/view/fchomo/client.js:1622 #: htdocs/luci-static/resources/view/fchomo/client.js:1623 -#: htdocs/luci-static/resources/view/fchomo/node.js:1579 -#: htdocs/luci-static/resources/view/fchomo/node.js:1587 -#: htdocs/luci-static/resources/view/fchomo/node.js:1601 -#: htdocs/luci-static/resources/view/fchomo/node.js:1609 +#: htdocs/luci-static/resources/view/fchomo/node.js:1591 +#: htdocs/luci-static/resources/view/fchomo/node.js:1597 +#: htdocs/luci-static/resources/view/fchomo/node.js:1611 +#: htdocs/luci-static/resources/view/fchomo/node.js:1617 msgid "-- Please choose --" msgstr "-- 请选择 --" @@ -86,9 +76,9 @@ msgstr "仅限 0 或 1。" #: htdocs/luci-static/resources/view/fchomo/node.js:897 #: htdocs/luci-static/resources/view/fchomo/node.js:911 -#: htdocs/luci-static/resources/view/fchomo/server.js:740 -#: htdocs/luci-static/resources/view/fchomo/server.js:755 -#: htdocs/luci-static/resources/view/fchomo/server.js:780 +#: htdocs/luci-static/resources/view/fchomo/server.js:800 +#: htdocs/luci-static/resources/view/fchomo/server.js:815 +#: htdocs/luci-static/resources/view/fchomo/server.js:840 msgid "Save your configuration before uploading files!" msgstr "上传文件前请先保存配置！" @@ -161,7 +151,7 @@ msgstr "新增 节点" msgid "Add a provider" msgstr "新增 供应商" -#: htdocs/luci-static/resources/view/fchomo/node.js:1555 +#: htdocs/luci-static/resources/view/fchomo/node.js:1567 msgid "Add a proxy chain" msgstr "新增 代理链" @@ -177,7 +167,7 @@ msgstr "新增 路由规则" msgid "Add a rule set" msgstr "新增 规则集" -#: htdocs/luci-static/resources/view/fchomo/server.js:188 +#: htdocs/luci-static/resources/view/fchomo/server.js:199 msgid "Add a server" msgstr "新增 服务器" @@ -185,11 +175,11 @@ msgstr "新增 服务器" msgid "Add a sub rule" msgstr "新增 子规则" -#: htdocs/luci-static/resources/view/fchomo/node.js:1380 +#: htdocs/luci-static/resources/view/fchomo/node.js:1392 msgid "Add prefix" msgstr "添加前缀" -#: htdocs/luci-static/resources/view/fchomo/node.js:1384 +#: htdocs/luci-static/resources/view/fchomo/node.js:1396 msgid "Add suffix" msgstr "添加后缀" @@ -239,7 +229,7 @@ msgid "Already in updating." msgstr "已在更新中。" #: htdocs/luci-static/resources/view/fchomo/node.js:559 -#: htdocs/luci-static/resources/view/fchomo/server.js:442 +#: htdocs/luci-static/resources/view/fchomo/server.js:502 msgid "Alter ID" msgstr "额外 ID" @@ -261,7 +251,7 @@ msgstr "作为 dnsmasq 的最优先上游" msgid "As the TOP upstream of dnsmasq." msgstr "作为 dnsmasq 的最优先上游。" -#: htdocs/luci-static/resources/view/fchomo/server.js:392 +#: htdocs/luci-static/resources/view/fchomo/server.js:452 msgid "Auth timeout" msgstr "认证超时" @@ -273,7 +263,7 @@ msgstr "认证长度" msgid "Auto" msgstr "自动" -#: htdocs/luci-static/resources/view/fchomo/server.js:211 +#: htdocs/luci-static/resources/view/fchomo/server.js:222 msgid "Auto configure firewall" msgstr "自动配置防火墙" @@ -308,12 +298,12 @@ msgstr "二进制 mrs" #: htdocs/luci-static/resources/view/fchomo/global.js:740 #: htdocs/luci-static/resources/view/fchomo/node.js:1147 -#: htdocs/luci-static/resources/view/fchomo/node.js:1453 +#: htdocs/luci-static/resources/view/fchomo/node.js:1465 msgid "Bind interface" msgstr "绑定接口" #: htdocs/luci-static/resources/view/fchomo/node.js:1148 -#: htdocs/luci-static/resources/view/fchomo/node.js:1454 +#: htdocs/luci-static/resources/view/fchomo/node.js:1466 msgid "Bind outbound interface.
" msgstr "绑定出站接口。
" @@ -372,20 +362,10 @@ msgid "" msgstr "证书指纹。用于实现 SSL证书固定 并防止 MitM。" #: htdocs/luci-static/resources/view/fchomo/node.js:890 -#: htdocs/luci-static/resources/view/fchomo/server.js:732 +#: htdocs/luci-static/resources/view/fchomo/server.js:792 msgid "Certificate path" msgstr "证书路径" -#: htdocs/luci-static/resources/view/fchomo/node.js:1578 -#: htdocs/luci-static/resources/view/fchomo/node.js:1584 -msgid "Chain head" -msgstr "链头" - -#: htdocs/luci-static/resources/view/fchomo/node.js:1600 -#: htdocs/luci-static/resources/view/fchomo/node.js:1606 -msgid "Chain tail" -msgstr "链尾" - #: htdocs/luci-static/resources/view/fchomo/global.js:221 #: htdocs/luci-static/resources/view/fchomo/global.js:271 msgid "Check" @@ -414,8 +394,8 @@ msgstr "大陆域名列表版本" #: htdocs/luci-static/resources/view/fchomo/node.js:324 #: htdocs/luci-static/resources/view/fchomo/node.js:377 #: htdocs/luci-static/resources/view/fchomo/node.js:565 -#: htdocs/luci-static/resources/view/fchomo/server.js:291 -#: htdocs/luci-static/resources/view/fchomo/server.js:323 +#: htdocs/luci-static/resources/view/fchomo/server.js:302 +#: htdocs/luci-static/resources/view/fchomo/server.js:389 msgid "Chipher" msgstr "加密方法" @@ -435,17 +415,17 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:767 #: htdocs/luci-static/resources/view/fchomo/node.js:891 #: htdocs/luci-static/resources/view/fchomo/node.js:905 -#: htdocs/luci-static/resources/view/fchomo/server.js:561 -#: htdocs/luci-static/resources/view/fchomo/server.js:771 +#: htdocs/luci-static/resources/view/fchomo/server.js:621 +#: htdocs/luci-static/resources/view/fchomo/server.js:831 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:22 msgid "Client" msgstr "客户端" -#: htdocs/luci-static/resources/view/fchomo/server.js:770 +#: htdocs/luci-static/resources/view/fchomo/server.js:830 msgid "Client Auth Certificate path" msgstr "客户端认证证书路径" -#: htdocs/luci-static/resources/view/fchomo/server.js:762 +#: htdocs/luci-static/resources/view/fchomo/server.js:822 msgid "Client Auth type" msgstr "客户端认证类型" @@ -453,7 +433,7 @@ msgstr "客户端认证类型" msgid "Client fingerprint" msgstr "客户端指纹" -#: htdocs/luci-static/resources/view/fchomo/server.js:374 +#: htdocs/luci-static/resources/view/fchomo/server.js:385 msgid "Client key" msgstr "客户端密钥" @@ -474,12 +454,12 @@ msgstr "常用端口（绕过 P2P 流量）" msgid "Complete" msgstr "完成" -#: htdocs/luci-static/resources/view/fchomo/node.js:1400 +#: htdocs/luci-static/resources/view/fchomo/node.js:1412 msgid "Configuration Items" msgstr "配置项" #: htdocs/luci-static/resources/view/fchomo/node.js:439 -#: htdocs/luci-static/resources/view/fchomo/server.js:370 +#: htdocs/luci-static/resources/view/fchomo/server.js:430 msgid "Congestion controller" msgstr "拥塞控制器" @@ -487,15 +467,15 @@ msgstr "拥塞控制器" msgid "Connection check" msgstr "连接检查" -#: htdocs/luci-static/resources/view/fchomo/server.js:36 +#: htdocs/luci-static/resources/view/fchomo/server.js:35 msgid "Content copied to clipboard!" msgstr "内容已复制到剪贴板！" #: htdocs/luci-static/resources/view/fchomo/client.js:598 #: htdocs/luci-static/resources/view/fchomo/node.js:1322 -#: htdocs/luci-static/resources/view/fchomo/node.js:1336 +#: htdocs/luci-static/resources/view/fchomo/node.js:1348 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:326 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:340 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:352 msgid "Content will not be verified, Please make sure you enter it correctly." msgstr "内容将不会被验证，请确保输入正确。" @@ -508,7 +488,7 @@ msgstr "内容" msgid "Contents have been saved." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:38 +#: htdocs/luci-static/resources/view/fchomo/server.js:37 msgid "Copy" msgstr "复制" @@ -524,7 +504,7 @@ msgstr "Cron 表达式" msgid "Custom Direct List" msgstr "自定义直连列表" -#: htdocs/luci-static/resources/view/fchomo/node.js:1371 +#: htdocs/luci-static/resources/view/fchomo/node.js:1383 msgid "Custom HTTP header." msgstr "自定义 HTTP header。" @@ -581,6 +561,11 @@ msgstr "默认 DNS（由 WAN 下发）" msgid "Default DNS server" msgstr "默认 DNS 服务器" +#: htdocs/luci-static/resources/view/fchomo/node.js:1590 +#: htdocs/luci-static/resources/view/fchomo/node.js:1596 +msgid "Destination" +msgstr "落地" + #: htdocs/luci-static/resources/view/fchomo/node.js:631 msgid "Destination addresses allowed to be forwarded via Wireguard." msgstr "允许通过 WireGuard 转发的目的地址" @@ -589,8 +574,8 @@ msgstr "允许通过 WireGuard 转发的目的地址" msgid "Dial fields" msgstr "拨号字段" -#: htdocs/luci-static/resources/view/fchomo/node.js:1593 -#: htdocs/luci-static/resources/view/fchomo/node.js:1615 +#: htdocs/luci-static/resources/view/fchomo/node.js:1603 +#: htdocs/luci-static/resources/view/fchomo/node.js:1623 msgid "Different chain head/tail" msgstr "不同的链头/链尾" @@ -612,7 +597,7 @@ msgstr "直连 MAC 地址" #: htdocs/luci-static/resources/view/fchomo/global.js:403 #: htdocs/luci-static/resources/view/fchomo/node.js:290 -#: htdocs/luci-static/resources/view/fchomo/server.js:271 +#: htdocs/luci-static/resources/view/fchomo/server.js:282 msgid "Disable" msgstr "禁用" @@ -670,7 +655,7 @@ msgstr "不要在 ClientHello 中发送服务器名称。" #: htdocs/luci-static/resources/view/fchomo/client.js:1456 #: htdocs/luci-static/resources/view/fchomo/node.js:883 -#: htdocs/luci-static/resources/view/fchomo/node.js:1440 +#: htdocs/luci-static/resources/view/fchomo/node.js:1452 msgid "Donot verifying server certificate." msgstr "不验证服务器证书。" @@ -695,11 +680,11 @@ msgid "Dual stack" msgstr "双栈" #: htdocs/luci-static/resources/view/fchomo/node.js:924 -#: htdocs/luci-static/resources/view/fchomo/server.js:828 +#: htdocs/luci-static/resources/view/fchomo/server.js:888 msgid "ECH config" msgstr "ECH 配置" -#: htdocs/luci-static/resources/view/fchomo/server.js:787 +#: htdocs/luci-static/resources/view/fchomo/server.js:847 msgid "ECH key" msgstr "ECH 密钥" @@ -750,11 +735,11 @@ msgstr "消除加密头特征" #: htdocs/luci-static/resources/view/fchomo/global.js:686 #: htdocs/luci-static/resources/view/fchomo/node.js:232 #: htdocs/luci-static/resources/view/fchomo/node.js:1292 -#: htdocs/luci-static/resources/view/fchomo/node.js:1476 -#: htdocs/luci-static/resources/view/fchomo/node.js:1565 +#: htdocs/luci-static/resources/view/fchomo/node.js:1488 +#: htdocs/luci-static/resources/view/fchomo/node.js:1577 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:251 -#: htdocs/luci-static/resources/view/fchomo/server.js:179 -#: htdocs/luci-static/resources/view/fchomo/server.js:206 +#: htdocs/luci-static/resources/view/fchomo/server.js:190 +#: htdocs/luci-static/resources/view/fchomo/server.js:217 msgid "Enable" msgstr "启用" @@ -804,19 +789,19 @@ msgid "Enable statistic" msgstr "启用统计" #: htdocs/luci-static/resources/view/fchomo/node.js:719 -#: htdocs/luci-static/resources/view/fchomo/node.js:1422 +#: htdocs/luci-static/resources/view/fchomo/node.js:1434 msgid "" "Enable the SUoT protocol, requires server support. Conflict with Multiplex." msgstr "启用 SUoT 协议，需要服务端支持。与多路复用冲突。" #: htdocs/luci-static/resources/view/fchomo/node.js:296 -#: htdocs/luci-static/resources/view/fchomo/server.js:277 +#: htdocs/luci-static/resources/view/fchomo/server.js:288 msgid "" "Enabling obfuscation will make the server incompatible with standard QUIC " "connections, losing the ability to masquerade with HTTP/3." msgstr "启用混淆将使服务器与标准的 QUIC 连接不兼容，失去 HTTP/3 伪装的能力。" -#: htdocs/luci-static/resources/view/fchomo/server.js:524 +#: htdocs/luci-static/resources/view/fchomo/server.js:584 msgid "Encryption method" msgstr "加密方法" @@ -839,7 +824,7 @@ msgid "" "if empty." msgstr "超过此限制将会触发强制健康检查。留空则使用 5。" -#: htdocs/luci-static/resources/view/fchomo/node.js:1534 +#: htdocs/luci-static/resources/view/fchomo/node.js:1546 msgid "Exclude matched node types." msgstr "排除匹配的节点类型。" @@ -852,7 +837,7 @@ msgstr "" "rel=\"noreferrer noopener\">此处。" #: htdocs/luci-static/resources/view/fchomo/client.js:1043 -#: htdocs/luci-static/resources/view/fchomo/node.js:1527 +#: htdocs/luci-static/resources/view/fchomo/node.js:1539 msgid "Exclude nodes that meet keywords or regexps." msgstr "排除匹配关键词或表达式的节点。" @@ -861,12 +846,12 @@ msgid "Expand/Collapse result" msgstr "展开/收起 结果" #: htdocs/luci-static/resources/view/fchomo/client.js:1003 -#: htdocs/luci-static/resources/view/fchomo/node.js:1512 +#: htdocs/luci-static/resources/view/fchomo/node.js:1524 msgid "Expected HTTP code. 204 will be used if empty." msgstr "预期的 HTTP code。留空则使用 204。" #: htdocs/luci-static/resources/view/fchomo/client.js:1005 -#: htdocs/luci-static/resources/view/fchomo/node.js:1514 +#: htdocs/luci-static/resources/view/fchomo/node.js:1526 msgid "Expected status" msgstr "预期状态" @@ -898,20 +883,20 @@ msgstr "预期状态" #: htdocs/luci-static/resources/view/fchomo/global.js:871 #: htdocs/luci-static/resources/view/fchomo/node.js:790 #: htdocs/luci-static/resources/view/fchomo/node.js:875 -#: htdocs/luci-static/resources/view/fchomo/node.js:1593 -#: htdocs/luci-static/resources/view/fchomo/node.js:1615 +#: htdocs/luci-static/resources/view/fchomo/node.js:1603 +#: htdocs/luci-static/resources/view/fchomo/node.js:1623 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:278 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:292 -#: htdocs/luci-static/resources/view/fchomo/server.js:553 -#: htdocs/luci-static/resources/view/fchomo/server.js:584 -#: htdocs/luci-static/resources/view/fchomo/server.js:685 +#: htdocs/luci-static/resources/view/fchomo/server.js:613 +#: htdocs/luci-static/resources/view/fchomo/server.js:644 +#: htdocs/luci-static/resources/view/fchomo/server.js:745 msgid "Expecting: %s" msgstr "请输入：%s" #: htdocs/luci-static/resources/view/fchomo/node.js:980 #: htdocs/luci-static/resources/view/fchomo/node.js:987 -#: htdocs/luci-static/resources/view/fchomo/server.js:895 -#: htdocs/luci-static/resources/view/fchomo/server.js:902 +#: htdocs/luci-static/resources/view/fchomo/server.js:955 +#: htdocs/luci-static/resources/view/fchomo/server.js:962 msgid "Expecting: only support %s." msgstr "请输入：仅支援 %s." @@ -960,7 +945,7 @@ msgid "Fallback filter" msgstr "後備过滤器" #: htdocs/luci-static/resources/view/fchomo/client.js:1038 -#: htdocs/luci-static/resources/view/fchomo/node.js:1521 +#: htdocs/luci-static/resources/view/fchomo/node.js:1533 msgid "Filter nodes that meet keywords or regexps." msgstr "过滤匹配关键字或表达式的节点。" @@ -976,12 +961,12 @@ msgstr "兜底 DNS 服务器 (用于未被投毒污染的域名)" msgid "Final DNS server (For poisoned domains)" msgstr "兜底 DNS 服务器 (用于已被投毒污染的域名)" -#: htdocs/luci-static/resources/view/fchomo/server.js:210 +#: htdocs/luci-static/resources/view/fchomo/server.js:221 msgid "Firewall" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:551 -#: htdocs/luci-static/resources/view/fchomo/server.js:434 +#: htdocs/luci-static/resources/view/fchomo/server.js:494 msgid "Flow" msgstr "流控" @@ -994,8 +979,8 @@ msgstr "" "noopener\">%s." #: htdocs/luci-static/resources/view/fchomo/client.js:1004 -#: htdocs/luci-static/resources/view/fchomo/node.js:1390 -#: htdocs/luci-static/resources/view/fchomo/node.js:1513 +#: htdocs/luci-static/resources/view/fchomo/node.js:1402 +#: htdocs/luci-static/resources/view/fchomo/node.js:1525 msgid "" "For format see %s." @@ -1037,7 +1022,7 @@ msgstr "常规" #: htdocs/luci-static/resources/view/fchomo/client.js:891 #: htdocs/luci-static/resources/view/fchomo/node.js:220 #: htdocs/luci-static/resources/view/fchomo/node.js:1282 -#: htdocs/luci-static/resources/view/fchomo/server.js:193 +#: htdocs/luci-static/resources/view/fchomo/server.js:204 msgid "General fields" msgstr "常规字段" @@ -1050,8 +1035,9 @@ msgstr "常规设置" #: htdocs/luci-static/resources/fchomo.js:510 #: htdocs/luci-static/resources/fchomo.js:512 #: htdocs/luci-static/resources/view/fchomo/global.js:593 -#: htdocs/luci-static/resources/view/fchomo/server.js:657 -#: htdocs/luci-static/resources/view/fchomo/server.js:820 +#: htdocs/luci-static/resources/view/fchomo/server.js:376 +#: htdocs/luci-static/resources/view/fchomo/server.js:717 +#: htdocs/luci-static/resources/view/fchomo/server.js:880 msgid "Generate" msgstr "生成" @@ -1123,13 +1109,13 @@ msgstr "组" #: htdocs/luci-static/resources/view/fchomo/node.js:672 #: htdocs/luci-static/resources/view/fchomo/node.js:969 #: htdocs/luci-static/resources/view/fchomo/node.js:980 -#: htdocs/luci-static/resources/view/fchomo/server.js:895 +#: htdocs/luci-static/resources/view/fchomo/server.js:955 msgid "HTTP" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:265 #: htdocs/luci-static/resources/view/fchomo/node.js:1028 -#: htdocs/luci-static/resources/view/fchomo/node.js:1370 +#: htdocs/luci-static/resources/view/fchomo/node.js:1382 msgid "HTTP header" msgstr "HTTP header" @@ -1145,7 +1131,7 @@ msgstr "HTTP 请求方法" msgid "HTTP/3" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:285 +#: htdocs/luci-static/resources/view/fchomo/server.js:296 msgid "" "HTTP3 server behavior when authentication fails.
A 404 page will be " "returned if empty." @@ -1153,7 +1139,7 @@ msgstr "身份验证失败时的 HTTP3 服务器响应。默认返回 404 页面 #: htdocs/luci-static/resources/view/fchomo/node.js:970 #: htdocs/luci-static/resources/view/fchomo/node.js:981 -#: htdocs/luci-static/resources/view/fchomo/server.js:896 +#: htdocs/luci-static/resources/view/fchomo/server.js:956 msgid "HTTPUpgrade" msgstr "" @@ -1165,31 +1151,31 @@ msgstr "处理域名" msgid "Handshake mode" msgstr "握手模式" -#: htdocs/luci-static/resources/view/fchomo/server.js:457 +#: htdocs/luci-static/resources/view/fchomo/server.js:517 msgid "Handshake target that supports TLS 1.3" msgstr "握手目标 (支援 TLS 1.3)" -#: htdocs/luci-static/resources/view/fchomo/server.js:357 +#: htdocs/luci-static/resources/view/fchomo/server.js:417 msgid "Handshake timeout" msgstr "握手超时" #: htdocs/luci-static/resources/view/fchomo/client.js:973 -#: htdocs/luci-static/resources/view/fchomo/node.js:1481 +#: htdocs/luci-static/resources/view/fchomo/node.js:1493 msgid "Health check URL" msgstr "健康检查 URL" #: htdocs/luci-static/resources/view/fchomo/client.js:1002 -#: htdocs/luci-static/resources/view/fchomo/node.js:1511 +#: htdocs/luci-static/resources/view/fchomo/node.js:1523 msgid "Health check expected status" msgstr "健康检查预期状态" #: htdocs/luci-static/resources/view/fchomo/client.js:982 -#: htdocs/luci-static/resources/view/fchomo/node.js:1491 +#: htdocs/luci-static/resources/view/fchomo/node.js:1503 msgid "Health check interval" msgstr "健康检查间隔" #: htdocs/luci-static/resources/view/fchomo/client.js:989 -#: htdocs/luci-static/resources/view/fchomo/node.js:1498 +#: htdocs/luci-static/resources/view/fchomo/node.js:1510 msgid "Health check timeout" msgstr "健康检查超时" @@ -1242,7 +1228,7 @@ msgid "IP override" msgstr "IP 覆写" #: htdocs/luci-static/resources/view/fchomo/node.js:1159 -#: htdocs/luci-static/resources/view/fchomo/node.js:1467 +#: htdocs/luci-static/resources/view/fchomo/node.js:1479 msgid "IP version" msgstr "IP 版本" @@ -1271,7 +1257,7 @@ msgstr "闲置会话检查间隔" msgid "Idle session timeout" msgstr "闲置会话超时" -#: htdocs/luci-static/resources/view/fchomo/server.js:385 +#: htdocs/luci-static/resources/view/fchomo/server.js:445 msgid "Idle timeout" msgstr "闲置超时" @@ -1283,7 +1269,7 @@ msgstr "如果选择了“所有端口”，则取消选中“其他”" msgid "If Block is selected, uncheck others" msgstr "如果选择了“阻止”，则取消选中“其他”" -#: htdocs/luci-static/resources/view/fchomo/server.js:264 +#: htdocs/luci-static/resources/view/fchomo/server.js:275 msgid "Ignore client bandwidth" msgstr "忽略客户端带宽" @@ -1316,15 +1302,15 @@ msgstr "导入规则集链接" #: htdocs/luci-static/resources/view/fchomo/node.js:278 #: htdocs/luci-static/resources/view/fchomo/node.js:284 -#: htdocs/luci-static/resources/view/fchomo/node.js:1428 -#: htdocs/luci-static/resources/view/fchomo/node.js:1434 -#: htdocs/luci-static/resources/view/fchomo/server.js:253 -#: htdocs/luci-static/resources/view/fchomo/server.js:259 +#: htdocs/luci-static/resources/view/fchomo/node.js:1440 +#: htdocs/luci-static/resources/view/fchomo/node.js:1446 +#: htdocs/luci-static/resources/view/fchomo/server.js:264 +#: htdocs/luci-static/resources/view/fchomo/server.js:270 msgid "In Mbps." msgstr "单位为 Mbps。" -#: htdocs/luci-static/resources/view/fchomo/node.js:1348 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:352 +#: htdocs/luci-static/resources/view/fchomo/node.js:1360 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:364 msgid "In bytes. %s will be used if empty." msgstr "单位为字节。留空则使用 %s。" @@ -1335,14 +1321,14 @@ msgstr "单位为毫秒。" #: htdocs/luci-static/resources/view/fchomo/client.js:990 #: htdocs/luci-static/resources/view/fchomo/client.js:1019 -#: htdocs/luci-static/resources/view/fchomo/node.js:1499 +#: htdocs/luci-static/resources/view/fchomo/node.js:1511 msgid "In millisecond. %s will be used if empty." msgstr "单位为毫秒。留空则使用 %s。" #: htdocs/luci-static/resources/view/fchomo/node.js:525 #: htdocs/luci-static/resources/view/fchomo/node.js:532 -#: htdocs/luci-static/resources/view/fchomo/server.js:386 -#: htdocs/luci-static/resources/view/fchomo/server.js:393 +#: htdocs/luci-static/resources/view/fchomo/server.js:446 +#: htdocs/luci-static/resources/view/fchomo/server.js:453 msgid "In seconds." msgstr "单位为秒。" @@ -1350,14 +1336,14 @@ msgstr "单位为秒。" #: htdocs/luci-static/resources/view/fchomo/global.js:425 #: htdocs/luci-static/resources/view/fchomo/global.js:430 #: htdocs/luci-static/resources/view/fchomo/global.js:515 -#: htdocs/luci-static/resources/view/fchomo/node.js:1354 -#: htdocs/luci-static/resources/view/fchomo/node.js:1492 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:358 +#: htdocs/luci-static/resources/view/fchomo/node.js:1366 +#: htdocs/luci-static/resources/view/fchomo/node.js:1504 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:370 msgid "In seconds. %s will be used if empty." msgstr "单位为秒。留空则使用 %s。" #: htdocs/luci-static/resources/view/fchomo/node.js:779 -#: htdocs/luci-static/resources/view/fchomo/server.js:573 +#: htdocs/luci-static/resources/view/fchomo/server.js:633 msgid "" "In the order of one Padding-Length and one Padding-" "Interval, infinite concatenation." @@ -1406,26 +1392,21 @@ msgstr "内嵌" msgid "Interface Control" msgstr "接口控制" -#: htdocs/luci-static/resources/view/fchomo/server.js:352 -msgid "Keep consistent with the %s." -msgstr "与%s保持一致" - #: htdocs/luci-static/resources/fchomo.js:142 msgid "Keep default" msgstr "保持缺省" #: htdocs/luci-static/resources/view/fchomo/node.js:371 -#: htdocs/luci-static/resources/view/fchomo/server.js:317 -#: htdocs/luci-static/resources/view/fchomo/server.js:352 +#: htdocs/luci-static/resources/view/fchomo/server.js:332 msgid "Key" msgstr "密钥" #: htdocs/luci-static/resources/view/fchomo/node.js:904 -#: htdocs/luci-static/resources/view/fchomo/server.js:747 +#: htdocs/luci-static/resources/view/fchomo/server.js:807 msgid "Key path" msgstr "证书路径" -#: htdocs/luci-static/resources/view/fchomo/server.js:592 +#: htdocs/luci-static/resources/view/fchomo/server.js:652 msgid "Keypairs" msgstr "密钥对" @@ -1436,18 +1417,18 @@ msgstr "密钥对" #: htdocs/luci-static/resources/view/fchomo/client.js:1589 #: htdocs/luci-static/resources/view/fchomo/node.js:227 #: htdocs/luci-static/resources/view/fchomo/node.js:1287 -#: htdocs/luci-static/resources/view/fchomo/node.js:1560 +#: htdocs/luci-static/resources/view/fchomo/node.js:1572 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:246 -#: htdocs/luci-static/resources/view/fchomo/server.js:201 +#: htdocs/luci-static/resources/view/fchomo/server.js:212 msgid "Label" msgstr "标签" #: htdocs/luci-static/resources/view/fchomo/client.js:996 -#: htdocs/luci-static/resources/view/fchomo/node.js:1505 +#: htdocs/luci-static/resources/view/fchomo/node.js:1517 msgid "Lazy" msgstr "懒惰状态" -#: htdocs/luci-static/resources/view/fchomo/server.js:443 +#: htdocs/luci-static/resources/view/fchomo/server.js:503 msgid "" "Legacy protocol support (VMess MD5 Authentication) is provided for " "compatibility purposes only, use of alterId > 1 is not recommended." @@ -1460,15 +1441,15 @@ msgid "Less compatibility and sometimes better performance." msgstr "有时性能更好。" #: htdocs/luci-static/resources/view/fchomo/node.js:831 -#: htdocs/luci-static/resources/view/fchomo/server.js:728 +#: htdocs/luci-static/resources/view/fchomo/server.js:788 msgid "List of supported application level protocols, in order of preference." msgstr "支持的应用层协议协商列表，按顺序排列。" -#: htdocs/luci-static/resources/view/fchomo/server.js:221 +#: htdocs/luci-static/resources/view/fchomo/server.js:232 msgid "Listen address" msgstr "监听地址" -#: htdocs/luci-static/resources/view/fchomo/server.js:198 +#: htdocs/luci-static/resources/view/fchomo/server.js:209 msgid "Listen fields" msgstr "监听字段" @@ -1477,7 +1458,7 @@ msgid "Listen interfaces" msgstr "监听接口" #: htdocs/luci-static/resources/view/fchomo/client.js:1251 -#: htdocs/luci-static/resources/view/fchomo/server.js:226 +#: htdocs/luci-static/resources/view/fchomo/server.js:237 msgid "Listen port" msgstr "监听端口" @@ -1527,7 +1508,7 @@ msgstr "仅限小写" msgid "MTU" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:284 +#: htdocs/luci-static/resources/view/fchomo/server.js:295 msgid "Masquerade" msgstr "伪装" @@ -1564,7 +1545,7 @@ msgid "Max Early Data" msgstr "前置数据最大值" #: htdocs/luci-static/resources/view/fchomo/node.js:467 -#: htdocs/luci-static/resources/view/fchomo/server.js:379 +#: htdocs/luci-static/resources/view/fchomo/server.js:439 msgid "Max UDP relay packet size" msgstr "UDP 中继数据包最大尺寸" @@ -1573,7 +1554,7 @@ msgid "Max count of failures" msgstr "最大失败次数" #: htdocs/luci-static/resources/view/fchomo/node.js:283 -#: htdocs/luci-static/resources/view/fchomo/server.js:258 +#: htdocs/luci-static/resources/view/fchomo/server.js:269 msgid "Max download speed" msgstr "最大下载速度" @@ -1582,7 +1563,7 @@ msgid "Max open streams" msgstr "限制打开流的数量" #: htdocs/luci-static/resources/view/fchomo/node.js:277 -#: htdocs/luci-static/resources/view/fchomo/server.js:252 +#: htdocs/luci-static/resources/view/fchomo/server.js:263 msgid "Max upload speed" msgstr "最大上传速度" @@ -1600,7 +1581,7 @@ msgstr "" "%s 冲突。" #: htdocs/luci-static/resources/view/fchomo/node.js:398 -#: htdocs/luci-static/resources/view/fchomo/server.js:344 +#: htdocs/luci-static/resources/view/fchomo/server.js:410 msgid "Maximum padding" msgstr "最大填充" @@ -1621,7 +1602,7 @@ msgstr "Mihomo 客户端" #: htdocs/luci-static/resources/view/fchomo/log.js:158 #: htdocs/luci-static/resources/view/fchomo/log.js:163 -#: htdocs/luci-static/resources/view/fchomo/server.js:153 +#: htdocs/luci-static/resources/view/fchomo/server.js:164 msgid "Mihomo server" msgstr "Mihomo 服务端" @@ -1635,7 +1616,7 @@ msgid "" msgstr "在打开新连接之前，连接中的最小多路复用流数量。" #: htdocs/luci-static/resources/view/fchomo/node.js:391 -#: htdocs/luci-static/resources/view/fchomo/server.js:337 +#: htdocs/luci-static/resources/view/fchomo/server.js:403 msgid "Minimum padding" msgstr "最小填充" @@ -1662,7 +1643,7 @@ msgid "Multiplex" msgstr "多路复用" #: htdocs/luci-static/resources/view/fchomo/node.js:224 -#: htdocs/luci-static/resources/view/fchomo/server.js:197 +#: htdocs/luci-static/resources/view/fchomo/server.js:208 msgid "Multiplex fields" msgstr "多路复用字段" @@ -1675,11 +1656,11 @@ msgstr "多路复用" msgid "NOT" msgstr "NOT" -#: htdocs/luci-static/resources/view/fchomo/node.js:1360 +#: htdocs/luci-static/resources/view/fchomo/node.js:1372 msgid "Name of the Proxy group to download provider." msgstr "用于下载供应商订阅的代理组名称。" -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:364 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:376 msgid "Name of the Proxy group to download rule set." msgstr "用于下载规则集订阅的代理组名称。" @@ -1700,7 +1681,7 @@ msgid "No add'l params" msgstr "无附加参数" #: htdocs/luci-static/resources/view/fchomo/client.js:997 -#: htdocs/luci-static/resources/view/fchomo/node.js:1506 +#: htdocs/luci-static/resources/view/fchomo/node.js:1518 msgid "No testing is performed when this provider node is not in use." msgstr "当此供应商的节点未使用时，不执行任何测试。" @@ -1719,17 +1700,17 @@ msgid "Node" msgstr "节点" #: htdocs/luci-static/resources/view/fchomo/client.js:1042 -#: htdocs/luci-static/resources/view/fchomo/node.js:1526 +#: htdocs/luci-static/resources/view/fchomo/node.js:1538 msgid "Node exclude filter" msgstr "排除节点" #: htdocs/luci-static/resources/view/fchomo/client.js:1047 -#: htdocs/luci-static/resources/view/fchomo/node.js:1533 +#: htdocs/luci-static/resources/view/fchomo/node.js:1545 msgid "Node exclude type" msgstr "排除节点类型" #: htdocs/luci-static/resources/view/fchomo/client.js:1037 -#: htdocs/luci-static/resources/view/fchomo/node.js:1520 +#: htdocs/luci-static/resources/view/fchomo/node.js:1532 msgid "Node filter" msgstr "过滤节点" @@ -1754,24 +1735,24 @@ msgid "Obfs Mode" msgstr "Obfs 模式" #: htdocs/luci-static/resources/view/fchomo/node.js:295 -#: htdocs/luci-static/resources/view/fchomo/server.js:276 +#: htdocs/luci-static/resources/view/fchomo/server.js:287 msgid "Obfuscate password" msgstr "混淆密码" #: htdocs/luci-static/resources/view/fchomo/node.js:289 #: htdocs/luci-static/resources/view/fchomo/node.js:385 -#: htdocs/luci-static/resources/view/fchomo/server.js:270 -#: htdocs/luci-static/resources/view/fchomo/server.js:331 +#: htdocs/luci-static/resources/view/fchomo/server.js:281 +#: htdocs/luci-static/resources/view/fchomo/server.js:397 msgid "Obfuscate type" msgstr "混淆类型" #: htdocs/luci-static/resources/view/fchomo/node.js:386 -#: htdocs/luci-static/resources/view/fchomo/server.js:332 +#: htdocs/luci-static/resources/view/fchomo/server.js:398 msgid "Obfuscated as ASCII data stream" msgstr "混淆为 ASCII 数据流" #: htdocs/luci-static/resources/view/fchomo/node.js:387 -#: htdocs/luci-static/resources/view/fchomo/server.js:333 +#: htdocs/luci-static/resources/view/fchomo/server.js:399 msgid "Obfuscated as low-entropy data stream" msgstr "混淆为低熵数据流" @@ -1833,27 +1814,27 @@ msgstr "" msgid "Packet encoding" msgstr "数据包编码" -#: htdocs/luci-static/resources/view/fchomo/server.js:423 +#: htdocs/luci-static/resources/view/fchomo/server.js:483 msgid "Padding scheme" msgstr "填充方案" #: htdocs/luci-static/resources/view/fchomo/node.js:777 -#: htdocs/luci-static/resources/view/fchomo/server.js:571 +#: htdocs/luci-static/resources/view/fchomo/server.js:631 msgid "Paddings" msgstr "填充 (Paddings)" #: htdocs/luci-static/resources/view/fchomo/node.js:259 #: htdocs/luci-static/resources/view/fchomo/node.js:332 #: htdocs/luci-static/resources/view/fchomo/node.js:686 -#: htdocs/luci-static/resources/view/fchomo/server.js:243 -#: htdocs/luci-static/resources/view/fchomo/server.js:299 -#: htdocs/luci-static/resources/view/fchomo/server.js:464 +#: htdocs/luci-static/resources/view/fchomo/server.js:254 +#: htdocs/luci-static/resources/view/fchomo/server.js:310 +#: htdocs/luci-static/resources/view/fchomo/server.js:524 msgid "Password" msgstr "密码" -#: htdocs/luci-static/resources/view/fchomo/node.js:1335 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:339 -#: htdocs/luci-static/resources/view/fchomo/server.js:511 +#: htdocs/luci-static/resources/view/fchomo/node.js:1347 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:351 +#: htdocs/luci-static/resources/view/fchomo/server.js:571 msgid "Payload" msgstr "Payload" @@ -1887,9 +1868,9 @@ msgid "" msgstr "链接格式标准请参考 %s。" #: htdocs/luci-static/resources/view/fchomo/node.js:1320 -#: htdocs/luci-static/resources/view/fchomo/node.js:1334 +#: htdocs/luci-static/resources/view/fchomo/node.js:1346 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:324 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:338 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:350 msgid "" "Please type %s." @@ -1907,7 +1888,7 @@ msgid "Please type %s fields of mihomo config.
" msgstr "请输入 mihomo 配置的 %s 字段。
" #: htdocs/luci-static/resources/view/fchomo/node.js:660 -#: htdocs/luci-static/resources/view/fchomo/server.js:450 +#: htdocs/luci-static/resources/view/fchomo/server.js:510 msgid "Plugin" msgstr "插件" @@ -1917,9 +1898,9 @@ msgstr "插件" #: htdocs/luci-static/resources/view/fchomo/node.js:692 #: htdocs/luci-static/resources/view/fchomo/node.js:700 #: htdocs/luci-static/resources/view/fchomo/node.js:706 -#: htdocs/luci-static/resources/view/fchomo/server.js:457 -#: htdocs/luci-static/resources/view/fchomo/server.js:464 -#: htdocs/luci-static/resources/view/fchomo/server.js:470 +#: htdocs/luci-static/resources/view/fchomo/server.js:517 +#: htdocs/luci-static/resources/view/fchomo/server.js:524 +#: htdocs/luci-static/resources/view/fchomo/server.js:530 msgid "Plugin:" msgstr "插件：" @@ -1940,7 +1921,7 @@ msgid "Ports" msgstr "端口" #: htdocs/luci-static/resources/view/fchomo/node.js:272 -#: htdocs/luci-static/resources/view/fchomo/server.js:226 +#: htdocs/luci-static/resources/view/fchomo/server.js:237 msgid "Ports pool" msgstr "端口池" @@ -1966,8 +1947,8 @@ msgstr "防止某些情况下的 ICMP 环回问题。Ping 不会显示实际延 #: htdocs/luci-static/resources/view/fchomo/global.js:759 #: htdocs/luci-static/resources/view/fchomo/node.js:1149 #: htdocs/luci-static/resources/view/fchomo/node.js:1155 -#: htdocs/luci-static/resources/view/fchomo/node.js:1455 -#: htdocs/luci-static/resources/view/fchomo/node.js:1462 +#: htdocs/luci-static/resources/view/fchomo/node.js:1467 +#: htdocs/luci-static/resources/view/fchomo/node.js:1474 msgid "Priority: Proxy Node > Global." msgstr "优先级: 代理节点 > 全局。" @@ -2005,11 +1986,11 @@ msgstr "协议参数。 如启用会随机浪费流量（在 v2ray 中默认启 #: htdocs/luci-static/resources/view/fchomo/client.js:937 #: htdocs/luci-static/resources/view/fchomo/node.js:1168 #: htdocs/luci-static/resources/view/fchomo/node.js:1177 -#: htdocs/luci-static/resources/view/fchomo/node.js:1571 +#: htdocs/luci-static/resources/view/fchomo/node.js:1583 msgid "Provider" msgstr "供应商" -#: htdocs/luci-static/resources/view/fchomo/node.js:1341 +#: htdocs/luci-static/resources/view/fchomo/node.js:1353 msgid "Provider URL" msgstr "供应商订阅 URL" @@ -2032,19 +2013,19 @@ msgid "Proxy MAC-s" msgstr "代理 MAC 地址" #: htdocs/luci-static/resources/view/fchomo/node.js:206 -#: htdocs/luci-static/resources/view/fchomo/node.js:1570 +#: htdocs/luci-static/resources/view/fchomo/node.js:1582 msgid "Proxy Node" msgstr "代理节点" -#: htdocs/luci-static/resources/view/fchomo/node.js:1546 -#: htdocs/luci-static/resources/view/fchomo/node.js:1555 +#: htdocs/luci-static/resources/view/fchomo/node.js:1558 +#: htdocs/luci-static/resources/view/fchomo/node.js:1567 msgid "Proxy chain" msgstr "代理链" #: htdocs/luci-static/resources/view/fchomo/client.js:713 #: htdocs/luci-static/resources/view/fchomo/client.js:1422 -#: htdocs/luci-static/resources/view/fchomo/node.js:1359 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:363 +#: htdocs/luci-static/resources/view/fchomo/node.js:1371 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:375 msgid "Proxy group" msgstr "代理组" @@ -2065,17 +2046,17 @@ msgid "QUIC" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:440 -#: htdocs/luci-static/resources/view/fchomo/server.js:371 +#: htdocs/luci-static/resources/view/fchomo/server.js:431 msgid "QUIC congestion controller." msgstr "QUIC 拥塞控制器。" #: htdocs/luci-static/resources/view/fchomo/client.js:804 -#: htdocs/luci-static/resources/view/fchomo/server.js:174 +#: htdocs/luci-static/resources/view/fchomo/server.js:185 msgid "Quick Reload" msgstr "快速重载" #: htdocs/luci-static/resources/view/fchomo/node.js:940 -#: htdocs/luci-static/resources/view/fchomo/server.js:835 +#: htdocs/luci-static/resources/view/fchomo/server.js:895 msgid "REALITY" msgstr "REALITY" @@ -2083,31 +2064,31 @@ msgstr "REALITY" msgid "REALITY X25519MLKEM768 PQC support" msgstr "REALITY X25519MLKEM768 后量子加密支持" -#: htdocs/luci-static/resources/view/fchomo/server.js:872 +#: htdocs/luci-static/resources/view/fchomo/server.js:932 msgid "REALITY certificate issued to" msgstr "REALITY 证书颁发给" -#: htdocs/luci-static/resources/view/fchomo/server.js:840 +#: htdocs/luci-static/resources/view/fchomo/server.js:900 msgid "REALITY handshake server" msgstr "REALITY 握手服务器" -#: htdocs/luci-static/resources/view/fchomo/server.js:847 +#: htdocs/luci-static/resources/view/fchomo/server.js:907 msgid "REALITY private key" msgstr "REALITY 私钥" #: htdocs/luci-static/resources/view/fchomo/node.js:945 -#: htdocs/luci-static/resources/view/fchomo/server.js:862 +#: htdocs/luci-static/resources/view/fchomo/server.js:922 msgid "REALITY public key" msgstr "REALITY 公钥" #: htdocs/luci-static/resources/view/fchomo/node.js:950 -#: htdocs/luci-static/resources/view/fchomo/server.js:866 +#: htdocs/luci-static/resources/view/fchomo/server.js:926 msgid "REALITY short ID" msgstr "REALITY 标识符" #: htdocs/luci-static/resources/view/fchomo/node.js:767 -#: htdocs/luci-static/resources/view/fchomo/server.js:542 -#: htdocs/luci-static/resources/view/fchomo/server.js:561 +#: htdocs/luci-static/resources/view/fchomo/server.js:602 +#: htdocs/luci-static/resources/view/fchomo/server.js:621 msgid "RTT" msgstr "" @@ -2123,11 +2104,6 @@ msgstr "留空将使用随机令牌。" msgid "Randomized traffic characteristics" msgstr "随机化流量特征" -#: htdocs/luci-static/resources/view/fchomo/node.js:1585 -#: htdocs/luci-static/resources/view/fchomo/node.js:1607 -msgid "Recommended to use UoT node.
such as %s." -msgstr "建议使用 UoT 节点。
例如%s。" - #: htdocs/luci-static/resources/view/fchomo/global.js:460 msgid "Redir port" msgstr "Redir 端口" @@ -2151,7 +2127,7 @@ msgstr "每 %s 秒刷新。" #: htdocs/luci-static/resources/fchomo.js:1025 #: htdocs/luci-static/resources/view/fchomo/client.js:805 #: htdocs/luci-static/resources/view/fchomo/global.js:193 -#: htdocs/luci-static/resources/view/fchomo/server.js:175 +#: htdocs/luci-static/resources/view/fchomo/server.js:186 msgid "Reload" msgstr "重载" @@ -2180,11 +2156,11 @@ msgstr "移除" msgid "Remove idles" msgstr "移除闲置" -#: htdocs/luci-static/resources/view/fchomo/node.js:1388 +#: htdocs/luci-static/resources/view/fchomo/node.js:1400 msgid "Replace name" msgstr "名称替换" -#: htdocs/luci-static/resources/view/fchomo/node.js:1389 +#: htdocs/luci-static/resources/view/fchomo/node.js:1401 msgid "Replace node name." msgstr "替换节点名称" @@ -2194,7 +2170,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1014 #: htdocs/luci-static/resources/view/fchomo/node.js:1021 -#: htdocs/luci-static/resources/view/fchomo/server.js:914 +#: htdocs/luci-static/resources/view/fchomo/server.js:974 msgid "Request path" msgstr "请求路径" @@ -2251,7 +2227,7 @@ msgid "Routing GFW" msgstr "路由 GFW 流量" #: htdocs/luci-static/resources/view/fchomo/node.js:1154 -#: htdocs/luci-static/resources/view/fchomo/node.js:1461 +#: htdocs/luci-static/resources/view/fchomo/node.js:1473 msgid "Routing mark" msgstr "路由标记" @@ -2299,7 +2275,7 @@ msgstr "规则" msgid "Rule set" msgstr "规则集" -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:345 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:357 msgid "Rule set URL" msgstr "规则集订阅 URL" @@ -2344,7 +2320,7 @@ msgid "SUoT version" msgstr "SUoT 版本" #: htdocs/luci-static/resources/view/fchomo/node.js:291 -#: htdocs/luci-static/resources/view/fchomo/server.js:272 +#: htdocs/luci-static/resources/view/fchomo/server.js:283 msgid "Salamander" msgstr "Salamander" @@ -2356,10 +2332,6 @@ msgstr "相同 目标地址 请求。相同节点" msgid "Same srcaddr and dstaddr requests. Same node" msgstr "相同 来源地址 和 目标地址 请求。相同节点" -#: htdocs/luci-static/resources/view/fchomo/server.js:351 -msgid "Seed" -msgstr "种子" - #: htdocs/luci-static/resources/view/fchomo/global.js:509 msgid "Segment maximum size" msgstr "分段最大尺寸" @@ -2381,10 +2353,10 @@ msgstr "以 50% 的概率发送随机 0-3333 字节的填充。" msgid "Send random ticket of 300s-600s duration for client 0-RTT reuse." msgstr "发送 300-600 秒的随机票证，以供客户端 0-RTT 重用。" -#: htdocs/luci-static/resources/view/fchomo/server.js:188 -#: htdocs/luci-static/resources/view/fchomo/server.js:542 -#: htdocs/luci-static/resources/view/fchomo/server.js:733 -#: htdocs/luci-static/resources/view/fchomo/server.js:748 +#: htdocs/luci-static/resources/view/fchomo/server.js:199 +#: htdocs/luci-static/resources/view/fchomo/server.js:602 +#: htdocs/luci-static/resources/view/fchomo/server.js:793 +#: htdocs/luci-static/resources/view/fchomo/server.js:808 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:54 msgid "Server" msgstr "服务端" @@ -2411,17 +2383,17 @@ msgid "Shadowsocks" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:506 -#: htdocs/luci-static/resources/view/fchomo/server.js:405 +#: htdocs/luci-static/resources/view/fchomo/server.js:465 msgid "Shadowsocks chipher" msgstr "Shadowsocks 加密方法" #: htdocs/luci-static/resources/view/fchomo/node.js:501 -#: htdocs/luci-static/resources/view/fchomo/server.js:400 +#: htdocs/luci-static/resources/view/fchomo/server.js:460 msgid "Shadowsocks encrypt" msgstr "Shadowsocks 加密" #: htdocs/luci-static/resources/view/fchomo/node.js:514 -#: htdocs/luci-static/resources/view/fchomo/server.js:413 +#: htdocs/luci-static/resources/view/fchomo/server.js:473 msgid "Shadowsocks password" msgstr "Shadowsocks 密码" @@ -2437,14 +2409,14 @@ msgstr "静音" msgid "Simple round-robin all nodes" msgstr "简单轮替所有节点" -#: htdocs/luci-static/resources/view/fchomo/node.js:1347 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:351 +#: htdocs/luci-static/resources/view/fchomo/node.js:1359 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:363 msgid "Size limit" msgstr "大小限制" #: htdocs/luci-static/resources/view/fchomo/client.js:1455 #: htdocs/luci-static/resources/view/fchomo/node.js:882 -#: htdocs/luci-static/resources/view/fchomo/node.js:1439 +#: htdocs/luci-static/resources/view/fchomo/node.js:1451 msgid "Skip cert verify" msgstr "跳过证书验证" @@ -2543,6 +2515,20 @@ msgstr "系统" msgid "System DNS" msgstr "系统 DNS" +#: htdocs/luci-static/resources/fchomo.js:126 +#: htdocs/luci-static/resources/fchomo.js:131 +#: htdocs/luci-static/resources/fchomo.js:132 +#: htdocs/luci-static/resources/fchomo.js:133 +#: htdocs/luci-static/resources/fchomo.js:134 +#: htdocs/luci-static/resources/fchomo.js:135 +#: htdocs/luci-static/resources/fchomo.js:158 +#: htdocs/luci-static/resources/fchomo.js:163 +#: htdocs/luci-static/resources/fchomo.js:164 +#: htdocs/luci-static/resources/fchomo.js:165 +#: htdocs/luci-static/resources/fchomo.js:166 +#: htdocs/luci-static/resources/fchomo.js:167 +#: htdocs/luci-static/resources/fchomo.js:168 +#: htdocs/luci-static/resources/fchomo.js:173 #: htdocs/luci-static/resources/view/fchomo/client.js:517 #: htdocs/luci-static/resources/view/fchomo/client.js:607 msgid "TCP" @@ -2564,20 +2550,31 @@ msgstr "TCP-Keep-Alive 闲置超时" msgid "TCP-Keep-Alive interval" msgstr "TCP-Keep-Alive 间隔" +#: htdocs/luci-static/resources/fchomo.js:127 +#: htdocs/luci-static/resources/fchomo.js:128 +#: htdocs/luci-static/resources/fchomo.js:129 +#: htdocs/luci-static/resources/fchomo.js:130 +#: htdocs/luci-static/resources/fchomo.js:157 +#: htdocs/luci-static/resources/fchomo.js:159 +#: htdocs/luci-static/resources/fchomo.js:160 +#: htdocs/luci-static/resources/fchomo.js:162 +msgid "TCP/UDP" +msgstr "" + #: htdocs/luci-static/resources/view/fchomo/node.js:1133 -#: htdocs/luci-static/resources/view/fchomo/node.js:1406 +#: htdocs/luci-static/resources/view/fchomo/node.js:1418 msgid "TFO" msgstr "TCP 快速打开 (TFO)" #: htdocs/luci-static/resources/view/fchomo/global.js:529 #: htdocs/luci-static/resources/view/fchomo/node.js:673 #: htdocs/luci-static/resources/view/fchomo/node.js:799 -#: htdocs/luci-static/resources/view/fchomo/server.js:696 +#: htdocs/luci-static/resources/view/fchomo/server.js:756 msgid "TLS" msgstr "TLS" #: htdocs/luci-static/resources/view/fchomo/node.js:830 -#: htdocs/luci-static/resources/view/fchomo/server.js:727 +#: htdocs/luci-static/resources/view/fchomo/server.js:787 msgid "TLS ALPN" msgstr "TLS ALPN" @@ -2586,7 +2583,7 @@ msgid "TLS SNI" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:222 -#: htdocs/luci-static/resources/view/fchomo/server.js:195 +#: htdocs/luci-static/resources/view/fchomo/server.js:206 msgid "TLS fields" msgstr "TLS字段" @@ -2599,7 +2596,7 @@ msgstr "" msgid "TURN ports" msgstr "TURN 端口" -#: htdocs/luci-static/resources/view/fchomo/server.js:265 +#: htdocs/luci-static/resources/view/fchomo/server.js:276 msgid "" "Tell the client to use the BBR flow control algorithm instead of Hysteria CC." msgstr "让客户端使用 BBR 流控算法。" @@ -2610,14 +2607,14 @@ msgid "The %s address used by local machine in the Wireguard network." msgstr "WireGuard 网络中使用的本机 %s 地址。" #: htdocs/luci-static/resources/view/fchomo/node.js:905 -#: htdocs/luci-static/resources/view/fchomo/server.js:748 +#: htdocs/luci-static/resources/view/fchomo/server.js:808 msgid "The %s private key, in PEM format." msgstr "%s私钥，需要 PEM 格式。" #: htdocs/luci-static/resources/view/fchomo/global.js:556 #: htdocs/luci-static/resources/view/fchomo/node.js:891 -#: htdocs/luci-static/resources/view/fchomo/server.js:733 -#: htdocs/luci-static/resources/view/fchomo/server.js:771 +#: htdocs/luci-static/resources/view/fchomo/server.js:793 +#: htdocs/luci-static/resources/view/fchomo/server.js:831 msgid "The %s public key, in PEM format." msgstr "%s公钥，需要 PEM 格式。" @@ -2631,7 +2628,7 @@ msgstr "域名的 HTTPS 记录的 ECH 参数。留空则通过 DNS 解析。" msgid "The ED25519 available private key or UUID provided by Sudoku server." msgstr "Sudoku 服务器提供的 ED25519 可用私钥 或 UUID。" -#: htdocs/luci-static/resources/view/fchomo/server.js:318 +#: htdocs/luci-static/resources/view/fchomo/server.js:333 msgid "The ED25519 master public key or UUID generated by Sudoku." msgstr "Sudoku 生成的 ED25519 主公钥 或 UUID。" @@ -2640,7 +2637,7 @@ msgid "The default value is 2:00 every day." msgstr "默认值为每天 2:00。" #: htdocs/luci-static/resources/view/fchomo/node.js:780 -#: htdocs/luci-static/resources/view/fchomo/server.js:574 +#: htdocs/luci-static/resources/view/fchomo/server.js:634 msgid "" "The first padding must have a probability of 100% and at least 35 bytes." msgstr "首个填充必须为 100% 的概率并且至少 35 字节。" @@ -2656,18 +2653,18 @@ msgid "The matching %s will be deemed as poisoned." msgstr "匹配 %s 的将被视为已被投毒污染。" #: htdocs/luci-static/resources/view/fchomo/node.js:778 -#: htdocs/luci-static/resources/view/fchomo/server.js:572 +#: htdocs/luci-static/resources/view/fchomo/server.js:632 msgid "The server and client can set different padding parameters." msgstr "服务器和客户端可以设置不同的填充参数。" #: htdocs/luci-static/resources/view/fchomo/global.js:600 -#: htdocs/luci-static/resources/view/fchomo/server.js:829 +#: htdocs/luci-static/resources/view/fchomo/server.js:889 msgid "This ECH parameter needs to be added to the HTTPS record of the domain." msgstr "此 ECH 参数需要添加到域名的 HTTPS 记录中。" #: htdocs/luci-static/resources/view/fchomo/client.js:1458 #: htdocs/luci-static/resources/view/fchomo/node.js:885 -#: htdocs/luci-static/resources/view/fchomo/node.js:1442 +#: htdocs/luci-static/resources/view/fchomo/node.js:1454 msgid "" "This is DANGEROUS, your traffic is almost like " "PLAIN TEXT! Use at your own risk!" @@ -2706,20 +2703,25 @@ msgstr "Tproxy Fwmark/fwmask" msgid "Tproxy port" msgstr "Tproxy 端口" +#: htdocs/luci-static/resources/view/fchomo/node.js:1610 +#: htdocs/luci-static/resources/view/fchomo/node.js:1616 +msgid "Transit" +msgstr "中转" + #: htdocs/luci-static/resources/view/fchomo/node.js:347 #: htdocs/luci-static/resources/view/fchomo/node.js:962 -#: htdocs/luci-static/resources/view/fchomo/server.js:309 -#: htdocs/luci-static/resources/view/fchomo/server.js:880 +#: htdocs/luci-static/resources/view/fchomo/server.js:320 +#: htdocs/luci-static/resources/view/fchomo/server.js:940 msgid "Transport" msgstr "传输层" #: htdocs/luci-static/resources/view/fchomo/node.js:223 -#: htdocs/luci-static/resources/view/fchomo/server.js:196 +#: htdocs/luci-static/resources/view/fchomo/server.js:207 msgid "Transport fields" msgstr "传输层字段" #: htdocs/luci-static/resources/view/fchomo/node.js:967 -#: htdocs/luci-static/resources/view/fchomo/server.js:885 +#: htdocs/luci-static/resources/view/fchomo/server.js:945 msgid "Transport type" msgstr "传输层类型" @@ -2755,17 +2757,22 @@ msgstr "Tun 堆栈" #: htdocs/luci-static/resources/view/fchomo/client.js:1604 #: htdocs/luci-static/resources/view/fchomo/node.js:236 #: htdocs/luci-static/resources/view/fchomo/node.js:1296 -#: htdocs/luci-static/resources/view/fchomo/node.js:1569 +#: htdocs/luci-static/resources/view/fchomo/node.js:1581 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:263 -#: htdocs/luci-static/resources/view/fchomo/server.js:215 +#: htdocs/luci-static/resources/view/fchomo/server.js:226 msgid "Type" msgstr "类型" +#: htdocs/luci-static/resources/fchomo.js:136 +#: htdocs/luci-static/resources/fchomo.js:137 +#: htdocs/luci-static/resources/fchomo.js:170 +#: htdocs/luci-static/resources/fchomo.js:171 +#: htdocs/luci-static/resources/fchomo.js:172 #: htdocs/luci-static/resources/view/fchomo/client.js:516 #: htdocs/luci-static/resources/view/fchomo/client.js:606 #: htdocs/luci-static/resources/view/fchomo/node.js:713 -#: htdocs/luci-static/resources/view/fchomo/node.js:1416 -#: htdocs/luci-static/resources/view/fchomo/server.js:479 +#: htdocs/luci-static/resources/view/fchomo/node.js:1428 +#: htdocs/luci-static/resources/view/fchomo/server.js:539 msgid "UDP" msgstr "UDP" @@ -2795,8 +2802,9 @@ msgstr "自动选择" #: htdocs/luci-static/resources/view/fchomo/node.js:427 #: htdocs/luci-static/resources/view/fchomo/node.js:545 -#: htdocs/luci-static/resources/view/fchomo/server.js:364 -#: htdocs/luci-static/resources/view/fchomo/server.js:428 +#: htdocs/luci-static/resources/view/fchomo/server.js:330 +#: htdocs/luci-static/resources/view/fchomo/server.js:424 +#: htdocs/luci-static/resources/view/fchomo/server.js:488 msgid "UUID" msgstr "UUID" @@ -2826,7 +2834,7 @@ msgid "Unknown error: %s" msgstr "未知错误：%s" #: htdocs/luci-static/resources/view/fchomo/node.js:718 -#: htdocs/luci-static/resources/view/fchomo/node.js:1421 +#: htdocs/luci-static/resources/view/fchomo/node.js:1433 msgid "UoT" msgstr "UDP over TCP (UoT)" @@ -2834,8 +2842,8 @@ msgstr "UDP over TCP (UoT)" msgid "Update failed." msgstr "更新失败。" -#: htdocs/luci-static/resources/view/fchomo/node.js:1353 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:357 +#: htdocs/luci-static/resources/view/fchomo/node.js:1365 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:369 msgid "Update interval" msgstr "更新间隔" @@ -2848,8 +2856,8 @@ msgid "Upload bandwidth in Mbps." msgstr "上传带宽（单位：Mbps）。" #: htdocs/luci-static/resources/view/fchomo/node.js:896 -#: htdocs/luci-static/resources/view/fchomo/server.js:739 -#: htdocs/luci-static/resources/view/fchomo/server.js:779 +#: htdocs/luci-static/resources/view/fchomo/server.js:799 +#: htdocs/luci-static/resources/view/fchomo/server.js:839 msgid "Upload certificate" msgstr "上传证书" @@ -2858,16 +2866,16 @@ msgid "Upload initial package" msgstr "上传初始资源包" #: htdocs/luci-static/resources/view/fchomo/node.js:910 -#: htdocs/luci-static/resources/view/fchomo/server.js:754 +#: htdocs/luci-static/resources/view/fchomo/server.js:814 msgid "Upload key" msgstr "上传密钥" #: htdocs/luci-static/resources/view/fchomo/global.js:306 #: htdocs/luci-static/resources/view/fchomo/node.js:899 #: htdocs/luci-static/resources/view/fchomo/node.js:913 -#: htdocs/luci-static/resources/view/fchomo/server.js:742 -#: htdocs/luci-static/resources/view/fchomo/server.js:757 -#: htdocs/luci-static/resources/view/fchomo/server.js:782 +#: htdocs/luci-static/resources/view/fchomo/server.js:802 +#: htdocs/luci-static/resources/view/fchomo/server.js:817 +#: htdocs/luci-static/resources/view/fchomo/server.js:842 msgid "Upload..." msgstr "上传..." @@ -2900,7 +2908,7 @@ msgid "User Authentication" msgstr "用户认证" #: htdocs/luci-static/resources/view/fchomo/node.js:254 -#: htdocs/luci-static/resources/view/fchomo/server.js:238 +#: htdocs/luci-static/resources/view/fchomo/server.js:249 msgid "Username" msgstr "用户名" @@ -2927,7 +2935,7 @@ msgid "VMess" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1302 -#: htdocs/luci-static/resources/view/fchomo/node.js:1575 +#: htdocs/luci-static/resources/view/fchomo/node.js:1587 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:306 msgid "Value" msgstr "可视化值" @@ -2938,7 +2946,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:418 #: htdocs/luci-static/resources/view/fchomo/node.js:692 -#: htdocs/luci-static/resources/view/fchomo/server.js:470 +#: htdocs/luci-static/resources/view/fchomo/server.js:530 msgid "Version" msgstr "版本" @@ -2947,7 +2955,7 @@ msgid "Version hint" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:221 -#: htdocs/luci-static/resources/view/fchomo/server.js:194 +#: htdocs/luci-static/resources/view/fchomo/server.js:205 msgid "Vless Encryption fields" msgstr "Vless Encryption 字段" @@ -2962,13 +2970,13 @@ msgstr "警告" #: htdocs/luci-static/resources/view/fchomo/node.js:972 #: htdocs/luci-static/resources/view/fchomo/node.js:983 #: htdocs/luci-static/resources/view/fchomo/node.js:988 -#: htdocs/luci-static/resources/view/fchomo/server.js:887 -#: htdocs/luci-static/resources/view/fchomo/server.js:898 -#: htdocs/luci-static/resources/view/fchomo/server.js:903 +#: htdocs/luci-static/resources/view/fchomo/server.js:947 +#: htdocs/luci-static/resources/view/fchomo/server.js:958 +#: htdocs/luci-static/resources/view/fchomo/server.js:963 msgid "WebSocket" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:154 +#: htdocs/luci-static/resources/view/fchomo/server.js:165 msgid "When used as a server, HomeProxy is a better choice." msgstr "用作服务端时，HomeProxy 是更好的选择。" @@ -2992,7 +3000,7 @@ msgstr "WireGuard 预共享密钥。" msgid "WireGuard requires base64-encoded private keys." msgstr "WireGuard 要求 base64 编码的私钥。" -#: htdocs/luci-static/resources/view/fchomo/server.js:533 +#: htdocs/luci-static/resources/view/fchomo/server.js:593 msgid "XOR mode" msgstr "XOR 模式" @@ -3033,13 +3041,13 @@ msgid "auto" msgstr "自动" #: htdocs/luci-static/resources/view/fchomo/node.js:444 -#: htdocs/luci-static/resources/view/fchomo/server.js:375 +#: htdocs/luci-static/resources/view/fchomo/server.js:435 msgid "bbr" msgstr "bbr" #: htdocs/luci-static/resources/view/fchomo/node.js:901 -#: htdocs/luci-static/resources/view/fchomo/server.js:744 -#: htdocs/luci-static/resources/view/fchomo/server.js:784 +#: htdocs/luci-static/resources/view/fchomo/server.js:804 +#: htdocs/luci-static/resources/view/fchomo/server.js:844 msgid "certificate" msgstr "证书" @@ -3054,12 +3062,12 @@ msgid "chacha20-poly1305" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:442 -#: htdocs/luci-static/resources/view/fchomo/server.js:373 +#: htdocs/luci-static/resources/view/fchomo/server.js:433 msgid "cubic" msgstr "cubic" -#: htdocs/luci-static/resources/view/fchomo/server.js:485 -#: htdocs/luci-static/resources/view/fchomo/server.js:516 +#: htdocs/luci-static/resources/view/fchomo/server.js:545 +#: htdocs/luci-static/resources/view/fchomo/server.js:576 msgid "decryption" msgstr "decryption" @@ -3067,27 +3075,27 @@ msgstr "decryption" msgid "dnsmasq selects upstream on its own. (may affect CDN accuracy)" msgstr "dnsmasq 自行选择上游服务器。 (可能影响 CDN 准确性)" -#: htdocs/luci-static/resources/view/fchomo/node.js:1433 +#: htdocs/luci-static/resources/view/fchomo/node.js:1445 msgid "down" msgstr "Hysteria 下载速率" #: htdocs/luci-static/resources/view/fchomo/node.js:732 #: htdocs/luci-static/resources/view/fchomo/node.js:755 -#: htdocs/luci-static/resources/view/fchomo/server.js:520 +#: htdocs/luci-static/resources/view/fchomo/server.js:580 msgid "encryption" msgstr "encryption" #: htdocs/luci-static/resources/view/fchomo/node.js:971 #: htdocs/luci-static/resources/view/fchomo/node.js:982 #: htdocs/luci-static/resources/view/fchomo/node.js:987 -#: htdocs/luci-static/resources/view/fchomo/server.js:886 -#: htdocs/luci-static/resources/view/fchomo/server.js:897 -#: htdocs/luci-static/resources/view/fchomo/server.js:902 +#: htdocs/luci-static/resources/view/fchomo/server.js:946 +#: htdocs/luci-static/resources/view/fchomo/server.js:957 +#: htdocs/luci-static/resources/view/fchomo/server.js:962 msgid "gRPC" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1034 -#: htdocs/luci-static/resources/view/fchomo/server.js:921 +#: htdocs/luci-static/resources/view/fchomo/server.js:981 msgid "gRPC service name" msgstr "gRPC 服务名称" @@ -3099,7 +3107,7 @@ msgstr "gVisor" msgid "h2mux" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:685 +#: htdocs/luci-static/resources/view/fchomo/server.js:745 msgid "least one keypair required" msgstr "至少需要一对密钥" @@ -3122,12 +3130,12 @@ msgid "mlkem768x25519plus" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1137 -#: htdocs/luci-static/resources/view/fchomo/node.js:1411 +#: htdocs/luci-static/resources/view/fchomo/node.js:1423 msgid "mpTCP" msgstr "多路径 TCP (mpTCP)" #: htdocs/luci-static/resources/view/fchomo/node.js:443 -#: htdocs/luci-static/resources/view/fchomo/server.js:374 +#: htdocs/luci-static/resources/view/fchomo/server.js:434 msgid "new_reno" msgstr "new_reno" @@ -3149,7 +3157,7 @@ msgstr "非空值" #: htdocs/luci-static/resources/view/fchomo/node.js:588 #: htdocs/luci-static/resources/view/fchomo/node.js:661 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:302 -#: htdocs/luci-static/resources/view/fchomo/server.js:451 +#: htdocs/luci-static/resources/view/fchomo/server.js:511 msgid "none" msgstr "无" @@ -3169,7 +3177,7 @@ msgstr "" msgid "obfs-simple" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1391 +#: htdocs/luci-static/resources/view/fchomo/node.js:1403 msgid "override.proxy-name" msgstr "" @@ -3178,7 +3186,7 @@ msgid "packet addr (v2ray-core v5+)" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:915 -#: htdocs/luci-static/resources/view/fchomo/server.js:759 +#: htdocs/luci-static/resources/view/fchomo/server.js:819 msgid "private key" msgstr "私钥" @@ -3200,7 +3208,7 @@ msgid "rule-set" msgstr "规则集" #: htdocs/luci-static/resources/view/fchomo/node.js:665 -#: htdocs/luci-static/resources/view/fchomo/server.js:452 +#: htdocs/luci-static/resources/view/fchomo/server.js:512 msgid "shadow-tls" msgstr "" @@ -3212,6 +3220,10 @@ msgstr "" msgid "src" msgstr "src" +#: htdocs/luci-static/resources/view/fchomo/server.js:329 +msgid "sudoku-keypair" +msgstr "" + #: htdocs/luci-static/resources/view/fchomo/global.js:223 msgid "unchecked" msgstr "未检查" @@ -3228,7 +3240,7 @@ msgstr "独立标识" msgid "unique value" msgstr "独立值" -#: htdocs/luci-static/resources/view/fchomo/node.js:1427 +#: htdocs/luci-static/resources/view/fchomo/node.js:1439 msgid "up" msgstr "Hysteria 上传速率" @@ -3236,20 +3248,20 @@ msgstr "Hysteria 上传速率" #: htdocs/luci-static/resources/view/fchomo/node.js:463 #: htdocs/luci-static/resources/view/fchomo/node.js:693 #: htdocs/luci-static/resources/view/fchomo/node.js:725 -#: htdocs/luci-static/resources/view/fchomo/server.js:471 +#: htdocs/luci-static/resources/view/fchomo/server.js:531 msgid "v1" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:420 #: htdocs/luci-static/resources/view/fchomo/node.js:694 #: htdocs/luci-static/resources/view/fchomo/node.js:726 -#: htdocs/luci-static/resources/view/fchomo/server.js:472 +#: htdocs/luci-static/resources/view/fchomo/server.js:532 msgid "v2" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:421 #: htdocs/luci-static/resources/view/fchomo/node.js:695 -#: htdocs/luci-static/resources/view/fchomo/server.js:473 +#: htdocs/luci-static/resources/view/fchomo/server.js:533 msgid "v3" msgstr "" @@ -3315,6 +3327,21 @@ msgstr "" msgid "🡇" msgstr "" +#~ msgid "Chain head" +#~ msgstr "链头" + +#~ msgid "Chain tail" +#~ msgstr "链尾" + +#~ msgid "Keep consistent with the %s." +#~ msgstr "与%s保持一致" + +#~ msgid "Recommended to use UoT node.
such as %s." +#~ msgstr "建议使用 UoT 节点。
例如%s。" + +#~ msgid "Seed" +#~ msgstr "种子" + #~ msgid "Default" #~ msgstr "默认" diff --git a/small/luci-app-fchomo/po/zh_Hant/fchomo.po b/small/luci-app-fchomo/po/zh_Hant/fchomo.po index 021eae7738..538dfab995 100644 --- a/small/luci-app-fchomo/po/zh_Hant/fchomo.po +++ b/small/luci-app-fchomo/po/zh_Hant/fchomo.po @@ -12,11 +12,6 @@ msgstr "" msgid "%s log" msgstr "%s 日誌" -#: htdocs/luci-static/resources/view/fchomo/node.js:1578 -#: htdocs/luci-static/resources/view/fchomo/node.js:1584 -msgid "(Destination)" -msgstr "(落地)" - #: htdocs/luci-static/resources/fchomo.js:594 #: htdocs/luci-static/resources/view/fchomo/client.js:237 #: htdocs/luci-static/resources/view/fchomo/client.js:267 @@ -24,20 +19,15 @@ msgstr "(落地)" msgid "(Imported)" msgstr "(已導入)" -#: htdocs/luci-static/resources/view/fchomo/node.js:1600 -#: htdocs/luci-static/resources/view/fchomo/node.js:1606 -msgid "(Transit)" -msgstr "(中轉)" - #: htdocs/luci-static/resources/view/fchomo/global.js:549 #: htdocs/luci-static/resources/view/fchomo/global.js:555 #: htdocs/luci-static/resources/view/fchomo/node.js:890 #: htdocs/luci-static/resources/view/fchomo/node.js:896 #: htdocs/luci-static/resources/view/fchomo/node.js:904 #: htdocs/luci-static/resources/view/fchomo/node.js:910 -#: htdocs/luci-static/resources/view/fchomo/server.js:762 -#: htdocs/luci-static/resources/view/fchomo/server.js:770 -#: htdocs/luci-static/resources/view/fchomo/server.js:779 +#: htdocs/luci-static/resources/view/fchomo/server.js:822 +#: htdocs/luci-static/resources/view/fchomo/server.js:830 +#: htdocs/luci-static/resources/view/fchomo/server.js:839 msgid "(mTLS)" msgstr "" @@ -48,10 +38,10 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/client.js:1151 #: htdocs/luci-static/resources/view/fchomo/client.js:1622 #: htdocs/luci-static/resources/view/fchomo/client.js:1623 -#: htdocs/luci-static/resources/view/fchomo/node.js:1579 -#: htdocs/luci-static/resources/view/fchomo/node.js:1587 -#: htdocs/luci-static/resources/view/fchomo/node.js:1601 -#: htdocs/luci-static/resources/view/fchomo/node.js:1609 +#: htdocs/luci-static/resources/view/fchomo/node.js:1591 +#: htdocs/luci-static/resources/view/fchomo/node.js:1597 +#: htdocs/luci-static/resources/view/fchomo/node.js:1611 +#: htdocs/luci-static/resources/view/fchomo/node.js:1617 msgid "-- Please choose --" msgstr "-- 請選擇 --" @@ -86,9 +76,9 @@ msgstr "僅限 0 或 1。" #: htdocs/luci-static/resources/view/fchomo/node.js:897 #: htdocs/luci-static/resources/view/fchomo/node.js:911 -#: htdocs/luci-static/resources/view/fchomo/server.js:740 -#: htdocs/luci-static/resources/view/fchomo/server.js:755 -#: htdocs/luci-static/resources/view/fchomo/server.js:780 +#: htdocs/luci-static/resources/view/fchomo/server.js:800 +#: htdocs/luci-static/resources/view/fchomo/server.js:815 +#: htdocs/luci-static/resources/view/fchomo/server.js:840 msgid "Save your configuration before uploading files!" msgstr "上傳文件前請先保存配置！" @@ -161,7 +151,7 @@ msgstr "新增 節點" msgid "Add a provider" msgstr "新增 供應商" -#: htdocs/luci-static/resources/view/fchomo/node.js:1555 +#: htdocs/luci-static/resources/view/fchomo/node.js:1567 msgid "Add a proxy chain" msgstr "新增 代理鏈" @@ -177,7 +167,7 @@ msgstr "新增 路由規則" msgid "Add a rule set" msgstr "新增 規則集" -#: htdocs/luci-static/resources/view/fchomo/server.js:188 +#: htdocs/luci-static/resources/view/fchomo/server.js:199 msgid "Add a server" msgstr "新增 伺服器" @@ -185,11 +175,11 @@ msgstr "新增 伺服器" msgid "Add a sub rule" msgstr "新增 子規則" -#: htdocs/luci-static/resources/view/fchomo/node.js:1380 +#: htdocs/luci-static/resources/view/fchomo/node.js:1392 msgid "Add prefix" msgstr "添加前綴" -#: htdocs/luci-static/resources/view/fchomo/node.js:1384 +#: htdocs/luci-static/resources/view/fchomo/node.js:1396 msgid "Add suffix" msgstr "添加後綴" @@ -239,7 +229,7 @@ msgid "Already in updating." msgstr "已在更新中。" #: htdocs/luci-static/resources/view/fchomo/node.js:559 -#: htdocs/luci-static/resources/view/fchomo/server.js:442 +#: htdocs/luci-static/resources/view/fchomo/server.js:502 msgid "Alter ID" msgstr "額外 ID" @@ -261,7 +251,7 @@ msgstr "作為 dnsmasq 的最優先上游" msgid "As the TOP upstream of dnsmasq." msgstr "作為 dnsmasq 的最優先上游。" -#: htdocs/luci-static/resources/view/fchomo/server.js:392 +#: htdocs/luci-static/resources/view/fchomo/server.js:452 msgid "Auth timeout" msgstr "認證超時" @@ -273,7 +263,7 @@ msgstr "認證長度" msgid "Auto" msgstr "自動" -#: htdocs/luci-static/resources/view/fchomo/server.js:211 +#: htdocs/luci-static/resources/view/fchomo/server.js:222 msgid "Auto configure firewall" msgstr "自動配置防火牆" @@ -308,12 +298,12 @@ msgstr "二進位 mrs" #: htdocs/luci-static/resources/view/fchomo/global.js:740 #: htdocs/luci-static/resources/view/fchomo/node.js:1147 -#: htdocs/luci-static/resources/view/fchomo/node.js:1453 +#: htdocs/luci-static/resources/view/fchomo/node.js:1465 msgid "Bind interface" msgstr "綁定介面" #: htdocs/luci-static/resources/view/fchomo/node.js:1148 -#: htdocs/luci-static/resources/view/fchomo/node.js:1454 +#: htdocs/luci-static/resources/view/fchomo/node.js:1466 msgid "Bind outbound interface.
" msgstr "綁定出站介面。
" @@ -372,20 +362,10 @@ msgid "" msgstr "憑證指紋。用於實現 SSL憑證固定 並防止 MitM。" #: htdocs/luci-static/resources/view/fchomo/node.js:890 -#: htdocs/luci-static/resources/view/fchomo/server.js:732 +#: htdocs/luci-static/resources/view/fchomo/server.js:792 msgid "Certificate path" msgstr "憑證路徑" -#: htdocs/luci-static/resources/view/fchomo/node.js:1578 -#: htdocs/luci-static/resources/view/fchomo/node.js:1584 -msgid "Chain head" -msgstr "鏈頭" - -#: htdocs/luci-static/resources/view/fchomo/node.js:1600 -#: htdocs/luci-static/resources/view/fchomo/node.js:1606 -msgid "Chain tail" -msgstr "鏈尾" - #: htdocs/luci-static/resources/view/fchomo/global.js:221 #: htdocs/luci-static/resources/view/fchomo/global.js:271 msgid "Check" @@ -414,8 +394,8 @@ msgstr "大陸網域清單版本" #: htdocs/luci-static/resources/view/fchomo/node.js:324 #: htdocs/luci-static/resources/view/fchomo/node.js:377 #: htdocs/luci-static/resources/view/fchomo/node.js:565 -#: htdocs/luci-static/resources/view/fchomo/server.js:291 -#: htdocs/luci-static/resources/view/fchomo/server.js:323 +#: htdocs/luci-static/resources/view/fchomo/server.js:302 +#: htdocs/luci-static/resources/view/fchomo/server.js:389 msgid "Chipher" msgstr "加密方法" @@ -435,17 +415,17 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:767 #: htdocs/luci-static/resources/view/fchomo/node.js:891 #: htdocs/luci-static/resources/view/fchomo/node.js:905 -#: htdocs/luci-static/resources/view/fchomo/server.js:561 -#: htdocs/luci-static/resources/view/fchomo/server.js:771 +#: htdocs/luci-static/resources/view/fchomo/server.js:621 +#: htdocs/luci-static/resources/view/fchomo/server.js:831 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:22 msgid "Client" msgstr "客戶端" -#: htdocs/luci-static/resources/view/fchomo/server.js:770 +#: htdocs/luci-static/resources/view/fchomo/server.js:830 msgid "Client Auth Certificate path" msgstr "客戶端認證憑證路徑" -#: htdocs/luci-static/resources/view/fchomo/server.js:762 +#: htdocs/luci-static/resources/view/fchomo/server.js:822 msgid "Client Auth type" msgstr "客戶端認證類型" @@ -453,7 +433,7 @@ msgstr "客戶端認證類型" msgid "Client fingerprint" msgstr "客戶端指紋" -#: htdocs/luci-static/resources/view/fchomo/server.js:374 +#: htdocs/luci-static/resources/view/fchomo/server.js:385 msgid "Client key" msgstr "客戶端密鑰" @@ -474,12 +454,12 @@ msgstr "常用連接埠（繞過 P2P 流量）" msgid "Complete" msgstr "完成" -#: htdocs/luci-static/resources/view/fchomo/node.js:1400 +#: htdocs/luci-static/resources/view/fchomo/node.js:1412 msgid "Configuration Items" msgstr "配置項" #: htdocs/luci-static/resources/view/fchomo/node.js:439 -#: htdocs/luci-static/resources/view/fchomo/server.js:370 +#: htdocs/luci-static/resources/view/fchomo/server.js:430 msgid "Congestion controller" msgstr "擁塞控制器" @@ -487,15 +467,15 @@ msgstr "擁塞控制器" msgid "Connection check" msgstr "連接檢查" -#: htdocs/luci-static/resources/view/fchomo/server.js:36 +#: htdocs/luci-static/resources/view/fchomo/server.js:35 msgid "Content copied to clipboard!" msgstr "內容已複製到剪貼簿！" #: htdocs/luci-static/resources/view/fchomo/client.js:598 #: htdocs/luci-static/resources/view/fchomo/node.js:1322 -#: htdocs/luci-static/resources/view/fchomo/node.js:1336 +#: htdocs/luci-static/resources/view/fchomo/node.js:1348 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:326 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:340 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:352 msgid "Content will not be verified, Please make sure you enter it correctly." msgstr "內容將不會被驗證，請確保輸入正確。" @@ -508,7 +488,7 @@ msgstr "內容" msgid "Contents have been saved." msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:38 +#: htdocs/luci-static/resources/view/fchomo/server.js:37 msgid "Copy" msgstr "複製" @@ -524,7 +504,7 @@ msgstr "Cron 表達式" msgid "Custom Direct List" msgstr "自訂直連清單" -#: htdocs/luci-static/resources/view/fchomo/node.js:1371 +#: htdocs/luci-static/resources/view/fchomo/node.js:1383 msgid "Custom HTTP header." msgstr "自訂 HTTP header。" @@ -581,6 +561,11 @@ msgstr "預設 DNS（由 WAN 下發）" msgid "Default DNS server" msgstr "預設 DNS 伺服器" +#: htdocs/luci-static/resources/view/fchomo/node.js:1590 +#: htdocs/luci-static/resources/view/fchomo/node.js:1596 +msgid "Destination" +msgstr "落地" + #: htdocs/luci-static/resources/view/fchomo/node.js:631 msgid "Destination addresses allowed to be forwarded via Wireguard." msgstr "允許通過 WireGuard 轉發的目的位址" @@ -589,8 +574,8 @@ msgstr "允許通過 WireGuard 轉發的目的位址" msgid "Dial fields" msgstr "撥號欄位" -#: htdocs/luci-static/resources/view/fchomo/node.js:1593 -#: htdocs/luci-static/resources/view/fchomo/node.js:1615 +#: htdocs/luci-static/resources/view/fchomo/node.js:1603 +#: htdocs/luci-static/resources/view/fchomo/node.js:1623 msgid "Different chain head/tail" msgstr "不同的鏈頭/鏈尾" @@ -612,7 +597,7 @@ msgstr "直連 MAC 位址" #: htdocs/luci-static/resources/view/fchomo/global.js:403 #: htdocs/luci-static/resources/view/fchomo/node.js:290 -#: htdocs/luci-static/resources/view/fchomo/server.js:271 +#: htdocs/luci-static/resources/view/fchomo/server.js:282 msgid "Disable" msgstr "停用" @@ -670,7 +655,7 @@ msgstr "不要在 ClientHello 中傳送伺服器名稱。" #: htdocs/luci-static/resources/view/fchomo/client.js:1456 #: htdocs/luci-static/resources/view/fchomo/node.js:883 -#: htdocs/luci-static/resources/view/fchomo/node.js:1440 +#: htdocs/luci-static/resources/view/fchomo/node.js:1452 msgid "Donot verifying server certificate." msgstr "不驗證伺服器憑證。" @@ -695,11 +680,11 @@ msgid "Dual stack" msgstr "雙棧" #: htdocs/luci-static/resources/view/fchomo/node.js:924 -#: htdocs/luci-static/resources/view/fchomo/server.js:828 +#: htdocs/luci-static/resources/view/fchomo/server.js:888 msgid "ECH config" msgstr "ECH 配置" -#: htdocs/luci-static/resources/view/fchomo/server.js:787 +#: htdocs/luci-static/resources/view/fchomo/server.js:847 msgid "ECH key" msgstr "ECH 密鑰" @@ -750,11 +735,11 @@ msgstr "消除加密頭特徵" #: htdocs/luci-static/resources/view/fchomo/global.js:686 #: htdocs/luci-static/resources/view/fchomo/node.js:232 #: htdocs/luci-static/resources/view/fchomo/node.js:1292 -#: htdocs/luci-static/resources/view/fchomo/node.js:1476 -#: htdocs/luci-static/resources/view/fchomo/node.js:1565 +#: htdocs/luci-static/resources/view/fchomo/node.js:1488 +#: htdocs/luci-static/resources/view/fchomo/node.js:1577 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:251 -#: htdocs/luci-static/resources/view/fchomo/server.js:179 -#: htdocs/luci-static/resources/view/fchomo/server.js:206 +#: htdocs/luci-static/resources/view/fchomo/server.js:190 +#: htdocs/luci-static/resources/view/fchomo/server.js:217 msgid "Enable" msgstr "啟用" @@ -804,19 +789,19 @@ msgid "Enable statistic" msgstr "啟用統計" #: htdocs/luci-static/resources/view/fchomo/node.js:719 -#: htdocs/luci-static/resources/view/fchomo/node.js:1422 +#: htdocs/luci-static/resources/view/fchomo/node.js:1434 msgid "" "Enable the SUoT protocol, requires server support. Conflict with Multiplex." msgstr "啟用 SUoT 協議，需要服務端支援。與多路復用衝突。" #: htdocs/luci-static/resources/view/fchomo/node.js:296 -#: htdocs/luci-static/resources/view/fchomo/server.js:277 +#: htdocs/luci-static/resources/view/fchomo/server.js:288 msgid "" "Enabling obfuscation will make the server incompatible with standard QUIC " "connections, losing the ability to masquerade with HTTP/3." msgstr "啟用混淆將使伺服器與標準的 QUIC 連線不相容，失去 HTTP/3 偽裝的能力。" -#: htdocs/luci-static/resources/view/fchomo/server.js:524 +#: htdocs/luci-static/resources/view/fchomo/server.js:584 msgid "Encryption method" msgstr "加密方法" @@ -839,7 +824,7 @@ msgid "" "if empty." msgstr "超過此限制將會觸發強制健康檢查。留空則使用 5。" -#: htdocs/luci-static/resources/view/fchomo/node.js:1534 +#: htdocs/luci-static/resources/view/fchomo/node.js:1546 msgid "Exclude matched node types." msgstr "排除匹配的節點類型。" @@ -852,7 +837,7 @@ msgstr "" "rel=\"noreferrer noopener\">此處。" #: htdocs/luci-static/resources/view/fchomo/client.js:1043 -#: htdocs/luci-static/resources/view/fchomo/node.js:1527 +#: htdocs/luci-static/resources/view/fchomo/node.js:1539 msgid "Exclude nodes that meet keywords or regexps." msgstr "排除匹配關鍵字或表達式的節點。" @@ -861,12 +846,12 @@ msgid "Expand/Collapse result" msgstr "展開/收起 結果" #: htdocs/luci-static/resources/view/fchomo/client.js:1003 -#: htdocs/luci-static/resources/view/fchomo/node.js:1512 +#: htdocs/luci-static/resources/view/fchomo/node.js:1524 msgid "Expected HTTP code. 204 will be used if empty." msgstr "預期的 HTTP code。留空則使用 204。" #: htdocs/luci-static/resources/view/fchomo/client.js:1005 -#: htdocs/luci-static/resources/view/fchomo/node.js:1514 +#: htdocs/luci-static/resources/view/fchomo/node.js:1526 msgid "Expected status" msgstr "預期狀態" @@ -898,20 +883,20 @@ msgstr "預期狀態" #: htdocs/luci-static/resources/view/fchomo/global.js:871 #: htdocs/luci-static/resources/view/fchomo/node.js:790 #: htdocs/luci-static/resources/view/fchomo/node.js:875 -#: htdocs/luci-static/resources/view/fchomo/node.js:1593 -#: htdocs/luci-static/resources/view/fchomo/node.js:1615 +#: htdocs/luci-static/resources/view/fchomo/node.js:1603 +#: htdocs/luci-static/resources/view/fchomo/node.js:1623 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:278 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:292 -#: htdocs/luci-static/resources/view/fchomo/server.js:553 -#: htdocs/luci-static/resources/view/fchomo/server.js:584 -#: htdocs/luci-static/resources/view/fchomo/server.js:685 +#: htdocs/luci-static/resources/view/fchomo/server.js:613 +#: htdocs/luci-static/resources/view/fchomo/server.js:644 +#: htdocs/luci-static/resources/view/fchomo/server.js:745 msgid "Expecting: %s" msgstr "請輸入：%s" #: htdocs/luci-static/resources/view/fchomo/node.js:980 #: htdocs/luci-static/resources/view/fchomo/node.js:987 -#: htdocs/luci-static/resources/view/fchomo/server.js:895 -#: htdocs/luci-static/resources/view/fchomo/server.js:902 +#: htdocs/luci-static/resources/view/fchomo/server.js:955 +#: htdocs/luci-static/resources/view/fchomo/server.js:962 msgid "Expecting: only support %s." msgstr "請輸入：僅支援 %s." @@ -960,7 +945,7 @@ msgid "Fallback filter" msgstr "後備過濾器" #: htdocs/luci-static/resources/view/fchomo/client.js:1038 -#: htdocs/luci-static/resources/view/fchomo/node.js:1521 +#: htdocs/luci-static/resources/view/fchomo/node.js:1533 msgid "Filter nodes that meet keywords or regexps." msgstr "過濾匹配關鍵字或表達式的節點。" @@ -976,12 +961,12 @@ msgstr "兜底 DNS 伺服器 (用於未被投毒汙染的網域)" msgid "Final DNS server (For poisoned domains)" msgstr "兜底 DNS 伺服器 (用於已被投毒汙染的網域)" -#: htdocs/luci-static/resources/view/fchomo/server.js:210 +#: htdocs/luci-static/resources/view/fchomo/server.js:221 msgid "Firewall" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:551 -#: htdocs/luci-static/resources/view/fchomo/server.js:434 +#: htdocs/luci-static/resources/view/fchomo/server.js:494 msgid "Flow" msgstr "流控" @@ -994,8 +979,8 @@ msgstr "" "noopener\">%s." #: htdocs/luci-static/resources/view/fchomo/client.js:1004 -#: htdocs/luci-static/resources/view/fchomo/node.js:1390 -#: htdocs/luci-static/resources/view/fchomo/node.js:1513 +#: htdocs/luci-static/resources/view/fchomo/node.js:1402 +#: htdocs/luci-static/resources/view/fchomo/node.js:1525 msgid "" "For format see %s." @@ -1037,7 +1022,7 @@ msgstr "常規" #: htdocs/luci-static/resources/view/fchomo/client.js:891 #: htdocs/luci-static/resources/view/fchomo/node.js:220 #: htdocs/luci-static/resources/view/fchomo/node.js:1282 -#: htdocs/luci-static/resources/view/fchomo/server.js:193 +#: htdocs/luci-static/resources/view/fchomo/server.js:204 msgid "General fields" msgstr "常規欄位" @@ -1050,8 +1035,9 @@ msgstr "常規設定" #: htdocs/luci-static/resources/fchomo.js:510 #: htdocs/luci-static/resources/fchomo.js:512 #: htdocs/luci-static/resources/view/fchomo/global.js:593 -#: htdocs/luci-static/resources/view/fchomo/server.js:657 -#: htdocs/luci-static/resources/view/fchomo/server.js:820 +#: htdocs/luci-static/resources/view/fchomo/server.js:376 +#: htdocs/luci-static/resources/view/fchomo/server.js:717 +#: htdocs/luci-static/resources/view/fchomo/server.js:880 msgid "Generate" msgstr "生成" @@ -1123,13 +1109,13 @@ msgstr "組" #: htdocs/luci-static/resources/view/fchomo/node.js:672 #: htdocs/luci-static/resources/view/fchomo/node.js:969 #: htdocs/luci-static/resources/view/fchomo/node.js:980 -#: htdocs/luci-static/resources/view/fchomo/server.js:895 +#: htdocs/luci-static/resources/view/fchomo/server.js:955 msgid "HTTP" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:265 #: htdocs/luci-static/resources/view/fchomo/node.js:1028 -#: htdocs/luci-static/resources/view/fchomo/node.js:1370 +#: htdocs/luci-static/resources/view/fchomo/node.js:1382 msgid "HTTP header" msgstr "HTTP header" @@ -1145,7 +1131,7 @@ msgstr "HTTP 請求方法" msgid "HTTP/3" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:285 +#: htdocs/luci-static/resources/view/fchomo/server.js:296 msgid "" "HTTP3 server behavior when authentication fails.
A 404 page will be " "returned if empty." @@ -1153,7 +1139,7 @@ msgstr "身份驗證失敗時的 HTTP3 伺服器回應。預設回傳 404 頁面 #: htdocs/luci-static/resources/view/fchomo/node.js:970 #: htdocs/luci-static/resources/view/fchomo/node.js:981 -#: htdocs/luci-static/resources/view/fchomo/server.js:896 +#: htdocs/luci-static/resources/view/fchomo/server.js:956 msgid "HTTPUpgrade" msgstr "" @@ -1165,31 +1151,31 @@ msgstr "處理網域" msgid "Handshake mode" msgstr "握手模式" -#: htdocs/luci-static/resources/view/fchomo/server.js:457 +#: htdocs/luci-static/resources/view/fchomo/server.js:517 msgid "Handshake target that supports TLS 1.3" msgstr "握手目標 (支援 TLS 1.3)" -#: htdocs/luci-static/resources/view/fchomo/server.js:357 +#: htdocs/luci-static/resources/view/fchomo/server.js:417 msgid "Handshake timeout" msgstr "握手超時" #: htdocs/luci-static/resources/view/fchomo/client.js:973 -#: htdocs/luci-static/resources/view/fchomo/node.js:1481 +#: htdocs/luci-static/resources/view/fchomo/node.js:1493 msgid "Health check URL" msgstr "健康檢查 URL" #: htdocs/luci-static/resources/view/fchomo/client.js:1002 -#: htdocs/luci-static/resources/view/fchomo/node.js:1511 +#: htdocs/luci-static/resources/view/fchomo/node.js:1523 msgid "Health check expected status" msgstr "健康檢查预期状态" #: htdocs/luci-static/resources/view/fchomo/client.js:982 -#: htdocs/luci-static/resources/view/fchomo/node.js:1491 +#: htdocs/luci-static/resources/view/fchomo/node.js:1503 msgid "Health check interval" msgstr "健康檢查间隔" #: htdocs/luci-static/resources/view/fchomo/client.js:989 -#: htdocs/luci-static/resources/view/fchomo/node.js:1498 +#: htdocs/luci-static/resources/view/fchomo/node.js:1510 msgid "Health check timeout" msgstr "健康檢查超时" @@ -1242,7 +1228,7 @@ msgid "IP override" msgstr "IP 覆寫" #: htdocs/luci-static/resources/view/fchomo/node.js:1159 -#: htdocs/luci-static/resources/view/fchomo/node.js:1467 +#: htdocs/luci-static/resources/view/fchomo/node.js:1479 msgid "IP version" msgstr "IP 版本" @@ -1271,7 +1257,7 @@ msgstr "閒置會話檢查間隔" msgid "Idle session timeout" msgstr "閒置會話逾時" -#: htdocs/luci-static/resources/view/fchomo/server.js:385 +#: htdocs/luci-static/resources/view/fchomo/server.js:445 msgid "Idle timeout" msgstr "閒置逾時" @@ -1283,7 +1269,7 @@ msgstr "如果選擇了“所有連接埠”，則取消選取“其他”" msgid "If Block is selected, uncheck others" msgstr "如果選擇了“封鎖”，則取消選取“其他”" -#: htdocs/luci-static/resources/view/fchomo/server.js:264 +#: htdocs/luci-static/resources/view/fchomo/server.js:275 msgid "Ignore client bandwidth" msgstr "忽略客戶端頻寬" @@ -1316,15 +1302,15 @@ msgstr "導入規則集連結" #: htdocs/luci-static/resources/view/fchomo/node.js:278 #: htdocs/luci-static/resources/view/fchomo/node.js:284 -#: htdocs/luci-static/resources/view/fchomo/node.js:1428 -#: htdocs/luci-static/resources/view/fchomo/node.js:1434 -#: htdocs/luci-static/resources/view/fchomo/server.js:253 -#: htdocs/luci-static/resources/view/fchomo/server.js:259 +#: htdocs/luci-static/resources/view/fchomo/node.js:1440 +#: htdocs/luci-static/resources/view/fchomo/node.js:1446 +#: htdocs/luci-static/resources/view/fchomo/server.js:264 +#: htdocs/luci-static/resources/view/fchomo/server.js:270 msgid "In Mbps." msgstr "單位為 Mbps。" -#: htdocs/luci-static/resources/view/fchomo/node.js:1348 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:352 +#: htdocs/luci-static/resources/view/fchomo/node.js:1360 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:364 msgid "In bytes. %s will be used if empty." msgstr "單位為位元組。留空則使用 %s。" @@ -1335,14 +1321,14 @@ msgstr "單位為毫秒。" #: htdocs/luci-static/resources/view/fchomo/client.js:990 #: htdocs/luci-static/resources/view/fchomo/client.js:1019 -#: htdocs/luci-static/resources/view/fchomo/node.js:1499 +#: htdocs/luci-static/resources/view/fchomo/node.js:1511 msgid "In millisecond. %s will be used if empty." msgstr "單位為毫秒。留空則使用 %s。" #: htdocs/luci-static/resources/view/fchomo/node.js:525 #: htdocs/luci-static/resources/view/fchomo/node.js:532 -#: htdocs/luci-static/resources/view/fchomo/server.js:386 -#: htdocs/luci-static/resources/view/fchomo/server.js:393 +#: htdocs/luci-static/resources/view/fchomo/server.js:446 +#: htdocs/luci-static/resources/view/fchomo/server.js:453 msgid "In seconds." msgstr "單位為秒。" @@ -1350,14 +1336,14 @@ msgstr "單位為秒。" #: htdocs/luci-static/resources/view/fchomo/global.js:425 #: htdocs/luci-static/resources/view/fchomo/global.js:430 #: htdocs/luci-static/resources/view/fchomo/global.js:515 -#: htdocs/luci-static/resources/view/fchomo/node.js:1354 -#: htdocs/luci-static/resources/view/fchomo/node.js:1492 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:358 +#: htdocs/luci-static/resources/view/fchomo/node.js:1366 +#: htdocs/luci-static/resources/view/fchomo/node.js:1504 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:370 msgid "In seconds. %s will be used if empty." msgstr "單位為秒。留空則使用 %s。" #: htdocs/luci-static/resources/view/fchomo/node.js:779 -#: htdocs/luci-static/resources/view/fchomo/server.js:573 +#: htdocs/luci-static/resources/view/fchomo/server.js:633 msgid "" "In the order of one Padding-Length and one Padding-" "Interval, infinite concatenation." @@ -1406,26 +1392,21 @@ msgstr "內嵌" msgid "Interface Control" msgstr "介面控制" -#: htdocs/luci-static/resources/view/fchomo/server.js:352 -msgid "Keep consistent with the %s." -msgstr "與%s保持一致" - #: htdocs/luci-static/resources/fchomo.js:142 msgid "Keep default" msgstr "保持預設" #: htdocs/luci-static/resources/view/fchomo/node.js:371 -#: htdocs/luci-static/resources/view/fchomo/server.js:317 -#: htdocs/luci-static/resources/view/fchomo/server.js:352 +#: htdocs/luci-static/resources/view/fchomo/server.js:332 msgid "Key" msgstr "密鑰" #: htdocs/luci-static/resources/view/fchomo/node.js:904 -#: htdocs/luci-static/resources/view/fchomo/server.js:747 +#: htdocs/luci-static/resources/view/fchomo/server.js:807 msgid "Key path" msgstr "憑證路徑" -#: htdocs/luci-static/resources/view/fchomo/server.js:592 +#: htdocs/luci-static/resources/view/fchomo/server.js:652 msgid "Keypairs" msgstr "密鑰對" @@ -1436,18 +1417,18 @@ msgstr "密鑰對" #: htdocs/luci-static/resources/view/fchomo/client.js:1589 #: htdocs/luci-static/resources/view/fchomo/node.js:227 #: htdocs/luci-static/resources/view/fchomo/node.js:1287 -#: htdocs/luci-static/resources/view/fchomo/node.js:1560 +#: htdocs/luci-static/resources/view/fchomo/node.js:1572 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:246 -#: htdocs/luci-static/resources/view/fchomo/server.js:201 +#: htdocs/luci-static/resources/view/fchomo/server.js:212 msgid "Label" msgstr "標籤" #: htdocs/luci-static/resources/view/fchomo/client.js:996 -#: htdocs/luci-static/resources/view/fchomo/node.js:1505 +#: htdocs/luci-static/resources/view/fchomo/node.js:1517 msgid "Lazy" msgstr "懶惰狀態" -#: htdocs/luci-static/resources/view/fchomo/server.js:443 +#: htdocs/luci-static/resources/view/fchomo/server.js:503 msgid "" "Legacy protocol support (VMess MD5 Authentication) is provided for " "compatibility purposes only, use of alterId > 1 is not recommended." @@ -1460,15 +1441,15 @@ msgid "Less compatibility and sometimes better performance." msgstr "有時效能較好。" #: htdocs/luci-static/resources/view/fchomo/node.js:831 -#: htdocs/luci-static/resources/view/fchomo/server.js:728 +#: htdocs/luci-static/resources/view/fchomo/server.js:788 msgid "List of supported application level protocols, in order of preference." msgstr "支援的應用層協議協商清單，依序排列。" -#: htdocs/luci-static/resources/view/fchomo/server.js:221 +#: htdocs/luci-static/resources/view/fchomo/server.js:232 msgid "Listen address" msgstr "監聽位址" -#: htdocs/luci-static/resources/view/fchomo/server.js:198 +#: htdocs/luci-static/resources/view/fchomo/server.js:209 msgid "Listen fields" msgstr "監聽欄位" @@ -1477,7 +1458,7 @@ msgid "Listen interfaces" msgstr "監聽介面" #: htdocs/luci-static/resources/view/fchomo/client.js:1251 -#: htdocs/luci-static/resources/view/fchomo/server.js:226 +#: htdocs/luci-static/resources/view/fchomo/server.js:237 msgid "Listen port" msgstr "監聽埠" @@ -1527,7 +1508,7 @@ msgstr "僅限小寫" msgid "MTU" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:284 +#: htdocs/luci-static/resources/view/fchomo/server.js:295 msgid "Masquerade" msgstr "偽裝" @@ -1564,7 +1545,7 @@ msgid "Max Early Data" msgstr "前置數據最大值" #: htdocs/luci-static/resources/view/fchomo/node.js:467 -#: htdocs/luci-static/resources/view/fchomo/server.js:379 +#: htdocs/luci-static/resources/view/fchomo/server.js:439 msgid "Max UDP relay packet size" msgstr "UDP 中繼數據包最大尺寸" @@ -1573,7 +1554,7 @@ msgid "Max count of failures" msgstr "最大失敗次數" #: htdocs/luci-static/resources/view/fchomo/node.js:283 -#: htdocs/luci-static/resources/view/fchomo/server.js:258 +#: htdocs/luci-static/resources/view/fchomo/server.js:269 msgid "Max download speed" msgstr "最大下載速度" @@ -1582,7 +1563,7 @@ msgid "Max open streams" msgstr "限制打開流的數量" #: htdocs/luci-static/resources/view/fchomo/node.js:277 -#: htdocs/luci-static/resources/view/fchomo/server.js:252 +#: htdocs/luci-static/resources/view/fchomo/server.js:263 msgid "Max upload speed" msgstr "最大上傳速度" @@ -1600,7 +1581,7 @@ msgstr "" "%s 衝突。" #: htdocs/luci-static/resources/view/fchomo/node.js:398 -#: htdocs/luci-static/resources/view/fchomo/server.js:344 +#: htdocs/luci-static/resources/view/fchomo/server.js:410 msgid "Maximum padding" msgstr "最大填充" @@ -1621,7 +1602,7 @@ msgstr "Mihomo 客戶端" #: htdocs/luci-static/resources/view/fchomo/log.js:158 #: htdocs/luci-static/resources/view/fchomo/log.js:163 -#: htdocs/luci-static/resources/view/fchomo/server.js:153 +#: htdocs/luci-static/resources/view/fchomo/server.js:164 msgid "Mihomo server" msgstr "Mihomo 服務端" @@ -1635,7 +1616,7 @@ msgid "" msgstr "在開啟新連線之前，連線中的最小多路復用流數量。" #: htdocs/luci-static/resources/view/fchomo/node.js:391 -#: htdocs/luci-static/resources/view/fchomo/server.js:337 +#: htdocs/luci-static/resources/view/fchomo/server.js:403 msgid "Minimum padding" msgstr "最小填充" @@ -1662,7 +1643,7 @@ msgid "Multiplex" msgstr "多路復用" #: htdocs/luci-static/resources/view/fchomo/node.js:224 -#: htdocs/luci-static/resources/view/fchomo/server.js:197 +#: htdocs/luci-static/resources/view/fchomo/server.js:208 msgid "Multiplex fields" msgstr "多路復用欄位" @@ -1675,11 +1656,11 @@ msgstr "多路復用" msgid "NOT" msgstr "NOT" -#: htdocs/luci-static/resources/view/fchomo/node.js:1360 +#: htdocs/luci-static/resources/view/fchomo/node.js:1372 msgid "Name of the Proxy group to download provider." msgstr "用於下載供應商訂閱的代理組名稱。" -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:364 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:376 msgid "Name of the Proxy group to download rule set." msgstr "用於下載規則集訂閱的代理組名稱。" @@ -1700,7 +1681,7 @@ msgid "No add'l params" msgstr "無附加參數" #: htdocs/luci-static/resources/view/fchomo/client.js:997 -#: htdocs/luci-static/resources/view/fchomo/node.js:1506 +#: htdocs/luci-static/resources/view/fchomo/node.js:1518 msgid "No testing is performed when this provider node is not in use." msgstr "當此供應商的節點未使用時，不執行任何測試。" @@ -1719,17 +1700,17 @@ msgid "Node" msgstr "節點" #: htdocs/luci-static/resources/view/fchomo/client.js:1042 -#: htdocs/luci-static/resources/view/fchomo/node.js:1526 +#: htdocs/luci-static/resources/view/fchomo/node.js:1538 msgid "Node exclude filter" msgstr "排除節點" #: htdocs/luci-static/resources/view/fchomo/client.js:1047 -#: htdocs/luci-static/resources/view/fchomo/node.js:1533 +#: htdocs/luci-static/resources/view/fchomo/node.js:1545 msgid "Node exclude type" msgstr "排除節點類型" #: htdocs/luci-static/resources/view/fchomo/client.js:1037 -#: htdocs/luci-static/resources/view/fchomo/node.js:1520 +#: htdocs/luci-static/resources/view/fchomo/node.js:1532 msgid "Node filter" msgstr "過濾節點" @@ -1754,24 +1735,24 @@ msgid "Obfs Mode" msgstr "Obfs 模式" #: htdocs/luci-static/resources/view/fchomo/node.js:295 -#: htdocs/luci-static/resources/view/fchomo/server.js:276 +#: htdocs/luci-static/resources/view/fchomo/server.js:287 msgid "Obfuscate password" msgstr "混淆密碼" #: htdocs/luci-static/resources/view/fchomo/node.js:289 #: htdocs/luci-static/resources/view/fchomo/node.js:385 -#: htdocs/luci-static/resources/view/fchomo/server.js:270 -#: htdocs/luci-static/resources/view/fchomo/server.js:331 +#: htdocs/luci-static/resources/view/fchomo/server.js:281 +#: htdocs/luci-static/resources/view/fchomo/server.js:397 msgid "Obfuscate type" msgstr "混淆類型" #: htdocs/luci-static/resources/view/fchomo/node.js:386 -#: htdocs/luci-static/resources/view/fchomo/server.js:332 +#: htdocs/luci-static/resources/view/fchomo/server.js:398 msgid "Obfuscated as ASCII data stream" msgstr "混淆為 ASCII 資料流" #: htdocs/luci-static/resources/view/fchomo/node.js:387 -#: htdocs/luci-static/resources/view/fchomo/server.js:333 +#: htdocs/luci-static/resources/view/fchomo/server.js:399 msgid "Obfuscated as low-entropy data stream" msgstr "混淆為低熵資料流" @@ -1833,27 +1814,27 @@ msgstr "" msgid "Packet encoding" msgstr "數據包編碼" -#: htdocs/luci-static/resources/view/fchomo/server.js:423 +#: htdocs/luci-static/resources/view/fchomo/server.js:483 msgid "Padding scheme" msgstr "填充方案" #: htdocs/luci-static/resources/view/fchomo/node.js:777 -#: htdocs/luci-static/resources/view/fchomo/server.js:571 +#: htdocs/luci-static/resources/view/fchomo/server.js:631 msgid "Paddings" msgstr "填充 (Paddings)" #: htdocs/luci-static/resources/view/fchomo/node.js:259 #: htdocs/luci-static/resources/view/fchomo/node.js:332 #: htdocs/luci-static/resources/view/fchomo/node.js:686 -#: htdocs/luci-static/resources/view/fchomo/server.js:243 -#: htdocs/luci-static/resources/view/fchomo/server.js:299 -#: htdocs/luci-static/resources/view/fchomo/server.js:464 +#: htdocs/luci-static/resources/view/fchomo/server.js:254 +#: htdocs/luci-static/resources/view/fchomo/server.js:310 +#: htdocs/luci-static/resources/view/fchomo/server.js:524 msgid "Password" msgstr "密碼" -#: htdocs/luci-static/resources/view/fchomo/node.js:1335 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:339 -#: htdocs/luci-static/resources/view/fchomo/server.js:511 +#: htdocs/luci-static/resources/view/fchomo/node.js:1347 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:351 +#: htdocs/luci-static/resources/view/fchomo/server.js:571 msgid "Payload" msgstr "Payload" @@ -1887,9 +1868,9 @@ msgid "" msgstr "連結格式標準請參考 %s。" #: htdocs/luci-static/resources/view/fchomo/node.js:1320 -#: htdocs/luci-static/resources/view/fchomo/node.js:1334 +#: htdocs/luci-static/resources/view/fchomo/node.js:1346 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:324 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:338 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:350 msgid "" "Please type %s." @@ -1907,7 +1888,7 @@ msgid "Please type %s fields of mihomo config.
" msgstr "請輸入 mihomo 配置的 %s 欄位。
" #: htdocs/luci-static/resources/view/fchomo/node.js:660 -#: htdocs/luci-static/resources/view/fchomo/server.js:450 +#: htdocs/luci-static/resources/view/fchomo/server.js:510 msgid "Plugin" msgstr "插件" @@ -1917,9 +1898,9 @@ msgstr "插件" #: htdocs/luci-static/resources/view/fchomo/node.js:692 #: htdocs/luci-static/resources/view/fchomo/node.js:700 #: htdocs/luci-static/resources/view/fchomo/node.js:706 -#: htdocs/luci-static/resources/view/fchomo/server.js:457 -#: htdocs/luci-static/resources/view/fchomo/server.js:464 -#: htdocs/luci-static/resources/view/fchomo/server.js:470 +#: htdocs/luci-static/resources/view/fchomo/server.js:517 +#: htdocs/luci-static/resources/view/fchomo/server.js:524 +#: htdocs/luci-static/resources/view/fchomo/server.js:530 msgid "Plugin:" msgstr "插件：" @@ -1940,7 +1921,7 @@ msgid "Ports" msgstr "連接埠" #: htdocs/luci-static/resources/view/fchomo/node.js:272 -#: htdocs/luci-static/resources/view/fchomo/server.js:226 +#: htdocs/luci-static/resources/view/fchomo/server.js:237 msgid "Ports pool" msgstr "連接埠池" @@ -1966,8 +1947,8 @@ msgstr "防止某些情況下的 ICMP 環回問題。 Ping 不會顯示實際延 #: htdocs/luci-static/resources/view/fchomo/global.js:759 #: htdocs/luci-static/resources/view/fchomo/node.js:1149 #: htdocs/luci-static/resources/view/fchomo/node.js:1155 -#: htdocs/luci-static/resources/view/fchomo/node.js:1455 -#: htdocs/luci-static/resources/view/fchomo/node.js:1462 +#: htdocs/luci-static/resources/view/fchomo/node.js:1467 +#: htdocs/luci-static/resources/view/fchomo/node.js:1474 msgid "Priority: Proxy Node > Global." msgstr "優先權: 代理節點 > 全域。" @@ -2005,11 +1986,11 @@ msgstr "協議參數。 如啟用會隨機浪費流量（在 v2ray 中預設為 #: htdocs/luci-static/resources/view/fchomo/client.js:937 #: htdocs/luci-static/resources/view/fchomo/node.js:1168 #: htdocs/luci-static/resources/view/fchomo/node.js:1177 -#: htdocs/luci-static/resources/view/fchomo/node.js:1571 +#: htdocs/luci-static/resources/view/fchomo/node.js:1583 msgid "Provider" msgstr "供應商" -#: htdocs/luci-static/resources/view/fchomo/node.js:1341 +#: htdocs/luci-static/resources/view/fchomo/node.js:1353 msgid "Provider URL" msgstr "供應商訂閱 URL" @@ -2032,19 +2013,19 @@ msgid "Proxy MAC-s" msgstr "代理 MAC 位址" #: htdocs/luci-static/resources/view/fchomo/node.js:206 -#: htdocs/luci-static/resources/view/fchomo/node.js:1570 +#: htdocs/luci-static/resources/view/fchomo/node.js:1582 msgid "Proxy Node" msgstr "代理節點" -#: htdocs/luci-static/resources/view/fchomo/node.js:1546 -#: htdocs/luci-static/resources/view/fchomo/node.js:1555 +#: htdocs/luci-static/resources/view/fchomo/node.js:1558 +#: htdocs/luci-static/resources/view/fchomo/node.js:1567 msgid "Proxy chain" msgstr "代理鏈" #: htdocs/luci-static/resources/view/fchomo/client.js:713 #: htdocs/luci-static/resources/view/fchomo/client.js:1422 -#: htdocs/luci-static/resources/view/fchomo/node.js:1359 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:363 +#: htdocs/luci-static/resources/view/fchomo/node.js:1371 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:375 msgid "Proxy group" msgstr "代理組" @@ -2065,17 +2046,17 @@ msgid "QUIC" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:440 -#: htdocs/luci-static/resources/view/fchomo/server.js:371 +#: htdocs/luci-static/resources/view/fchomo/server.js:431 msgid "QUIC congestion controller." msgstr "QUIC 壅塞控制器。" #: htdocs/luci-static/resources/view/fchomo/client.js:804 -#: htdocs/luci-static/resources/view/fchomo/server.js:174 +#: htdocs/luci-static/resources/view/fchomo/server.js:185 msgid "Quick Reload" msgstr "快速重載" #: htdocs/luci-static/resources/view/fchomo/node.js:940 -#: htdocs/luci-static/resources/view/fchomo/server.js:835 +#: htdocs/luci-static/resources/view/fchomo/server.js:895 msgid "REALITY" msgstr "REALITY" @@ -2083,31 +2064,31 @@ msgstr "REALITY" msgid "REALITY X25519MLKEM768 PQC support" msgstr "REALITY X25519MLKEM768 後量子加密支援" -#: htdocs/luci-static/resources/view/fchomo/server.js:872 +#: htdocs/luci-static/resources/view/fchomo/server.js:932 msgid "REALITY certificate issued to" msgstr "REALITY 證書頒發給" -#: htdocs/luci-static/resources/view/fchomo/server.js:840 +#: htdocs/luci-static/resources/view/fchomo/server.js:900 msgid "REALITY handshake server" msgstr "REALITY 握手伺服器" -#: htdocs/luci-static/resources/view/fchomo/server.js:847 +#: htdocs/luci-static/resources/view/fchomo/server.js:907 msgid "REALITY private key" msgstr "REALITY 私鑰" #: htdocs/luci-static/resources/view/fchomo/node.js:945 -#: htdocs/luci-static/resources/view/fchomo/server.js:862 +#: htdocs/luci-static/resources/view/fchomo/server.js:922 msgid "REALITY public key" msgstr "REALITY 公鑰" #: htdocs/luci-static/resources/view/fchomo/node.js:950 -#: htdocs/luci-static/resources/view/fchomo/server.js:866 +#: htdocs/luci-static/resources/view/fchomo/server.js:926 msgid "REALITY short ID" msgstr "REALITY 標識符" #: htdocs/luci-static/resources/view/fchomo/node.js:767 -#: htdocs/luci-static/resources/view/fchomo/server.js:542 -#: htdocs/luci-static/resources/view/fchomo/server.js:561 +#: htdocs/luci-static/resources/view/fchomo/server.js:602 +#: htdocs/luci-static/resources/view/fchomo/server.js:621 msgid "RTT" msgstr "" @@ -2123,11 +2104,6 @@ msgstr "留空將使用隨機令牌。" msgid "Randomized traffic characteristics" msgstr "隨機化流量特徵" -#: htdocs/luci-static/resources/view/fchomo/node.js:1585 -#: htdocs/luci-static/resources/view/fchomo/node.js:1607 -msgid "Recommended to use UoT node.
such as %s." -msgstr "建議使用 UoT 節點。
例如%s。" - #: htdocs/luci-static/resources/view/fchomo/global.js:460 msgid "Redir port" msgstr "Redir 連接埠" @@ -2151,7 +2127,7 @@ msgstr "每 %s 秒刷新。" #: htdocs/luci-static/resources/fchomo.js:1025 #: htdocs/luci-static/resources/view/fchomo/client.js:805 #: htdocs/luci-static/resources/view/fchomo/global.js:193 -#: htdocs/luci-static/resources/view/fchomo/server.js:175 +#: htdocs/luci-static/resources/view/fchomo/server.js:186 msgid "Reload" msgstr "重載" @@ -2180,11 +2156,11 @@ msgstr "移除" msgid "Remove idles" msgstr "移除閒置" -#: htdocs/luci-static/resources/view/fchomo/node.js:1388 +#: htdocs/luci-static/resources/view/fchomo/node.js:1400 msgid "Replace name" msgstr "名稱替換" -#: htdocs/luci-static/resources/view/fchomo/node.js:1389 +#: htdocs/luci-static/resources/view/fchomo/node.js:1401 msgid "Replace node name." msgstr "替換節點名稱" @@ -2194,7 +2170,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1014 #: htdocs/luci-static/resources/view/fchomo/node.js:1021 -#: htdocs/luci-static/resources/view/fchomo/server.js:914 +#: htdocs/luci-static/resources/view/fchomo/server.js:974 msgid "Request path" msgstr "請求路徑" @@ -2251,7 +2227,7 @@ msgid "Routing GFW" msgstr "路由 GFW 流量" #: htdocs/luci-static/resources/view/fchomo/node.js:1154 -#: htdocs/luci-static/resources/view/fchomo/node.js:1461 +#: htdocs/luci-static/resources/view/fchomo/node.js:1473 msgid "Routing mark" msgstr "路由標記" @@ -2299,7 +2275,7 @@ msgstr "規則" msgid "Rule set" msgstr "規則集" -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:345 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:357 msgid "Rule set URL" msgstr "規則集訂閱 URL" @@ -2344,7 +2320,7 @@ msgid "SUoT version" msgstr "SUoT 版本" #: htdocs/luci-static/resources/view/fchomo/node.js:291 -#: htdocs/luci-static/resources/view/fchomo/server.js:272 +#: htdocs/luci-static/resources/view/fchomo/server.js:283 msgid "Salamander" msgstr "Salamander" @@ -2356,10 +2332,6 @@ msgstr "相同 目標位址 請求。相同節點" msgid "Same srcaddr and dstaddr requests. Same node" msgstr "相同 來源位址 和 目標位址 請求。相同節點" -#: htdocs/luci-static/resources/view/fchomo/server.js:351 -msgid "Seed" -msgstr "種子" - #: htdocs/luci-static/resources/view/fchomo/global.js:509 msgid "Segment maximum size" msgstr "分段最大尺寸" @@ -2381,10 +2353,10 @@ msgstr "以 50% 的機率發送隨機 0 到 3333 位元組的填充。" msgid "Send random ticket of 300s-600s duration for client 0-RTT reuse." msgstr "發送 300-600 秒的隨機票證，以供客戶端 0-RTT 重用。" -#: htdocs/luci-static/resources/view/fchomo/server.js:188 -#: htdocs/luci-static/resources/view/fchomo/server.js:542 -#: htdocs/luci-static/resources/view/fchomo/server.js:733 -#: htdocs/luci-static/resources/view/fchomo/server.js:748 +#: htdocs/luci-static/resources/view/fchomo/server.js:199 +#: htdocs/luci-static/resources/view/fchomo/server.js:602 +#: htdocs/luci-static/resources/view/fchomo/server.js:793 +#: htdocs/luci-static/resources/view/fchomo/server.js:808 #: root/usr/share/luci/menu.d/luci-app-fchomo.json:54 msgid "Server" msgstr "服務端" @@ -2411,17 +2383,17 @@ msgid "Shadowsocks" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:506 -#: htdocs/luci-static/resources/view/fchomo/server.js:405 +#: htdocs/luci-static/resources/view/fchomo/server.js:465 msgid "Shadowsocks chipher" msgstr "Shadowsocks 加密方法" #: htdocs/luci-static/resources/view/fchomo/node.js:501 -#: htdocs/luci-static/resources/view/fchomo/server.js:400 +#: htdocs/luci-static/resources/view/fchomo/server.js:460 msgid "Shadowsocks encrypt" msgstr "Shadowsocks 加密" #: htdocs/luci-static/resources/view/fchomo/node.js:514 -#: htdocs/luci-static/resources/view/fchomo/server.js:413 +#: htdocs/luci-static/resources/view/fchomo/server.js:473 msgid "Shadowsocks password" msgstr "Shadowsocks 密碼" @@ -2437,14 +2409,14 @@ msgstr "靜音" msgid "Simple round-robin all nodes" msgstr "簡單輪替所有節點" -#: htdocs/luci-static/resources/view/fchomo/node.js:1347 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:351 +#: htdocs/luci-static/resources/view/fchomo/node.js:1359 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:363 msgid "Size limit" msgstr "大小限制" #: htdocs/luci-static/resources/view/fchomo/client.js:1455 #: htdocs/luci-static/resources/view/fchomo/node.js:882 -#: htdocs/luci-static/resources/view/fchomo/node.js:1439 +#: htdocs/luci-static/resources/view/fchomo/node.js:1451 msgid "Skip cert verify" msgstr "跳過憑證驗證" @@ -2543,6 +2515,20 @@ msgstr "系統" msgid "System DNS" msgstr "系統 DNS" +#: htdocs/luci-static/resources/fchomo.js:126 +#: htdocs/luci-static/resources/fchomo.js:131 +#: htdocs/luci-static/resources/fchomo.js:132 +#: htdocs/luci-static/resources/fchomo.js:133 +#: htdocs/luci-static/resources/fchomo.js:134 +#: htdocs/luci-static/resources/fchomo.js:135 +#: htdocs/luci-static/resources/fchomo.js:158 +#: htdocs/luci-static/resources/fchomo.js:163 +#: htdocs/luci-static/resources/fchomo.js:164 +#: htdocs/luci-static/resources/fchomo.js:165 +#: htdocs/luci-static/resources/fchomo.js:166 +#: htdocs/luci-static/resources/fchomo.js:167 +#: htdocs/luci-static/resources/fchomo.js:168 +#: htdocs/luci-static/resources/fchomo.js:173 #: htdocs/luci-static/resources/view/fchomo/client.js:517 #: htdocs/luci-static/resources/view/fchomo/client.js:607 msgid "TCP" @@ -2564,20 +2550,31 @@ msgstr "TCP-Keep-Alive 閒置逾時" msgid "TCP-Keep-Alive interval" msgstr "TCP-Keep-Alive 間隔" +#: htdocs/luci-static/resources/fchomo.js:127 +#: htdocs/luci-static/resources/fchomo.js:128 +#: htdocs/luci-static/resources/fchomo.js:129 +#: htdocs/luci-static/resources/fchomo.js:130 +#: htdocs/luci-static/resources/fchomo.js:157 +#: htdocs/luci-static/resources/fchomo.js:159 +#: htdocs/luci-static/resources/fchomo.js:160 +#: htdocs/luci-static/resources/fchomo.js:162 +msgid "TCP/UDP" +msgstr "" + #: htdocs/luci-static/resources/view/fchomo/node.js:1133 -#: htdocs/luci-static/resources/view/fchomo/node.js:1406 +#: htdocs/luci-static/resources/view/fchomo/node.js:1418 msgid "TFO" msgstr "TCP 快速開啟 (TFO)" #: htdocs/luci-static/resources/view/fchomo/global.js:529 #: htdocs/luci-static/resources/view/fchomo/node.js:673 #: htdocs/luci-static/resources/view/fchomo/node.js:799 -#: htdocs/luci-static/resources/view/fchomo/server.js:696 +#: htdocs/luci-static/resources/view/fchomo/server.js:756 msgid "TLS" msgstr "TLS" #: htdocs/luci-static/resources/view/fchomo/node.js:830 -#: htdocs/luci-static/resources/view/fchomo/server.js:727 +#: htdocs/luci-static/resources/view/fchomo/server.js:787 msgid "TLS ALPN" msgstr "TLS ALPN" @@ -2586,7 +2583,7 @@ msgid "TLS SNI" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:222 -#: htdocs/luci-static/resources/view/fchomo/server.js:195 +#: htdocs/luci-static/resources/view/fchomo/server.js:206 msgid "TLS fields" msgstr "TLS欄位" @@ -2599,7 +2596,7 @@ msgstr "" msgid "TURN ports" msgstr "TURN 連接埠" -#: htdocs/luci-static/resources/view/fchomo/server.js:265 +#: htdocs/luci-static/resources/view/fchomo/server.js:276 msgid "" "Tell the client to use the BBR flow control algorithm instead of Hysteria CC." msgstr "讓客戶端使用 BBR 流控演算法。" @@ -2610,14 +2607,14 @@ msgid "The %s address used by local machine in the Wireguard network." msgstr "WireGuard 網路中使用的本機 %s 位址。" #: htdocs/luci-static/resources/view/fchomo/node.js:905 -#: htdocs/luci-static/resources/view/fchomo/server.js:748 +#: htdocs/luci-static/resources/view/fchomo/server.js:808 msgid "The %s private key, in PEM format." msgstr "%s私鑰，需要 PEM 格式。" #: htdocs/luci-static/resources/view/fchomo/global.js:556 #: htdocs/luci-static/resources/view/fchomo/node.js:891 -#: htdocs/luci-static/resources/view/fchomo/server.js:733 -#: htdocs/luci-static/resources/view/fchomo/server.js:771 +#: htdocs/luci-static/resources/view/fchomo/server.js:793 +#: htdocs/luci-static/resources/view/fchomo/server.js:831 msgid "The %s public key, in PEM format." msgstr "%s公鑰，需要 PEM 格式。" @@ -2631,7 +2628,7 @@ msgstr "網域的 HTTPS 記錄的 ECH 參數。留空則透過 DNS 解析。" msgid "The ED25519 available private key or UUID provided by Sudoku server." msgstr "Sudoku 伺服器提供的 ED25519 可用私鑰 或 UUID。" -#: htdocs/luci-static/resources/view/fchomo/server.js:318 +#: htdocs/luci-static/resources/view/fchomo/server.js:333 msgid "The ED25519 master public key or UUID generated by Sudoku." msgstr "Sudoku 產生的 ED25519 主公鑰 或 UUID。" @@ -2640,7 +2637,7 @@ msgid "The default value is 2:00 every day." msgstr "預設值為每天 2:00。" #: htdocs/luci-static/resources/view/fchomo/node.js:780 -#: htdocs/luci-static/resources/view/fchomo/server.js:574 +#: htdocs/luci-static/resources/view/fchomo/server.js:634 msgid "" "The first padding must have a probability of 100% and at least 35 bytes." msgstr "首個填充必須為 100% 的機率並且至少 35 位元組。" @@ -2656,18 +2653,18 @@ msgid "The matching %s will be deemed as poisoned." msgstr "匹配 %s 的將被視為已被投毒汙染。" #: htdocs/luci-static/resources/view/fchomo/node.js:778 -#: htdocs/luci-static/resources/view/fchomo/server.js:572 +#: htdocs/luci-static/resources/view/fchomo/server.js:632 msgid "The server and client can set different padding parameters." msgstr "伺服器和客戶端可以設定不同的填充參數。" #: htdocs/luci-static/resources/view/fchomo/global.js:600 -#: htdocs/luci-static/resources/view/fchomo/server.js:829 +#: htdocs/luci-static/resources/view/fchomo/server.js:889 msgid "This ECH parameter needs to be added to the HTTPS record of the domain." msgstr "此 ECH 參數需要加入到網域的 HTTPS 記錄中。" #: htdocs/luci-static/resources/view/fchomo/client.js:1458 #: htdocs/luci-static/resources/view/fchomo/node.js:885 -#: htdocs/luci-static/resources/view/fchomo/node.js:1442 +#: htdocs/luci-static/resources/view/fchomo/node.js:1454 msgid "" "This is DANGEROUS, your traffic is almost like " "PLAIN TEXT! Use at your own risk!" @@ -2706,20 +2703,25 @@ msgstr "Tproxy Fwmark/fwmask" msgid "Tproxy port" msgstr "Tproxy 連接埠" +#: htdocs/luci-static/resources/view/fchomo/node.js:1610 +#: htdocs/luci-static/resources/view/fchomo/node.js:1616 +msgid "Transit" +msgstr "中轉" + #: htdocs/luci-static/resources/view/fchomo/node.js:347 #: htdocs/luci-static/resources/view/fchomo/node.js:962 -#: htdocs/luci-static/resources/view/fchomo/server.js:309 -#: htdocs/luci-static/resources/view/fchomo/server.js:880 +#: htdocs/luci-static/resources/view/fchomo/server.js:320 +#: htdocs/luci-static/resources/view/fchomo/server.js:940 msgid "Transport" msgstr "傳輸層" #: htdocs/luci-static/resources/view/fchomo/node.js:223 -#: htdocs/luci-static/resources/view/fchomo/server.js:196 +#: htdocs/luci-static/resources/view/fchomo/server.js:207 msgid "Transport fields" msgstr "傳輸層欄位" #: htdocs/luci-static/resources/view/fchomo/node.js:967 -#: htdocs/luci-static/resources/view/fchomo/server.js:885 +#: htdocs/luci-static/resources/view/fchomo/server.js:945 msgid "Transport type" msgstr "傳輸層類型" @@ -2755,17 +2757,22 @@ msgstr "Tun 堆栈" #: htdocs/luci-static/resources/view/fchomo/client.js:1604 #: htdocs/luci-static/resources/view/fchomo/node.js:236 #: htdocs/luci-static/resources/view/fchomo/node.js:1296 -#: htdocs/luci-static/resources/view/fchomo/node.js:1569 +#: htdocs/luci-static/resources/view/fchomo/node.js:1581 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:263 -#: htdocs/luci-static/resources/view/fchomo/server.js:215 +#: htdocs/luci-static/resources/view/fchomo/server.js:226 msgid "Type" msgstr "類型" +#: htdocs/luci-static/resources/fchomo.js:136 +#: htdocs/luci-static/resources/fchomo.js:137 +#: htdocs/luci-static/resources/fchomo.js:170 +#: htdocs/luci-static/resources/fchomo.js:171 +#: htdocs/luci-static/resources/fchomo.js:172 #: htdocs/luci-static/resources/view/fchomo/client.js:516 #: htdocs/luci-static/resources/view/fchomo/client.js:606 #: htdocs/luci-static/resources/view/fchomo/node.js:713 -#: htdocs/luci-static/resources/view/fchomo/node.js:1416 -#: htdocs/luci-static/resources/view/fchomo/server.js:479 +#: htdocs/luci-static/resources/view/fchomo/node.js:1428 +#: htdocs/luci-static/resources/view/fchomo/server.js:539 msgid "UDP" msgstr "UDP" @@ -2795,8 +2802,9 @@ msgstr "自動選擇" #: htdocs/luci-static/resources/view/fchomo/node.js:427 #: htdocs/luci-static/resources/view/fchomo/node.js:545 -#: htdocs/luci-static/resources/view/fchomo/server.js:364 -#: htdocs/luci-static/resources/view/fchomo/server.js:428 +#: htdocs/luci-static/resources/view/fchomo/server.js:330 +#: htdocs/luci-static/resources/view/fchomo/server.js:424 +#: htdocs/luci-static/resources/view/fchomo/server.js:488 msgid "UUID" msgstr "UUID" @@ -2826,7 +2834,7 @@ msgid "Unknown error: %s" msgstr "未知錯誤：%s" #: htdocs/luci-static/resources/view/fchomo/node.js:718 -#: htdocs/luci-static/resources/view/fchomo/node.js:1421 +#: htdocs/luci-static/resources/view/fchomo/node.js:1433 msgid "UoT" msgstr "UDP over TCP (UoT)" @@ -2834,8 +2842,8 @@ msgstr "UDP over TCP (UoT)" msgid "Update failed." msgstr "更新失敗。" -#: htdocs/luci-static/resources/view/fchomo/node.js:1353 -#: htdocs/luci-static/resources/view/fchomo/ruleset.js:357 +#: htdocs/luci-static/resources/view/fchomo/node.js:1365 +#: htdocs/luci-static/resources/view/fchomo/ruleset.js:369 msgid "Update interval" msgstr "更新間隔" @@ -2848,8 +2856,8 @@ msgid "Upload bandwidth in Mbps." msgstr "上傳頻寬（單位：Mbps）。" #: htdocs/luci-static/resources/view/fchomo/node.js:896 -#: htdocs/luci-static/resources/view/fchomo/server.js:739 -#: htdocs/luci-static/resources/view/fchomo/server.js:779 +#: htdocs/luci-static/resources/view/fchomo/server.js:799 +#: htdocs/luci-static/resources/view/fchomo/server.js:839 msgid "Upload certificate" msgstr "上傳憑證" @@ -2858,16 +2866,16 @@ msgid "Upload initial package" msgstr "上傳初始資源包" #: htdocs/luci-static/resources/view/fchomo/node.js:910 -#: htdocs/luci-static/resources/view/fchomo/server.js:754 +#: htdocs/luci-static/resources/view/fchomo/server.js:814 msgid "Upload key" msgstr "上傳金鑰" #: htdocs/luci-static/resources/view/fchomo/global.js:306 #: htdocs/luci-static/resources/view/fchomo/node.js:899 #: htdocs/luci-static/resources/view/fchomo/node.js:913 -#: htdocs/luci-static/resources/view/fchomo/server.js:742 -#: htdocs/luci-static/resources/view/fchomo/server.js:757 -#: htdocs/luci-static/resources/view/fchomo/server.js:782 +#: htdocs/luci-static/resources/view/fchomo/server.js:802 +#: htdocs/luci-static/resources/view/fchomo/server.js:817 +#: htdocs/luci-static/resources/view/fchomo/server.js:842 msgid "Upload..." msgstr "上傳..." @@ -2900,7 +2908,7 @@ msgid "User Authentication" msgstr "使用者認證" #: htdocs/luci-static/resources/view/fchomo/node.js:254 -#: htdocs/luci-static/resources/view/fchomo/server.js:238 +#: htdocs/luci-static/resources/view/fchomo/server.js:249 msgid "Username" msgstr "使用者名稱" @@ -2927,7 +2935,7 @@ msgid "VMess" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1302 -#: htdocs/luci-static/resources/view/fchomo/node.js:1575 +#: htdocs/luci-static/resources/view/fchomo/node.js:1587 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:306 msgid "Value" msgstr "可視化值" @@ -2938,7 +2946,7 @@ msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:418 #: htdocs/luci-static/resources/view/fchomo/node.js:692 -#: htdocs/luci-static/resources/view/fchomo/server.js:470 +#: htdocs/luci-static/resources/view/fchomo/server.js:530 msgid "Version" msgstr "版本" @@ -2947,7 +2955,7 @@ msgid "Version hint" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:221 -#: htdocs/luci-static/resources/view/fchomo/server.js:194 +#: htdocs/luci-static/resources/view/fchomo/server.js:205 msgid "Vless Encryption fields" msgstr "Vless Encryption 欄位" @@ -2962,13 +2970,13 @@ msgstr "警告" #: htdocs/luci-static/resources/view/fchomo/node.js:972 #: htdocs/luci-static/resources/view/fchomo/node.js:983 #: htdocs/luci-static/resources/view/fchomo/node.js:988 -#: htdocs/luci-static/resources/view/fchomo/server.js:887 -#: htdocs/luci-static/resources/view/fchomo/server.js:898 -#: htdocs/luci-static/resources/view/fchomo/server.js:903 +#: htdocs/luci-static/resources/view/fchomo/server.js:947 +#: htdocs/luci-static/resources/view/fchomo/server.js:958 +#: htdocs/luci-static/resources/view/fchomo/server.js:963 msgid "WebSocket" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:154 +#: htdocs/luci-static/resources/view/fchomo/server.js:165 msgid "When used as a server, HomeProxy is a better choice." msgstr "用作服務端時，HomeProxy 是更好的選擇。" @@ -2992,7 +3000,7 @@ msgstr "WireGuard 預先共用金鑰。" msgid "WireGuard requires base64-encoded private keys." msgstr "WireGuard 要求 base64 編碼的私鑰。" -#: htdocs/luci-static/resources/view/fchomo/server.js:533 +#: htdocs/luci-static/resources/view/fchomo/server.js:593 msgid "XOR mode" msgstr "XOR 模式" @@ -3033,13 +3041,13 @@ msgid "auto" msgstr "自動" #: htdocs/luci-static/resources/view/fchomo/node.js:444 -#: htdocs/luci-static/resources/view/fchomo/server.js:375 +#: htdocs/luci-static/resources/view/fchomo/server.js:435 msgid "bbr" msgstr "bbr" #: htdocs/luci-static/resources/view/fchomo/node.js:901 -#: htdocs/luci-static/resources/view/fchomo/server.js:744 -#: htdocs/luci-static/resources/view/fchomo/server.js:784 +#: htdocs/luci-static/resources/view/fchomo/server.js:804 +#: htdocs/luci-static/resources/view/fchomo/server.js:844 msgid "certificate" msgstr "憑證" @@ -3054,12 +3062,12 @@ msgid "chacha20-poly1305" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:442 -#: htdocs/luci-static/resources/view/fchomo/server.js:373 +#: htdocs/luci-static/resources/view/fchomo/server.js:433 msgid "cubic" msgstr "cubic" -#: htdocs/luci-static/resources/view/fchomo/server.js:485 -#: htdocs/luci-static/resources/view/fchomo/server.js:516 +#: htdocs/luci-static/resources/view/fchomo/server.js:545 +#: htdocs/luci-static/resources/view/fchomo/server.js:576 msgid "decryption" msgstr "decryption" @@ -3067,27 +3075,27 @@ msgstr "decryption" msgid "dnsmasq selects upstream on its own. (may affect CDN accuracy)" msgstr "dnsmasq 自行選擇上游服務器。 (可能影響 CDN 準確性)" -#: htdocs/luci-static/resources/view/fchomo/node.js:1433 +#: htdocs/luci-static/resources/view/fchomo/node.js:1445 msgid "down" msgstr "Hysteria 下載速率" #: htdocs/luci-static/resources/view/fchomo/node.js:732 #: htdocs/luci-static/resources/view/fchomo/node.js:755 -#: htdocs/luci-static/resources/view/fchomo/server.js:520 +#: htdocs/luci-static/resources/view/fchomo/server.js:580 msgid "encryption" msgstr "encryption" #: htdocs/luci-static/resources/view/fchomo/node.js:971 #: htdocs/luci-static/resources/view/fchomo/node.js:982 #: htdocs/luci-static/resources/view/fchomo/node.js:987 -#: htdocs/luci-static/resources/view/fchomo/server.js:886 -#: htdocs/luci-static/resources/view/fchomo/server.js:897 -#: htdocs/luci-static/resources/view/fchomo/server.js:902 +#: htdocs/luci-static/resources/view/fchomo/server.js:946 +#: htdocs/luci-static/resources/view/fchomo/server.js:957 +#: htdocs/luci-static/resources/view/fchomo/server.js:962 msgid "gRPC" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1034 -#: htdocs/luci-static/resources/view/fchomo/server.js:921 +#: htdocs/luci-static/resources/view/fchomo/server.js:981 msgid "gRPC service name" msgstr "gRPC 服務名稱" @@ -3099,7 +3107,7 @@ msgstr "gVisor" msgid "h2mux" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/server.js:685 +#: htdocs/luci-static/resources/view/fchomo/server.js:745 msgid "least one keypair required" msgstr "至少需要一對密鑰" @@ -3122,12 +3130,12 @@ msgid "mlkem768x25519plus" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:1137 -#: htdocs/luci-static/resources/view/fchomo/node.js:1411 +#: htdocs/luci-static/resources/view/fchomo/node.js:1423 msgid "mpTCP" msgstr "多路徑 TCP (mpTCP)" #: htdocs/luci-static/resources/view/fchomo/node.js:443 -#: htdocs/luci-static/resources/view/fchomo/server.js:374 +#: htdocs/luci-static/resources/view/fchomo/server.js:434 msgid "new_reno" msgstr "new_reno" @@ -3149,7 +3157,7 @@ msgstr "非空值" #: htdocs/luci-static/resources/view/fchomo/node.js:588 #: htdocs/luci-static/resources/view/fchomo/node.js:661 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:302 -#: htdocs/luci-static/resources/view/fchomo/server.js:451 +#: htdocs/luci-static/resources/view/fchomo/server.js:511 msgid "none" msgstr "無" @@ -3169,7 +3177,7 @@ msgstr "" msgid "obfs-simple" msgstr "" -#: htdocs/luci-static/resources/view/fchomo/node.js:1391 +#: htdocs/luci-static/resources/view/fchomo/node.js:1403 msgid "override.proxy-name" msgstr "" @@ -3178,7 +3186,7 @@ msgid "packet addr (v2ray-core v5+)" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:915 -#: htdocs/luci-static/resources/view/fchomo/server.js:759 +#: htdocs/luci-static/resources/view/fchomo/server.js:819 msgid "private key" msgstr "私鑰" @@ -3200,7 +3208,7 @@ msgid "rule-set" msgstr "規則集" #: htdocs/luci-static/resources/view/fchomo/node.js:665 -#: htdocs/luci-static/resources/view/fchomo/server.js:452 +#: htdocs/luci-static/resources/view/fchomo/server.js:512 msgid "shadow-tls" msgstr "" @@ -3212,6 +3220,10 @@ msgstr "" msgid "src" msgstr "src" +#: htdocs/luci-static/resources/view/fchomo/server.js:329 +msgid "sudoku-keypair" +msgstr "" + #: htdocs/luci-static/resources/view/fchomo/global.js:223 msgid "unchecked" msgstr "未檢查" @@ -3228,7 +3240,7 @@ msgstr "獨立標識" msgid "unique value" msgstr "獨立值" -#: htdocs/luci-static/resources/view/fchomo/node.js:1427 +#: htdocs/luci-static/resources/view/fchomo/node.js:1439 msgid "up" msgstr "Hysteria 上傳速率" @@ -3236,20 +3248,20 @@ msgstr "Hysteria 上傳速率" #: htdocs/luci-static/resources/view/fchomo/node.js:463 #: htdocs/luci-static/resources/view/fchomo/node.js:693 #: htdocs/luci-static/resources/view/fchomo/node.js:725 -#: htdocs/luci-static/resources/view/fchomo/server.js:471 +#: htdocs/luci-static/resources/view/fchomo/server.js:531 msgid "v1" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:420 #: htdocs/luci-static/resources/view/fchomo/node.js:694 #: htdocs/luci-static/resources/view/fchomo/node.js:726 -#: htdocs/luci-static/resources/view/fchomo/server.js:472 +#: htdocs/luci-static/resources/view/fchomo/server.js:532 msgid "v2" msgstr "" #: htdocs/luci-static/resources/view/fchomo/node.js:421 #: htdocs/luci-static/resources/view/fchomo/node.js:695 -#: htdocs/luci-static/resources/view/fchomo/server.js:473 +#: htdocs/luci-static/resources/view/fchomo/server.js:533 msgid "v3" msgstr "" @@ -3315,6 +3327,21 @@ msgstr "" msgid "🡇" msgstr "" +#~ msgid "Chain head" +#~ msgstr "鏈頭" + +#~ msgid "Chain tail" +#~ msgstr "鏈尾" + +#~ msgid "Keep consistent with the %s." +#~ msgstr "與%s保持一致" + +#~ msgid "Recommended to use UoT node.
such as %s." +#~ msgstr "建議使用 UoT 節點。
例如%s。" + +#~ msgid "Seed" +#~ msgstr "種子" + #~ msgid "Default" #~ msgstr "預設" diff --git a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua index f384eec26a..ec3c609878 100644 --- a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua +++ b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua @@ -13,7 +13,7 @@ s = m:section(NamedSection, arg[1], "nodes", "") s.addremove = false s.dynamic = false -o = s:option(DummyValue, "passwall", " ") +o = s:option(DummyValue, "passwall", "　") o.rawhtml = true o.template = "passwall/node_list/link_share_man" o.value = arg[1] @@ -61,7 +61,7 @@ if api.is_finded("ipt2socks") then s.fields["type"]:value("Socks", translate("Socks")) - o = s:option(ListValue, _n("del_protocol")) --始终隐藏，用于删除 protocol + o = s:option(ListValue, _n("del_protocol"), "　") --始终隐藏，用于删除 protocol o:depends({ [_n("__hide")] = "1" }) o.rewrite_option = "protocol" diff --git a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua index d82b0c02cb..4c1aae949a 100644 --- a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua +++ b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua @@ -64,11 +64,10 @@ if api.is_js_luci() then uci:commit(appname) api.showMsg_Redirect() end -end - -m.render = function(self, ...) - Map.render(self, ...) - api.optimize_cbi_ui() + m.render = function(self, ...) + Map.render(self, ...) + api.optimize_cbi_ui() + end end -- [[ Subscribe Settings ]]-- diff --git a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua index 184789d1bb..aa0f10454a 100644 --- a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua +++ b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua @@ -20,11 +20,10 @@ if api.is_js_luci() then uci:commit(appname) api.showMsg_Redirect(self.redirect, 3000) end -end - -m.render = function(self, ...) - Map.render(self, ...) - api.optimize_cbi_ui() + m.render = function(self, ...) + Map.render(self, ...) + api.optimize_cbi_ui() + end end local has_ss = api.is_finded("ss-redir") diff --git a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua index ffb269b0ee..26867b1a0f 100644 --- a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua +++ b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua @@ -91,25 +91,32 @@ o.datatype = "min(1)" o.default = 1 o:depends("enable_autoswitch", true) -autoswitch_backup_node = s:option(DynamicList, "autoswitch_backup_node", translate("List of backup nodes")) -autoswitch_backup_node:depends("enable_autoswitch", true) -function o.write(self, section, value) - local t = {} - local t2 = {} - if type(value) == "table" then - local x - for _, x in ipairs(value) do - if x and #x > 0 then - if not t2[x] then - t2[x] = x - t[#t+1] = x - end - end - end +o = s:option(MultiValue, "autoswitch_backup_node", translate("List of backup nodes")) +o:depends("enable_autoswitch", true) +o.widget = "checkbox" +o.template = appname .. "/cbi/nodes_multiselect" +o.group = {} +for i, v in pairs(nodes_table) do + o:value(v.id, v.remark) + o.group[#o.group+1] = v.group or "" + socks_node:value(v.id, v["remark"]) +end +-- 读取旧 DynamicList +function o.cfgvalue(self, section) + local val = m.uci:get_list(appname, section, "autoswitch_backup_node") + if val then + return val else - t = { value } + return {} end - return DynamicList.write(self, section, t) +end +-- 写入保持 DynamicList +function o.write(self, section, value) + local result = {} + for v in value:gmatch("%S+") do + result[#result + 1] = v + end + m.uci:set_list(appname, section, "autoswitch_backup_node", result) end o = s:option(Flag, "autoswitch_restore_switch", translate("Restore Switch"), translate("When detects main node is available, switch back to the main node.")) @@ -125,12 +132,7 @@ o:value("https://connect.rom.miui.com/generate_204", "MIUI (CN)") o:value("https://connectivitycheck.platform.hicloud.com/generate_204", "HiCloud (CN)") o:depends("enable_autoswitch", true) -for k, v in pairs(nodes_table) do - autoswitch_backup_node:value(v.id, v["remark"]) - socks_node:value(v.id, v["remark"]) -end - -o = s:option(DummyValue, "btn", " ") +o = s:option(DummyValue, "btn", "　") o.template = appname .. "/socks_auto_switch/btn" o:depends("enable_autoswitch", true) diff --git a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua index 853f828938..d3a707e1d2 100644 --- a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua +++ b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua @@ -61,7 +61,8 @@ for k, e in ipairs(api.get_valid_nodes()) do id = e[".name"], remark = e["remark"], type = e["type"], - chain_proxy = e["chain_proxy"] + chain_proxy = e["chain_proxy"], + group = e["group"] } end if e.protocol == "_balancing" then @@ -98,26 +99,29 @@ m.uci:foreach(appname, "socks", function(s) end) -- 负载均衡列表 -o = s:option(DynamicList, _n("balancing_node"), translate("Load balancing node list"), translate("Load balancing node list, document")) +o = s:option(MultiValue, _n("balancing_node"), translate("Load balancing node list"), translate("Load balancing node list, document")) o:depends({ [_n("protocol")] = "_balancing" }) -local valid_ids = {} -for k, v in pairs(nodes_table) do +o.widget = "checkbox" +o.template = appname .. "/cbi/nodes_multiselect" +o.group = {} +for i, v in pairs(nodes_table) do o:value(v.id, v.remark) - valid_ids[v.id] = true + o.group[#o.group+1] = v.group or "" end --- 去重并禁止自定义非法输入 +-- 读取旧 DynamicList +function o.cfgvalue(self, section) + local val = m.uci:get_list(appname, section, "balancing_node") + if val then + return val + else + return {} + end +end +-- 写入保持 DynamicList function o.custom_write(self, section, value) local result = {} - if type(value) == "table" then - local seen = {} - for _, v in ipairs(value) do - if v and not seen[v] and valid_ids[v] then - table.insert(result, v) - seen[v] = true - end - end - else - result = { value } + for v in value:gmatch("%S+") do + result[#result + 1] = v end m.uci:set_list(appname, section, "balancing_node", result) end diff --git a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua index 11028f2be7..5e27be824c 100644 --- a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua +++ b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua @@ -77,7 +77,8 @@ for k, e in ipairs(api.get_valid_nodes()) do id = e[".name"], remark = e["remark"], type = e["type"], - chain_proxy = e["chain_proxy"] + chain_proxy = e["chain_proxy"], + group = e["group"] } end if e.protocol == "_iface" then @@ -105,26 +106,29 @@ m.uci:foreach(appname, "socks", function(s) end) --[[ URLTest ]] -o = s:option(DynamicList, _n("urltest_node"), translate("URLTest node list"), translate("List of nodes to test, document")) +o = s:option(MultiValue, _n("urltest_node"), translate("URLTest node list"), translate("List of nodes to test, document")) o:depends({ [_n("protocol")] = "_urltest" }) -local valid_ids = {} -for k, v in pairs(nodes_table) do +o.widget = "checkbox" +o.template = appname .. "/cbi/nodes_multiselect" +o.group = {} +for i, v in pairs(nodes_table) do o:value(v.id, v.remark) - valid_ids[v.id] = true + o.group[#o.group+1] = v.group or "" end --- 去重并禁止自定义非法输入 +-- 读取旧 DynamicList +function o.cfgvalue(self, section) + local val = m.uci:get_list(appname, section, "urltest_node") + if val then + return val + else + return {} + end +end +-- 写入保持 DynamicList function o.custom_write(self, section, value) local result = {} - if type(value) == "table" then - local seen = {} - for _, v in ipairs(value) do - if v and not seen[v] and valid_ids[v] then - table.insert(result, v) - seen[v] = true - end - end - else - result = { value } + for v in value:gmatch("%S+") do + result[#result + 1] = v end m.uci:set_list(appname, section, "urltest_node", result) end diff --git a/small/luci-app-passwall/luasrc/passwall/api.lua b/small/luci-app-passwall/luasrc/passwall/api.lua index 802572ac0f..46a1e7b2c3 100644 --- a/small/luci-app-passwall/luasrc/passwall/api.lua +++ b/small/luci-app-passwall/luasrc/passwall/api.lua @@ -47,10 +47,10 @@ function set_apply_on_parse(map) map.on_after_apply = function(self) showMsg_Redirect(self.redirect, 3000) end - end - map.render = function(self, ...) - getmetatable(self).__index.render(self, ...) -- 保持原渲染流程 - optimize_cbi_ui() + map.render = function(self, ...) + getmetatable(self).__index.render(self, ...) -- 保持原渲染流程 + optimize_cbi_ui() + end end end diff --git a/small/luci-app-passwall/luasrc/view/passwall/cbi/nodes_multiselect.htm b/small/luci-app-passwall/luasrc/view/passwall/cbi/nodes_multiselect.htm new file mode 100644 index 0000000000..cc52fbdc99 --- /dev/null +++ b/small/luci-app-passwall/luasrc/view/passwall/cbi/nodes_multiselect.htm @@ -0,0 +1,284 @@ +<%+cbi/valueheader%> +<% +local api = require "luci.passwall.api" +local cbid = "cbid." .. self.config .. "." .. section .. "." .. self.option + +-- 读取 MultiValue +local values = {} +for i, key in pairs(self.keylist) do + values[#values + 1] = { + key = key, + label = self.vallist[i] or key, + group = self.group and self.group[i] or nil + } +end + +-- 获取选中值 +local selected = {} +local cval = self:cfgvalue(section) +if type(cval) == "table" then + for _, v in pairs(cval) do + selected[v] = true + end +elseif type(cval) == "string" then + for v in cval:gmatch("%S+") do + selected[v] = true + end +end + +-- 按原顺序分组 +local groups = {} +local group_order = {} +for _, item in ipairs(values) do + local g = item.group + if not g or g == "" then + g = api.i18n.translate("default") + end + if not groups[g] then + groups[g] = {} + table.insert(group_order, g) + end + table.insert(groups[g], item) +end +%> + + + +
+ + + +
+
    + <% for _, gname in ipairs(group_order) do %> + <% local items = groups[gname] %> +
  • + +
    + + <%=gname%> + + (0/<%=#items%>) + +
    + +
      + + <% for _, item in ipairs(items) do %> +
    • + /> + +
      • + <% end %> +
    +
    • + <% end %> +
+
+ +
+ + + +
+
+<%+cbi/valuefooter%> + + diff --git a/small/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm b/small/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm index 63863ee27e..7c5b03793b 100644 --- a/small/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm +++ b/small/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm @@ -321,7 +321,7 @@ local api = require "luci.passwall.api" - +
diff --git a/small/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm b/small/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm index 707452e8a0..84a04810e5 100644 --- a/small/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm +++ b/small/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm @@ -160,11 +160,6 @@ table td, .table .td { background-color: rgba(131, 191, 255, 0.7) !important; box-shadow: 0 4px 6px rgba(0,0,0,0.1); } - -/* hide save button */ -.cbi-page-actions { - display: none !important; -} <% if api.is_js_luci() then -%> diff --git a/small/luci-app-passwall/po/zh-cn/passwall.po b/small/luci-app-passwall/po/zh-cn/passwall.po index f6ca3935d1..04d5303a6f 100644 --- a/small/luci-app-passwall/po/zh-cn/passwall.po +++ b/small/luci-app-passwall/po/zh-cn/passwall.po @@ -388,6 +388,9 @@ msgstr "置顶" msgid "Select" msgstr "选择" +msgid "Selected:" +msgstr "已选：" + msgid "DeSelect" msgstr "反选" @@ -2016,3 +2019,6 @@ msgstr "调整节点分组" msgid "Currently using %s node" msgstr "当前使用的 %s 节点" + +msgid "Search nodes..." +msgstr "搜索节点…" diff --git a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua index 8134860f8a..b57d437066 100644 --- a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua +++ b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua @@ -138,7 +138,7 @@ o:depends("shunt_dns_mode", "2") o.description = translate("Custom DNS Server format as IP:PORT (default: 8.8.4.4:53)") o.datatype = "ip4addrport" -o = s:option(ListValue, "shunt_mosdns_dnsserver", translate("Anti-pollution DNS Server")) +o = s:option(Value, "shunt_mosdns_dnsserver", translate("Anti-pollution DNS Server")) o:value("tcp://8.8.4.4:53,tcp://8.8.8.8:53", translate("Google Public DNS")) o:value("tcp://208.67.222.222:53,tcp://208.67.220.220:53", translate("OpenDNS")) o:value("tcp://209.244.0.3:53,tcp://209.244.0.4:53", translate("Level 3 Public DNS-1 (209.244.0.3-4)")) @@ -146,7 +146,7 @@ o:value("tcp://4.2.2.1:53,tcp://4.2.2.2:53", translate("Level 3 Public DNS-2 (4. o:value("tcp://4.2.2.3:53,tcp://4.2.2.4:53", translate("Level 3 Public DNS-3 (4.2.2.3-4)")) o:value("tcp://1.1.1.1:53,tcp://1.0.0.1:53", translate("Cloudflare DNS")) o:depends("shunt_dns_mode", "3") -o.description = translate("Custom DNS Server for MosDNS") +o.description = translate("Custom DNS Server format as tcp://IP:PORT or tls://DOMAIN:PORT (tcp://8.8.8.8 or tls://dns.google:853)") o = s:option(Flag, "shunt_mosdns_ipv6", translate("Disable IPv6 In MosDNS Query Mode (Shunt Mode)")) o:depends("shunt_dns_mode", "3") diff --git a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua index 56f7dc16d9..17630423fe 100644 --- a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua +++ b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua @@ -161,7 +161,7 @@ o.description = translate("Custom DNS Server format as IP:PORT (default: 8.8.4.4 o.datatype = "ip4addrport" o.default = "8.8.4.4:53" -o = s:option(ListValue, "tunnel_forward_mosdns", translate("Anti-pollution DNS Server")) +o = s:option(Value, "tunnel_forward_mosdns", translate("Anti-pollution DNS Server")) o:value("tcp://8.8.4.4:53,tcp://8.8.8.8:53", translate("Google Public DNS")) o:value("tcp://208.67.222.222:53,tcp://208.67.220.220:53", translate("OpenDNS")) o:value("tcp://209.244.0.3:53,tcp://209.244.0.4:53", translate("Level 3 Public DNS-1 (209.244.0.3-4)")) @@ -169,7 +169,7 @@ o:value("tcp://4.2.2.1:53,tcp://4.2.2.2:53", translate("Level 3 Public DNS-2 (4. o:value("tcp://4.2.2.3:53,tcp://4.2.2.4:53", translate("Level 3 Public DNS-3 (4.2.2.3-4)")) o:value("tcp://1.1.1.1:53,tcp://1.0.0.1:53", translate("Cloudflare DNS")) o:depends("pdnsd_enable", "4") -o.description = translate("Custom DNS Server for MosDNS") +o.description = translate("Custom DNS Server format as tcp://IP:PORT or tls://DOMAIN:PORT (tcp://8.8.8.8 or tls://dns.google:853)") o = s:option(Flag, "mosdns_ipv6", translate("Disable IPv6 in MOSDNS query mode")) o:depends("pdnsd_enable", "4") diff --git a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua index 9f0eff11e8..4f52aab19a 100644 --- a/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua +++ b/small/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua @@ -73,6 +73,10 @@ if Process_list:find("tcp.udp.ssr.retcp") then reudp_run = 1 end +if Process_list:find("nft.ssr.retcp") then + redir_run = 1 +end + if Process_list:find("local.ssr.retcp") then redir_run = 1 sock5_run = 1 diff --git a/small/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po b/small/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po index a48a1d51cb..e56d8391e9 100644 --- a/small/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po +++ b/small/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po @@ -416,8 +416,8 @@ msgstr "" #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua:149 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua:172 -msgid "Custom DNS Server for MosDNS" -msgstr "MosDNS 自定义 DNS 服务器" +msgid "Custom DNS Server format as tcp://IP:PORT or tls://DOMAIN:PORT (tcp://8.8.8.8 or tls://dns.google:853)" +msgstr "格式为tcp://IP:Port或tls://域名:Port (tcp://8.8.8.8或tls://dns.google:853)" #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua:138 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua:220 diff --git a/small/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/small/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 3acb750cc8..95e03a6b8a 100755 --- a/small/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/small/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -211,8 +211,10 @@ start_dns() { local run_mode="$(uci_get_by_type global run_mode)" if [ "$ssrplus_dns" != "0" ]; then - if [ -n "$dnsserver" ]; then - add_dns_into_ipset $run_mode $dnsserver + if command -v iptables-legacy >/dev/null 2>&1; then + if [ -n "$dnsserver" ]; then + add_dns_into_ipset $run_mode $dnsserver + fi fi case "$ssrplus_dns" in 1) @@ -236,12 +238,14 @@ start_dns() { output=$(for i in $(echo $mosdns_dnsserver | sed "s/,/ /g"); do dnsserver=${i%:*} dnsserver=${i##*/} - add_dns_into_ipset $run_mode $dnsserver + if command -v iptables-legacy >/dev/null 2>&1; then + add_dns_into_ipset $run_mode $dnsserver + fi echo " - addr: $i" echo " enable_pipeline: true" done) - awk -v line=14 -v text="$output" 'NR == line+1 {print text} 1' /etc/ssrplus/mosdns-config.yaml | sed "s/DNS_PORT/$dns_port/g" > $TMP_PATH/mosdns-config.yaml + awk -v line=14 -v text="$output" 'NR == line+1 {print text} 1' /etc/ssrplus/mosdns-config.yaml | sed "s/DNS_PORT/$dns_port/g" | sed "s/\(concurrent:\).*/\1 $(echo "$mosdns_dnsserver" | sed 's/,/ /g' | wc -w)/g"> $TMP_PATH/mosdns-config.yaml if [ "$mosdns_ipv6" == "0" ]; then sed -i "s/DNS_MODE/main_sequence_with_IPv6/g" $TMP_PATH/mosdns-config.yaml else @@ -648,7 +652,7 @@ shunt_dns_command() { echo " socks5: \"127.0.0.1:$tmp_port\"" echo " enable_pipeline: true" done) - awk -v line=14 -v text="$output" 'NR == line+1 {print text} 1' /etc/ssrplus/mosdns-config.yaml | sed "s/DNS_PORT/$tmp_shunt_dns_port/g" > $TMP_PATH/mosdns-config-shunt.yaml + awk -v line=14 -v text="$output" 'NR == line+1 {print text} 1' /etc/ssrplus/mosdns-config.yaml | sed "s/DNS_PORT/$tmp_shunt_dns_port/g" | sed "s/\(concurrent:\).*/\1 $(echo "$mosdns_dnsserver" | sed 's/,/ /g' | wc -w)/g" > $TMP_PATH/mosdns-config-shunt.yaml if [ "$shunt_mosdns_ipv6" == "0" ]; then sed -i "s/DNS_MODE/main_sequence_with_IPv6/g" $TMP_PATH/mosdns-config-shunt.yaml @@ -1172,7 +1176,17 @@ load_config() { tcp_config_file=$TMP_PATH/tcp-only-ssr-retcp.json case "$UDP_RELAY_SERVER" in nil) - mode="tcp" + if command -v nft >/dev/null 2>&1; then + # nftables / fw4 + mode="tcp,udp" + ARG_UDP="" + udp_config_file="" + UDP_RELAY_SERVER="nil" + tcp_config_file=$TMP_PATH/nft-ssr-retcp.json + else + # iptables / fw3 + mode="tcp" + fi ;; $GLOBAL_SERVER | same) mode="tcp,udp" @@ -1185,7 +1199,13 @@ load_config() { udp_config_file=$TMP_PATH/udp-only-ssr-reudp.json ARG_UDP="-U" start_udp - mode="tcp" + if command -v nft >/dev/null 2>&1; then + # nftables / fw4 + mode="tcp,udp" + else + # iptables / fw3 + mode="tcp" + fi ;; esac case "$LOCAL_SERVER" in @@ -1419,6 +1439,11 @@ start_rules() { 2) echo "-O" ;; esac } + if command -v nft >/dev/null 2>&1; then + ARG_A="-A" + else + ARG_A="" + fi /usr/share/shadowsocksr/gfw2ipset.sh /usr/bin/ssr-rules \ -s "$server" \ @@ -1438,7 +1463,8 @@ start_rules() { -N "$shunt_ip" \ -M "$(uci_get_by_type global netflix_proxy 0)" \ -I "/etc/ssrplus/netflixip.list" \ - $(get_arg_out) $(gfwmode) $ARG_UDP + $(get_arg_out) $(gfwmode) $ARG_UDP $ARG_A + return $? } @@ -1486,6 +1512,13 @@ boot() { stop() { unlock set_lock + if command -v nft >/dev/null 2>&1; then + /usr/bin/ssr-rules -K + #local CLEANUP_PERSISTENCE="$(uci_get_by_type global global_server nil)" + #if [ "$CLEANUP_PERSISTENCE" == "nil" ]; then + # /usr/bin/ssr-rules -X + #fi + fi /usr/bin/ssr-rules -f local srulecount=0 if command -v nft >/dev/null 2>&1; then @@ -1527,6 +1560,7 @@ stop() { killall -q -9 kcptun-client fi $PS -w | grep -v "grep" | grep ssr-monitor | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + $PS -w | grep -v "grep" | grep ssr-rules | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & $PS -w | grep -v "grep" | grep "sleep 0000" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & ( \ # Graceful kill first, so programs have the chance to stop its subprocesses diff --git a/small/luci-app-ssr-plus/root/usr/bin/ssr-rules b/small/luci-app-ssr-plus/root/usr/bin/ssr-rules index 8fb813a447..fba38d8731 100755 --- a/small/luci-app-ssr-plus/root/usr/bin/ssr-rules +++ b/small/luci-app-ssr-plus/root/usr/bin/ssr-rules @@ -28,6 +28,24 @@ detect_firewall TAG="_SS_SPEC_RULE_" # comment tag +# 这些变量将在后续的 getopts 参数解析中被赋值 +ENABLE_AUTO_UPDATE=0 +STOP_AUTO_UPDATE=0 +FORCE_UPDATE=0 +CHECK_STATUS=0 +RESTORE_RULES=0 +FLUSH_RULES=0 +CLEANUP_PERSISTENCE=0 + +if [ "$USE_NFT" = "1" ]; then + # NFTables persistence directory + NFTABLES_RULES_DIR="/usr/share/nftables.d/ruleset-post" + NFTABLES_RULES_FILE="$NFTABLES_RULES_DIR/99-shadowsocksr.nft" + # Auto-update configuration + AUTO_UPDATE_INTERVAL=300 # 自动更新检查间隔（秒），0表示禁用自动更新 +fi + +# 修改 usage 函数 usage() { cat <<-EOF Usage: ssr-rules [options] @@ -63,6 +81,15 @@ usage() { -r router mode -c oversea mode -z all mode + + # 新增持久化管理选项 (使用不同的字母避免冲突) + -A enable auto-update daemon + -K stop auto-update daemon + -P force update persistence + -C check rules status + -R restore rules from persistence file + -X cleanup persistence files on stop + -h show this help message and exit EOF exit $1 @@ -73,6 +100,40 @@ loger() { logger -st ssr-rules[$$] -p$1 $2 } +# 清理持久化和运行模块文件等 +cleanup_persistence_files() { + if [ "$USE_NFT" != "1" ]; then + return 0 + fi + + # 删除持久化规则文件 + if [ -f "$NFTABLES_RULES_FILE" ]; then + rm -f "$NFTABLES_RULES_FILE" 2>/dev/null + loger 5 "Removed persistence file: $NFTABLES_RULES_FILE" + fi + + # 删除运行模块文件 + if [ -f "/tmp/.ssr_run_mode" ]; then + rm -f "/tmp/.ssr_run_mode" 2>/dev/null + loger 5 "Removed run mode file: /tmp/.ssr_run_mode" + fi + + # 删除 TPROXY 文件 + if [ -f "/tmp/.last_tproxy" ]; then + rm -f "/tmp/.last_tproxy" 2>/dev/null + loger 5 "Removed run mode file: /tmp/.last_tproxy" + fi + + # 删除 PROXY_PORTS 文件 + if [ -f "/tmp/.last_proxy_ports" ]; then + rm -f "/tmp/.last_proxy_ports" 2>/dev/null + loger 5 "Removed run mode file: /tmp/.last_proxy_ports" + fi + + loger 5 "Persistence cleanup completed" + return 0 +} + flush_r() { if [ "$USE_NFT" = "1" ]; then flush_nftables @@ -136,6 +197,13 @@ flush_nftables() { # 重置防火墙 include 文件 [ -n "$FWI" ] && echo '#!/bin/sh' >"$FWI" + # 清理持久化和运行模块文件 + if [ "$CLEANUP_PERSISTENCE" = "1" ]; then + cleanup_persistence_files + fi + + loger 6 "Memory rules flushed successfully" + return 0 } @@ -182,7 +250,7 @@ ipset_nft() { fi # Create necessary collections - for setname in china gmlan fplan bplan whitelist blacklist netflix; do + for setname in china gmlan fplan bplan whitelist blacklist netflix music; do if ! $NFT list set inet ss_spec $setname >/dev/null 2>&1; then $NFT add set inet ss_spec $setname '{ type ipv4_addr; flags interval; auto-merge; }' 2>/dev/null else @@ -190,7 +258,7 @@ ipset_nft() { fi done - # 批量导入中国IP列表 + # Bulk import china ip list safely (avoid huge single element limitation) if [ -f "${china_ip:=/etc/ssrplus/china_ssr.txt}" ]; then $NFT add element inet ss_spec china "{ $(tr '\n' ',' < "${china_ip}" | sed 's/,$//') }" 2>/dev/null fi @@ -212,109 +280,111 @@ ipset_nft() { [ -n "$ip" ] && $NFT add element inet ss_spec blacklist "{ $ip }" 2>/dev/null done - # Create main chain for WAN access control - if ! $NFT list chain inet ss_spec ss_spec_wan_ac >/dev/null 2>&1; then - $NFT add chain inet ss_spec ss_spec_wan_ac 2>/dev/null - fi - $NFT flush chain inet ss_spec ss_spec_wan_ac 2>/dev/null - - # Create forward chain with better error handling - if ! $NFT list chain inet ss_spec ss_spec_wan_fw >/dev/null 2>&1; then - $NFT add chain inet ss_spec ss_spec_wan_fw 2>/dev/null || { - loger 3 "Failed to create forward chain" - return 1 - } - fi - # Clear existing rules - $NFT flush chain inet ss_spec ss_spec_wan_fw 2>/dev/null - - EXT_ARGS="" - if [ -n "$PROXY_PORTS" ]; then - PORTS_ARGS=$(echo "$PROXY_PORTS" | sed 's/-m multiport --dports //') - if [ -n "$PORTS_ARGS" ]; then - EXT_ARGS="th dport { $PORTS_ARGS }" + # Create main chains for WAN access control + for chain in ss_spec_wan_fw_tcp ss_spec_wan_fw_udp ss_spec_wan_ac_tcp ss_spec_wan_ac_udp; do + if ! $NFT list chain inet ss_spec $chain >/dev/null 2>&1; then + $NFT add chain inet ss_spec $chain fi - fi + $NFT flush chain inet ss_spec $chain + done # Add basic rules - # ========== 按照正确顺序添加规则 ========== + # BASIC RULES (exceptions first) — TCP + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp meta l4proto tcp tcp dport 53 ip daddr 127.0.0.0/8 return + [ -n "$server" ] && $NFT add rule inet ss_spec ss_spec_wan_ac_tcp meta l4proto tcp tcp dport != 53 ip daddr "$server" return - # 1. 基础例外规则（最高优先级） - $NFT add rule inet ss_spec ss_spec_wan_ac tcp dport 53 ip daddr 127.0.0.0/8 return - [ -n "$server" ] && $NFT add rule inet ss_spec ss_spec_wan_ac tcp dport != 53 ip daddr "$server" return + # Access control: blacklist -> whitelist -> fplan/bplan — TCP + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip daddr @blacklist jump ss_spec_wan_fw_tcp + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip daddr @whitelist return + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip saddr @fplan jump ss_spec_wan_fw_tcp + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip saddr @bplan return - # 2. 强制访问控制 - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @blacklist jump ss_spec_wan_fw - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @whitelist return - $NFT add rule inet ss_spec ss_spec_wan_ac ip saddr @fplan jump ss_spec_wan_fw - $NFT add rule inet ss_spec ss_spec_wan_ac ip saddr @bplan return + # BASIC RULES (exceptions first) — UDP + $NFT add rule inet ss_spec ss_spec_wan_ac_udp meta l4proto udp udp dport 53 ip daddr 127.0.0.0/8 return + [ -n "$server" ] && $NFT add rule inet ss_spec ss_spec_wan_ac_udp meta l4proto udp udp dport != 53 ip daddr "$server" return + + # Access control: blacklist -> whitelist -> fplan/bplan — UDP + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip daddr @blacklist jump ss_spec_wan_fw_udp + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip daddr @whitelist return + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip saddr @fplan jump ss_spec_wan_fw_udp + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip saddr @bplan return - # 3. 特殊功能规则 # Music unlocking support if $NFT list set inet ss_spec music >/dev/null 2>&1; then - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @music return + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp meta l4proto tcp ip daddr @music return + $NFT add rule inet ss_spec ss_spec_wan_ac_udp meta l4proto udp ip daddr @music return fi # Shunt/Netflix rules - if [ "$SHUNT_PORT" != "0" ] && [ -f "$SHUNT_LIST" ]; then + if [ -f "$SHUNT_LIST" ]; then for ip in $(cat "$SHUNT_LIST" 2>/dev/null); do [ -n "$ip" ] && $NFT add element inet ss_spec netflix "{ $ip }" 2>/dev/null done - case "$SHUNT_PORT" in - 1) - $NFT add rule inet ss_spec ss_spec_wan_ac meta l4proto tcp $EXT_ARGS ip daddr @netflix counter redirect to :$local_port - ;; - *) - $NFT add rule inet ss_spec ss_spec_wan_ac meta l4proto tcp $EXT_ARGS ip daddr @netflix counter redirect to :$SHUNT_PORT - if [ "$SHUNT_PROXY" = "1" ]; then - $NFT add rule inet ss_spec ss_spec_wan_ac meta l4proto tcp $EXT_ARGS ip daddr $SHUNT_IP counter redirect to :$local_port - else - [ -n "$SHUNT_IP" ] && $NFT add element inet ss_spec whitelist "{ $SHUNT_IP }" 2>/dev/null - fi - ;; - esac fi - # 4. 模式特定规则 # Set up mode-specific rules case "$RUNMODE" in router) - if ! $NFT list set inet ss_spec ss_spec_wan_ac >/dev/null 2>&1; then - $NFT add set inet ss_spec ss_spec_wan_ac '{ type ipv4_addr; flags interval; auto-merge; }' + if ! $NFT list set inet ss_spec ss_spec_wan_ac_tcp >/dev/null 2>&1; then + $NFT add set inet ss_spec ss_spec_wan_ac_tcp '{ type ipv4_addr; flags interval; auto-merge; }' else - $NFT flush set inet ss_spec ss_spec_wan_ac 2>/dev/null + $NFT flush set inet ss_spec ss_spec_wan_ac_tcp 2>/dev/null fi # Add special IP ranges to WAN AC set for ip in $(gen_spec_iplist); do - [ -n "$ip" ] && $NFT add element inet ss_spec ss_spec_wan_ac "{ $ip }" 2>/dev/null + [ -n "$ip" ] && $NFT add element inet ss_spec ss_spec_wan_ac_tcp "{ $ip }" 2>/dev/null done - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @ss_spec_wan_ac return - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @china return - if $NFT list chain inet ss_spec ss_spec_wan_fw >/dev/null 2>&1; then - $NFT add rule inet ss_spec ss_spec_wan_ac ip saddr @gmlan ip daddr != @china jump ss_spec_wan_fw - $NFT add rule inet ss_spec ss_spec_wan_ac jump ss_spec_wan_fw + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip daddr @ss_spec_wan_ac_tcp return + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip daddr @china return + if $NFT list chain inet ss_spec ss_spec_wan_ac_tcp >/dev/null 2>&1; then + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip saddr @gmlan ip daddr != @china jump ss_spec_wan_fw_tcp + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp jump ss_spec_wan_fw_tcp + fi + if ! $NFT list set inet ss_spec ss_spec_wan_ac_udp >/dev/null 2>&1; then + $NFT add set inet ss_spec ss_spec_wan_ac_udp '{ type ipv4_addr; flags interval; auto-merge; }' + else + $NFT flush set inet ss_spec ss_spec_wan_ac_udp 2>/dev/null + fi + # Add special IP ranges to WAN AC set + for ip in $(gen_spec_iplist); do + [ -n "$ip" ] && $NFT add element inet ss_spec ss_spec_wan_ac_udp "{ $ip }" 2>/dev/null + done + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip daddr @ss_spec_wan_ac_udp return + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip daddr @china return + if $NFT list chain inet ss_spec ss_spec_wan_fw_udp >/dev/null 2>&1; then + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip saddr @gmlan ip daddr != @china jump ss_spec_wan_fw_udp + $NFT add rule inet ss_spec ss_spec_wan_ac_udp jump ss_spec_wan_fw_udp fi ;; gfw) if ! $NFT list set inet ss_spec gfwlist >/dev/null 2>&1; then $NFT add set inet ss_spec gfwlist '{ type ipv4_addr; flags interval; auto-merge; }' 2>/dev/null fi - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @china return - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @gfwlist jump ss_spec_wan_fw - $NFT add rule inet ss_spec ss_spec_wan_ac ip saddr @gmlan ip daddr != @china jump ss_spec_wan_fw + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip daddr @china return + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip daddr @gfwlist jump ss_spec_wan_fw_tcp + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip saddr @gmlan ip daddr != @china jump ss_spec_wan_fw_tcp + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip daddr @china return + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip daddr @gfwlist jump ss_spec_wan_fw_udp + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip saddr @gmlan ip daddr != @china jump ss_spec_wan_fw_udp ;; oversea) if ! $NFT list set inet ss_spec oversea >/dev/null 2>&1; then $NFT add set inet ss_spec oversea '{ type ipv4_addr; flags interval; auto-merge; }' 2>/dev/null fi - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @oversea jump ss_spec_wan_fw - $NFT add rule inet ss_spec ss_spec_wan_ac ip saddr @gmlan jump ss_spec_wan_fw - $NFT add rule inet ss_spec ss_spec_wan_ac ip daddr @china jump ss_spec_wan_fw + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip daddr @oversea jump ss_spec_wan_fw_tcp + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip saddr @gmlan jump ss_spec_wan_fw_tcp + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp ip daddr @china jump ss_spec_wan_fw_tcp + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip daddr @oversea jump ss_spec_wan_fw_udp + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip saddr @gmlan jump ss_spec_wan_fw_udp + $NFT add rule inet ss_spec ss_spec_wan_ac_udp ip daddr @china jump ss_spec_wan_fw_udp ;; all) - if $NFT list chain inet ss_spec ss_spec_wan_fw >/dev/null 2>&1; then - $NFT add rule inet ss_spec ss_spec_wan_ac jump ss_spec_wan_fw + if $NFT list chain inet ss_spec ss_spec_wan_fw_tcp >/dev/null 2>&1; then + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp jump ss_spec_wan_fw_tcp + fi + if $NFT list chain inet ss_spec ss_spec_wan_fw_udp >/dev/null 2>&1; then + $NFT add rule inet ss_spec ss_spec_wan_ac_udp jump ss_spec_wan_fw_udp fi ;; esac @@ -402,28 +472,68 @@ fw_rule() { } fw_rule_nft() { - # Exclude special local addresses - if $NFT list chain inet ss_spec ss_spec_wan_fw >/dev/null 2>&1; then - for net in 0.0.0.0/8 10.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 224.0.0.0/4 240.0.0.0/4; do - $NFT add rule inet ss_spec ss_spec_wan_fw ip daddr $net return 2>/dev/null - done + # set up routing table for tproxy + if ! ip rule show | grep -Eq "fwmark 0x0*1.*lookup 100"; then + ip rule add fwmark 0x01/0x01 table 100 2>/dev/null + fi + + if ! ip route show table 100 | grep -q "^local.*dev lo"; then + ip route add local 0.0.0.0/0 dev lo table 100 2>/dev/null fi # redirect/translation: when PROXY_PORTS present, redirect those tcp ports to local_port if [ -n "$PROXY_PORTS" ]; then - PORTS=$(echo "$PROXY_PORTS" | sed 's/-m multiport --dports //') - RULE="tcp dport { $PORTS } counter redirect to :"$local_port"" + PORTS_ARGS=$(echo "$PROXY_PORTS" | sed 's/-m multiport --dports //') + if [ -n "$PORTS_ARGS" ]; then + TCP_EXT_ARGS="meta l4proto tcp tcp dport { $PORTS_ARGS }" + UDP_EXT_ARGS="meta l4proto udp udp dport { $PORTS_ARGS }" + + TCP_RULE="meta l4proto tcp tcp dport { $PORTS_ARGS } counter redirect to :$local_port" + UDP_RULE="meta l4proto udp udp dport { $PORTS_ARGS } counter tproxy ip to :$local_port meta mark set 0x01" + fi else + TCP_EXT_ARGS="meta l4proto tcp" + UDP_EXT_ARGS="meta l4proto udp" + # default: redirect everything except ssh(22) - RULE="tcp dport != 22 counter redirect to :"$local_port"" + TCP_RULE="meta l4proto tcp tcp dport != 22 counter redirect to :$local_port" + # default: when PROXY_PORTS present, redirect those udp ports to local_port + UDP_RULE="meta l4proto udp counter tproxy ip to :$local_port meta mark set 0x01" fi - if ! $NFT list chain inet ss_spec ss_spec_wan_fw 2>/dev/null | grep -q "$RULE"; then - if ! $NFT add rule inet ss_spec ss_spec_wan_fw $RULE 2>/dev/null; then - loger 3 "Can't redirect, please check nftables." + # add TCP rule to fw chain if not exists (use -F exact match) + if ! $NFT list chain inet ss_spec ss_spec_wan_fw_tcp 2>/dev/null | grep -F -- "$TCP_RULE" >/dev/null 2>&1; then + if ! $NFT add rule inet ss_spec ss_spec_wan_fw_tcp $TCP_RULE 2>/dev/null; then + loger 3 "Can't redirect TCP, please check nftables." return 1 fi fi + if ! $NFT list chain inet ss_spec ss_spec_wan_fw_udp 2>/dev/null | grep -F -- "$UDP_RULE" >/dev/null 2>&1; then + if ! $NFT add rule inet ss_spec ss_spec_wan_fw_udp $UDP_RULE 2>/dev/null; then + loger 3 "Can't tproxy UDP, please check nftables." + return 1 + fi + fi + + if [ "$SHUNT_PORT" != "0" ] && [ -f "$SHUNT_LIST" ]; then + case "$SHUNT_PORT" in + 1) + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp $TCP_EXT_ARGS ip daddr @netflix counter redirect to :$local_port + $NFT add rule inet ss_spec ss_spec_wan_ac_udp $UDP_EXT_ARGS ip daddr @netflix counter tproxy ip to :$local_port meta mark set 0x01 + ;; + *) + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp $TCP_EXT_ARGS ip daddr @netflix counter redirect to :$SHUNT_PORT + $NFT add rule inet ss_spec ss_spec_wan_ac_udp $UDP_EXT_ARGS ip daddr @netflix counter tproxy ip to :$SHUNT_PORT meta mark set 0x01 + if [ "$SHUNT_PROXY" = "1" ]; then + $NFT add rule inet ss_spec ss_spec_wan_ac_tcp $TCP_EXT_ARGS ip daddr $SHUNT_IP counter redirect to :$local_port + $NFT add rule inet ss_spec ss_spec_wan_ac_udp $UDP_EXT_ARGS ip daddr $SHUNT_IP counter tproxy ip to :$local_port meta mark set 0x01 + else + [ -n "$SHUNT_IP" ] && $NFT add element inet ss_spec whitelist "{ $SHUNT_IP }" 2>/dev/null + fi + ;; + esac + fi + return $? } @@ -482,34 +592,67 @@ ac_rule_nft() { esac fi - # 创建ss_spec_prerouting链 - if ! $NFT list chain inet ss_spec ss_spec_prerouting >/dev/null 2>&1; then - $NFT add chain inet ss_spec ss_spec_prerouting '{ type nat hook prerouting priority 0; policy accept; }' + # Create ss_spec_prerouting tcp chain + if ! $NFT list chain inet ss_spec ss_spec_prerouting_tcp >/dev/null 2>&1; then + $NFT add chain inet ss_spec ss_spec_prerouting_tcp '{ type nat hook prerouting priority 0; policy accept; }' fi - $NFT flush chain inet ss_spec ss_spec_prerouting 2>/dev/null + $NFT flush chain inet ss_spec ss_spec_prerouting_tcp 2>/dev/null - # 创建ss_spec_output链 - if ! $NFT list chain inet ss_spec ss_spec_output >/dev/null 2>&1; then - $NFT add chain inet ss_spec ss_spec_output '{ type nat hook output priority 0; policy accept; }' + # Exclude special local addresses + if $NFT list chain inet ss_spec ss_spec_prerouting_tcp >/dev/null 2>&1; then + for net in 0.0.0.0/8 10.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 224.0.0.0/4 240.0.0.0/4; do + $NFT add rule inet ss_spec ss_spec_prerouting_tcp ip daddr $net return 2>/dev/null + done fi - $NFT flush chain inet ss_spec ss_spec_output 2>/dev/null + + # 暂注释 IPV6 用于后续开启 IPV6 + #if $NFT list chain inet ss_spec ss_spec_prerouting_tcp >/dev/null 2>&1; then + # for net in ::1/128 fe80::/10 fc00::/7 ff00::/8 ::/128 ::ffff:0:0/96; do + # $NFT add rule inet ss_spec ss_spec_prerouting_tcp ip6 daddr $net return 2>/dev/null + # done + #fi + + # Create ss_spec_prerouting udp chain + if ! $NFT list chain inet ss_spec ss_spec_prerouting_udp >/dev/null 2>&1; then + $NFT add chain inet ss_spec ss_spec_prerouting_udp '{ type filter hook prerouting priority -150; policy accept; }' + fi + $NFT flush chain inet ss_spec ss_spec_prerouting_udp 2>/dev/null + + # Exclude special local addresses + if $NFT list chain inet ss_spec ss_spec_prerouting_udp >/dev/null 2>&1; then + for net in 0.0.0.0/8 10.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 224.0.0.0/4 240.0.0.0/4; do + $NFT add rule inet ss_spec ss_spec_prerouting_udp ip daddr $net return 2>/dev/null + done + fi + + # 暂注释 IPV6 用于后续开启 IPV6 + #if $NFT list chain inet ss_spec ss_spec_prerouting_udp >/dev/null 2>&1; then + # for net in ::1/128 fe80::/10 fc00::/7 ff00::/8 ::/128 ::ffff:0:0/96; do + # $NFT add rule inet ss_spec ss_spec_prerouting_udp ip6 daddr $net return 2>/dev/null + # done + #fi # Build a rule in the prerouting hook chain that jumps to business chain with conditions - EXT_ARGS="" if [ -n "$PROXY_PORTS" ]; then PORTS_ARGS=$(echo "$PROXY_PORTS" | sed 's/-m multiport --dports //') if [ -n "$PORTS_ARGS" ]; then - EXT_ARGS="th dport { $PORTS_ARGS }" + TCP_EXT_ARGS="meta l4proto tcp tcp dport { $PORTS_ARGS }" + UDP_EXT_ARGS="meta l4proto udp udp dport { $PORTS_ARGS }" fi + else + TCP_EXT_ARGS="meta l4proto tcp" + UDP_EXT_ARGS="meta l4proto udp" fi if [ -z "$Interface" ]; then # generic prerouting jump already exists (see ipset_nft), but if we have MATCH_SET_CONDITION we add a more specific rule if [ -n "$MATCH_SET" ]; then # add a more specific rule at the top of ss_spec_prerouting - $NFT insert rule inet ss_spec ss_spec_prerouting meta l4proto tcp $EXT_ARGS $MATCH_SET jump ss_spec_wan_ac comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_prerouting_tcp $TCP_EXT_ARGS $MATCH_SET jump ss_spec_wan_ac_tcp comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_prerouting_udp $UDP_EXT_ARGS $MATCH_SET jump ss_spec_wan_ac_udp comment "\"$TAG\"" 2>/dev/null else - $NFT insert rule inet ss_spec ss_spec_prerouting meta l4proto tcp $EXT_ARGS jump ss_spec_wan_ac comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_prerouting_tcp $TCP_EXT_ARGS jump ss_spec_wan_ac_tcp comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_prerouting_udp $UDP_EXT_ARGS jump ss_spec_wan_ac_udp comment "\"$TAG\"" 2>/dev/null fi else # For each Interface, find its actual ifname and add an iifname-limited prerouting rule @@ -518,9 +661,11 @@ ac_rule_nft() { [ -z "$IFNAME" ] && IFNAME=$(uci -P /var/state get network."$name".device 2>/dev/null) if [ -n "$IFNAME" ]; then if [ -n "$MATCH_SET" ]; then - $NFT insert rule inet ss_spec ss_spec_prerouting meta iifname "$IFNAME" meta l4proto tcp $EXT_ARGS $MATCH_SET jump ss_spec_wan_ac comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_prerouting_tcp meta iifname "$IFNAME" $TCP_EXT_ARGS $MATCH_SET jump ss_spec_wan_ac_tcp comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_prerouting_udp meta iifname "$IFNAME" $UDP_EXT_ARGS $MATCH_SET jump ss_spec_wan_ac_udp comment "\"$TAG\"" 2>/dev/null else - $NFT insert rule inet ss_spec ss_spec_prerouting meta iifname "$IFNAME" meta l4proto tcp $EXT_ARGS jump ss_spec_wan_ac comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_prerouting_tcp meta iifname "$IFNAME" $TCP_EXT_ARGS jump ss_spec_wan_ac_tcp comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_prerouting_udp meta iifname "$IFNAME" $UDP_EXT_ARGS jump ss_spec_wan_ac_udp comment "\"$TAG\"" 2>/dev/null fi fi done @@ -528,8 +673,51 @@ ac_rule_nft() { case "$OUTPUT" in 1) + # Create ss_spec_output tcp chain + if ! $NFT list chain inet ss_spec ss_spec_output_tcp >/dev/null 2>&1; then + $NFT add chain inet ss_spec ss_spec_output_tcp '{ type nat hook output priority 0; policy accept; }' + fi + $NFT flush chain inet ss_spec ss_spec_output_tcp 2>/dev/null + + # Exclude special local addresses + if $NFT list chain inet ss_spec ss_spec_output_tcp >/dev/null 2>&1; then + for net in 0.0.0.0/8 10.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 224.0.0.0/4 240.0.0.0/4; do + $NFT add rule inet ss_spec ss_spec_output_tcp ip daddr $net return 2>/dev/null + done + fi + + # 暂注释 IPV6 用于后续开启 IPV6 + #if $NFT list chain inet ss_spec ss_spec_output_tcp >/dev/null 2>&1; then + # for net in ::1/128 fe80::/10 fc00::/7 ff00::/8 ::/128 ::ffff:0:0/96; do + # $NFT add rule inet ss_spec ss_spec_output_tcp ip6 daddr $net return 2>/dev/null + # done + #fi + # create output hook chain & route output traffic into router chain - $NFT insert rule inet ss_spec ss_spec_output meta l4proto tcp $EXT_ARGS jump ss_spec_wan_ac comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_output_tcp $TCP_EXT_ARGS jump ss_spec_wan_ac_tcp comment "\"$TAG\"" 2>/dev/null + + # Create ss_spec_output udp chain + if ! $NFT list chain inet ss_spec ss_spec_output_udp >/dev/null 2>&1; then + $NFT add chain inet ss_spec ss_spec_output_udp '{ type filter hook output priority -150; policy accept; }' + fi + $NFT flush chain inet ss_spec ss_spec_output_udp 2>/dev/null + + # Exclude special local addresses + if $NFT list chain inet ss_spec ss_spec_output_udp >/dev/null 2>&1; then + for net in 0.0.0.0/8 10.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 224.0.0.0/4 240.0.0.0/4; do + $NFT add rule inet ss_spec ss_spec_output_udp ip daddr $net return 2>/dev/null + done + fi + + # 暂注释 IPV6 用于后续开启 IPV6 + #if $NFT list chain inet ss_spec ss_spec_output_udp >/dev/null 2>&1; then + # for net in ::1/128 fe80::/10 fc00::/7 ff00::/8 ::/128 ::ffff:0:0/96; do + # $NFT add rule inet ss_spec ss_spec_output_udp ip6 daddr $net return 2>/dev/null + # done + #fi + + # create output hook chain & route output traffic into router chain + $NFT add rule inet ss_spec ss_spec_output_udp $UDP_EXT_ARGS meta mark set 0x01 comment "\"$TAG\"" 2>/dev/null ;; 2) # router mode output chain: create ssr_gen_router set & router chain @@ -539,8 +727,10 @@ ac_rule_nft() { done $NFT add chain inet ss_spec ss_spec_router 2>/dev/null $NFT add rule inet ss_spec ss_spec_router ip daddr @ssr_gen_router return 2>/dev/null - $NFT add rule inet ss_spec ss_spec_router jump ss_spec_wan_fw 2>/dev/null - $NFT add rule inet ss_spec ss_spec_output meta l4proto tcp $EXT_ARGS jump ss_spec_router comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_router jump ss_spec_wan_fw_tcp 2>/dev/null + $NFT add rule inet ss_spec ss_spec_output $TCP_EXT_ARGS jump ss_spec_router comment "\"$TAG\"" 2>/dev/null + $NFT add rule inet ss_spec ss_spec_router jump ss_spec_wan_fw_udp 2>/dev/null + $NFT add rule inet ss_spec ss_spec_output $UDP_EXT_ARGS jump ss_spec_router comment "\"$TAG\"" 2>/dev/null ;; esac return 0 @@ -605,8 +795,13 @@ tp_rule() { tp_rule_nft() { # set up routing table for tproxy - ip rule add fwmark 0x01/0x01 table 100 2>/dev/null - ip route add local 0.0.0.0/0 dev lo table 100 2>/dev/null + if ! ip rule show | grep -Eq "fwmark 0x0*1.*lookup 100"; then + ip rule add fwmark 0x01/0x01 table 100 2>/dev/null + fi + + if ! ip route show table 100 | grep -q "^local.*dev lo"; then + ip route add local 0.0.0.0/0 dev lo table 100 2>/dev/null + fi # create mangle table and tproxy chain if ! $NFT list table ip ss_spec_mangle >/dev/null 2>&1; then @@ -615,20 +810,15 @@ tp_rule_nft() { local MATCH_SET="" - EXT_ARGS="" if [ -n "$PROXY_PORTS" ]; then PORTS_ARGS=$(echo "$PROXY_PORTS" | sed 's/-m multiport --dports //') if [ -n "$PORTS_ARGS" ]; then - EXT_ARGS="th dport { $PORTS_ARGS }" + EXT_ARGS="udp dport { $PORTS_ARGS }" else EXT_ARGS="" fi fi - # 有端口 => 1，无端口 => 0 - HAS_PORTS=0 - [ -n "$EXT_ARGS" ] && HAS_PORTS=1 - if [ -n "$LAN_AC_IP" ]; then # Create LAN access control set if needed if ! $NFT list set ip ss_spec_mangle ss_spec_lan_ac >/dev/null 2>&1; then @@ -664,7 +854,7 @@ tp_rule_nft() { fi done - # 批量导入中国IP列表 + # Bulk import china ip list safely (avoid huge single element limitation) if [ -f "${china_ip:=/etc/ssrplus/china_ssr.txt}" ]; then $NFT add element ip ss_spec_mangle china "{ $(tr '\n' ',' < "${china_ip}" | sed 's/,$//') }" 2>/dev/null fi @@ -682,12 +872,19 @@ tp_rule_nft() { done fi + # 暂注释 IPV6 用于后续开启 IPV6 + #if $NFT list chain ip ss_spec_mangle ss_spec_tproxy >/dev/null 2>&1; then + # for net in ::1/128 fe80::/10 fc00::/7 ff00::/8 fe80::/10 ::/128 ::ffff:0:0/96; do + # $NFT add rule ip ss_spec_mangle ss_spec_tproxy ip6 daddr $net return 2>/dev/null + # done + #fi + # basic return rules in tproxy chain - $NFT add rule ip ss_spec_mangle ss_spec_tproxy udp dport 53 return 2>/dev/null + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp dport 53 return 2>/dev/null # avoid redirecting to udp server address if [ -n "$server" ]; then - $NFT add rule ip ss_spec_mangle ss_spec_tproxy udp dport != 53 ip daddr "$server" return 2>/dev/null + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp dport != 53 ip daddr "$server" return 2>/dev/null fi # if server != SERVER add SERVER to whitelist set (so tproxy won't touch it) @@ -700,12 +897,7 @@ tp_rule_nft() { # access control and tproxy rules $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip saddr @bplan return 2>/dev/null - - if [ $HAS_PORTS -eq 1 ]; then - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip saddr @fplan counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 - else - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip saddr @fplan counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null - fi + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip saddr @fplan counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null # Handle different run modes for nftables case "$RUNMODE" in @@ -722,50 +914,38 @@ tp_rule_nft() { $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip daddr @ss_spec_wan_ac return 2>/dev/null $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip daddr @china return 2>/dev/null - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp dport 80 drop 2>/dev/null + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp udp dport 80 drop 2>/dev/null $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip saddr @gmlan ip daddr != @china counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null - if [ $HAS_PORTS -eq 1 ]; then - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip daddr != @ss_spec_wan_ac counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null - else - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip daddr != @ss_spec_wan_ac counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null - fi + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip daddr != @ss_spec_wan_ac counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null ;; gfw) - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip daddr @china return 2>/dev/null - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp dport 80 drop 2>/dev/null - if [ $HAS_PORTS -eq 1 ]; then - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip daddr @gfwlist counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null + if ! $NFT list set ip ss_spec_mangle gfwlist >/dev/null 2>&1; then + $NFT add set ip ss_spec_mangle gfwlist '{ type ipv4_addr; flags interval; auto-merge; }' 2>/dev/null fi + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip daddr @china return 2>/dev/null + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp udp dport 80 drop 2>/dev/null + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip daddr @gfwlist counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip saddr @gmlan ip daddr != @china counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null ;; oversea) if ! $NFT list set ip ss_spec_mangle oversea >/dev/null 2>&1; then $NFT add set ip ss_spec_mangle oversea '{ type ipv4_addr; flags interval; auto-merge; }' 2>/dev/null fi - if ! $NFT list set ip ss_spec_mangle china >/dev/null 2>&1; then - $NFT add set ip ss_spec_mangle china '{ type ipv4_addr; flags interval; auto-merge; }' 2>/dev/null - fi - if [ $HAS_PORTS -eq 1 ]; then - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip saddr @oversea counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip daddr @china counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null - fi + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip saddr @oversea counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS ip daddr @china counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp ip saddr @gmlan counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null ;; all) - if [ $HAS_PORTS -eq 1 ]; then - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null - else - $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null - fi + $NFT add rule ip ss_spec_mangle ss_spec_tproxy meta l4proto udp $EXT_ARGS counter tproxy ip to :"$LOCAL_PORT" meta mark set 0x01 2>/dev/null ;; esac - # 创建 prerouting 链（hook prerouting） + # finally, ensure prerouting hook entry to jump to tproxy chain if ! $NFT list chain ip ss_spec_mangle prerouting >/dev/null 2>&1; then $NFT add chain ip ss_spec_mangle prerouting '{ type filter hook prerouting priority mangle; policy accept; }' fi - # 添加规则到 prerouting 链 + # add prerouting jump (idempotent) if [ -z "$Interface" ]; then # 全局规则 if [ -n "$MATCH_SET" ]; then @@ -884,17 +1064,23 @@ gen_include() { return $? } +# 修改gen_include_nft，调用持久化功能 gen_include_nft() { # Generate nftables include file for firewall4 [ -n "$FWI" ] && echo '#!/bin/sh' >"$FWI" - cat <<-'EOF' >>"$FWI" + cat <<-EOF >>"$FWI" # Clear existing ss_spec tables nft delete table inet ss_spec 2>/dev/null nft delete table ip ss_spec 2>/dev/null nft delete table ip ss_spec_mangle 2>/dev/null - # Restore shadowsocks nftables rules - nft list ruleset | awk '/^table (inet|ip) ss_spec/{flag=1} /^table / && !/^table (inet|ip) ss_spec/{flag=0} flag' + # Restore shadowsocks nftables rules from persistent file + if [ -f "/usr/share/nftables.d/ruleset-post/99-shadowsocksr.nft" ]; then + nft -f /usr/share/nftables.d/ruleset-post/99-shadowsocksr.nft + else + # Fallback: restore from current ruleset (filtered) + nft list ruleset | awk '/^table (inet|ip) ss_spec/{flag=1} /^table / && !/^table (inet|ip) ss_spec/{flag=0} flag' | nft -f - + fi EOF chmod +x "$FWI" } @@ -914,7 +1100,273 @@ gen_include_iptables() { EOF } -while getopts ":m:s:l:S:L:i:e:a:B:b:w:p:G:D:F:N:M:I:oOuUfgrczh" arg; do +# 检查 nftables 规则状态 +check_nftables_status() { + if [ "$USE_NFT" != "1" ]; then + echo "NFTables not in use" + return 0 + fi + + # 检查ss_spec表是否存在 + if ! $NFT list table inet ss_spec >/dev/null 2>&1 && \ + ! $NFT list table ip ss_spec_mangle >/dev/null 2>&1; then + echo "ss_spec tables missing in nftables" + return 1 + fi + + # 检查是否有基本规则 + if ! $NFT list table inet ss_spec 2>/dev/null | grep -q "chain.*ss_spec_wan_ac" || \ + ! $NFT list table inet ss_spec 2>/dev/null | grep -q "jump.*ss_spec_wan_fw"; then + echo "Basic SSR rules missing" + return 1 + fi + + echo "NFTables rules status: OK" + return 0 +} + +# 比较当前规则与持久化规则 +compare_rules() { + if [ "$USE_NFT" != "1" ]; then + return 1 # NFTables未使用，需要更新 + fi + + # 如果没有持久化文件，更新持久化文件 + if [ ! -f "$NFTABLES_RULES_FILE" ]; then + loger 6 "No persistence file found, update needed" + return 1 # 需要更新持久化文件 + fi + + # 检查ss_spec表是否存在 + if ! $NFT list table inet ss_spec >/dev/null 2>&1 && \ + ! $NFT list table ip ss_spec_mangle >/dev/null 2>&1; then + loger 6 "ss_spec tables missing, update needed" + return 1 # 需要更新ss_spec表 + fi + + # 生成当前规则的临时文件 + local temp_file=$(mktemp) + local rules_file=$(mktemp) + loger 7 "DEBUG: Temporary file path: $current_rules_file" + + # 导出当前规则到临时文件 + $NFT list ruleset | awk ' + /^table (inet ss_spec|ip ss_spec_mangle)/ {flag=1} + /^table / && !/^table (inet ss_spec|ip ss_spec_mangle)/ {flag=0} + flag + ' > "$rules_file" 2>/dev/null + + # 检查是否成功导出了当前规则 + if [ ! -s "$rules_file" ] || ! grep -q "table" "$rules_file" 2>/dev/null; then + loger 4 "Failed to export current rules" + rm -f "$temp_file" "$rules_file" + return 1 # 导出失败，需要更新 + fi + + # 比较当前规则与持久化文件中的规则 + if ! cmp -s "$rules_file" "$NFTABLES_RULES_FILE"; then + loger 6 "Rules differ, update needed" + rm -f "$temp_file" "$rules_file" + return 1 # 需要更新 + fi + + rm -f "$temp_file" "$rules_file" + loger 6 "Rules unchanged, no update needed" + return 0 # 无需更新 +} + +# 自动更新持久化规则 +persist_nftables_rules() { + if [ "$USE_NFT" != "1" ]; then + return 0 + fi + + # 如果模式未改变且存在持久化文件，跳过更新 + if [ "$MODE_CHANGED" = "0" ] && [ -f "$NFTABLES_RULES_FILE" ]; then + loger 6 "Mode unchanged and persistence file exists, skipping update" + return 0 + fi + + # 强制更新时，跳过比较检查并删除旧文件 + if [ "$FORCE_UPDATE" = "1" ]; then + loger 6 "Force update requested, removing old persistence file" + rm -f "$NFTABLES_RULES_FILE" 2>/dev/null + # 非强制更新时，进行规则比较 + elif [ -f "$NFTABLES_RULES_FILE" ]; then + if compare_rules; then + loger 6 "Rules unchanged, skipping persistence update" + return 0 + fi + fi + + # 确保目录存在 + mkdir -p "$NFTABLES_RULES_DIR" 2>/dev/null + + # 生成nftables规则文件 + cat <<-'EOF' >>$NFTABLES_RULES_FILE + #!/usr/sbin/nft -f + + # ShadowsocksR nftables rules + # Generated by ssr-rules script + EOF + + echo "# Auto-updated: $(date)" >> "$NFTABLES_RULES_FILE" + echo "# Runmode: ${RUNMODE:-router}" >> "$NFTABLES_RULES_FILE" + echo "# Server: $server, Port: $local_port" >> "$NFTABLES_RULES_FILE" + echo "" >> "$NFTABLES_RULES_FILE" + + local HAS_RULES=0 + + # 分别导出每个表 + if $NFT list table inet ss_spec >/dev/null 2>&1; then + loger 6 "Exporting table inet ss_spec" + { + echo "" + echo "# inet ss_spec table for main rules" + $NFT list table inet ss_spec 2>/dev/null + } >> "$NFTABLES_RULES_FILE" + HAS_RULES=1 + fi + + if $NFT list table ip ss_spec_mangle >/dev/null 2>&1; then + loger 6 "Exporting table ip ss_spec_mangle" + { + echo "" + echo "# ip ss_spec_mangle table for TPROXY rules" + $NFT list table ip ss_spec_mangle 2>/dev/null + } >> "$NFTABLES_RULES_FILE" + HAS_RULES=1 + fi + + # 检查是否成功导出了规则 + if [ $HAS_RULES -eq 0 ] || [ ! -s "$NFTABLES_RULES_FILE" ] || ! grep -q "table" "$NFTABLES_RULES_FILE" 2>/dev/null; then + loger 4 "No ss_spec nftables rules found to persist" + rm -f "$NFTABLES_RULES_FILE" 2>/dev/null + return 1 + fi + + # 设置文件权限 + chmod 644 "$NFTABLES_RULES_FILE" 2>/dev/null + + # 记录成功信息 + local TABLES=$(grep "^table" "$NFTABLES_RULES_FILE" | awk '{print $2 " " $3}' | tr '\n' ',' | sed 's/,$//') + loger 5 "NFTables rules persisted to $NFTABLES_RULES_FILE (Tables: $TABLES)" + + return 0 +} + +# 自动更新守护进程 +start_auto_update_daemon() { + if [ "$USE_NFT" != "1" ] || [ "$AUTO_UPDATE_INTERVAL" = "0" ]; then + return 0 + fi + + loger 6 "Starting nftables rules auto-update daemon" + + # 停止已经运行的守护进程 + stop_auto_update_daemon + + # 直接在后台启动守护进程 + ( + logger -t ssr-rules[daemon] "Auto-update daemon started - PID: $$" + echo $$ > "/var/run/ssr-rules-daemon.pid" + + while true; do + sleep 300 + if [ -x "/usr/bin/ssr-rules" ]; then + if /usr/bin/ssr-rules -C >/dev/null 2>&1; then + logger -t ssr-rules[daemon] "Rules changed or missing, updating persistence" + if /usr/bin/ssr-rules -P >/dev/null 2>&1; then + logger -t ssr-rules[daemon] "Persistence rules updated successfully" + else + logger -t ssr-rules[daemon] "Failed to update persistence" + fi + else + logger -t ssr-rules[daemon] "Rules status OK, no update needed" + fi + else + logger -t ssr-rules[daemon] "Script not found, exiting daemon" + exit 1 + fi + done + ) & + + local DAEMON_PID=$! + sleep 2 + + if kill -0 "$DAEMON_PID" 2>/dev/null; then + loger 6 "Auto-update daemon started with PID: $DAEMON_PID" + return 0 + else + loger 3 "Auto-update daemon failed to start" + return 1 + fi +} + +# 停止自动更新守护进程函数 +stop_auto_update_daemon() { + local PID_FILE="/var/run/ssr-rules-daemon.pid" + + if [ -f "$PID_FILE" ]; then + local DAEMON_PID=$(cat "$PID_FILE" 2>/dev/null) + if [ -n "$DAEMON_PID" ] && kill -0 "$DAEMON_PID" 2>/dev/null; then + kill "$DAEMON_PID" 2>/dev/null + loger 6 "Stopped auto-update daemon (PID: $DAEMON_PID)" + fi + rm -f "$PID_FILE" 2>/dev/null + fi + + loger 6 "Auto-update daemon stopped" +} + +# 强制更新持久化规则函数 +force_update_persistence() { + if [ "$USE_NFT" != "1" ]; then + echo "NFTables not in use" + return 0 + fi + + # 移除现有规则文件确保重新创建 + rm -f "$NFTABLES_RULES_FILE" 2>/dev/null + + # 调用持久化函数 + if persist_nftables_rules; then + loger 5 "Persistence update completed successfully" + return 0 + else + loger 3 "Persistence update failed" + return 1 + fi +} + +# 从持久化文件恢复规则 +restore_from_persistence() { + if [ "$USE_NFT" != "1" ]; then + loger 3 "NFTables not in use, cannot restore rules" + return 1 + fi + + if [ ! -f "$NFTABLES_RULES_FILE" ]; then + loger 4 "Persistence file not found: $NFTABLES_RULES_FILE" + return 1 + fi + + loger 6 "Restoring rules from persistence file" + + # 清理现有规则 + flush_r + + # 从文件恢复规则 + if $NFT -f "$NFTABLES_RULES_FILE" 2>/dev/null; then + loger 5 "Rules restored successfully from persistence file" + return 0 + else + loger 4 "Failed to restore rules from persistence file" + return 1 + fi +} + +while getopts ":m:s:l:S:L:i:e:a:B:b:w:p:G:D:F:N:M:I:oOuUfgrczAKPCRXh" arg; do case "$arg" in m) Interface=$OPTARG @@ -994,58 +1446,283 @@ while getopts ":m:s:l:S:L:i:e:a:B:b:w:p:G:D:F:N:M:I:oOuUfgrczh" arg; do z) RUNMODE=all ;; - f) - flush_r - exit 0 + # 新增持久化管理选项 + A) + ENABLE_AUTO_UPDATE=1 + ;; + K) + STOP_AUTO_UPDATE=1 + ;; + P) + FORCE_UPDATE=1 + ;; + C) + CHECK_STATUS=1 + ;; + R) + RESTORE_RULES=1 + ;; + X) + CLEANUP_PERSISTENCE=1 + ;; + f) + FLUSH_RULES=1 + ;; + h) + usage 0 ;; - h) usage 0 ;; esac done -if [ -z "$server" ] || [ -z "$local_port" ]; then - usage 2 +# 首先处理需要立即退出的选项 +if [ "$CHECK_STATUS" = "1" ]; then + check_nftables_status + exit $? fi -if ! echo "$local_port" | grep -qE '^[0-9]+$'; then - loger 3 "Invalid local port: $local_port" - exit 1 +if [ "$STOP_AUTO_UPDATE" = "1" ]; then + stop_auto_update_daemon + exit 0 fi -case "$TPROXY" in -1) - SERVER=$server - LOCAL_PORT=$local_port - ;; -2) - : ${SERVER:?"You must assign an ip for the udp relay server."} - : ${LOCAL_PORT:?"You must assign a port for the udp relay server."} - ;; -esac - -# First check whether nftables is working properly -if [ "$USE_NFT" = "1" ]; then - if ! $NFT list tables 2>/dev/null; then - loger 3 "nftables is not working properly, check if nftables is installed and running" - exit 1 - fi +# 只有-X选项，执行清理后退出 +if [ "$CLEANUP_PERSISTENCE" = "1" ] && [ "$FLUSH_RULES" != "1" ] && [ -z "$server" ] && [ -z "$local_port" ] && \ + [ "$FORCE_UPDATE" != "1" ] && [ "$RESTORE_RULES" != "1" ] && [ "$ENABLE_AUTO_UPDATE" != "1" ]; then + cleanup_persistence_files + exit $? fi -if [ "$USE_NFT" = "1" ]; then - # NFTables - if flush_r && ipset_r && fw_rule && ac_rule && tp_rule && gen_include; then - loger 5 "NFTables rules applied successfully" - exit 0 +# 检查是否有持久化管理选项单独处理 +PERSISTENCE_ONLY=0 +if [ -z "$server" ] && [ -z "$local_port" ] && [ "$FLUSH_RULES" != "1" ]; then + if [ "$FORCE_UPDATE" = "1" ] || [ "$RESTORE_RULES" = "1" ] || [ "$ENABLE_AUTO_UPDATE" = "1" ] || [ "$CLEANUP_PERSISTENCE" = "1" ]; then + PERSISTENCE_ONLY=1 else - loger 3 "NFTables setup failed!" - exit 1 - fi -else - # iptables - if flush_r && fw_rule && ipset_r && ac_rule && tp_rule && gen_include; then - loger 5 "iptables rules applied successfully" - exit 0 - else - loger 3 "iptables setup failed!" - exit 1 + usage 2 + fi +fi + +# 处理持久化管理选项的情况 +if [ "$PERSISTENCE_ONLY" = "1" ]; then + if [ "$FORCE_UPDATE" = "1" ]; then + force_update_persistence + exit $? + fi + + if [ "$RESTORE_RULES" = "1" ]; then + restore_from_persistence + exit $? + fi + + if [ "$ENABLE_AUTO_UPDATE" = "1" ]; then + start_auto_update_daemon + exit $? + fi +fi + +# 强制刷新规则 +if [ "$FLUSH_RULES" = "1" ]; then + flush_r + # 如果只有 -f 选项，则退出 + if [ -z "$server" ] && [ -z "$local_port" ] && [ "$FORCE_UPDATE" != "1" ] && \ + [ "$RESTORE_RULES" != "1" ] && [ "$ENABLE_AUTO_UPDATE" != "1" ] && \ + [ "$CLEANUP_PERSISTENCE" != "1" ]; then + exit 0 + fi +fi + +# 从持久化文件恢复规则（在规则应用之前） +if [ "$RESTORE_RULES" = "1" ]; then + restore_from_persistence + if [ $? -ne 0 ]; then + loger 3 "Failed to restore from persistence, continuing with rule application" + fi +fi + +# 运行模式更改 +runmode_change() { + local mode_file="/tmp/.ssr_run_mode" + local new_mode="" + local old_mode="" + + # 从参数获取模式 + if [ -n "$1" ]; then + new_mode="$1" + fi + + # 从文件中读取上一次的运行模式 + if [ -f "$mode_file" ]; then + old_mode=$(cat "$mode_file" 2>/dev/null) + fi + + # 比较模式是否改变 + if [ "$old_mode" = "$new_mode" ] && [ -n "$old_mode" ]; then + # 模式未改变 + echo "$new_mode" > "$mode_file" # 更新文件时间戳 + loger 6 "Runmode unchanged: $new_mode" + return 1 # 返回1表示未改变 + else + # 模式已改变或首次运行 + echo "$new_mode" > "$mode_file" + if [ -n "$old_mode" ]; then + loger 6 "Runmode changed from '$old_mode' to '$new_mode'" + else + loger 6 "Runmode set to '$new_mode'" + fi + return 0 # 返回0表示已改变 + fi +} + +# Main process +if [ -n "$server" ] && [ -n "$local_port" ]; then + if ! echo "$local_port" | grep -qE '^[0-9]+$'; then + loger 3 "Invalid local port: $local_port" + exit 1 + fi + + case "$TPROXY" in + 1) + SERVER=$server + LOCAL_PORT=$local_port + ;; + 2) + : ${SERVER:?"You must assign an ip for the udp relay server."} + : ${LOCAL_PORT:?"You must assign a port for the udp relay server."} + ;; + esac + + if [ "$USE_NFT" = "1" ]; then + # NFTables + # 保存上一次 TPROXY 状态文件 + TPROXY_STATE_FILE="/tmp/.last_tproxy" + if [ -f "$TPROXY_STATE_FILE" ]; then + LAST_TPROXY=$(cat "$TPROXY_STATE_FILE") + else + LAST_TPROXY="" + fi + + # 保存上一次 PROXY_PORTS 状态 + PROXY_PORTS_STATE_FILE="/tmp/.last_proxy_ports" + if [ -f "$PROXY_PORTS_STATE_FILE" ]; then + LAST_PROXY_PORTS=$(cat "$PROXY_PORTS_STATE_FILE") + else + LAST_PROXY_PORTS="" + fi + + # STEP 1: 判断 TPROXY 是否有值（1 或 2） + if [ "$TPROXY" = "1" ] || [ "$TPROXY" = "2" ]; then + TPROXY_HAS_VALUE=1 + else + TPROXY_HAS_VALUE=0 + fi + + if [ "$LAST_TPROXY" = "1" ] || [ "$LAST_TPROXY" = "2" ]; then + LAST_HAS_VALUE=1 + else + LAST_HAS_VALUE=0 + fi + + # STEP 2: 判断 PROXY_PORTS 是否有值（非空字符串） + if [ -n "${PROXY_PORTS// }" ]; then + PROXY_HAS_VALUE=1 + else + PROXY_HAS_VALUE=0 + fi + + if [ -n "${LAST_PROXY_PORTS// }" ]; then + LAST_PROXY_HAS_VALUE=1 + else + LAST_PROXY_HAS_VALUE=0 + fi + + # STEP 3: 判断是否需要强制重建 + FORCE_RECREATE=0 + PERSISTENCE_EXISTS=0 + + # 触发条件： + # 1. TPROXY 从空 ↔ 有值变化 + # 2. PROXY_PORTS 从空 ↔ 有值变化 + if [ "$TPROXY_HAS_VALUE" != "$LAST_HAS_VALUE" ] || [ "$PROXY_HAS_VALUE" != "$LAST_PROXY_HAS_VALUE" ]; then + FORCE_RECREATE=1 + loger 6 "TPROXY or PROXY_PORTS changed → force rebuild rules" + rm -f "$NFTABLES_RULES_FILE" 2>/dev/null + else + # 未触发 FORCE_RECREATE → 检查持久化文件 + if [ -f "$NFTABLES_RULES_FILE" ] && [ -s "$NFTABLES_RULES_FILE" ]; then + PERSISTENCE_EXISTS=1 + loger 6 "Persistence file exists: $NFTABLES_RULES_FILE" + else + PERSISTENCE_EXISTS=0 + loger 6 "Persistence file does not exist or empty" + fi + fi + + # STEP 4: 保存当前状态 + echo "$TPROXY" > "$TPROXY_STATE_FILE" + echo "$PROXY_PORTS" > "$PROXY_PORTS_STATE_FILE" + + # STEP 5: 判断运行模式是否改变 + if runmode_change "$RUNMODE"; then + MODE_CHANGED=1 + loger 6 "Runmode changed: MODE_CHANGED=1" + else + MODE_CHANGED=0 + loger 6 "Runmode unchanged: MODE_CHANGED=0" + fi + + # STEP 6: 模式改变且持久化存在 → 删除一次 + if [ "$MODE_CHANGED" = "1" ] && [ "$PERSISTENCE_EXISTS" = "1" ]; then + loger 6 "Mode changed → removing persistence file" + rm -f "$NFTABLES_RULES_FILE" + PERSISTENCE_EXISTS=0 + fi + + # STEP 7: FORCE_RECREATE 优先 → 必须重建规则 + if [ "$FORCE_RECREATE" = "1" ]; then + loger 5 "Forced regeneration of NFTables rules" + if flush_r && ipset_r && fw_rule && ac_rule && tp_rule && gen_include; then + loger 5 "NFT rules applied successfully (forced rebuild)" + persist_nftables_rules + [ "$ENABLE_AUTO_UPDATE" = "1" ] && start_auto_update_daemon + exit 0 + else + loger 3 "NFT forced rebuild failed!" + exit 1 + fi + fi + + # STEP 8: 持久化存在 → 尝试 restore + if [ "$PERSISTENCE_EXISTS" = "1" ]; then + # 恢复规则 + if restore_from_persistence; then + loger 5 "NFT rules restored from persistence" + gen_include + [ "$ENABLE_AUTO_UPDATE" = "1" ] && start_auto_update_daemon + exit 0 + else + loger 3 "Restore failed → fallback to full setup" + PERSISTENCE_EXISTS=0 + fi + fi + + # STEP 9: 持久化不存在或 restore 失败 → 生成新规则 + if flush_r && ipset_r && fw_rule && ac_rule && tp_rule && gen_include; then + loger 5 "NFTables rules applied successfully" + persist_nftables_rules + [ "$ENABLE_AUTO_UPDATE" = "1" ] && start_auto_update_daemon + exit 0 + else + loger 3 "NFTables setup failed!" + exit 1 + fi + else + # iptables + if flush_r && fw_rule && ipset_r && ac_rule && tp_rule && gen_include; then + loger 5 "iptables rules applied successfully" + exit 0 + else + loger 3 "iptables setup failed!" + exit 1 + fi fi fi diff --git a/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua b/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua index 65e98a7cc6..34d13dc89e 100755 --- a/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua +++ b/small/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua @@ -213,7 +213,9 @@ local function update(url, file, type, file2) if type == "gfw_data" or type == "ad_data" then luci.sys.call("/usr/share/shadowsocksr/gfw2ipset.sh") else - luci.sys.call("/usr/share/shadowsocksr/chinaipset.sh " .. TMP_PATH .. "/china_ssr.txt") + if luci.sys.call("command -v ipset >/dev/null 2>&1") == 0 then + luci.sys.call("/usr/share/shadowsocksr/chinaipset.sh " .. TMP_PATH .. "/china_ssr.txt") + end end if args then log(0, tonumber(icount) / Num) diff --git a/small/v2ray-geodata/Makefile b/small/v2ray-geodata/Makefile index 5f6967a879..d183411a0c 100644 --- a/small/v2ray-geodata/Makefile +++ b/small/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=6878dbacfb1fcb1ee022f63ed6934bcefc95a3c4ba10c88f1131fb88dbf7c337 endef -GEOSITE_VER:=20251206075552 +GEOSITE_VER:=20251207105427 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=f1276502c556709de5cc6c7581cb2e9369721c37dc6142aacf5771f7c60106f6 + HASH:=546daff727fb5068cd53e10c471d9439e4009d77286ad33b5fd43194cf874221 endef GEOSITE_IRAN_VER:=202512010051 diff --git a/v2rayn/v2rayN/Directory.Build.props b/v2rayn/v2rayN/Directory.Build.props index 74e37384af..eec3a432a4 100644 --- a/v2rayn/v2rayN/Directory.Build.props +++ b/v2rayn/v2rayN/Directory.Build.props @@ -1,7 +1,7 @@ - 7.16.5 + 7.16.6 diff --git a/v2rayn/v2rayN/Directory.Packages.props b/v2rayn/v2rayN/Directory.Packages.props index beb870f2ed..c842bee0b9 100644 --- a/v2rayn/v2rayN/Directory.Packages.props +++ b/v2rayn/v2rayN/Directory.Packages.props @@ -12,13 +12,13 @@ - + - + - + diff --git a/v2rayn/v2rayN/ServiceLib/Global.cs b/v2rayn/v2rayN/ServiceLib/Global.cs index c96578d4c6..f0a2402859 100644 --- a/v2rayn/v2rayN/ServiceLib/Global.cs +++ b/v2rayn/v2rayN/ServiceLib/Global.cs @@ -586,7 +586,6 @@ public class Global public static readonly List IPAPIUrls = [ - @"https://speed.cloudflare.com/meta", @"https://api.ip.sb/geoip", @"https://api-ipv4.ip.sb/geoip", @"https://api-ipv6.ip.sb/geoip", diff --git a/v2rayn/v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs b/v2rayn/v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs index 7b665816a2..fd3436dbd0 100644 --- a/v2rayn/v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs +++ b/v2rayn/v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs @@ -12,8 +12,10 @@ public class ActionPrecheckManager(Config config) // sing-box supported transports for different protocol types private static readonly HashSet SingboxUnsupportedTransports = [nameof(ETransport.kcp), nameof(ETransport.xhttp)]; + private static readonly HashSet SingboxTransportSupportedProtocols = [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks]; + private static readonly HashSet SingboxShadowsocksAllowedTransports = [nameof(ETransport.tcp), nameof(ETransport.ws), nameof(ETransport.quic)]; diff --git a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs index b04c6e9ffd..f18f833c6f 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs @@ -365,7 +365,7 @@ public partial class CoreConfigSingboxService case nameof(ETransport.ws): transport.type = nameof(ETransport.ws); var wsPath = node.Path; - + // Parse eh and ed parameters from path using regex if (!wsPath.IsNullOrEmpty()) { diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs b/v2rayn/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs index 5a3fca9527..4266b91fb5 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.IO; -using Avalonia; -using Avalonia.Media; - namespace v2rayN.Desktop.Common; public static class AppBuilderExtension @@ -11,7 +5,7 @@ public static class AppBuilderExtension public static AppBuilder WithFontByDefault(this AppBuilder appBuilder) { var fallbacks = new List(); - + var notoSansSc = new FontFamily(Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC")); fallbacks.Add(new FontFallback { FontFamily = notoSansSc }); diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml index 82fc797086..bb95588dd8 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml @@ -34,7 +34,6 @@ @@ -89,7 +88,7 @@ - + - - + Margin="{StaticResource Margin4}" + IsEditable="True" /> this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SrsFileSourceUrl, v => v.cmbSrsFilesSourceUrl.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.RoutingRulesSourceUrl, v => v.cmbRoutingRulesSourceUrl.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.IPAPIUrl, v => v.cmbIPAPIUrl.SelectedValue).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.IPAPIUrl, v => v.cmbIPAPIUrl.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.notProxyLocalAddress, v => v.tognotProxyLocalAddress.IsChecked).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.SelectedValue).DisposeWith(disposables); diff --git a/v2rayn/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml index 97f54407bc..841b3d84ce 100644 --- a/v2rayn/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml +++ b/v2rayn/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml @@ -134,7 +134,10 @@ - + @@ -188,9 +191,7 @@ Style="{StaticResource DefTextBox}" /> - - \d+)\.html' + _TESTS = [{ + 'url': 'https://www.alibaba.com/product-detail/Kids-Entertainment-Bouncer-Bouncy-Castle-Waterslide_1601271126969.html', + 'info_dict': { + 'id': '6000280444270', + 'display_id': '1601271126969', + 'ext': 'mp4', + 'title': 'Kids Entertainment Bouncer Bouncy Castle Waterslide Juex Gonflables Commercial Inflatable Tropical Water Slide', + 'duration': 30, + 'thumbnail': 'https://sc04.alicdn.com/kf/Hc5bb391974454af18c7a4f91cbe4062bg.jpg_120x120.jpg', + }, + }] + + def _real_extract(self, url): + display_id = self._match_id(url) + webpage = self._download_webpage(url, display_id) + product_data = self._search_json( + r'window\.detailData\s*=', webpage, 'detail data', display_id)['globalData']['product'] + + return { + **traverse_obj(product_data, ('mediaItems', lambda _, v: v['type'] == 'video' and v['videoId'], any, { + 'id': ('videoId', {int}, {str_or_none}), + 'duration': ('duration', {int_or_none}), + 'thumbnail': ('videoCoverUrl', {url_or_none}), + 'formats': ('videoUrl', lambda _, v: url_or_none(v['videoUrl']), { + 'url': 'videoUrl', + 'format_id': ('definition', {str_or_none}), + 'tbr': ('bitrate', {int_or_none}), + 'width': ('width', {int_or_none}), + 'height': ('height', {int_or_none}), + 'filesize': ('length', {int_or_none}), + }), + })), + 'title': traverse_obj(product_data, ('subject', {str})), + 'display_id': display_id, + } diff --git a/yt-dlp/yt_dlp/extractor/sportdeutschland.py b/yt-dlp/yt_dlp/extractor/sportdeutschland.py index 0b7d90a071..cba026c8f0 100644 --- a/yt-dlp/yt_dlp/extractor/sportdeutschland.py +++ b/yt-dlp/yt_dlp/extractor/sportdeutschland.py @@ -8,10 +8,11 @@ from ..utils import ( class SportDeutschlandIE(InfoExtractor): - _VALID_URL = r'https?://(?:player\.)?sportdeutschland\.tv/(?P(?:[^/?#]+/)?[^?#/&]+)' + IE_NAME = 'sporteurope' + _VALID_URL = r'https?://(?:player\.)?sporteurope\.tv/(?P(?:[^/?#]+/)?[^?#/&]+)' _TESTS = [{ # Single-part video, direct link - 'url': 'https://sportdeutschland.tv/rostock-griffins/gfl2-rostock-griffins-vs-elmshorn-fighting-pirates', + 'url': 'https://sporteurope.tv/rostock-griffins/gfl2-rostock-griffins-vs-elmshorn-fighting-pirates', 'md5': '35c11a19395c938cdd076b93bda54cde', 'info_dict': { 'id': '9f27a97d-1544-4d0b-aa03-48d92d17a03a', @@ -19,9 +20,9 @@ class SportDeutschlandIE(InfoExtractor): 'title': 'GFL2: Rostock Griffins vs. Elmshorn Fighting Pirates', 'display_id': 'rostock-griffins/gfl2-rostock-griffins-vs-elmshorn-fighting-pirates', 'channel': 'Rostock Griffins', - 'channel_url': 'https://sportdeutschland.tv/rostock-griffins', + 'channel_url': 'https://sporteurope.tv/rostock-griffins', 'live_status': 'was_live', - 'description': 'md5:60cb00067e55dafa27b0933a43d72862', + 'description': r're:Video-Livestream des Spiels Rostock Griffins vs\. Elmshorn Fighting Pirates.+', 'channel_id': '9635f21c-3f67-4584-9ce4-796e9a47276b', 'timestamp': 1749913117, 'upload_date': '20250614', @@ -29,16 +30,16 @@ class SportDeutschlandIE(InfoExtractor): }, }, { # Single-part video, embedded player link - 'url': 'https://player.sportdeutschland.tv/9e9619c4-7d77-43c4-926d-49fb57dc06dc', + 'url': 'https://player.sporteurope.tv/9e9619c4-7d77-43c4-926d-49fb57dc06dc', 'info_dict': { 'id': '9f27a97d-1544-4d0b-aa03-48d92d17a03a', 'ext': 'mp4', 'title': 'GFL2: Rostock Griffins vs. Elmshorn Fighting Pirates', 'display_id': '9e9619c4-7d77-43c4-926d-49fb57dc06dc', 'channel': 'Rostock Griffins', - 'channel_url': 'https://sportdeutschland.tv/rostock-griffins', + 'channel_url': 'https://sporteurope.tv/rostock-griffins', 'live_status': 'was_live', - 'description': 'md5:60cb00067e55dafa27b0933a43d72862', + 'description': r're:Video-Livestream des Spiels Rostock Griffins vs\. Elmshorn Fighting Pirates.+', 'channel_id': '9635f21c-3f67-4584-9ce4-796e9a47276b', 'timestamp': 1749913117, 'upload_date': '20250614', @@ -47,7 +48,7 @@ class SportDeutschlandIE(InfoExtractor): 'params': {'skip_download': True}, }, { # Multi-part video - 'url': 'https://sportdeutschland.tv/rhine-ruhr-2025-fisu-world-university-games/volleyball-w-japan-vs-brasilien-halbfinale-2', + 'url': 'https://sporteurope.tv/rhine-ruhr-2025-fisu-world-university-games/volleyball-w-japan-vs-brasilien-halbfinale-2', 'info_dict': { 'id': '9f63d737-2444-4e3a-a1ea-840df73fd481', 'display_id': 'rhine-ruhr-2025-fisu-world-university-games/volleyball-w-japan-vs-brasilien-halbfinale-2', @@ -55,7 +56,7 @@ class SportDeutschlandIE(InfoExtractor): 'description': 'md5:0a17da15e48a687e6019639c3452572b', 'channel': 'Rhine-Ruhr 2025 FISU World University Games', 'channel_id': '9f5216be-a49d-470b-9a30-4fe9df993334', - 'channel_url': 'https://sportdeutschland.tv/rhine-ruhr-2025-fisu-world-university-games', + 'channel_url': 'https://sporteurope.tv/rhine-ruhr-2025-fisu-world-university-games', 'live_status': 'was_live', }, 'playlist_count': 2, @@ -66,7 +67,7 @@ class SportDeutschlandIE(InfoExtractor): 'title': 'Volleyball w: Japan vs. Braslien - Halbfinale 2 Part 1', 'channel': 'Rhine-Ruhr 2025 FISU World University Games', 'channel_id': '9f5216be-a49d-470b-9a30-4fe9df993334', - 'channel_url': 'https://sportdeutschland.tv/rhine-ruhr-2025-fisu-world-university-games', + 'channel_url': 'https://sporteurope.tv/rhine-ruhr-2025-fisu-world-university-games', 'duration': 14773.0, 'timestamp': 1753085197, 'upload_date': '20250721', @@ -79,16 +80,17 @@ class SportDeutschlandIE(InfoExtractor): 'title': 'Volleyball w: Japan vs. Braslien - Halbfinale 2 Part 2', 'channel': 'Rhine-Ruhr 2025 FISU World University Games', 'channel_id': '9f5216be-a49d-470b-9a30-4fe9df993334', - 'channel_url': 'https://sportdeutschland.tv/rhine-ruhr-2025-fisu-world-university-games', + 'channel_url': 'https://sporteurope.tv/rhine-ruhr-2025-fisu-world-university-games', 'duration': 14773.0, 'timestamp': 1753128421, 'upload_date': '20250721', 'live_status': 'was_live', }, }], + 'skip': '404 Not Found', }, { # Livestream - 'url': 'https://sportdeutschland.tv/dtb/gymnastik-international-tag-1', + 'url': 'https://sporteurope.tv/dtb/gymnastik-international-tag-1', 'info_dict': { 'id': '95d71b8a-370a-4b87-ad16-94680da18528', 'ext': 'mp4', @@ -96,7 +98,7 @@ class SportDeutschlandIE(InfoExtractor): 'display_id': 'dtb/gymnastik-international-tag-1', 'channel_id': '936ecef1-2f4a-4e08-be2f-68073cb7ecab', 'channel': 'Deutscher Turner-Bund', - 'channel_url': 'https://sportdeutschland.tv/dtb', + 'channel_url': 'https://sporteurope.tv/dtb', 'description': 'md5:07a885dde5838a6f0796ee21dc3b0c52', 'live_status': 'is_live', }, @@ -106,9 +108,9 @@ class SportDeutschlandIE(InfoExtractor): def _process_video(self, asset_id, video): is_live = video['type'] == 'mux_live' token = self._download_json( - f'https://api.sportdeutschland.tv/api/web/personal/asset-token/{asset_id}', + f'https://api.sporteurope.tv/api/web/personal/asset-token/{asset_id}', video['id'], query={'type': video['type'], 'playback_id': video['src']}, - headers={'Referer': 'https://sportdeutschland.tv/'})['token'] + headers={'Referer': 'https://sporteurope.tv/'})['token'] formats, subtitles = self._extract_m3u8_formats_and_subtitles( f'https://stream.mux.com/{video["src"]}.m3u8?token={token}', video['id'], live=is_live) @@ -126,7 +128,7 @@ class SportDeutschlandIE(InfoExtractor): def _real_extract(self, url): display_id = self._match_id(url) meta = self._download_json( - f'https://api.sportdeutschland.tv/api/stateless/frontend/assets/{display_id}', + f'https://api.sporteurope.tv/api/stateless/frontend/assets/{display_id}', display_id, query={'access_token': 'true'}) info = { @@ -139,7 +141,7 @@ class SportDeutschlandIE(InfoExtractor): 'channel_id': ('profile', 'id'), 'is_live': 'currently_live', 'was_live': 'was_live', - 'channel_url': ('profile', 'slug', {lambda x: f'https://sportdeutschland.tv/{x}'}), + 'channel_url': ('profile', 'slug', {lambda x: f'https://sporteurope.tv/{x}'}), }, get_all=False), } diff --git a/yt-dlp/yt_dlp/extractor/xhamster.py b/yt-dlp/yt_dlp/extractor/xhamster.py index d83d9da9f6..8b2893b07f 100644 --- a/yt-dlp/yt_dlp/extractor/xhamster.py +++ b/yt-dlp/yt_dlp/extractor/xhamster.py @@ -1,8 +1,6 @@ -import base64 -import codecs import itertools import re -import string +import urllib.parse from .common import InfoExtractor from ..utils import ( @@ -16,7 +14,6 @@ from ..utils import ( join_nonempty, parse_duration, str_or_none, - try_call, try_get, unified_strdate, url_or_none, @@ -32,7 +29,7 @@ class _ByteGenerator: try: self._algorithm = getattr(self, f'_algo{algo_id}') except AttributeError: - raise ExtractorError(f'Unknown algorithm ID: {algo_id}') + raise ExtractorError(f'Unknown algorithm ID "{algo_id}"') self._s = to_signed_32(seed) def _algo1(self, s): @@ -216,32 +213,28 @@ class XHamsterIE(InfoExtractor): 'only_matching': True, }] - _XOR_KEY = b'xh7999' - def _decipher_format_url(self, format_url, format_id): - if all(char in string.hexdigits for char in format_url): - byte_data = bytes.fromhex(format_url) - seed = int.from_bytes(byte_data[1:5], byteorder='little', signed=True) - byte_gen = _ByteGenerator(byte_data[0], seed) - return bytearray(byte ^ next(byte_gen) for byte in byte_data[5:]).decode('latin-1') + parsed_url = urllib.parse.urlparse(format_url) - cipher_type, _, ciphertext = try_call( - lambda: base64.b64decode(format_url).decode().partition('_')) or [None] * 3 - - if not cipher_type or not ciphertext: - self.report_warning(f'Skipping format "{format_id}": failed to decipher URL') + hex_string, path_remainder = self._search_regex( + r'^/(?P[0-9a-fA-F]{12,})(?P[/,].+)$', parsed_url.path, 'url components', + default=(None, None), group=('hex', 'rem')) + if not hex_string: + self.report_warning(f'Skipping format "{format_id}": unsupported URL format') return None - if cipher_type == 'xor': - return bytes( - a ^ b for a, b in - zip(ciphertext.encode(), itertools.cycle(self._XOR_KEY))).decode() + byte_data = bytes.fromhex(hex_string) + seed = int.from_bytes(byte_data[1:5], byteorder='little', signed=True) - if cipher_type == 'rot13': - return codecs.decode(ciphertext, cipher_type) + try: + byte_gen = _ByteGenerator(byte_data[0], seed) + except ExtractorError as e: + self.report_warning(f'Skipping format "{format_id}": {e.msg}') + return None - self.report_warning(f'Skipping format "{format_id}": unsupported cipher type "{cipher_type}"') - return None + deciphered = bytearray(byte ^ next(byte_gen) for byte in byte_data[5:]).decode('latin-1') + + return parsed_url._replace(path=f'/{deciphered}{path_remainder}').geturl() def _fixup_formats(self, formats): for f in formats: @@ -364,8 +357,11 @@ class XHamsterIE(InfoExtractor): 'height': get_height(quality), 'filesize': format_sizes.get(quality), 'http_headers': { - 'Referer': standard_url, + 'Referer': urlh.url, }, + # HTTP formats return "Wrong key" error even when deciphered by site JS + # TODO: Remove this when resolved on the site's end + '__needs_testing': True, }) categories_list = video.get('categories') @@ -402,7 +398,8 @@ class XHamsterIE(InfoExtractor): 'age_limit': age_limit if age_limit is not None else 18, 'categories': categories, 'formats': self._fixup_formats(formats), - '_format_sort_fields': ('res', 'proto', 'tbr'), + # TODO: Revert to ('res', 'proto', 'tbr') when HTTP formats problem is resolved + '_format_sort_fields': ('res', 'proto:m3u8', 'tbr'), } # Old layout fallback