Merge branch 'master' of https://github.com/juewuy/ShellCrash into master

.github/workflows/bin_update.yml

@@ -105,13 +105,13 @@ jobs:
         source version
         curl -kfSL -o geodata/Country.mmdb https://raw.githubusercontent.com/alecthw/mmdb_china_ip_list/release/Country.mmdb
         curl -kfSL -o geodata/cn_mini.mmdb https://raw.githubusercontent.com/Hackl0us/GeoIP2-CN/release/Country.mmdb
-        curl -kfSL -o geodata/china_ip_list.txt https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt
+        curl -kfSL -o geodata/china_ip_list.txt https://raw.githubusercontent.com/ChanthMiao/China-IPv4-List/release/cn.txt
         curl -kfSL -o geodata/china_ipv6_list.txt https://raw.githubusercontent.com/ChanthMiao/China-IPv6-List/release/cn6.txt
         curl -kfSL -o geodata/geosite.dat https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/geosite.dat
         curl -kfSL -o geodata/geoip_cn.db https://github.com/lyc8503/sing-box-rules/releases/latest/download/geoip-cn.db
         curl -kfSL -o geodata/geosite_cn.db https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite-cn.db
         curl -kfSL -o geodata/srs_geoip_cn.srs https://raw.githubusercontent.com/SagerNet/sing-geoip/rule-set/geoip-cn.srs
-        curl -kfSL -o geodata/srs_geosite_cn.srs https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-cn.srs
+        curl -kfSL -o geodata/srs_geosite_cn.srs https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-geolocation-cn.srs
         curl -kfSL -o fix/ca-certificates.crt https://raw.githubusercontent.com/P3TERX/ca-certificates.crt/download/ca-certificates.crt
         sed -i '/GeoIP_v*/'d version
         echo GeoIP_v=`date '+%Y%m%d'` >> version

bin/geodata/china_ipv6_list.txt

@@ -117,7 +117,6 @@
 2401:20::/40
 2401:800::/32
 2401:1160::/32
-2401:11a0:150::/44
 2401:11a0:1500::/40
 2401:1200::/48
 2401:1320::/32
@@ -374,7 +373,6 @@
 2405:7040:6000::/47
 2405:78c0:6e00::/43
 2405:8280::/32
-2405:84c0:ff80::/44
 2405:8a40::/32
 2405:a900:ffee::/48
 2405:a900:fffe::/48
@@ -395,13 +393,16 @@
 2406:840:80::/47
 2406:840:90::/48
 2406:840:100::/48
+2406:840:1c0::/48
 2406:840:301::/48
 2406:840:3c1::/48
+2406:840:410::/48
 2406:840:800::/42
 2406:840:840::/47
 2406:840:860::/48
 2406:840:880::/48
 2406:840:a08::/48
+2406:840:a10::/48
 2406:840:c00::/48
 2406:840:1800::/48
 2406:840:1860::/48
@@ -427,6 +428,7 @@
 2406:840:981c::/46
 2406:840:9960::/44
 2406:840:9980::/48
+2406:840:9984::/48
 2406:840:9ef0::/44
 2406:840:a000::/35
 2406:840:c0a8::/48
@@ -449,7 +451,6 @@
 2406:840:e340::/44
 2406:840:e36f::/48
 2406:840:e500::/47
-2406:840:e576::/48
 2406:840:e57b::/48
 2406:840:e57f::/48
 2406:840:e666::/47
@@ -501,6 +502,7 @@
 2406:840:fec0::/47
 2406:840:fec4::/47
 2406:840:fec8::/47
+2406:840:feca::/48
 2406:840:fed1::/48
 2406:840:fed2::/47
 2406:840:fed4::/46
@@ -1050,6 +1052,7 @@
 2409:2000::/32
 2409:27fa::/48
 2409:27fa:f000::/48
+2409:27fc::/48
 2409:6100::/44
 2409:8000::/20
 240a:2000::/29
@@ -1135,6 +1138,7 @@
 240e::/20
 2602:2a3::/40
 2602:2a4:ff::/48
+2602:2c3:810::/44
 2602:f9a9:101::/48
 2602:f9ba:a9::/48
 2602:f9df:400::/48
@@ -1192,7 +1196,6 @@
 2605:9d80:9071::/48
 2605:9d80:9092::/48
 2605:f440:cafe::/48
-2607:7640::/48
 2804:1e48::/32
 2a03:5840:f3::/48
 2a03:5840:290::/48
@@ -1230,11 +1233,11 @@
 2a05:1087::/32
 2a05:dfc1:5900::/41
 2a05:dfc1:5a00::/40
-2a05:dfc1:6601::/48
 2a05:dfc1:6607::/48
 2a05:dfc1:7100::/47
 2a05:dfc1:7103::/48
 2a05:dfc1:7108::/47
+2a05:dfc1:8c00::/48
 2a05:dfc1:8c02::/48
 2a05:dfc1:8c05::/48
 2a05:dfc1:8c09::/48
@@ -1245,6 +1248,8 @@
 2a05:dfc1:8c1d::/48
 2a05:dfc1:8c22::/48
 2a05:dfc1:8c24::/48
+2a05:dfc1:8c30::/48
+2a05:dfc1:8c3a::/48
 2a05:dfc1:8c40::/48
 2a05:dfc1:8c90::/47
 2a05:dfc1:8c94::/47
@@ -1275,6 +1280,7 @@
 2a06:a005:1800::/48
 2a06:a005:1c40::/44
 2a06:a005:1ee1::/48
+2a06:a005:1ee8::/47
 2a06:a005:1eee::/48
 2a06:a005:2040::/44
 2a06:a005:2100::/44
@@ -1291,29 +1297,37 @@
 2a06:a005:29d1::/48
 2a06:de00:de04::/48
 2a06:de00:de0e::/47
-2a06:de01:806::/48
+2a06:de01:80d::/48
-2a06:de01:82d::/48
+2a06:de01:81d::/48
-2a06:de01:861::/48
+2a06:de01:835::/48
-2a06:de01:876::/48
+2a06:de01:83f::/48
-2a06:de01:8a1::/48
+2a06:de01:85a::/48
-2a06:de01:8a7::/48
+2a06:de01:869::/48
-2a06:de01:8d5::/48
+2a06:de01:86c::/48
-2a06:de01:8d9::/48
+2a06:de01:86e::/48
-2a06:de01:8f1::/48
+2a06:de01:8a5::/48
-2a06:de01:908::/48
+2a06:de01:8b6::/48
-2a06:de01:93b::/48
+2a06:de01:8b8::/48
-2a06:de01:953::/48
+2a06:de01:8fe::/48
-2a06:de01:97e::/48
+2a06:de01:90f::/48
-2a06:de01:989::/48
+2a06:de01:918::/48
-2a06:de01:9a6::/48
+2a06:de01:91a::/48
-2a06:de01:9ab::/48
+2a06:de01:929::/48
-2a06:de01:9b8::/48
+2a06:de01:92b::/48
-2a06:de01:ac2::/48
+2a06:de01:944::/47
-2a06:de01:ae3::/48
+2a06:de01:94c::/48
-2a06:de01:ae4::/48
+2a06:de01:977::/48
-2a06:de01:b0a::/48
+2a06:de01:982::/48
-2a06:de01:b26::/48
+2a06:de01:988::/48
+2a06:de01:98e::/48
+2a06:de01:9a4::/48
+2a06:de01:9b6::/48
+2a06:de01:ac8::/48
+2a06:de01:acd::/48
+2a06:de01:af9::/48
+2a06:de01:b32::/48
 2a06:de01:b36::/48
+2a06:de01:b3f::/48
 2a06:e881:2509::/48
 2a06:e881:5501::/48
 2a06:e881:5502::/48
@@ -1324,8 +1338,6 @@
 2a09:b280:ff80::/47
 2a09:b280:ff83::/48
 2a09:b280:ff84::/47
-2a0a:280:2d00::/46
-2a0a:280:2d04::/47
 2a0a:2840:20::/43
 2a0a:2845:aab8::/46
 2a0a:6040:c00::/40
@@ -1371,7 +1383,6 @@
 2a0a:6040:d612::/48
 2a0a:6040:d614::/46
 2a0a:6040:d710::/44
-2a0a:6040:e100::/40
 2a0a:6040:e541::/48
 2a0a:6040:e543::/48
 2a0a:6040:e544::/47
@@ -1427,7 +1438,6 @@
 2a0d:2580:ff08::/46
 2a0d:2581:fffc::/48
 2a0d:2581:fffe::/47
-2a0d:2586::/48
 2a0d:2683:2::/48
 2a0d:2687::/32
 2a0d:2904::/44
@@ -1441,6 +1451,7 @@
 2a0e:8f02:f006::/48
 2a0e:8f02:f058::/48
 2a0e:8f02:f062::/48
+2a0e:8f02:f067::/48
 2a0e:97c0:220::/44
 2a0e:97c0:550::/44
 2a0e:97c0:5ef::/48
@@ -1460,6 +1471,7 @@
 2a0e:aa07:e043::/48
 2a0e:aa07:e050::/44
 2a0e:aa07:e060::/48
+2a0e:aa07:e071::/48
 2a0e:aa07:e073::/48
 2a0e:aa07:e0f1::/48
 2a0e:aa07:e0f7::/48
@@ -1486,7 +1498,6 @@
 2a0e:b107:12b::/48
 2a0e:b107:1c0::/48
 2a0e:b107:272::/48
-2a0e:b107:4e0::/48
 2a0e:b107:790::/44
 2a0e:b107:bd0::/48
 2a0e:b107:c10::/48
@@ -1494,6 +1505,7 @@
 2a0e:b107:dce::/48
 2a0e:b107:14a0::/44
 2a0e:b107:16b0::/44
