Merge remote-tracking branch 'fork/master' into dev

# Conflicts: # .github/workflows/build.yml # .github/workflows/docker.yml # .gitignore # base/pref.example.toml # base/snippets/emoji.toml # base/snippets/emoji.txt # scripts/build.macos.release.sh # scripts/build.windows.release.sh # scripts/rules_config.conf # src/generator/config/subexport.cpp # src/handler/interfaces.cpp # src/handler/settings.cpp # src/parser/config/proxy.h # src/parser/subparser.cpp # src/parser/subparser.h # src/utils/map_extra.h # src/version.h
2025-10-28 04:12:49 +00:00 · 2025-03-25 14:08:43 +08:00
parent 3a8762c307 92f66bf5b5
commit e88f8fd485
33 changed files with 887 additions and 729 deletions
--- a/base/base/all_base.tpl
+++ b/base/base/all_base.tpl
@@ -5,7 +5,7 @@ socks-port: {{ default(global.clash.socks_port, "7891") }}
 allow-lan: {{ default(global.clash.allow_lan, "true") }}
 mode: Rule
 log-level: {{ default(global.clash.log_level, "info") }}
-external-controller: :9090
+external-controller: {{ default(global.clash.external_controller, "127.0.0.1:9090") }}
 {% if default(request.clash.dns, "") == "1" %}
 dns:
  enable: true
@@ -378,7 +378,16 @@ enhanced-mode-by-rule = true
        "rules": [],
        "auto_detect_interface": true
    },
-    "experimental": {}
+    "experimental": {
+        "cache_file": {
+            "enabled": true,
+            "store_fakeip": true
+        },
+        "clash_api": {
+            "external_controller": "{{ default(global.clash.external_controller, "127.0.0.1:9090") }}",
+            "external_ui": "dashboard"
+        }
+    }
 }

 {% endif %}
--- a/base/base/singbox.json
+++ b/base/base/singbox.json
@@ -100,5 +100,14 @@
        "rules": [],
        "auto_detect_interface": true
    },
-    "experimental": {}
+    "experimental": {
+        "cache_file": {
+            "enabled": true,
+            "store_fakeip": true
+        },
+        "clash_api": {
+            "external_controller": "127.0.0.1:9090",
+            "external_ui": "dashboard"
+        }
+    }
 }
--- a/base/pref.example.ini
+++ b/base/pref.example.ini
@@ -109,13 +109,14 @@ filter_deprecated_nodes=false
 append_sub_userinfo=true
 clash_use_new_field_name=true

-;Generate style of the proxies section of Clash subscriptions.
+;Generate style of the proxies and proxy groups section of Clash subscriptions.
 ;Supported styles: block, flow, compact
 ;Block: - name: name1    Flow: - {name: name1, key: value}    Compact: [{name: name1, key: value},{name: name2, key: value}]
 ;         key: value           - {name: name2, key: value}
 ;       - name: name2
 ;         key: value
 clash_proxies_style=flow
+clash_proxy_groups_style=block

 ;add Clash mode to sing-box rules, and add a GLOBAL group to end of outbounds
 singbox_add_clash_modes=true
@@ -232,6 +233,7 @@ clash.http_port=7890
 clash.socks_port=7891
 clash.allow_lan=true
 clash.log_level=info
+clash.external_controller=127.0.0.1:9090
 singbox.allow_lan=true
 singbox.mixed_port=2080

--- a/base/pref.example.toml
+++ b/base/pref.example.toml
@@ -117,9 +117,9 @@ match = '^Smart Access expire: (\d+)/(\d+)/(\d+)$'
 replace = '$1:$2:$3:0:0:0'

 [node_pref]
-#udp_flag = true
+#udp_flag = false
 #tcp_fast_open_flag = false
-#skip_cert_verify_flag = true
+#skip_cert_verify_flag = false
 #tls13_flag = false

 sort_flag = false
@@ -135,13 +135,14 @@ filter_deprecated_nodes = false
 append_sub_userinfo = true
 clash_use_new_field_name = true

-# Generate style of the proxies section of Clash subscriptions.
+# Generate style of the proxies and proxy groups section of Clash subscriptions.
 # Supported styles: block, flow, compact
 # Block: - name: name1    Flow: - {name: name1, key: value}    Compact: [{name: name1, key: value},{name: name2, key: value}]
 #         key: value           - {name: name2, key: value}
 #       - name: name2
 #         key: value
 clash_proxies_style = "flow"
+clash_proxy_groups_style = "block"

 # add Clash mode to sing-box rules, and add a GLOBAL group to end of outbounds
 singbox_add_clash_modes = true
@@ -243,6 +244,10 @@ value = "true"
 key = "clash.log_level"
 value = "info"

+[[template.globals]]
+key = "clash.external_controller"
+value = "127.0.0.1:9090"
+
 [[template.globals]]
 key = "singbox.allow_lan"
 value = "true"
