From 23da6f745897f0392cf0ae4a07589a082eff00ae Mon Sep 17 00:00:00 2001 From: DaTekShaman Date: Thu, 4 Dec 2025 16:00:46 +0300 Subject: [PATCH] Huge updates --- config-clash/pontifex/pontifex.yaml | 196 ++++++++++-------- .../consolidated-services/entertainment.yaml | 2 + .../consolidated-services/games.yaml | 2 + .../consolidated-services/libraries.yaml | 2 + rule-provider/services/gemini.yaml | 2 + rule-provider/services/google.yaml | 14 +- 6 files changed, 126 insertions(+), 92 deletions(-) create mode 100644 rule-provider/consolidated-services/entertainment.yaml diff --git a/config-clash/pontifex/pontifex.yaml b/config-clash/pontifex/pontifex.yaml index e4e6b01..f33a724 100644 --- a/config-clash/pontifex/pontifex.yaml +++ b/config-clash/pontifex/pontifex.yaml @@ -128,6 +128,7 @@ tun: # gso-max-size: 65536 # udp-timeout: 300 +# {Забирать у себя} # ————————————————— GEO DATA CONFIGURATION ————————————————— https://github.com/runetfreedom/russia-v2ray-rules-dat ————— geodata-mode: true geodata-loader: memconservative @@ -136,6 +137,8 @@ geo-update-interval: 24 geox-url: geoip: https://raw.githubusercontent.com/runetfreedom/russia-v2ray-rules-dat/release/geoip.dat geosite: https://raw.githubusercontent.com/runetfreedom/russia-v2ray-rules-dat/release/geosite.dat + mmdb: https://testingcf.jsdelivr.net/gh/alecthw/mmdb_china_ip_list@release/Country.mmdb + asn: https://testingcf.jsdelivr.net/gh/xishang0128/geoip@release/GeoLite2-ASN.mmdb global-ua: clash.meta etag-support: true @@ -203,24 +206,29 @@ dns: # ———————————————————————————————————————————————————————— MACRO ———————————————————————————————————————————————————————— # # ———————————————————————————————— direct proxy ————————————————————————————————— # - direct_proxy: &direct_proxy + proxy_direct: &proxy_direct type: direct udp: true ip-version: ipv4 - external_proxy: &external_proxy + proxy_extrnl: &proxy_extrnl type: http interval: 3600 proxy: ▣ Personal exclude-filter: "(?i)Наш TG|Истекает|@FizzVPN|UNAVAILABLE|EXPIRE|TELEGRAM|USERNAME:|Купить|🔜" - gitea_proxy: &gitea_proxy + proxy_ownvps: &proxy_ownvps + type: http + interval: 3600 + proxy: DIRECT + exclude-filter: "(?i)xhttp" + + proxy_owngit: &proxy_owngit type: http interval: 3600 proxy: DIRECT exclude-filter: "" - - + # # ———————————————————————————————— health checks ———————————————————————————————— # health-check-for-providers: &health_check_for_providers health-check: @@ -249,6 +257,18 @@ dns: hidden: true # disable-udp: false # # ————————————————————————————————— proxies list ———————————————————————————————— # + proxy-all-list: &proxy_all_list + use: + - 💫 own-dexterity + - 💫 own-prowess + - 💫 own-agility + - 💫 own-finesse + - 🎭 xfizz + - 🎭 uncd + - 🎭 vezdehod + - 🎭 d-vpn + - 🎩 amnezia + - 🎩 hynet proxy-own-list: &proxy_own_list use: - 💫 own-dexterity @@ -266,6 +286,15 @@ dns: - 🎩 amnezia - 🎩 hynet # # ————————————— url-test, load-balancers, smart-groups and selectors ———————————— # + smart-group-defaults: &smart_group_defaults + # policy-priority: "" + type: smart + uselightgbm: true + collectdata: true + strategy: 'sticky-sessions' + sample-rate: 1 + hidden: true + own-url-test: &own_url_test # disable-udp: false type: url-test @@ -280,14 +309,7 @@ dns: own-smart-gr: &own_smart_gr # disable-udp: false - type: smart - # policy-priority: "" - uselightgbm: true - collectdata: true - strategy: 'sticky-sessions' - sample-rate: 1 - hidden: true - <<: *proxy_own_list + <<: [*proxy_own_list, *smart_group_defaults] own-selector: &own_selector # disable-udp: false @@ -302,14 +324,7 @@ dns: ext-smart-gr: &ext_smart_gr # disable-udp: false - type: smart - # policy-priority: "" - uselightgbm: true - collectdata: true - strategy: 'sticky-sessions' - sample-rate: 1 - hidden: true - <<: *proxy_ext_list + <<: [*proxy_ext_list, *smart_group_defaults] ext-balancer: &ext_balancer # disable-udp: false @@ -321,25 +336,43 @@ dns: # disable-udp: false type: select <<: *proxy_ext_list -# # ——————————————————————————————— regional filters —————————————————————————————— # + + tcp-smart-gr: &tcp_smart_gr + disable-udp: true + <<: [*proxy_all_list, *smart_group_defaults] + + udp-smart-gr: &udp_smart_gr + disable-udp: false + <<: [*proxy_all_list, *smart_group_defaults] + + +# # —————————————————————————— regional and type filters —————————————————————————— # filter-ame: &filter_ame - filter: "(?i)Hong Kong|China|Malaysia|Philippines|Japan|Singapore|Egypt|Taiwan|UAE|India|Япония" + filter: "(?i)china|egypt|hong kong|india|israel|japan|korea|malaysia|nigeria|philippines|singapore|taiwan|thailand|uae|vietnam|гонконг|китай|япония" filter-eur: &filter_eur - filter: "(?i)NL|Finland|Estonia|France|Germany|Sweden|Ireland|Spain|UK|Switzerland|Italy|Norway|Belgium|Netherl|Poland|GREAT BRIATAIN|GREAT BRITAIN|Austria|Denmark|Lithuania|Latvia|MOLDOVA|Польша|Финляндия|Нидерланды|Великобритания|Швейцария" + filter: "(?i)austria|belgium|briatain|britain|czech|denmark|england|estonia|finland|france|georgia|germany|great britain|ireland|italy|latvia|lithuania|moldova|netherl|nl|norway|poland|portugal|romania|spain|sweden|switzerland|uk|великобритания|нидерланды|польша|финляндия|швейцария" filter-kaz: &filter_kaz - filter: "(?i)Kazakhstan|KZ|Казахстан" + filter: "(?i)kaz|kazakhstan|kz|каз|казахстан" filter-rus: &filter_rus - filter: "(?i)Russia|Россия" + filter: "(?i)russia|россия" filter-trk: &filter_trk - filter: "(?i)TURKEY|Турция" + filter: "(?i)turkey|турция" filter-usa: &filter_usa - filter: "(?i)USA|Canada|США" + filter: "(?i)canada|gemini|usa|сша" + filter-ytb: &filter_ytb - filter: "(?i)Russia|Россия" + filter: "(?i)belarus|russia|беларусь|белоруссия|россия" exclude-filter: "(?i)via" filter-p2p: &filter_p2p - filter: "(?i)P2P" - exclude-filter: "(?i)noP2P" + filter: "(?i)p2p|torrent|торрент" + exclude-filter: "(?i)nop2p" + + filter-udp: &filter_udp + filter: "(?i)wg|wireguard" + exclude-filter: "" + filter-cun: &filter_cun + filter: "(?i)SS|8443" + exclude-filter: "(?i)vless" # # —————————————————————————————————— route sets ————————————————————————————————— # set-small: &set_small proxies: @@ -450,10 +483,10 @@ proxies: # # —————————————————————————————— direct wan routes —————————————————————————————— # - name: "WAN A" interface-name: eth2 - <<: [*direct_proxy, *health_check_for_providers] + <<: [*proxy_direct, *health_check_for_providers] - name: "WAN B" interface-name: eth1 - <<: [*direct_proxy, *health_check_for_providers] + <<: [*proxy_direct, *health_check_for_providers] # # ——————————————————————————————— private proxies ——————————————————————————————— # # ——————————————————————————————————————————————————— PROXY PROVIDERS ——————————————————————————————————————————————————— @@ -462,57 +495,37 @@ proxy-providers: #https://dexterity.shamanlanding.org/M4eh2gd/first 💫 own-agility: - type: http url: "https://agility.shamanlanding.org/WjZYGvfRocx/first" - interval: 3600 - proxy: DIRECT path: "./proxy_provider/own-agility.txt" - exclude-filter: "xhttp" override: additional-prefix: "💫 " additional-suffix: "ᵃ" - health-check: - <<: *health_check_for_providers + <<: [*proxy_ownvps, *health_check_for_providers] 💫 own-dexterity: - type: http url: "https://dexterity.shamanlanding.org/M4eh2gd/first" - interval: 3600 - proxy: DIRECT path: "./proxy_provider/own-dexterity.txt" - exclude-filter: "xhttp" override: additional-prefix: "💫 " additional-suffix: "ᵈ" - health-check: - <<: *health_check_for_providers + <<: [*proxy_ownvps, *health_check_for_providers] 💫 own-finesse: - type: http url: "https://agility.shamanlanding.org/WjZYGvfRocx/first" - interval: 3600 - proxy: DIRECT path: "./proxy_provider/own-finesse.txt" - exclude-filter: "xhttp" override: additional-prefix: "💫 " additional-suffix: "ᶠ" - health-check: - <<: *health_check_for_providers - + <<: [*proxy_ownvps, *health_check_for_providers] + 💫 own-prowess: - type: http url: "https://prowess.shamanlanding.org/Dj1wXSw/first" - interval: 3600 - proxy: DIRECT path: "./proxy_provider/own-prowess.txt" - exclude-filter: "xhttp" override: additional-prefix: "💫 " additional-suffix: "ᵖ" - health-check: - <<: *health_check_for_providers - + <<: [*proxy_ownvps, *health_check_for_providers] + # # ———————————————————————————— external vpn services ———————————————————————————— # 🎭 d-vpn: @@ -521,7 +534,7 @@ proxy-providers: override: additional-prefix: "" additional-suffix: "•𝓭" - <<: [*health_check_for_providers, *external_proxy] + <<: [*health_check_for_providers, *proxy_extrnl] 🎭 vezdehod: url: "https://sub-001.dns-on-fire.net/api/sub/Jfo_eg3X0NchfJ3_" @@ -529,7 +542,7 @@ proxy-providers: override: additional-prefix: "" additional-suffix: "•𝓿" - <<: [*health_check_for_providers, *external_proxy] + <<: [*health_check_for_providers, *proxy_extrnl] 🎭 xfizz: url: "https://xfizz.cc/sublink/XzU0rRmBeOZtIPprW46f2ieNFcF8PJw9?name=1Y:2213" @@ -537,7 +550,7 @@ proxy-providers: override: additional-prefix: "" additional-suffix: "•𝓯" - <<: [*health_check_for_providers, *external_proxy] + <<: [*health_check_for_providers, *proxy_extrnl] 🎭 uncd: url: "https://subs.un1c4d3.ru:52478/sub/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJQTF9WTFNTX0FMTDIxMCIsImFjY2VzcyI6InN1YnNjcmlwdGlvbiIsImlhdCI6MTczNzgwMDQwOH0.mPr4BSMMpo1mrlZPvB34IRGcn2mHOZetHXaZyebirT4" @@ -545,7 +558,7 @@ proxy-providers: override: additional-prefix: "" additional-suffix: "•𝓾" - <<: [*health_check_for_providers, *external_proxy] + <<: [*health_check_for_providers, *proxy_extrnl] 🎩 amnezia: url: "https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/proxy-provider/scarus/amnezia.yaml" @@ -553,7 +566,7 @@ proxy-providers: override: additional-prefix: "🎩 " additional-suffix: "" - <<: [*health_check_for_providers, *gitea_proxy] + <<: [*health_check_for_providers, *proxy_owngit] 🎩 hynet: type: file @@ -569,8 +582,6 @@ proxy-providers: # ————————————————————————————————————————————————————— PROXY GROUPS ———————————————————————————————————————————————————— proxy-groups: -# Личные, публичные, Лучший последний шанс, Лучший необычный - # # ——————————————————————————————————— fallback —————————————————————————————————— # - name: "FALLBACK" @@ -659,11 +670,24 @@ proxy-groups: - name: ▣ Personal <<: [*own_smart_gr, *health_check] + - name: ▣ Neighborhood Tunnels + <<: [*tcp_smart_gr, *health_check, *filter_cun] # # ———————————————————————— smart groups for external vpn ———————————————————————— # - name: ▣ Non-personal <<: [*ext_smart_gr, *health_check] - + - name: ▣ Last Resort + <<: [*tcp_smart_gr, *health_check] + - name: ▣ Cunning Protocols + <<: [*tcp_smart_gr, *health_check, *filter_cun] + - name: ▣ UDP Ready + <<: [*udp_smart_gr, *health_check, *filter_udp] + + - name: YTB Service + <<: [*tcp_smart_gr, *health_check, *filter_ytb] + - name: P2P Service + <<: [*tcp_smart_gr, *health_check, *filter_p2p] + - name: Asia & ME 🇳🇵 <<: [*ext_smart_gr, *health_check, *filter_ame] - name: Europe 🇪🇺 @@ -676,10 +700,6 @@ proxy-groups: <<: [*ext_smart_gr, *health_check, *filter_trk] - name: USA 🇺🇸 <<: [*ext_smart_gr, *health_check, *filter_usa] - - name: YTB Service - <<: [*ext_smart_gr, *health_check, *filter_ytb] - - name: P2P Service - <<: [*ext_smart_gr, *health_check, *filter_p2p] # # ————————————————————————— global selectors for own vpn ———————————————————————— # - name: Personal 1️⃣ @@ -830,12 +850,8 @@ proxy-groups: proxies: - DIRECT - PASS - - REJECT - REJECT-DROP - - Route Alpha - - Route Bravo - - Route Charlie - - Route Delta + - ▣ UDP Ready <<: [*group_selector, *set_basic, *health_check] - name: Akamai @@ -852,6 +868,8 @@ proxy-groups: <<: [*set_basic, *group_selector_hidden, *health_check] - name: Anime <<: [*set_extnd, *group_selector, *health_check] + - name: Entertainment + <<: [*set_extnd, *group_selector, *health_check] - name: Hentai <<: [*set_extnd, *group_selector, *health_check] - name: Games @@ -1119,6 +1137,10 @@ rule-providers: url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/crypto.yaml path: "./rule_provider/consolidated-services/crypto.yaml" <<: *default_rule_provider_config + 📦 Entertainment: + url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/entertainment.yaml + path: "./rule_provider/services/entertainment.yaml" + <<: *default_rule_provider_config 📦 Hentai: url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/hentai.yaml path: "./rule_provider/services/hentai.yaml" @@ -1387,6 +1409,11 @@ rules: - DOMAIN-SUFFIX,ifconfig.me,Personal 1️⃣ - DOMAIN-SUFFIX,whatismyipaddress.com,Personal 2️⃣ +# ———————————————————————— udp catcher —————————————————————— # ————————————————————————————————————————————————————————— +- AND((NETWORK,udp),(RULE-SET,Telegram)),UDP Catcher +- AND((NETWORK,udp),(RULE-SET,Discord)),UDP Catcher +- AND((NETWORK,udp),(RULE-SET,WhatsApp)),UDP Catcher + # ———————————————————————— by service ——————————————————————— # ————————————————————————————————————————————————————————— - RULE-SET,Adobe,Adobe - RULE-SET,AliExpress,AliExpress @@ -1432,6 +1459,7 @@ rules: - RULE-SET,📦 Crypto Stuff,Crypto Stuff - RULE-SET,📦 RU Intracountry VPN,RU Intracountry VPN - RULE-SET,📦 Hentai,Hentai +- RULE-SET,📦 Entertainment,Entertainment - RULE-SET,📦 Games,Games - RULE-SET,📦 Libraries,Libraries - RULE-SET,📦 News,News @@ -1458,7 +1486,7 @@ rules: # ————————————————————— by private lists ———————————————————— # ————————————————————————————————————————————————————————— - RULE-SET,📃 Persistent Proxy,Persistent Proxy - RULE-SET,📃 General Proxy Domain List,Adaptation -- RULE-SET,📃 General Proxy IP List,Adaptation +- RULE-SET,📃 General Proxy IP List,Adaptation,no-resolve # ————————————————————— community lists ————————————————————— # ————————————————————————————————————————————————————————— - RULE-SET,👥 Antifilter Community IP List,Antifilter @@ -1470,17 +1498,11 @@ rules: - RULE-SET,🚫 Adblock List GL,Adblock 🗺️ # ———————————— by service group (manual country) ———————————— # ————————————————————————————————————————————————————————— -- RULE-SET,📦 US Services Manual,US Services -- RULE-SET,📦 EU Services Manual,EU Services -- RULE-SET,📦 CN Services Manual,CN Services +- OR,((RULE-SET,📦 RU Services Manual),(GEOIP,RU),(GEOSITE,category-ru)),RU Services +- OR,((RULE-SET,📦 US Services Manual),(GEOIP,US),US Services +- OR,((RULE-SET,📦 CN Services Manual),(GEOIP,US),CN Services +- OR,((RULE-SET,📦 EU Services Manual),(GEOIP,UK),EU Services -# —————————————— force russian geoip to russia —————————————— # ————————————————————————————————————————————————————————— -# - GEOIP,EU,EU Services # Split By Country -- GEOIP,RU,RU Services -# - GEOIP,US,US Services -# - GEOIP,CN,CN Services - -# ———————————————————— force other geoip ———————————————————— # ————————————————————————————————————————————————————————— - MATCH,FALLBACK # Epic \ No newline at end of file diff --git a/rule-provider/consolidated-services/entertainment.yaml b/rule-provider/consolidated-services/entertainment.yaml new file mode 100644 index 0000000..c5c1393 --- /dev/null +++ b/rule-provider/consolidated-services/entertainment.yaml @@ -0,0 +1,2 @@ +payload: + - GEOSITE, category-entertainment \ No newline at end of file diff --git a/rule-provider/consolidated-services/games.yaml b/rule-provider/consolidated-services/games.yaml index b78bd62..2c56989 100644 --- a/rule-provider/consolidated-services/games.yaml +++ b/rule-provider/consolidated-services/games.yaml @@ -2,6 +2,8 @@ ##FETCH## https://github.com/blackmatrix7/ios_rule_script/blob/master/rule/Clash/Rockstar/Rockstar.yaml payload: + - GEOSITE,category-games-!cn + - DOMAIN,eaasserts-a.akamaihd.net - DOMAIN,originasserts.akamaized.net - DOMAIN,gog.salesmanago.com diff --git a/rule-provider/consolidated-services/libraries.yaml b/rule-provider/consolidated-services/libraries.yaml index 64be6a0..4af931a 100644 --- a/rule-provider/consolidated-services/libraries.yaml +++ b/rule-provider/consolidated-services/libraries.yaml @@ -2,4 +2,6 @@ ##FETCH## payload: + - GEOSITE,category-novel + - DOMAIN-SUFFIX,libgen.li \ No newline at end of file diff --git a/rule-provider/services/gemini.yaml b/rule-provider/services/gemini.yaml index 3b39cab..884cf47 100644 --- a/rule-provider/services/gemini.yaml +++ b/rule-provider/services/gemini.yaml @@ -2,6 +2,8 @@ ##FETCH## payload: + - GEOSITE,google-gemini + - DOMAIN,ai.google.dev - DOMAIN,alkalimakersuite-pa.clients6.google.com - DOMAIN,makersuite.google.com diff --git a/rule-provider/services/google.yaml b/rule-provider/services/google.yaml index d580464..f74de42 100644 --- a/rule-provider/services/google.yaml +++ b/rule-provider/services/google.yaml @@ -4,6 +4,15 @@ payload: - GEOIP,google,no-resolve + - GEOSITE,google + - GEOSITE,google-deepmind + - GEOSITE,google-play + - GEOSITE,google-registry + - GEOSITE,google-registry-tld + - GEOSITE,google-scholar + - GEOSITE,google-trust-services + - GEOSITE,googlefcm) + - DOMAIN,voice.telephony.goog - DOMAIN-SUFFIX,0emm.com - DOMAIN-SUFFIX,1e100.net @@ -700,11 +709,6 @@ payload: - DOMAIN-KEYWORD,gmail - DOMAIN-KEYWORD,google - DOMAIN-KEYWORD,recaptcha - - IP-CIDR,172.110.32.0/21 - - IP-CIDR,173.194.0.0/16 - - IP-CIDR,216.73.80.0/20 - - IP-CIDR,74.125.0.0/16 - - IP-CIDR6,2620:120:e000::/40 - DOMAIN,www.googleapis.com - DOMAIN-SUFFIX,docs.google.com