+2a0e:b107:16c0::/44
 2a0e:b107:1a40::/46
 2a0e:b107:1b60::/48
 2a0e:b107:1d25::/48
@@ -1501,7 +1513,7 @@
 2a0f:1440::/29
 2a0f:2100::/29
 2a0f:5707:fe01::/48
-2a0f:5707:fff4::/47
+2a0f:5707:fff5::/48
 2a0f:7803:fc00::/44
 2a0f:7803:fc30::/44
 2a0f:7803:fcc0::/44
@@ -1537,6 +1549,7 @@
 2a12:3fc2:aa40::/44
 2a12:3fc2:ab50::/48
 2a12:3fc2:e72e::/48
+2a12:3fc2:e810::/44
 2a12:3fc7::/48
 2a12:3fc7:8000::/48
 2a12:dd47:5c00::/40
@@ -1557,12 +1570,15 @@
 2a13:a5c7:1600::/46
 2a13:a5c7:1604::/48
 2a13:a5c7:1606::/47
-2a13:a5c7:1608::/47
+2a13:a5c7:1608::/48
 2a13:a5c7:1610::/47
 2a13:a5c7:1612::/48
+2a13:aac4:f000::/44
+2a13:b487:11da::/48
 2a13:b487:1200::/43
 2a13:b487:1b86::/48
 2a13:b487:1bb2::/48
+2a13:b487:1bb6::/48
 2a13:b487:1bbb::/48
 2a13:b487:1f00::/45
 2a13:b487:4200::/47
@@ -1570,6 +1586,7 @@
 2a13:b487:4220::/43
 2a13:b487:4240::/43
 2a13:b487:42d0::/44
+2a13:df80:3b10::/48
 2a13:df80:6808::/48
 2a13:df85:be00::/48
 2a13:df85:be80::/48

bin/version

@@ -4,5 +4,5 @@ clash_v=v1.7.1
 meta_v=v1.18.0
 singboxp_v=1.8.5-73d97226
 singbox_v=1.8.5
-GeoIP_v=20240210
+GeoIP_v=20240220
-versionsh=1.9.0pre8
+versionsh=1.9.0pre11

rules/ShellClash_Full.ini

@@ -15,10 +15,10 @@ ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/ma
 ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
 ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
 ruleset=🎮 外服游戏,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Game.list
+ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
 ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list

rules/ShellClash_Full_Block.ini

@@ -18,10 +18,10 @@ ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/ma
 ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
 ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
 ruleset=🎮 外服游戏,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Game.list
+ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
 ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list

rules/ShellClash_Full_FB.ini

@@ -15,10 +15,10 @@ ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/ma
 ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
 ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
 ruleset=🎮 外服游戏,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Game.list
+ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
 ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list

rules/ShellClash_Full_LB.ini

@@ -15,10 +15,10 @@ ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/ma
 ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
 ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
 ruleset=🎮 外服游戏,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Game.list
+ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
 ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list

rules/ShellClash_Full_SL.ini

@@ -15,10 +15,10 @@ ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/ma
 ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
 ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
 ruleset=🎮 外服游戏,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Game.list
+ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
 ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
-ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
 ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list

rules/ai.list

@@ -7,6 +7,9 @@ DOMAIN-SUFFIX,opendns.com
 DOMAIN-SUFFIX,bing.com
 DOMAIN-SUFFIX,civitai.com
 DOMAIN,bard.google.com
+DOMAIN,ai.google.dev
+DOMAIN,gemini.google.com
+DOMAIN-SUFFIX,googleapis.com
 DOMAIN-SUFFIX,sentry.io
 DOMAIN-SUFFIX,intercom.io
 DOMAIN-SUFFIX,featuregates.org

rules/clash_providers/DustinWin_Geo_Ads.yaml

@@ -1,21 +1,20 @@
 #DustinWin-ruleset全分组规则
 proxy-groups:
-  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
+  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
-  - {name: 🐟 漏网之鱼, type: select, proxies: [🚀 节点选择, 🎯 本机直连]}
+  - {name: 🐟 漏网之鱼, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
   - {name: 🛑 广告拦截, type: select, proxies: [REJECT, 🎯 本机直连]}
-  - {name: 🔗 直连域名, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🎯 全球直连, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 🪜 代理域名, type: select, proxies: [🚀 节点选择, 🎯 本机直连]}
+  - {name: 🤖 人工智能, type: select, proxies: [🇯🇵 日本节点, 🇺🇸 美国节点, 🇸🇬 新加坡节点, 🚀 节点选择, 🚀 手动切换]}
-  - {name: 🤖 人工智能, type: select, proxies: [🇸🇬 新加坡节点, 🇺🇸 美国节点, 🇯🇵 日本节点, 🚀 节点选择, 🚀 手动切换]}
   - {name: 📲 电报消息, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
-  - {name: 🎮 游戏平台, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🎮 游戏平台, type: select, proxies: [🎯 本机直连, 👍 高级节点, 🚀 节点选择]}
   - {name: Ⓜ️ 微软服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
   - {name: 📢 谷歌服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
   - {name: 🍎 苹果服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 🇨🇳 国内 IP, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 📈 网络测试, type: select, proxies: [🎯 本机直连, {providers_tags}, 🚀 手动切换]}
-  - {name: 🔒 私有网络, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 📈 网络测试, type: select, proxies: [🎯 本机直连, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
   - {name: 🎯 本机直连, type: select, proxies: [DIRECT]}
   - {name: 🚀 手动切换, type: select, use: [{providers_tags}]}
+  - {name: 📺 省流节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(0.[1-5]|低倍率|省流|大流量)"}
+  - {name: 👍 高级节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC)"}
   - {name: 🇭🇰 香港节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)港|hk|hongkong|hong kong"}
   - {name: 🇹🇼 台湾节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)台|tw|taiwan"}
   - {name: 🇯🇵 日本节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)日本|jp|japan"}
@@ -24,17 +23,17 @@ proxy-groups:
 
 rules:
   - GEOSITE,category-ads-all,🛑 广告拦截
-  - GEOSITE,private,🔒 私有网络
+  - GEOSITE,private,🎯 全球直连
-  - GEOSITE,ai,🤖 人工智能
+  - GEOSITE,openai,🤖 人工智能
   - GEOSITE,microsoft@cn,Ⓜ️ 微软服务
   - GEOSITE,apple-cn,🍎 苹果服务
   - GEOSITE,google-cn,📢 谷歌服务
   - GEOSITE,category-games@cn,🎮 游戏平台
   - GEOSITE,speedtest,📈 网络测试
-  - GEOSITE,geolocation-!cn,🪜 代理域名
+  - GEOSITE,geolocation-!cn,🚀 节点选择
-  - GEOSITE,cn,🔗 直连域名
+  - GEOSITE,cn,🎯 全球直连
   - GEOIP,telegram,📲 电报消息
-  - GEOIP,private,🔒 私有网络,no-resolve
+  - GEOIP,private,🎯 全球直连,no-resolve
-  - GEOIP,cn,🇨🇳 国内 IP
+  - GEOIP,cn,🎯 全球直连
   - MATCH,🐟 漏网之鱼
   

rules/clash_providers/DustinWin_Geo_Full.yaml

@@ -1,20 +1,19 @@
 #DustinWin-ruleset全分组规则
 proxy-groups:
-  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
+  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
-  - {name: 🐟 漏网之鱼, type: select, proxies: [🚀 节点选择, 🎯 本机直连]}
+  - {name: 🐟 漏网之鱼, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
-  - {name: 🔗 直连域名, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🎯 全球直连, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 🪜 代理域名, type: select, proxies: [🚀 节点选择, 🎯 本机直连]}
+  - {name: 🤖 人工智能, type: select, proxies: [🇯🇵 日本节点, 🇺🇸 美国节点, 🇸🇬 新加坡节点, 🚀 节点选择, 🚀 手动切换]}
-  - {name: 🤖 人工智能, type: select, proxies: [🇸🇬 新加坡节点, 🇺🇸 美国节点, 🇯🇵 日本节点, 🚀 节点选择, 🚀 手动切换]}
   - {name: 📲 电报消息, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
-  - {name: 🎮 游戏平台, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🎮 游戏平台, type: select, proxies: [🎯 本机直连, 👍 高级节点, 🚀 节点选择]}
   - {name: Ⓜ️ 微软服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
   - {name: 📢 谷歌服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
   - {name: 🍎 苹果服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 🇨🇳 国内 IP, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 📈 网络测试, type: select, proxies: [🎯 本机直连, {providers_tags}, 🚀 手动切换]}
-  - {name: 🔒 私有网络, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 📈 网络测试, type: select, proxies: [🎯 本机直连, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
   - {name: 🎯 本机直连, type: select, proxies: [DIRECT]}
   - {name: 🚀 手动切换, type: select, use: [{providers_tags}]}
+  - {name: 📺 省流节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(0.[1-5]|低倍率|省流|大流量)"}
+  - {name: 👍 高级节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC)"}
   - {name: 🇭🇰 香港节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)港|hk|hongkong|hong kong"}
   - {name: 🇹🇼 台湾节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)台|tw|taiwan"}
   - {name: 🇯🇵 日本节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)日本|jp|japan"}
@@ -22,17 +21,17 @@ proxy-groups:
   - {name: 🇺🇸 美国节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)美|us|unitedstates|united states"}
 
 rules:
-  - GEOSITE,private,🔒 私有网络
+  - GEOSITE,private,🎯 全球直连
-  - GEOSITE,ai,🤖 人工智能
+  - GEOSITE,openai,🤖 人工智能
   - GEOSITE,microsoft@cn,Ⓜ️ 微软服务
   - GEOSITE,apple-cn,🍎 苹果服务
   - GEOSITE,google-cn,📢 谷歌服务
   - GEOSITE,category-games@cn,🎮 游戏平台
   - GEOSITE,speedtest,📈 网络测试
-  - GEOSITE,geolocation-!cn,🪜 代理域名
+  - GEOSITE,geolocation-!cn,🚀 节点选择
-  - GEOSITE,cn,🔗 直连域名
+  - GEOSITE,cn,🎯 全球直连
   - GEOIP,telegram,📲 电报消息
-  - GEOIP,private,🔒 私有网络,no-resolve
+  - GEOIP,private,🎯 全球直连,no-resolve
-  - GEOIP,cn,🇨🇳 国内 IP
+  - GEOIP,cn,🎯 全球直连
   - MATCH,🐟 漏网之鱼
   

rules/clash_providers/DustinWin_RS_Ads.yaml

@@ -1,26 +1,26 @@
 #DustinWin-ruleset全分组规则
 proxy-groups:
-  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
+  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
-  - {name: 🐟 漏网之鱼, type: select, proxies: [🚀 节点选择, 🎯 本机直连]}
+  - {name: 🐟 漏网之鱼, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
   - {name: 🛑 广告拦截, type: select, proxies: [REJECT, 🎯 本机直连]}
-  - {name: 🔗 直连域名, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🎯 全球直连, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 🪜 代理域名, type: select, proxies: [🚀 节点选择, 🎯 本机直连]}
+  - {name: 🤖 人工智能, type: select, proxies: [🇯🇵 日本节点, 🇺🇸 美国节点, 🇸🇬 新加坡节点, 🚀 节点选择, 🚀 手动切换]}
-  - {name: 🤖 人工智能, type: select, proxies: [🇸🇬 新加坡节点, 🇺🇸 美国节点, 🇯🇵 日本节点, 🚀 节点选择, 🚀 手动切换]}
   - {name: 📲 电报消息, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
-  - {name: 🎮 游戏平台, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🎮 游戏平台, type: select, proxies: [🎯 本机直连, 👍 高级节点, 🚀 节点选择]}
   - {name: Ⓜ️ 微软服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
   - {name: 📢 谷歌服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
   - {name: 🍎 苹果服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 🇨🇳 国内 IP, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 📈 网络测试, type: select, proxies: [🎯 本机直连, {providers_tags}, 🚀 手动切换]}
-  - {name: 🔒 私有网络, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 📈 网络测试, type: select, proxies: [🎯 本机直连, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
   - {name: 🎯 本机直连, type: select, proxies: [DIRECT]}
   - {name: 🚀 手动切换, type: select, use: [{providers_tags}]}
+  - {name: 📺 省流节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(0.[1-5]|低倍率|省流|大流量)"}
+  - {name: 👍 高级节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC)"}
   - {name: 🇭🇰 香港节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)港|hk|hongkong|hong kong"}
   - {name: 🇹🇼 台湾节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)台|tw|taiwan"}
   - {name: 🇯🇵 日本节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)日本|jp|japan"}
   - {name: 🇸🇬 新加坡节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)新|sg|singapore"}
   - {name: 🇺🇸 美国节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)美|us|unitedstates|united states"}
+  
 rule-providers:
   ads:
     type: http
@@ -103,16 +103,16 @@ rule-providers:
 
 rules:
   - RULE-SET,ads,🛑 广告拦截
-  - RULE-SET,private,🔒 私有网络
+  - RULE-SET,private,🎯 全球直连
   - RULE-SET,ai,🤖 人工智能
   - RULE-SET,microsoft-cn,Ⓜ️ 微软服务
   - RULE-SET,apple-cn,🍎 苹果服务
   - RULE-SET,google-cn,📢 谷歌服务
   - RULE-SET,games-cn,🎮 游戏平台
   - RULE-SET,networktest,📈 网络测试
-  - RULE-SET,proxy,🪜 代理域名
+  - RULE-SET,proxy,🚀 节点选择
-  - RULE-SET,cn,🔗 直连域名
+  - RULE-SET,cn,🎯 全球直连
   - RULE-SET,telegramip,📲 电报消息
-  - RULE-SET,privateip,🔒 私有网络,no-resolve
+  - RULE-SET,privateip,🎯 全球直连,no-resolve
-  - RULE-SET,cnip,🇨🇳 国内 IP
+  - RULE-SET,cnip,🎯 全球直连
   - MATCH,🐟 漏网之鱼

rules/clash_providers/DustinWin_RS_Full.yaml

@@ -1,25 +1,25 @@
 #DustinWin-ruleset全分组规则
 proxy-groups:
-  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
+  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
-  - {name: 🐟 漏网之鱼, type: select, proxies: [🚀 节点选择, 🎯 本机直连]}
+  - {name: 🐟 漏网之鱼, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
-  - {name: 🔗 直连域名, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🎯 全球直连, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 🪜 代理域名, type: select, proxies: [🚀 节点选择, 🎯 本机直连]}
+  - {name: 🤖 人工智能, type: select, proxies: [🇯🇵 日本节点, 🇺🇸 美国节点, 🇸🇬 新加坡节点, 🚀 节点选择, 🚀 手动切换]}
-  - {name: 🤖 人工智能, type: select, proxies: [🇸🇬 新加坡节点, 🇺🇸 美国节点, 🇯🇵 日本节点, 🚀 节点选择, 🚀 手动切换]}
   - {name: 📲 电报消息, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
-  - {name: 🎮 游戏平台, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🎮 游戏平台, type: select, proxies: [🎯 本机直连, 👍 高级节点, 🚀 节点选择]}
   - {name: Ⓜ️ 微软服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
   - {name: 📢 谷歌服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
   - {name: 🍎 苹果服务, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 🇨🇳 国内 IP, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 📈 网络测试, type: select, proxies: [🎯 本机直连, {providers_tags}, 🚀 手动切换]}
-  - {name: 🔒 私有网络, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
-  - {name: 📈 网络测试, type: select, proxies: [🎯 本机直连, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
   - {name: 🎯 本机直连, type: select, proxies: [DIRECT]}
   - {name: 🚀 手动切换, type: select, use: [{providers_tags}]}
+  - {name: 📺 省流节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(0.[1-5]|低倍率|省流|大流量)"}
+  - {name: 👍 高级节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC)"}
   - {name: 🇭🇰 香港节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)港|hk|hongkong|hong kong"}
   - {name: 🇹🇼 台湾节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)台|tw|taiwan"}
   - {name: 🇯🇵 日本节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)日本|jp|japan"}
   - {name: 🇸🇬 新加坡节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)新|sg|singapore"}
   - {name: 🇺🇸 美国节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)美|us|unitedstates|united states"}
+  
 rule-providers:
   private:
     type: http
@@ -95,16 +95,16 @@ rule-providers:
     interval: 86400
 
 rules:
-  - RULE-SET,private,🔒 私有网络
+  - RULE-SET,private,🎯 全球直连
   - RULE-SET,ai,🤖 人工智能
   - RULE-SET,microsoft-cn,Ⓜ️ 微软服务
   - RULE-SET,apple-cn,🍎 苹果服务
   - RULE-SET,google-cn,📢 谷歌服务
   - RULE-SET,games-cn,🎮 游戏平台
   - RULE-SET,networktest,📈 网络测试
-  - RULE-SET,proxy,🪜 代理域名
+  - RULE-SET,proxy,🚀 节点选择
-  - RULE-SET,cn,🔗 直连域名
+  - RULE-SET,cn,🎯 全球直连
   - RULE-SET,telegramip,📲 电报消息
-  - RULE-SET,privateip,🔒 私有网络,no-resolve
+  - RULE-SET,privateip,🎯 全球直连,no-resolve
-  - RULE-SET,cnip,🇨🇳 国内 IP
+  - RULE-SET,cnip,🎯 全球直连
   - MATCH,🐟 漏网之鱼

rules/clash_providers/DustinWin_RS_Light.yaml

@@ -0,0 +1,62 @@
+#DustinWin-ruleset轻量规则
+proxy-groups:
+  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
+  - {name: 🐟 漏网之鱼, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 📺 省流节点, 👍 高级节点, {providers_tags}, 🚀 手动切换, 🎯 本机直连]}
+  - {name: 🎯 全球直连, type: select, proxies: [🎯 本机直连, 🚀 节点选择]}
+  - {name: 🤖 人工智能, type: select, proxies: [🇯🇵 日本节点, 🇺🇸 美国节点, 🇸🇬 新加坡节点, 🚀 节点选择, 🚀 手动切换]}
+  - {name: 📲 电报消息, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, {providers_tags}, 🚀 手动切换]}
+  - {name: 🎯 本机直连, type: select, proxies: [DIRECT]}
+  - {name: 🚀 手动切换, type: select, use: [{providers_tags}]}
+  - {name: 📺 省流节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(0.[1-5]|低倍率|省流|大流量)"}
+  - {name: 👍 高级节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC)"}
+  - {name: 🇭🇰 香港节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)港|hk|hongkong|hong kong"}
+  - {name: 🇹🇼 台湾节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)台|tw|taiwan"}
+  - {name: 🇯🇵 日本节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)日本|jp|japan"}
+  - {name: 🇸🇬 新加坡节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)新|sg|singapore"}
+  - {name: 🇺🇸 美国节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(?i)美|us|unitedstates|united states"}
+rule-providers:
+  private:
+    type: http
+    behavior: domain
+    url: "https://cdn.jsdelivr.net/gh/DustinWin/ruleset_geodata@clash/private.yaml"
+    path: ./providers/private.yaml
+    interval: 86400
+  ai:
+    type: http
+    behavior: domain
+    url: "https://cdn.jsdelivr.net/gh/DustinWin/ruleset_geodata@clash/ai.yaml"
+    path: ./providers/ai.yaml
+    interval: 86400
+  proxy:
+    type: http
+    behavior: domain
+    url: "https://cdn.jsdelivr.net/gh/DustinWin/ruleset_geodata@clash/proxy.yaml"
+    path: ./providers/proxy.yaml
+    interval: 86400
+  telegramip:
+    type: http
+    behavior: ipcidr
+    url: "https://cdn.jsdelivr.net/gh/DustinWin/ruleset_geodata@clash/telegramip.yaml"
+    path: ./providers/telegramip.yaml
+    interval: 86400
+  privateip:
+    type: http
+    behavior: ipcidr
+    url: "https://cdn.jsdelivr.net/gh/DustinWin/ruleset_geodata@clash/privateip.yaml"
+    path: ./providers/privateip.yaml
+    interval: 86400
+  cnip:
+    type: http
+    behavior: ipcidr
+    url: "https://cdn.jsdelivr.net/gh/DustinWin/ruleset_geodata@clash/cnip.yaml"
+    path: ./providers/cnip.yaml
+    interval: 86400
+
+rules:
+  - RULE-SET,private,🎯 全球直连
+  - RULE-SET,ai,🤖 人工智能
+  - RULE-SET,proxy,🚀 节点选择
+  - RULE-SET,telegramip,📲 电报消息
+  - RULE-SET,privateip,🎯 全球直连,no-resolve
+  - RULE-SET,cnip,🎯 全球直连
+  - MATCH,🐟 漏网之鱼

rules/clash_providers/ShellCrash_Geo_Nano.yaml

@@ -0,0 +1,11 @@
+#ShellCrash-geoip极简规则
+proxy-groups:
+  - {name: 🚀 节点选择, type: select, proxies: [{providers_tags}, 📺 省流节点, 👍 高级节点], use: [{providers_tags}]}
+  - {name: 🐟 漏网之鱼, type: select, proxies: [🚀 节点选择, DIRECT]}
+  - {name: 🎯 全球直连, type: select, proxies: [DIRECT, 🚀 节点选择]}
+  - {name: 📺 省流节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(0.[1-5]|低倍率|省流|大流量)"}
+  - {name: 👍 高级节点, type: url-test, tolerance: 100, lazy: true, use: [{providers_tags}], filter: "(专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC)"}
+rules:
+  - GEOIP,cn,🎯 全球直连
+  - MATCH,🐟 漏网之鱼
+  

rules/clash_providers/clash_providers.list

@@ -1,3 +1,5 @@
+ShellCrash-geoip极简规则 ShellCrash_Geo_Nano.yaml
+DustinWin-ruleset轻量规则 DustinWin_RS_Light.yaml
 DustinWin-Geosite全分组规则 DustinWin_Geo_Full.yaml
 DustinWin-ruleset全分组规则 DustinWin_RS_Full.yaml
 DustinWin-Geosite去广告规则 DustinWin_Geo_Ads.yaml

rules/singbox_providers/DustinWin_Geo_Ads.json

@@ -1,28 +1,26 @@
 //DustinWin-Geodb去广告规则
 {
   "outbounds": [
-    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
+    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
-    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
+    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
 	{ "tag": "🛑 广告拦截", "type": "selector", "outbounds": [ "❌ 禁止连接", "🎯 本机直连" ] },
-    { "tag": "🔗 直连域名", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
+    { "tag": "🎯 全球直连", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🪜 代理域名", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
     { "tag": "📲 电报消息", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
-    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇸🇬 新加坡节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇺🇸 美国节点", "🚀 节点选择" ] },
+    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇯🇵 日本节点", "🇺🇸 美国节点", "🇸🇬 新加坡节点", "🇰🇷 韩国节点", "🚀 节点选择" ] },
     { "tag": "🎮 游戏平台", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "Ⓜ️ 微软服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "📢 谷歌服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "🍎 苹果服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🇨🇳 国内 IP", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🔒 私有网络", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "📈 网络测试", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
     { "tag": "GLOBAL", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
-    { "tag": "🚀 手动切换", "type": "selector", "providers": [ {providers_tags} ], "includes": [ ".*" ] },
+    { "tag": "🚀 手动切换", "type": "selector", "use_all_providers": true },
-    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "港|HK|Hong Kong" ] },
+    { "tag": "📺 省流节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "0.[1-5]|低倍率|省流|大流量" ] },
-    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "台|新北|彰化|TW|Taiwan" ] },
+    { "tag": "👍 高级节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC" ] },
-    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
+    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "港|HK|Hong Kong" ] },
-    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "台|新北|彰化|TW|Taiwan" ] },
-    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
-    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
+    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
 	{ "tag": "🎯 本机直连", "type": "direct" },
 	{ "tag": "❌ 禁止连接", "type": "block" },
 	{ "tag": "dns-out", "type": "dns" }
@@ -33,27 +31,18 @@
       { "clash_mode": "Global", "outbound": "GLOBAL" },
       { "clash_mode": "Direct", "outbound": "🎯 本机直连" },
       { "geosite": "category-ads-all", "outbound": "🛑 广告拦截" },
-      { "geosite": "private", "outbound": "🔒 私有网络" },
+      { "geosite": "private", "outbound": "🎯 全球直连" },
 	  { "geosite": "ai", "outbound": "🤖 人工智能" },
       { "geosite": "microsoft@cn", "outbound": "Ⓜ️ 微软服务" },
       { "geosite": "apple-cn", "outbound": "🍎 苹果服务" },
       { "geosite": "google-cn", "outbound": "📢 谷歌服务" },
       { "geosite": "category-games@cn", "outbound": "🎮 游戏平台" },
-      { "geosite": "speedtest", "outbound": "📈 网络测速" },
+      { "geosite": "geolocation-!cn", "outbound": "🚀 节点选择" },
-      { "geosite": "geolocation-!cn", "outbound": "🪜 代理域名" },
+      { "geosite": "cn", "outbound": "🎯 全球直连" },
-      { "geosite": "cn", "outbound": "🔗 直连域名" },
       { "geoip": "telegram", "outbound": "📲 电报消息" },
-      { "geoip": "private",  "outbound": "🔒 私有网络" },
+      { "geoip": "private",  "outbound": "🎯 全球直连" },
-      { "geoip": "cn", "outbound": "🇨🇳 国内 IP" }
+      { "geoip": "cn", "outbound": "🎯 全球直连" }
     ],
-    "geosite": {
-      "download_url": "https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.db",
-      "download_detour": "🎯 本机直连"
-    },
-    "geoip": {
-      "download_url": "https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.db",
-      "download_detour": "🎯 本机直连"
-    },
     "final": "🐟 漏网之鱼"
   }
 }

rules/singbox_providers/DustinWin_Geo_Full.json

@@ -1,27 +1,25 @@
 //DustinWin-Geodb全分组规则
 {
   "outbounds": [
-    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
+    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
-    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
+    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
-    { "tag": "🔗 直连域名", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
+    { "tag": "🎯 全球直连", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🪜 代理域名", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
     { "tag": "📲 电报消息", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
-    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇸🇬 新加坡节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇺🇸 美国节点", "🚀 节点选择" ] },
+    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇯🇵 日本节点", "🇺🇸 美国节点", "🇸🇬 新加坡节点", "🇰🇷 韩国节点", "🚀 节点选择" ] },
     { "tag": "🎮 游戏平台", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "Ⓜ️ 微软服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "📢 谷歌服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "🍎 苹果服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🇨🇳 国内 IP", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🔒 私有网络", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "📈 网络测试", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
     { "tag": "GLOBAL", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
-    { "tag": "🚀 手动切换", "type": "selector", "providers": [ {providers_tags} ], "includes": [ ".*" ] },
+    { "tag": "🚀 手动切换", "type": "selector", "use_all_providers": true },
-    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "港|HK|Hong Kong" ] },
+    { "tag": "📺 省流节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "0.[1-5]|低倍率|省流|大流量" ] },
-    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "台|新北|彰化|TW|Taiwan" ] },
+    { "tag": "👍 高级节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC" ] },
-    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
+    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "港|HK|Hong Kong" ] },
-    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "台|新北|彰化|TW|Taiwan" ] },
-    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
-    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
+    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
     { "tag": "🎯 本机直连", "type": "direct" },
     { "tag": "dns-out", "type": "dns" }
   ],
@@ -30,27 +28,18 @@
       { "protocol": "dns", "outbound": "dns-out" },
       { "clash_mode": "Global", "outbound": "GLOBAL" },
       { "clash_mode": "Direct", "outbound": "🎯 本机直连" },
-      { "geosite": "private", "outbound": "🔒 私有网络" },
+      { "geosite": "private", "outbound": "🎯 全球直连" },
 	  { "geosite": "ai", "outbound": "🤖 人工智能" },
       { "geosite": "microsoft@cn", "outbound": "Ⓜ️ 微软服务" },
       { "geosite": "apple-cn", "outbound": "🍎 苹果服务" },
       { "geosite": "google-cn", "outbound": "📢 谷歌服务" },
       { "geosite": "category-games@cn", "outbound": "🎮 游戏平台" },
-      { "geosite": "speedtest", "outbound": "📈 网络测速" },
+      { "geosite": "geolocation-!cn", "outbound": "🚀 节点选择" },
-      { "geosite": "geolocation-!cn", "outbound": "🪜 代理域名" },
+      { "geosite": "cn", "outbound": "🎯 全球直连" },
-      { "geosite": "cn", "outbound": "🔗 直连域名" },
       { "geoip": "telegram", "outbound": "📲 电报消息" },
-      { "geoip": "private",  "outbound": "🔒 私有网络" },
+      { "geoip": "private",  "outbound": "🎯 全球直连" },
-      { "geoip": "cn", "outbound": "🇨🇳 国内 IP" }
+      { "geoip": "cn", "outbound": "🎯 全球直连" }
     ],
-    "geosite": {
-      "download_url": "https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.db",
-      "download_detour": "🎯 本机直连"
-    },
-    "geoip": {
-      "download_url": "https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.db",
-      "download_detour": "🎯 本机直连"
-    },
     "final": "🐟 漏网之鱼"
   }
 }

rules/singbox_providers/DustinWin_RS_Ads.json

@@ -1,28 +1,27 @@
 //DustinWin-ruleset去广告规则
 {
   "outbounds": [
-    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
+    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
-    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
+    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
 	{ "tag": "🛑 广告拦截", "type": "selector", "outbounds": [ "❌ 禁止连接", "🎯 本机直连" ] },
-    { "tag": "🔗 直连域名", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
+    { "tag": "🎯 全球直连", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🪜 代理域名", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
     { "tag": "📲 电报消息", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
-    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇸🇬 新加坡节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇺🇸 美国节点", "🚀 节点选择" ] },
+    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇯🇵 日本节点", "🇺🇸 美国节点", "🇸🇬 新加坡节点", "🇰🇷 韩国节点", "🚀 节点选择" ] },
     { "tag": "🎮 游戏平台", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "Ⓜ️ 微软服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "📢 谷歌服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "🍎 苹果服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🇨🇳 国内 IP", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🔒 私有网络", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "📈 网络测试", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
     { "tag": "GLOBAL", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
-    { "tag": "🚀 手动切换", "type": "selector", "providers": [ {providers_tags} ], "includes": [ ".*" ] },
+    { "tag": "🚀 手动切换", "type": "selector", "use_all_providers": true },
-    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "港|HK|Hong Kong" ] },
+    { "tag": "📺 省流节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "0.[1-5]|低倍率|省流|大流量" ] },
-    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "台|新北|彰化|TW|Taiwan" ] },
+    { "tag": "👍 高级节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC" ] },
-    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
+    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "港|HK|Hong Kong" ] },
-    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "台|新北|彰化|TW|Taiwan" ] },
-    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
-    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
+    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
     { "tag": "🎯 本机直连", "type": "direct" },
     { "tag": "❌ 禁止连接", "type": "block" },
     { "tag": "dns-out", "type": "dns" }
@@ -32,7 +31,7 @@
       { "protocol":  "dns" , "outbound": "dns-out" },
       { "clash_mode": "Global", "outbound": "GLOBAL" },
       { "clash_mode": "Direct", "outbound": "🎯 本机直连" },
-      { "rule_set": "private", "outbound": "🔒 私有网络" },
+      { "rule_set": "private", "outbound": "🎯 全球直连" },
 	  { "rule_set": "ai", "outbound": "🤖 人工智能" },
 	  { "rule_set": "ads", "outbound": "🛑 广告拦截" },
       { "rule_set": "microsoft-cn", "outbound": "Ⓜ️ 微软服务" },
@@ -40,102 +39,102 @@
       { "rule_set": "google-cn", "outbound": "📢 谷歌服务" },
       { "rule_set": "games-cn", "outbound": "🎮 游戏平台" },
       { "rule_set": "networktest", "outbound": "📈 网络测试" },
-      { "rule_set": "proxy", "outbound": "🪜 代理域名" },
+      { "rule_set": "proxy", "outbound": "🚀 节点选择" },
-      { "rule_set": "cn", "outbound": "🔗 直连域名" },
+      { "rule_set": "cn", "outbound": "🎯 全球直连" },
       { "rule_set": "telegramip", "outbound": "📲 电报消息" },
-      { "rule_set": "privateip", "outbound": "🔒 私有网络" },
+      { "rule_set": "privateip", "outbound": "🎯 全球直连" },
-      { "rule_set": "cnip", "outbound": "🇨🇳 国内 IP" }
+      { "rule_set": "cnip", "outbound": "🎯 全球直连" }
     ],
     "rule_set": [
       {
         "tag": "private",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/private.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/private.srs",
         "download_detour": "🎯 本机直连"
       },     
       {
         "tag": "ai",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/ai.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/ai.srs",
         "download_detour": "🎯 本机直连"
       },
 	  {
         "tag": "ads",
         "type": "remote",
         "format": "binary",
-        "url": "https://cdn.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/ads.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/ads.srs",
-        "download_detour": "DIRECT"
+        "download_detour": "🎯 本机直连"
       },
       {
         "tag": "microsoft-cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/microsoft-cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/microsoft-cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "apple-cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/apple-cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/apple-cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "google-cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/google-cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/google-cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "games-cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/games-cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/games-cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "networktest",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/networktest.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/networktest.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "proxy",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/proxy.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/proxy.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "telegramip",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/telegramip.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/telegramip.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "privateip",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/privateip.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/privateip.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "cnip",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/cnip.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/cnip.srs",
         "download_detour": "🎯 本机直连"
       }
     ],

rules/singbox_providers/DustinWin_RS_Full.json

@@ -1,27 +1,26 @@
 //DustinWin-ruleset全分组规则
 {
   "outbounds": [
-    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
+    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
-    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
+    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
-    { "tag": "🔗 直连域名", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
+    { "tag": "🎯 全球直连", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🪜 代理域名", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
     { "tag": "📲 电报消息", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
-    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇸🇬 新加坡节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇺🇸 美国节点", "🚀 节点选择" ] },
+    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇯🇵 日本节点", "🇺🇸 美国节点", "🇸🇬 新加坡节点", "🇰🇷 韩国节点", "🚀 节点选择" ] },
     { "tag": "🎮 游戏平台", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "Ⓜ️ 微软服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "📢 谷歌服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "🍎 苹果服务", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🇨🇳 国内 IP", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
-    { "tag": "🔒 私有网络", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
     { "tag": "📈 网络测试", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
     { "tag": "GLOBAL", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
-    { "tag": "🚀 手动切换", "type": "selector", "providers": [ {providers_tags} ], "includes": [ ".*" ] },
+    { "tag": "🚀 手动切换", "type": "selector", "use_all_providers": true },
-    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "港|HK|Hong Kong" ] },
+    { "tag": "📺 省流节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "0.[1-5]|低倍率|省流|大流量" ] },
-    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "台|新北|彰化|TW|Taiwan" ] },
+    { "tag": "👍 高级节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC" ] },
-    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
+    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "港|HK|Hong Kong" ] },
-    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "台|新北|彰化|TW|Taiwan" ] },
-    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
-    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "providers": [ {providers_tags} ], "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
+    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
     { "tag": "🎯 本机直连", "type": "direct" },
     { "tag": "dns-out", "type": "dns" }
   ],
@@ -30,102 +29,102 @@
       { "protocol":  "dns" , "outbound": "dns-out" },
       { "clash_mode": "Global", "outbound": "GLOBAL" },
       { "clash_mode": "Direct", "outbound": "🎯 本机直连" },
-      { "rule_set": "private", "outbound": "🔒 私有网络" },
+      { "rule_set": "private", "outbound": "🎯 全球直连" },
 	  { "rule_set": "ai", "outbound": "🤖 人工智能" },
       { "rule_set": "microsoft-cn", "outbound": "Ⓜ️ 微软服务" },
       { "rule_set": "apple-cn", "outbound": "🍎 苹果服务" },
       { "rule_set": "google-cn", "outbound": "📢 谷歌服务" },
       { "rule_set": "games-cn", "outbound": "🎮 游戏平台" },
       { "rule_set": "networktest", "outbound": "📈 网络测试" },
-      { "rule_set": "proxy", "outbound": "🪜 代理域名" },
+      { "rule_set": "proxy", "outbound": "🚀 节点选择" },
-      { "rule_set": "cn", "outbound": "🔗 直连域名" },
+      { "rule_set": "cn", "outbound": "🎯 全球直连" },
       { "rule_set": "telegramip", "outbound": "📲 电报消息" },
-      { "rule_set": "privateip", "outbound": "🔒 私有网络" },
+      { "rule_set": "privateip", "outbound": "🎯 全球直连" },
-      { "rule_set": "cnip", "outbound": "🇨🇳 国内 IP" }
+      { "rule_set": "cnip", "outbound": "🎯 全球直连" }
     ],
     "rule_set": [
       {
         "tag": "private",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/private.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/private.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "ai",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/ai.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/ai.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "microsoft-cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/microsoft-cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/microsoft-cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "apple-cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/apple-cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/apple-cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "google-cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/google-cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/google-cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "games-cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/games-cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/games-cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "networktest",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/networktest.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/networktest.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "proxy",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/proxy.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/proxy.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "cn",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/cn.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/cn.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "telegramip",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/telegramip.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/telegramip.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "privateip",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/privateip.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/privateip.srs",
         "download_detour": "🎯 本机直连"
       },
       {
         "tag": "cnip",
         "type": "remote",
         "format": "binary",
-        "url": "https://raw.githubusercontent.com/DustinWin/ruleset_geodata/sing-box/cnip.srs",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/cnip.srs",
         "download_detour": "🎯 本机直连"
       }
     ],

rules/singbox_providers/DustinWin_RS_Light.json

@@ -0,0 +1,80 @@
+//DustinWin-ruleset轻量规则
+{
+  "outbounds": [
+    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
+    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ {providers_tags}, "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "📺 省流节点", "👍 高级节点", "🚀 手动切换", "🎯 本机直连" ] },
+    { "tag": "🎯 全球直连", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
+    { "tag": "📲 电报消息", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
+    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🇯🇵 日本节点", "🇺🇸 美国节点", "🇸🇬 新加坡节点", "🇰🇷 韩国节点", "🚀 节点选择" ] },
+    { "tag": "GLOBAL", "type": "selector", "outbounds": [ "🎯 本机直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇰🇷 韩国节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", {providers_tags}, "🚀 手动切换" ] },
+    { "tag": "🚀 手动切换", "type": "selector", "use_all_providers": true },
+    { "tag": "📺 省流节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "0.[1-5]|低倍率|省流|大流量" ] },
+    { "tag": "👍 高级节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "专线|专用|高级|直连|急速|高倍率|游戏|game|Game|GAME|IEPL|IPLC|AIA|CTM|CC|iepl|iplc|aia|ctm|cc|AC" ] },
+    { "tag": "🇭🇰 香港节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "港|HK|Hong Kong" ] },
+    { "tag": "🇹🇼 台湾节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "台|新北|彰化|TW|Taiwan" ] },
+    { "tag": "🇯🇵 日本节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan" ] },
+    { "tag": "🇰🇷 韩国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "KR|Korea|KOR|首尔|韩|韓" ] },
+    { "tag": "🇸🇬 新加坡节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "新加坡|坡|狮城|SG|Singapore" ] },
+    { "tag": "🇺🇸 美国节点", "type": "urltest", "tolerance": 100, "use_all_providers": true, "includes": [ "美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States" ] },
+    { "tag": "🎯 本机直连", "type": "direct" },
+    { "tag": "dns-out", "type": "dns" }
+  ],
+  "route": {
+    "rules": [
+      { "protocol":  "dns" , "outbound": "dns-out" },
+      { "clash_mode": "Global", "outbound": "GLOBAL" },
+      { "clash_mode": "Direct", "outbound": "🎯 本机直连" },
+      { "rule_set": "private", "outbound": "🎯 全球直连" },
+	  { "rule_set": "ai", "outbound": "🤖 人工智能" },
+      { "rule_set": "proxy", "outbound": "🚀 节点选择" },
+      { "rule_set": "telegramip", "outbound": "📲 电报消息" },
+      { "rule_set": "privateip", "outbound": "🎯 全球直连" },
+      { "rule_set": "cnip", "outbound": "🎯 全球直连" }
+    ],
+    "rule_set": [
+      {
+        "tag": "private",
+        "type": "remote",
+        "format": "binary",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/private.srs",
+        "download_detour": "🎯 本机直连"
+      },
+      {
+        "tag": "ai",
+        "type": "remote",
+        "format": "binary",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/ai.srs",
+        "download_detour": "🎯 本机直连"
+      },
+      {
+        "tag": "proxy",
+        "type": "remote",
+        "format": "binary",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/proxy.srs",
+        "download_detour": "🎯 本机直连"
+      },
+      {
+        "tag": "telegramip",
+        "type": "remote",
+        "format": "binary",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/telegramip.srs",
+        "download_detour": "🎯 本机直连"
+      },
+      {
+        "tag": "privateip",
+        "type": "remote",
+        "format": "binary",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/privateip.srs",
+        "download_detour": "🎯 本机直连"
+      },
+      {
+        "tag": "cnip",
+        "type": "remote",
+        "format": "binary",
+        "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box/cnip.srs",
+        "download_detour": "🎯 本机直连"
+      }
+    ],
+    "final": "🐟 漏网之鱼"
+  }
+}

rules/singbox_providers/ShellCrash_Geo_Nano.json

@@ -0,0 +1,20 @@
+//ShellCrash-geoip极简规则
+{
+  "outbounds": [
+    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ {providers_tags} ], "use_all_providers": true },
+    { "tag": "🐟 漏网之鱼", "type": "selector", "outbounds": [ "🚀 节点选择", "🎯 本机直连" ] },
+    { "tag": "🎯 全球直连", "type": "selector", "outbounds": [ "🎯 本机直连", "🚀 节点选择" ] },
+	{ "tag": "GLOBAL", "type": "selector", "outbounds": [ "🎯 本机直连", {providers_tags} ], "use_all_providers": true },
+	{ "tag": "🎯 本机直连", "type": "direct" },
+    { "tag": "dns-out", "type": "dns" }
+  ],
+  "route": {
+    "rules": [
+      { "protocol": "dns", "outbound": "dns-out" },
+      { "clash_mode": "Global", "outbound": "GLOBAL" },
+      { "clash_mode": "Direct", "outbound": "🎯 本机直连" },
+      { "geoip": "cn", "outbound": "🎯 全球直连" }
+    ],
+    "final": "🐟 漏网之鱼"
+  }
+}

rules/singbox_providers/singbox_providers.list

@@ -1,3 +1,5 @@
+ShellCrash-geoip极简规则 ShellCrash_Geo_Nano.json
+DustinWin-ruleset轻量规则 DustinWin_RS_Light.json
 DustinWin-ruleset全分组规则 DustinWin_RS_Full.json
 DustinWin-Geosite全分组规则 DustinWin_Geo_Full.json
 DustinWin-ruleset去广告规则 DustinWin_RS_Ads.json

scripts/getdate.sh

@@ -348,6 +348,14 @@ gen_clash_providers(){ #生成clash的providers配置文件
       url: "https://www.gstatic.com/generate_204"
       interval: 600
 EOF
+		[ "$crashcore" = 'meta' ] && {
+		[ "$skip_cert" = "已开启" ] && skip_cert_verify='skip-cert-verify: true'
+		cat >> $TMPDIR/providers/providers.yaml <<EOF
+    override:
+      udp: true
+      $skip_cert_verify
+EOF
+		}
 	}
 	if [ -z "$(grep "provider_temp_${coretype}" ${CRASHDIR}/configs/ShellCrash.cfg)" ];then
 		provider_temp_file=$(sed -n "1 p" ${CRASHDIR}/configs/${coretype}_providers.list | awk '{print $2}')
@@ -355,11 +363,10 @@ EOF
 		provider_temp_file=$(grep "provider_temp_${coretype}" ${CRASHDIR}/configs/ShellCrash.cfg | awk -F '=' '{print $2}')
 	fi
 	echo -----------------------------------------------
-	if [ ! -s ${CRASHDIR}/providers/${provider_temp_file} ];then
+	if [ ! -s ${TMPDIR}/${provider_temp_file} ];then
-		echo -e "\033[33m未找到本地模版，尝试在线获取！\033[0m"
+		echo -e "\033[33m正在获取在线模版！\033[0m"
-		mkdir -p ${CRASHDIR}/providers
+		${CRASHDIR}/start.sh get_bin ${TMPDIR}/${provider_temp_file} rules/${coretype}_providers/${provider_temp_file}
-		${CRASHDIR}/start.sh get_bin ${CRASHDIR}/providers/${provider_temp_file} rules/${coretype}_providers/${provider_temp_file}
+		[ -z "$(grep -o 'rules' ${TMPDIR}/${provider_temp_file})" ] && {
-		[ "$?" != 0 ] && {
 			echo -e "\033[31m下载失败，请尝试更换安装源！\033[0m"
 			setserver
 			setproviders
@@ -370,11 +377,14 @@ EOF
 	#预创建文件并写入对应文件头
 	echo 'proxy-providers:' > ${TMPDIR}/providers/providers.yaml
 	#切割模版文件
-	sed -n '/^proxy-groups:/,/^[a-z]/ { /^rule/d; p; }' ${CRASHDIR}/providers/${provider_temp_file} > ${TMPDIR}/providers/proxy-groups.yaml
+	sed -n '/^proxy-groups:/,/^[a-z]/ { /^rule/d; p; }' ${TMPDIR}/${provider_temp_file} > ${TMPDIR}/providers/proxy-groups.yaml
-	sed -n '/^rule/,$p' ${CRASHDIR}/providers/${provider_temp_file} > ${TMPDIR}/providers/rules.yaml
+	sed -n '/^rule/,$p' ${TMPDIR}/${provider_temp_file} > ${TMPDIR}/providers/rules.yaml
+	rm -rf ${TMPDIR}/${provider_temp_file}
 	#生成providers模块
 	if [ -n "$2" ];then
 		gen_clash_providers_txt $1 $2
+		providers_tags=$1
+		sed -i 's/, {providers_tags}//g' ${TMPDIR}/providers/proxy-groups.yaml
 	else
 		providers_tags=''
 		while read line;do
@@ -390,7 +400,7 @@ EOF
 	cut -c 1- ${TMPDIR}/providers/providers.yaml ${TMPDIR}/providers/proxy-groups.yaml ${TMPDIR}/providers/rules.yaml > ${TMPDIR}/config.yaml
 	rm -rf ${TMPDIR}/providers
 	#调用内核测试
-	${CRASHDIR}/start.sh core_check && ${TMPDIR}/CrashCore -t -d ${BINDIR} -f ${TMPDIR}/config.yaml >/dev/null
+	${CRASHDIR}/start.sh core_check && ${TMPDIR}/CrashCore -t -d ${BINDIR} -f ${TMPDIR}/config.yaml
 	if [ "$?" = 0 ];then
 		echo -e "\033[32m配置文件生成成功！\033[0m"
 		mv -f ${TMPDIR}/config.yaml ${CRASHDIR}/yamls/config.yaml
@@ -401,6 +411,7 @@ EOF
 		}
 	else
 		rm -rf ${TMPDIR}/CrashCore
+		rm -rf ${TMPDIR}/config.yaml
 		echo -e "\033[31m生成配置文件出错，请仔细检查输入！\033[0m"
 	fi
 }
@@ -414,7 +425,7 @@ gen_singbox_providers(){ #生成singbox的providers配置文件
       "healthcheck_interval": "10m",
       "download_url": "${2}",
       "path": "./providers/${1}.yaml",
-      "download_ua": "clash",
+      "download_ua": "clash.meta",
       "download_interval": "24h",
       "download_detour": "DIRECT"
 	},
@@ -426,11 +437,10 @@ EOF
 		provider_temp_file=$(grep "provider_temp_${coretype}" ${CRASHDIR}/configs/ShellCrash.cfg | awk -F '=' '{print $2}')
 	fi
 	echo -----------------------------------------------
-	if [ ! -s ${CRASHDIR}/providers/${provider_temp_file} ];then
+	if [ ! -s ${TMPDIR}/${provider_temp_file} ];then
-		echo -e "\033[33m未找到本地模版，尝试在线获取！\033[0m"
+		echo -e "\033[33m正在获取在线模版！\033[0m"
-		mkdir -p ${CRASHDIR}/providers
+		${CRASHDIR}/start.sh get_bin ${TMPDIR}/${provider_temp_file} rules/${coretype}_providers/${provider_temp_file}
-		${CRASHDIR}/start.sh get_bin ${CRASHDIR}/providers/${provider_temp_file} rules/${coretype}_providers/${provider_temp_file}
+		[ -z "$(grep -o 'route' ${TMPDIR}/${provider_temp_file})" ] && {
-		[ "$?" != 0 ] && {
 			echo -e "\033[31m下载失败，请尝试更换安装源！\033[0m"
 			setserver
 			setproviders
@@ -443,13 +453,14 @@ EOF
 {
   "outbound_providers": [
 EOF
+	if [ -n "$2" ];then
+		gen_singbox_providers_txt $1 $2
+		providers_tags=\"$1\"
+	else
 		cat > ${TMPDIR}/providers/outbounds_add.json <<EOF
 {
   "outbounds": [
 EOF
-	if [ -n "$2" ];then
-		gen_singbox_providers_txt $1 $2
-	else
 		providers_tags=''
 		while read line;do
 			tag=$(echo $line | awk '{print $1}')
@@ -458,11 +469,12 @@ EOF
 			gen_singbox_providers_txt $tag $url
 			echo '{ "tag": "'${tag}'", "type": "urltest", "tolerance": 100, "providers": "'${tag}'", "includes": ".*" },' >> ${TMPDIR}/providers/outbounds_add.json
 		done < ${CRASHDIR}/configs/providers.cfg
+		sed -i '$s/},/}]}/' ${TMPDIR}/providers/outbounds_add.json #修复文件格式
 	fi
 	sed -i '$s/},/}]}/' ${TMPDIR}/providers/providers.json #修复文件格式
-	sed -i '$s/},/}]}/' ${TMPDIR}/providers/outbounds_add.json #修复文件格式
 	#使用模版生成outbounds和rules模块
-	cat ${CRASHDIR}/providers/${provider_temp_file} | sed "s/{providers_tags}/$providers_tags/g" >> ${TMPDIR}/providers/outbounds.json
+	cat ${TMPDIR}/${provider_temp_file} | sed "s/{providers_tags}/$providers_tags/g" >> ${TMPDIR}/providers/outbounds.json
+	rm -rf ${TMPDIR}/${provider_temp_file}
 	#调用内核测试
 	${CRASHDIR}/start.sh core_check && ${TMPDIR}/CrashCore merge ${TMPDIR}/config.json -C ${TMPDIR}/providers
 	if [ "$?" = 0 ];then
@@ -483,7 +495,7 @@ EOF
 setproviders(){ #自定义providers
 	echo -----------------------------------------------
 	echo -e "\033[33m你可以在这里快捷管理与生成自定义的providers提供者\033[0m"
-	echo -e "\033[33m暂时只支持yaml格式的配置导入\033[0m"
+	echo -e "\033[33m暂时只支持yaml格式的配置导入，并且不支持跳过证书验证功能\033[0m"
 	[ -s $CRASHDIR/configs/providers.cfg ] && { 
 		echo -----------------------------------------------
 		echo -e "\033[36m输入对应数字可管理providers提供者\033[0m"
@@ -494,6 +506,7 @@ setproviders(){ #自定义providers
 	echo -e " b \033[32m生成\033[0m基于providers的配置文件"
 	echo -e " c 选择\033[33m规则模版\033[0m"
 	echo -e " d \033[31m清空\033[0mproviders列表"
+	echo -e " e \033[33m清理\033[0mproviders目录"
 	echo -e " 0 返回上级菜单"
 	read -p "请输入对应数字 > " num
 	case $num in
@@ -534,10 +547,10 @@ setproviders(){ #自定义providers
 				fi
 			;;	
 			3)
-				gen_outbound_providers $provider_name $provider_url
+				gen_${coretype}_providers $provider_name $provider_url
 			;;	
 			4)
-				sed -i "/$provider_name/d" $CRASHDIR/configs/providers.cfg
+				sed -i "/^$provider_name /d" $CRASHDIR/configs/providers.cfg
 			;;
 			*)
 				errornum
@@ -549,7 +562,7 @@ setproviders(){ #自定义providers
 	;;
 	a)
 		echo -----------------------------------------------
-		read -p "请输入http(s)格式的providers链接地址 > " link
+		read -p "请输入http(s)格式的providers订阅地址 > " link
 		[ -n "$(echo $link | grep -E '.*\..*')" ] && {
 			read -p "请输入代理提供者的名称或者代号(不可重复) > " name
 			[ -n "$name" ] && [ -z "$(grep "name" $CRASHDIR/configs/providers.cfg)" ] && { 
@@ -569,24 +582,20 @@ setproviders(){ #自定义providers
 	;;
 	b)	
 		echo -----------------------------------------------
+		if [ -s $CRASHDIR/configs/providers.cfg ];then
 			echo -e "\033[33msingboxp与mihomo内核的providers配置文件不互通！\033[0m"
 			echo -----------------------------------------------
 			read -p "确认生成${coretype}配置文件？(1/0) > " res
 			[ "$res" = "1" ] && {
 				gen_${coretype}_providers
 			}
+		else
+			echo -e "\033[31m你还未添加providers提供者，请先添加！\033[0m"
+			sleep 1
+		fi
 		setproviders
 	;;
 	c)	
-		[ ! -s ${CRASHDIR}/configs/${coretype}_providers.list ] && {
-		echo -e "\033[32m正在在线获取模版列表！\033[0m"
-		${CRASHDIR}/start.sh get_bin ${CRASHDIR}/configs/${coretype}_providers.list rules/${coretype}_providers/${coretype}_providers.list
-		[ "$?" != 0 ] && {
-			echo -e "\033[31m下载失败，请尝试更换安装源！\033[0m"
-			setserver
-			setproviders
-			}
-		}
 		if [ -z "$(grep "provider_temp_${coretype}" ${CRASHDIR}/configs/ShellCrash.cfg)" ];then
 			provider_temp_des=$(sed -n "1 p" ${CRASHDIR}/configs/${coretype}_providers.list | awk '{print $1}')
 		else
@@ -613,6 +622,12 @@ setproviders(){ #自定义providers
 		[ "$res" = "1" ] && rm -rf $CRASHDIR/configs/providers.cfg
 		setproviders
 	;;
+	d)
+		echo -e "\033[33m将清空 $CRASHDIR/providers 目录下所有内容\033[0m"
+		read -p "是否继续？(1/0) > " res
+		[ "$res" = "1" ] && rm -rf $CRASHDIR/providers
+		setproviders
+	;;
 	*)
 		errornum
 	;;
@@ -942,7 +957,7 @@ set_core_config(){ #配置文件功能
 	echo -----------------------------------------------
 	echo -e " 1 在线\033[32m生成$crashcore配置文件\033[0m"
 	echo -e " 2 在线\033[33m获取完整配置文件\033[0m"
-	echo -e " 3 本地\033[32m生成providers配置文件\033[0m(实验性)\033[0m"	
+	echo -e " 3 本地\033[32m生成providers配置文件\033[0m"	
 	echo -e " 4 本地\033[33m上传完整配置文件\033[0m"
 	echo -e " 5 设置\033[36m自动更新\033[0m"
 	echo -e " 6 \033[32m自定义\033[0m配置文件"
@@ -1157,6 +1172,8 @@ setcoretype(){ #手动指定内核类型
 switch_core(){ #clash与singbox内核切换
 	#singbox和clash内核切换时提示是否保留文件
 	[ "$core_new" != "$core_old" ] && {
+		[ "$dns_mod" = "redir_host" ] && [ "$core_old" = "clash" ] && setconfig dns_mod mix #singbox自动切换dns
+		[ "$dns_mod" = "mix" ] && [ "$core_old" = "singbox" ] && setconfig dns_mod fake-ip #singbox自动切换dns
 		echo -e "\033[33m已从$core_old内核切换至$core_new内核\033[0m"
 		echo -e "\033[33m二者Geo数据库及yaml/json配置文件不通用\033[0m"
 		read -p "是否保留相关数据库文件？(1/0) > " res

scripts/init.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (C) Juewuy
 
-version=1.9.0pre8
+version=1.9.0pre11
 
 setdir(){
 	dir_avail(){
@@ -176,6 +176,7 @@ else
 		systemctl daemon-reload
 	else
 		#设为保守模式启动
+		systemctl disable shellcrash 2>/dev/null
 		setconfig start_old 已开启
 	fi
 fi
@@ -272,7 +273,7 @@ for file in config.yaml.bak user.yaml proxies.yaml proxy-groups.yaml rules.yaml
 	mv -f ${CRASHDIR}/$file ${CRASHDIR}/yamls/$file 2>/dev/null
 done
 	[ ! -L ${CRASHDIR}/config.yaml ] && mv -f ${CRASHDIR}/config.yaml ${CRASHDIR}/yamls/config.yaml 2>/dev/null
-for file in fake_ip_filter mac web_save servers.list fake_ip_filter.list fallback_filter.list;do
+for file in fake_ip_filter mac web_save servers.list fake_ip_filter.list fallback_filter.list singbox_providers.list clash_providers.list;do
 	mv -f ${CRASHDIR}/$file ${CRASHDIR}/configs/$file 2>/dev/null
 done
 	#配置文件改名

scripts/menu.sh

@@ -47,8 +47,13 @@ ckstatus(){
 	[ -z "$host" ] && host=$(ip a 2>&1 | grep -w 'inet' | grep 'global' | grep -E ' 1(92|0|72)\.' | sed 's/.*inet.//g' | sed 's/\/[0-9][0-9].*$//g' | head -n 1)
 	[ -z "$host" ] && host='设备IP地址'
 	#dashboard目录位置
-	[ -f ${CRASHDIR}/ui/index.html ] && dbdir=${CRASHDIR}/ui && hostdir=":$db_port/ui"
+	if [ -f /www/clash/index.html ];then
-	[ -f /www/clash/index.html ] && dbdir=/www/clash && hostdir=/clash
+		dbdir=/www/clash
+		hostdir=/clash
+	else
+		dbdir=${CRASHDIR}/ui
+		hostdir=":$db_port/ui"
+	fi
 	#开机自启检测
 	if [ -f /etc/rc.common -a "$(cat /proc/1/comm)" = "procd" ];then
 		[ -n "$(find /etc/rc.d -name '*shellcrash')" ] && autostart=enable || autostart=disable
@@ -175,7 +180,12 @@ start_core(){
 		core_config=${CRASHDIR}/yamls/config.yaml
 	fi
 	echo -----------------------------------------------
-	if [ -s $core_config -o -n "$Url" -o -n "$Https" ];then
+	if [ ! -s $core_config -a -s $CRASHDIR/configs/providers.cfg ];then
+		echo -e "\033[33m没有找到${crashcore}配置文件，尝试生成providers配置文件！\033[0m"
+		[ "$crashcore" = singboxp ] && coretype=singbox
+		[ "$crashcore" = meta -o "$crashcore" = clashpre ] && coretype=clash
+		source ${CRASHDIR}/getdate.sh && gen_${coretype}_providers
+	elif [ -s $core_config -o -n "$Url" -o -n "$Https" ];then
 		${CRASHDIR}/start.sh start
 		#设置循环检测以判定服务启动是否成功
 		i=1
@@ -917,6 +927,10 @@ localproxy(){ #本机代理
 	[ -w /etc/systemd/system/shellcrash.service -o -w /usr/lib/systemd/system/shellcrash.service -o -x /bin/su ] && local_enh=1
 	[ -f /etc/rc.common -a "$(cat /proc/1/comm)" = "procd" ] && [ -w /etc/passwd ] && local_enh=1
 	echo -----------------------------------------------
+	echo -e "\033[31m注意:\033[0m如果你不了解Linux系统的流量机制及$crashcore内核的流量劫持机制"
+	echo -e "启用此功能将可能导致\033[31m流量回环乃至设备死机\033[0m等严重问题！！！"
+	echo -e "\033[33m如你使用了第三方DNS如smartdns等，请务必禁用此功能或者使用shellcrash用户执行！\033[0m"
+	sleep 1
 	[ -n "$local_enh" ] && {
 		ckcmd iptables && [ -n "$(iptables -m owner --help | grep owner)" ] && echo -e " 1 使用\033[32miptables增强模式\033[0m配置(支持docker,推荐！)"
 		nft add table inet shellcrash 2>/dev/null && echo -e " 2 使用\033[32mnftables增强模式\033[0m配置(支持docker,推荐！)"
@@ -1207,7 +1221,6 @@ normal_set(){ #基础设置
 
 	}
 	set_dns_mod(){
-		[ "$dns_mod" = mix ] && [ "$crashcore" != singbox -o "$crashcore" != singboxp ] && dns_mod=redir_host
 		echo -----------------------------------------------
 		echo -e "当前DNS运行模式为：\033[47;30m $dns_mod \033[0m"
 		echo -e "\033[33m切换模式后需要手动重启服务以生效！\033[0m"

scripts/start.sh

@@ -240,7 +240,7 @@ check_clash_config(){ #检查clash配置文件
 }
 check_singbox_config(){ #检查singbox配置文件
 	#检测节点或providers
-	if [ -z "$(cat $core_config_new | grep -Eo '"server":|"outbound_providers":' )" ];then
+	if [ -z "$(cat $core_config_new | grep -Eo 'server|outbound_providers' )" ];then
 		echo -----------------------------------------------
 		logger "获取到了配置文件【$core_config_new】，但似乎并不包含正确的节点信息！" 31
 		exit 1
@@ -382,8 +382,8 @@ EOF
 		}		
 }
 	#域名嗅探配置
-	[ "$sniffer" = "已启用" ] && [ "$crashcore" = "meta" ] && sniffer_set="sniffer: {enable: true, skip-domain: [Mijia Cloud], sniff: {tls: {ports: [443, 8443]}, http: {ports: [80, 8080-8880]}}}"
+	[ "$sniffer" = "已启用" ] && [ "$crashcore" = "meta" ] && sniffer_set="sniffer: {enable: true, parse-pure-ip: true, skip-domain: [Mijia Cloud], sniff: {tls: {ports: [443, 8443]}, http: {ports: [80, 8080-8880]}}}"
-	[ "$crashcore" = "clashpre" ] && [ "$dns_mod" = "redir_host" ] && exper="experimental: {ignore-resolve-fail: true, interface-name: en0, sniff-tls-sni: true}"
+	[ "$crashcore" = "clashpre" ] && [ "$dns_mod" = "redir_host" -o "$sniffer" = "已启用" ] && exper="experimental: {ignore-resolve-fail: true, interface-name: en0, sniff-tls-sni: true}"
 	#生成set.yaml
 	cat > ${TMPDIR}/set.yaml <<EOF
 mixed-port: $mix_port
@@ -590,7 +590,7 @@ EOF
 		fake_ip_filter=$(cat ${CRASHDIR}/configs/fake_ip_filter 2>/dev/null | grep '\.' | awk '{printf "\"%s\", ",$1}' | sed "s/, $//" | sed 's/+/.+/g' | sed 's/*/.*/g')
 		[ -n "$fake_ip_filter" ] && fake_ip_filter="{ \"domain_regex\": [$fake_ip_filter], \"server\": \"local\" },"
 		if [ -z "$(echo "$core_v" | grep -E '^1\.7.*')" ];then
-			mix_dns="{ \"rule_set\": [\"geosite-cn\"], \"invert\": true, \"server\": \"dns_fakeip\" },"
+			mix_dns="{ \"rule_set\": [\"geosite-cn\"], \"invert\": true, \"server\": \"dns_fakeip\", \"rewrite_ttl\": 1 },"
 			#生成add_rule_set.json
 			[ -z "$(cat ${CRASHDIR}/jsons/*.json | grep -Ei '\"tag\" *: *\"geosite-cn\"')" ] && cat > ${TMPDIR}/jsons/add_rule_set.json <<EOF
 {
@@ -607,7 +607,7 @@ EOF
 }
 EOF
 		else
-			mix_dns="{ \"geosite\": [\"cn\"], \"invert\": true, \"server\": \"dns_fakeip\" },"
+			mix_dns="{ \"geosite\": [\"geolocation-cn\"], \"invert\": true, \"server\": \"dns_fakeip\", \"rewrite_ttl\": 1 },"
 		fi
 	}
 	cat > ${TMPDIR}/jsons/dns.json <<EOF
@@ -633,7 +633,7 @@ EOF
 	],
     "rules": [
 	  { "outbound": ["any"], "server": "dns_resolver" },
-	  { "clash_mode": "Global", "server": "$global_dns" },
+	  { "clash_mode": "Global", "server": "$global_dns", "rewrite_ttl": 1 },
       { "clash_mode": "Direct", "server": "dns_direct" },
 	  $fake_ip_filter
 	  $mix_dns
@@ -1089,7 +1089,7 @@ start_tun(){ #iptables-tun
 		iptables -I FORWARD -p udp --dport 443 -o utun -m comment --comment "ShellCrash-QUIC-REJECT" $set_cn_ip -j REJECT >/dev/null 2>&1 
 		ip6tables -I FORWARD -p udp --dport 443 -o utun -m comment --comment "ShellCrash-QUIC-REJECT" $set_cn_ip6 -j REJECT >/dev/null 2>&1
 	fi
-	modprobe xt_mark >/dev/null 2>&1 && {
+	if [ -n "$(iptables -j MARK 2>&1 | grep 'mark')" ];then
 		i=1
 		while [ -z "$(ip route list |grep utun)" -a "$i" -le 29 ];do
 			sleep 1
@@ -1159,7 +1159,9 @@ start_tun(){ #iptables-tun
 				[ "$1" = "all" ] && ip6tables -t mangle -A PREROUTING -p tcp $ports -j shellcrashv6
 			}
 		fi
-	}
+	else
+		logger "iptables缺少-J MARK功能，放弃启动tun相关防火墙规则！" 31
+	fi
 }
 start_nft(){ #nftables-allinone
 	#获取局域网host地址
@@ -1774,8 +1776,10 @@ update_config(){ #更新订阅并重启
 hotupdate(){ #热更新订阅
 		getconfig
 		get_core_config
+		core_check
 		modify_$format && \
 		put_save http://127.0.0.1:${db_port}/configs "{\"path\":\"${CRASHDIR}/config.$format\"}"
+		rm -rf ${TMPDIR}/CrashCore
 }
 set_proxy(){ #设置环境变量
 	getconfig
@@ -1805,10 +1809,12 @@ start)
 		elif [ -f /etc/rc.common -a "$(cat /proc/1/comm)" = "procd" ];then
 			/etc/init.d/shellcrash start 
 		elif [ "$USER" = "root" -a "$(cat /proc/1/comm)" = "systemd" ];then
+			bfstart && {
 				FragmentPath=$(systemctl show -p FragmentPath shellcrash | sed 's/FragmentPath=//')
 				[ -f $FragmentPath ] && setconfig ExecStart "$COMMAND >/dev/null" "$FragmentPath"
 				systemctl daemon-reload
 				systemctl start shellcrash.service || start_error
+			}
 		else
 			bfstart && start_old
 		fi