From 53d74f2099e7b3e7169028613b98994337e13124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= Date: Wed, 27 Nov 2024 10:52:50 +0800 Subject: [PATCH] update --- docs/config/proxy-groups/index.en.md | 4 ++-- docs/config/proxy-groups/index.md | 4 ++-- docs/config/proxy-providers/index.en.md | 9 +++++++-- docs/config/proxy-providers/index.md | 9 +++++++-- docs/config/rule-providers/index.en.md | 7 ++++++- docs/config/rule-providers/index.md | 5 +++++ docs/startup/client/client.md | 12 ++++++------ mkdocs.yml | 12 ++++++------ 8 files changed, 41 insertions(+), 21 deletions(-) diff --git a/docs/config/proxy-groups/index.en.md b/docs/config/proxy-groups/index.en.md index c5bf0706..e773a390 100644 --- a/docs/config/proxy-groups/index.en.md +++ b/docs/config/proxy-groups/index.en.md @@ -122,9 +122,9 @@ Excludes nodes that meet keywords or [regular expressions](https://github.com/zi ## exclude-type -Excludes node types. +Regular expressions are not supported. Split by `|`, exclude based on node type, only excluding [ingress outbound proxies](#proxies) -Note that the syntax for `proxy-groups` and `proxy-providers` is different; regular expressions are not supported, and should be separated by `|`. +For supported types, please refer to [Adapter Type](https://github.com/MetaCubeX/mihomo/blob/fbead56ec97ae93f904f4476df1741af718c9c2a/constant/adapters.go#L18-L45) ## expected-status diff --git a/docs/config/proxy-groups/index.md b/docs/config/proxy-groups/index.md index 9a3d86d8..163b9b83 100644 --- a/docs/config/proxy-groups/index.md +++ b/docs/config/proxy-groups/index.md @@ -122,9 +122,9 @@ proxy-groups: ## exclude-type -排除节点类型 +不支持正则表达式，通过 `|` 分割，根据节点类型排除，仅排除[引入出站代理](#proxies) -注意，`proxy-groups` 与 `proxy-providers` 写法不同，不支持正则表达式，通过 `|` 分隔 +支持类型请参阅[Adapter Type](https://github.com/MetaCubeX/mihomo/blob/fbead56ec97ae93f904f4476df1741af718c9c2a/constant/adapters.go#L18-L45) ## expected-status diff --git a/docs/config/proxy-providers/index.en.md b/docs/config/proxy-providers/index.en.md index ea704da9..1f22474b 100644 --- a/docs/config/proxy-providers/index.en.md +++ b/docs/config/proxy-providers/index.en.md @@ -8,6 +8,7 @@ proxy-providers: path: ./proxy_providers/provider1.yaml interval: 3600 proxy: DIRECT + size-limit: 0 header: User-Agent: - "Clash/v1.18.0" @@ -77,6 +78,10 @@ The update time for the `provider`, measured in seconds. Download/update through the specified proxy. +## size-limit + +The maximum size of downloadable files is restricted, with the default being 0, which means no size limit; the unit is bytes (`b`) + ## Header Custom HTTP request headers. @@ -135,7 +140,7 @@ Add a fixed suffix to the node name. Replace the content of the node name, supporting regular expressions, where pattern is the replacement content and target is the replacement target. -### Configuration Items +### override.Configuration_items Refer to common fields [tfo](../proxies/index.md#tfo) @@ -171,4 +176,4 @@ Exclude nodes that meet keywords or [regular expressions](https://github.com/zii Regular expressions are not supported; use `|` to separate and exclude based on node type. -Note that the syntax for `proxy-groups` and `proxy-providers` is different. \ No newline at end of file +The `exclude-type` of the provider uses the `type` from the configuration file for exclusion \ No newline at end of file diff --git a/docs/config/proxy-providers/index.md b/docs/config/proxy-providers/index.md index 6a279ab9..bdece937 100644 --- a/docs/config/proxy-providers/index.md +++ b/docs/config/proxy-providers/index.md @@ -8,6 +8,7 @@ proxy-providers: path: ./proxy_providers/provider1.yaml interval: 3600 proxy: DIRECT + size-limit: 0 header: User-Agent: - "Clash/v1.18.0" @@ -77,6 +78,10 @@ proxy-providers: 经过指定代理进行下载/更新 +## size-limit + +限制下载文件的最大大小，默认为 0 即不限制文件大小，单位为字节 (`b`) + ## header 自定义 http 请求头 @@ -135,7 +140,7 @@ proxy-providers: 对节点名称内容进行替换，支持正则表达式，pattern 为替换内容，target 为替换目标 -### 配置项 +### override.其余配置项 参阅通用字段 [tfo](../proxies/index.md#tfo) @@ -171,4 +176,4 @@ proxy-providers: 不支持正则表达式，通过 `|` 分割，根据节点类型排除 -注意，`proxy-groups` 与 `proxy-providers` 写法不同 +provider 的 `exclude-type` 使用配置文件中的 `type` 类型进行排除 diff --git a/docs/config/rule-providers/index.en.md b/docs/config/rule-providers/index.en.md index 38cb9007..afb24218 100644 --- a/docs/config/rule-providers/index.en.md +++ b/docs/config/rule-providers/index.en.md @@ -10,6 +10,7 @@ rule-providers: proxy: DIRECT behavior: classical format: yaml + size-limit: 0 ``` ## name @@ -46,4 +47,8 @@ Behavior, options are `domain` / `ipcidr` / `classical`, corresponding to differ Format, options are `yaml` / `text` / `mrs`, default is `yaml`. -Currently, `mrs` behavior only supports `domain` / `ipcidr`. You can convert using `mihomo convert-ruleset domain/ipcidr yaml/text XXX.yaml XXX.mrs`. \ No newline at end of file +Currently, `mrs` behavior only supports `domain` / `ipcidr`. You can convert using `mihomo convert-ruleset domain/ipcidr yaml/text XXX.yaml XXX.mrs`. + +## size-limit + +The maximum size of downloadable files is restricted, with the default being 0, which means no size limit; the unit is bytes (`b`) diff --git a/docs/config/rule-providers/index.md b/docs/config/rule-providers/index.md index 5393ca0d..d057bda2 100644 --- a/docs/config/rule-providers/index.md +++ b/docs/config/rule-providers/index.md @@ -10,6 +10,7 @@ rule-providers: proxy: DIRECT behavior: classical format: yaml + size-limit: 0 ``` ## name @@ -47,3 +48,7 @@ rule-providers: 格式，可选 `yaml`/`text`/`mrs`，默认 `yaml` `mrs`目前 `behavior` 仅支持 `domain`/`ipcidr`，可以通过`mihomo convert-ruleset domain/ipcidr yaml/text XXX.yaml XXX.mrs`转换得到 + +## size-limit + +限制下载文件的最大大小，默认为 0 即不限制文件大小，单位为字节 (`b`) diff --git a/docs/startup/client/client.md b/docs/startup/client/client.md index ef269b40..c41535a7 100644 --- a/docs/startup/client/client.md +++ b/docs/startup/client/client.md @@ -1,9 +1,10 @@ -# 第三方工具 +# 三方工具/客户端 ## Windows |项目名称 | 维护状态 | |:----|:----| +|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 | |[clash-verge](https://github.com/MetaCubeX/clash-verge)|停止维护 | |[clash-verge-rev](https://github.com/clash-verge-rev/clash-verge-rev)|维护中 | |[clash-nyanpasu](https://github.com/keiko233/clash-nyanpasu)|维护中 | @@ -13,30 +14,29 @@ |[clashtui](https://github.com/JohanChane/clashtui)|维护中 | |[GUI.for.Clash](https://github.com/GUI-for-Cores/GUI.for.Clash)|维护中 | |[FlClash](https://github.com/chen08209/FlClash)|维护中 | -|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 | ## MacOS |项目名称 | 维护状态 | |:----|:----| +|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 | |[clash-verge](https://github.com/MetaCubeX/clash-verge)|停止维护 | |[clash-verge-rev](https://github.com/clash-verge-rev/clash-verge-rev)|维护中 | |[clash-nyanpasu](https://github.com/keiko233/clash-nyanpasu)|维护中 | |[GUI.for.Clash](https://github.com/GUI-for-Cores/GUI.for.Clash)|维护中 | |[FlClash](https://github.com/chen08209/FlClash)|维护中 | -|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 | ## Linux |项目名称 | 维护状态 | |:----|:----| +|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 | |[clash-verge](https://github.com/MetaCubeX/clash-verge)|停止维护 | |[clash-verge-rev](https://github.com/clash-verge-rev/clash-verge-rev)|维护中 | |[clash-nyanpasu](https://github.com/keiko233/clash-nyanpasu)|维护中 | |[clashtui](https://github.com/JohanChane/clashtui)|维护中 | |[GUI.for.Clash](https://github.com/GUI-for-Cores/GUI.for.Clash)|维护中 | |[FlClash](https://github.com/chen08209/FlClash)|维护中 | -|[mihomo-party](https://github.com/pompurin404/mihomo-party)|维护中 | ## Android @@ -54,8 +54,8 @@ |项目名称 | 维护状态 | |:----|:----| -|[OpenClash](https://github.com/vernesong/OpenClash)|维护中| -|[OpenWrt-mihomo](https://github.com/morytyann/OpenWrt-mihomo)|维护中| +|[OpenClash](https://github.com/vernesong/OpenClash)|维护中 | +|[OpenWrt-mihomo](https://github.com/morytyann/OpenWrt-mihomo)|维护中 | |[openwrt-fchomo](https://github.com/muink/openwrt-fchomo)|维护中| ## Shell diff --git a/mkdocs.yml b/mkdocs.yml index 29a323bd..469525d5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -114,7 +114,7 @@ plugins: web面板: Web dashboard 客户端: Client 创建运行服务: Create a running service - 第三方工具: Third-party tools + 三方工具/客户端: Third-party tools/client 常见问题: common problem 完整示例: Complete example @@ -133,8 +133,8 @@ plugins: 代理集合: Proxy-Providers 代理集合配置: proxy-providers configuration 代理集合内容: proxy-providers contents - 策略组: Proxy-Groups - 策略组配置: proxy-groups configuration + 代理组: Proxy-Groups + 代理组配置: proxy-groups configuration 手动选择: Select 自动选择: Url-Test 自动回退: Fallback @@ -160,7 +160,7 @@ nav: - web面板: startup/web.md - 创建运行服务: startup/service/index.md - - 第三方工具: startup/client/client.md + - 三方工具/客户端: startup/client/client.md - 手册: - handbook/index.md - 语法: handbook/syntax.md @@ -215,8 +215,8 @@ nav: - 代理集合: - 代理集合配置: config/proxy-providers/index.md - 代理集合内容: config/proxy-providers/content.md - - 策略组: - - 策略组配置: config/proxy-groups/index.md + - 代理组: + - 代理组配置: config/proxy-groups/index.md - 手动选择: config/proxy-groups/select.md - 自动选择: config/proxy-groups/url-test.md - 自动回退: config/proxy-groups/fallback.md