--- a/base/pref.example.yml
+++ b/base/pref.example.yml
@@ -50,6 +50,7 @@ node_pref:
  append_sub_userinfo: true
  clash_use_new_field_name: true
  clash_proxies_style: flow
+  clash_proxy_groups_style: block
  singbox_add_clash_modes: true
  rename_node:
 #  - {match: "\\(?((x|X)?(\\d+)(\\.?\\d+)?)((\\s?倍率?)|(x|X))\\)?", replace: "$1x"}
@@ -108,9 +109,10 @@ template:
  - {key: clash.socks_port, value: 7891}
  - {key: clash.allow_lan, value: true}
  - {key: clash.log_level, value: info}
+  - {key: clash.external_controller, value: '127.0.0.1:9090'}
  - {key: singbox.allow_lan, value: true}
  - {key: singbox.mixed_port, value: 2080}
-  
+
 aliases:
  - {uri: /v, target: /version}
  - {uri: /clash, target: "/sub?target=clash"}
--- a/base/snippets/emoji.toml
+++ b/base/snippets/emoji.toml
@@ -23,7 +23,7 @@ match = "(?i:\\bJP[N]?\\d*\\b|Japan|Tokyo|Osaka|Saitama|日本|东京|大阪|埼
 emoji = "🇯🇵"

 [[emoji]]
-match = "(?i:\\bK[O]?R\\d*\\b|Korea|(?<!North)Korea|首尔|韩|韓)"
+match = "(?i:(?<!North\\s)(\\bK[O]?R\\d*\\b|Korea|首尔|韩|韓))"
 emoji = "🇰🇷"

 [[emoji]]
@@ -334,10 +334,6 @@ emoji = "🇹🇷"
 match = "(乌拉圭|Uruguay)"
 emoji = "🇺🇾"

-[[emoji]]
-match = "(梵蒂冈|Vatican)"
-emoji = "🇻🇦"
-
 [[emoji]]
 match = "(Vietnam|越南)"
 emoji = "🇻🇳"
--- a/base/snippets/emoji.txt
+++ b/base/snippets/emoji.txt
@@ -4,7 +4,7 @@
 (?i:\bSG[P]?\d*\b|Singapore|新加坡|狮城|[^-]新),🇸🇬
 (尼日利亚|Nigeria),🇳🇬
 (?i:\bJP[N]?\d*\b|Japan|Tokyo|Osaka|Saitama|日本|东京|大阪|埼玉|[^-]日),🇯🇵
-(?i:\bK[O]?R\d*\b|Korea|(?<!North)Korea|首尔|韩|韓),🇰🇷
+(?i:(?<!North\s)(\bK[O]?R\d*\b|Korea|首尔|韩|韓)),🇰🇷
 (?i:\bUS[A]?\d*\b|America|United.*?States|美国|[^-]美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥),🇺🇸
 (Ascension|阿森松),🇦🇨
 (?i:\bUAE\b|Dubai|阿联酋|迪拜),🇦🇪
@@ -92,4 +92,4 @@
 (Morocco|摩洛哥),🇲🇦
 (Nepal|尼泊尔),🇳🇵
 (Bengal|孟加拉),🇧🇩
-(?i:\bC[H]?N\b|China|back|回国|中国[^-]|江苏[^-]|北京[^-]|上海[^-]|广州[^-]|深圳[^-]|杭州[^-]|常州[^-]|徐州[^-]|青岛[^-]|宁波[^-]|镇江[^-]|成都[^-]|河北[^-]|山西[^-]|辽宁[^-]|吉林[^-]|黑龙江[^-]|江苏[^-]|浙江[^-]|安徽[^-]|福建[^-]|江西[^-]|山东[^-]|河南[^-]|湖北[^-]|湖南[^-]|广东[^-]|海南[^-]|四川[^-]|贵州[^-]|云南[^-]|陕西[^-]|甘肃[^-]|青海[^-]|内蒙古[^-]|广西[^-]|西藏[^-]|宁夏[^-]|新疆[^-]),🇨🇳
+(?i:\bC[H]?N\b|China|back|回国|中国[^-]|江苏[^-]|北京[^-]|上海[^-]|广州[^-]|深圳[^-]|杭州[^-]|常州[^-]|徐州[^-]|青岛[^-]|宁波[^-]|镇江[^-]|成都[^-]|河北[^-]|山西[^-]|辽宁[^-]|吉林[^-]|黑龙江[^-]|江苏[^-]|浙江[^-]|安徽[^-]|福建[^-]|江西[^-]|山东[^-]|河南[^-]|湖北[^-]|湖南[^-]|广东[^-]|海南[^-]|四川[^-]|贵州[^-]|云南[^-]|陕西[^-]|甘肃[^-]|青海[^-]|内蒙古[^-]|广西[^-]|西藏[^-]|宁夏[^-]|新疆[^-]),🇨🇳