Merge pull request #6 from DivineEngine/master

Master
4 years ago · d290645a65
parent 11749bd8f2 c7103de79d
commit d290645a65
25 changed files with 48 additions and 2802 deletions
--- a/Clash/RuleSet/China.yaml
+++ b/Clash/RuleSet/China.yaml
@ -295,6 +295,7 @@ payload:
  - DOMAIN-SUFFIX,nim-lang-cn.org
  - DOMAIN-SUFFIX,nvidia.com
  - DOMAIN-SUFFIX,oracle.com
+  - DOMAIN-SUFFIX,originlab.com
  - DOMAIN-SUFFIX,plex.tv
  - DOMAIN-SUFFIX,qdaily.com
  - DOMAIN-SUFFIX,qidian.com
--- a/Clash/RuleSet/Global.yaml
+++ b/Clash/RuleSet/Global.yaml
@ -543,4 +543,5 @@ payload:
  - DOMAIN-SUFFIX,s3.amazonaws.com
  - DOMAIN-SUFFIX,zaobao.com.sg
  - DOMAIN,international-gfe.download.nvidia.com
-  - DOMAIN,ocsp.apple.com
+  - DOMAIN,ocsp.apple.com
+  - DOMAIN,store-images.s-microsoft.com
--- a/Clash/RuleSet/Guard/Advertising.yaml
+++ b/Clash/RuleSet/Guard/Advertising.yaml
@ -131,6 +131,7 @@ payload:
  - DOMAIN-SUFFIX,bulldogcpi.com
  - DOMAIN-SUFFIX,bxsnews.com
  - DOMAIN-SUFFIX,carbonads.net
+  - DOMAIN-SUFFIX,cdj99d.cn
  - DOMAIN-SUFFIX,clotfun.mobi
  - DOMAIN-SUFFIX,clotfun.online
  - DOMAIN-SUFFIX,cloudmobi.net
@ -191,6 +192,7 @@ payload:
  - DOMAIN-SUFFIX,smaato.net
  - DOMAIN-SUFFIX,smartadserver.com
  - DOMAIN-SUFFIX,smartnews-ads.com
+  - DOMAIN-SUFFIX,socdm.com
  - DOMAIN-SUFFIX,supersonic.com
  - DOMAIN-SUFFIX,supersonicads.com
  - DOMAIN-SUFFIX,tagtic.cn
@ -239,7 +241,6 @@ payload:

  - DOMAIN-SUFFIX,ad.cmvideo.cn
  - DOMAIN-SUFFIX,ad.daum.net
-  - DOMAIN-SUFFIX,aiseet.atianqi.com

  - DOMAIN,abema-adx.ameba.jp
  - DOMAIN,ad.12306.cn
@ -248,7 +249,6 @@ payload:
  - DOMAIN,ad.huajiao.com
  - DOMAIN,ad.hzyoka.com
  - DOMAIN,ad.jiemian.com
-  - DOMAIN,ad.toutiao.com
  - DOMAIN,ad.wappalyzer.com
  - DOMAIN,ad-cn.jovcloud.com
  - DOMAIN,ads.adadapted.com
@ -265,7 +265,6 @@ payload:
  - DOMAIN,adv.ettoday.net
  - DOMAIN,api.adnet.mob.com
  - DOMAIN,api-ad.kajicam.com
-  - DOMAIN,app-ad.variflight.com
  - DOMAIN,appnext.hs.llnwd.net
  - DOMAIN,appnext-a.akamaihd.net
  - DOMAIN,business-cdn.shouji.sogou.com
@ -331,6 +330,10 @@ payload:
  - IP-CIDR,101.227.200.28/32,no-resolve
  - IP-CIDR,124.192.153.42/32,no-resolve
  # ------
+  # > ByteDance
+  - DOMAIN-SUFFIX,pangolin-sdk-toutiao.com
+  - DOMAIN,ad.toutiao.com
+  - DOMAIN,pangolin.snssdk.com
  # > baicizhan
  - DOMAIN,advertise.baicizhan.com
  - DOMAIN,advertise.baicizhan.org
@ -518,6 +521,12 @@ payload:
  - DOMAIN,adsp.xunlei.com
  - DOMAIN,etl.xlmc.sandai.net

+  # (V)
+  # > VariFlight
+  - DOMAIN,adv-adlog.variflight.com
+  - DOMAIN,adv-ads.variflight.com
+  - DOMAIN,app-ad.variflight.com
+
  # (X)
  # > Ximalaya
  - DOMAIN,ad.ximalaya.com
@ -546,6 +555,9 @@ payload:

  # (Z)
  # > Zhihu
+  # USER-AGENT,AVOS*
+  - DOMAIN,appcloud2.zhihu.com
+  - DOMAIN,appcloud2.in.zhihu.com
  - DOMAIN,sugar.zhihu.com
  - IP-CIDR,118.89.204.198/32,no-resolve
  # > ZOL
--- a/Clash/RuleSet/StreamingMedia/Streaming.yaml
+++ b/Clash/RuleSet/StreamingMedia/Streaming.yaml
@ -71,9 +71,7 @@ payload:
  - DOMAIN,d27xxe7juh1us6.cloudfront.net
  - DOMAIN-KEYWORD,avoddashs
  # > Apple TV
-  - DOMAIN-SUFFIX,tv.apple.com
-  - DOMAIN,hls.itunes.apple.com
-  - DOMAIN,hls-amt.itunes.apple.com
+  - DOMAIN,linear.tv.apple.com
  - DOMAIN,play-edge.itunes.apple.com
  # > Bahamut
  - PROCESS-NAME,tw.com.gamer.android.animad
@ -223,7 +221,6 @@ payload:
  - DOMAIN-SUFFIX,dmc.nico
  - DOMAIN-SUFFIX,nicovideo.jp
  - DOMAIN-SUFFIX,nimg.jp
-  - DOMAIN-SUFFIX,socdm.com
  # > Now E
  - PROCESS-NAME,com.pccw.nowemobile
  - DOMAIN-SUFFIX,nowe.com
--- a/Clash/RuleSet/StreamingMedia/StreamingSE.yaml
+++ b/Clash/RuleSet/StreamingMedia/StreamingSE.yaml
@ -17,6 +17,8 @@ payload:
  - IP-CIDR,118.26.32.0/23,no-resolve
  - IP-CIDR,118.26.120.0/24,no-resolve
  - IP-CIDR,223.119.62.225/28,no-resolve
+  - IP-CIDR,23.40.242.10/32,no-resolve
+  - IP-CIDR,23.40.241.251/32,no-resolve
  # > 芒果TV国际
  - DOMAIN-SUFFIX,api.mgtv.com
  # > WeTV
--- a/Clash/RuleSet/StreamingMedia/Video/niconico.yaml
+++ b/Clash/RuleSet/StreamingMedia/Video/niconico.yaml
@ -3,5 +3,4 @@ payload:
  - PROCESS-NAME,jp.nicovideo.android
  - DOMAIN-SUFFIX,dmc.nico
  - DOMAIN-SUFFIX,nicovideo.jp
-  - DOMAIN-SUFFIX,nimg.jp
-  - DOMAIN-SUFFIX,socdm.com
+  - DOMAIN-SUFFIX,nimg.jp
--- a/Quantumult/Filter/China.list
+++ b/Quantumult/Filter/China.list
@ -296,6 +296,7 @@ DOMAIN-SUFFIX,myzaker.com,DIRECT
 DOMAIN-SUFFIX,nim-lang-cn.org,DIRECT
 DOMAIN-SUFFIX,nvidia.com,DIRECT
 DOMAIN-SUFFIX,oracle.com,DIRECT
+DOMAIN-SUFFIX,originlab.com,DIRECT
 DOMAIN-SUFFIX,plex.tv,DIRECT
 DOMAIN-SUFFIX,qdaily.com,DIRECT
 DOMAIN-SUFFIX,qidian.com,DIRECT
--- a/Quantumult/Filter/Global.list
+++ b/Quantumult/Filter/Global.list
@ -532,4 +532,5 @@ DOMAIN-SUFFIX,metapix.net,PROXY
 DOMAIN-SUFFIX,s3.amazonaws.com,PROXY
 DOMAIN-SUFFIX,zaobao.com.sg,PROXY
 DOMAIN,international-gfe.download.nvidia.com,PROXY
-DOMAIN,ocsp.apple.com,PROXY
+DOMAIN,ocsp.apple.com,PROXY
+DOMAIN,store-images.s-microsoft.com,PROXY
--- a/Quantumult/Filter/Guard/Advertising.list
+++ b/Quantumult/Filter/Guard/Advertising.list
@ -191,6 +191,7 @@ DOMAIN-SUFFIX,shuzilm.cn,REJECT
 DOMAIN-SUFFIX,smaato.net,REJECT
 DOMAIN-SUFFIX,smartadserver.com,REJECT
 DOMAIN-SUFFIX,smartnews-ads.com,REJECT
+DOMAIN-SUFFIX,socdm.com,REJECT
 DOMAIN-SUFFIX,supersonic.com,REJECT
 DOMAIN-SUFFIX,supersonicads.com,REJECT
 DOMAIN-SUFFIX,tagtic.cn,REJECT
@ -239,7 +240,6 @@ DOMAIN-SUFFIX,zumobi.com,REJECT

 DOMAIN-SUFFIX,ad.cmvideo.cn,REJECT
 DOMAIN-SUFFIX,ad.daum.net,REJECT
-DOMAIN-SUFFIX,aiseet.atianqi.com,REJECT

 DOMAIN,abema-adx.ameba.jp,REJECT
 DOMAIN,ad.12306.cn,REJECT
--- a/Quantumult/Filter/StreamingMedia/Streaming.list
+++ b/Quantumult/Filter/StreamingMedia/Streaming.list
@ -70,9 +70,7 @@ DOMAIN,d1v5ir2lpwr8os.cloudfront.net,Streaming
 DOMAIN,d27xxe7juh1us6.cloudfront.net,Streaming
 DOMAIN-KEYWORD,avoddashs,Streaming
 # > Apple TV
-DOMAIN-SUFFIX,tv.apple.com,Streaming
-DOMAIN,hls.itunes.apple.com,Streaming
-DOMAIN,hls-amt.itunes.apple.com,Streaming
+DOMAIN,linear.tv.apple.com,Streaming
 DOMAIN,play-edge.itunes.apple.com,Streaming
 # > Bahamut
 USER-AGENT,Anime*,Streaming
@ -221,7 +219,6 @@ USER-AGENT,Niconico*,Streaming
 DOMAIN-SUFFIX,dmc.nico,Streaming
 DOMAIN-SUFFIX,nicovideo.jp,Streaming
 DOMAIN-SUFFIX,nimg.jp,Streaming
-DOMAIN-SUFFIX,socdm.com,Streaming
 # > Now E
 DOMAIN-SUFFIX,nowe.com,Streaming
 DOMAIN-SUFFIX,nowestatic.com,Streaming
--- a/Quantumult/Filter/StreamingMedia/StreamingSE.list
+++ b/Quantumult/Filter/StreamingMedia/StreamingSE.list
@ -18,6 +18,8 @@ IP-CIDR,103.44.56.0/22,StreamingSE
 IP-CIDR,118.26.32.0/23,StreamingSE
 IP-CIDR,118.26.120.0/24,StreamingSE
 IP-CIDR,223.119.62.225/28,StreamingSE
+IP-CIDR,23.40.242.10/32,StreamingSE
+IP-CIDR,23.40.241.251/32,StreamingSE
 # > 芒果TV国际
 DOMAIN-SUFFIX,api.mgtv.com,StreamingSE
 # > WeTV
--- a/Quantumult/Filter/StreamingMedia/Video/niconico.list
+++ b/Quantumult/Filter/StreamingMedia/Video/niconico.list
@ -2,5 +2,4 @@
 USER-AGENT,Niconico*,niconico
 DOMAIN-SUFFIX,dmc.nico,niconico
 DOMAIN-SUFFIX,nicovideo.jp,niconico
-DOMAIN-SUFFIX,nimg.jp,niconico
-DOMAIN-SUFFIX,socdm.com,niconico
+DOMAIN-SUFFIX,nimg.jp,niconico
--- a/Quantumult/Outbound.conf
+++ b/Quantumult/Outbound.conf
@ -21,7 +21,7 @@ server_check_url=http://www.gstatic.com/generate_204

 # DNS 排除列表
 # dns_exclusion_list 包含了禁用占位符 IP (240.*) 的域，不在 dns_exclusion_list 中的域都启用了占位符 IP，并打开了 resolve-on-remote 设置。
-dns_exclusion_list=*.cmpassport.com, *.jegotrip.com.cn, *.icitymobile.mobi, id6.me, *.icitymobile.mobi, *.pingan.com.cn, *.cmbchina.com, *.localnetwork.uop, mfs.ykimg.com*.ttf
+dns_exclusion_list=*.cmpassport.com, *.jegotrip.com.cn, *.icitymobile.mobi, id6.me, *.icitymobile.mobi, *.pingan.com.cn, *.cmbchina.com

 # Quantumult 将不会处理到 excluded_routes 的流量。修改后最好重新启动您的设备。
 ;excluded_routes=192.168.0.0/16, 172.16.0.0/12, 100.64.0.0/10, 10.0.0.0/8
@ -54,12 +54,11 @@ dns_exclusion_list=*.cmpassport.com, *.jegotrip.com.cn, *.icitymobile.mobi, id6.
 # 当设置「no-ipv6」时，Quanumult X Tunnel 的 DNS 模块会直接让 AAAA 查询失败。
 no-ipv6

-# 第三方 DNS
+# 自定义 DNS
+# > DNSPod Public DNS
 server=119.29.29.29
-# 电信
-# server=118.118.118.118
-# 联通
-# server=116.116.116.116
+# > Alibaba Public DNS
+# server=223.5.5.5

 # 本地 DNS 映射
 # Firebase Cloud Messaging
--- a/Surge/Module/Unlock/TikTokJP.sgmodule
+++ b/Surge/Module/Unlock/TikTokJP.sgmodule
@ -1,13 +0,0 @@
-#!name=Unlock TikTok JP
-#!desc=Make Your Day - By wzw1997007 & Choler.Version < 17.9.0.
-#!system=ios
-
-[URL Rewrite]
-^https://api[\w-]*?.tiktokv.com/aweme/v\d/policy/notice/? - reject
-
-(?<=_region=)CN(?=&) JP 307
-(?<=&app_version=)1[6-9]..(?=.?.?&) 100. 307
-(?<=\?version_code=)1[6-9]..(?=.?.?&) 100. 307
-
-[MITM]
-hostname = %INSERT% *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com
--- a/Surge/Module/Unlock/TikTokKR.sgmodule
+++ b/Surge/Module/Unlock/TikTokKR.sgmodule
@ -1,13 +0,0 @@
-#!name=Unlock TikTok KR
-#!desc=Make Your Day - By wzw1997007 & Choler.Version < 17.9.0.
-#!system=ios
-
-[URL Rewrite]
-^https://api[\w-]*?.tiktokv.com/aweme/v\d/policy/notice/? - reject
-
-(?<=_region=)CN(?=&) KR 307
-(?<=&app_version=)1[6-9]..(?=.?.?&) 100. 307
-(?<=\?version_code=)1[6-9]..(?=.?.?&) 100. 307
-
-[MITM]
-hostname = %INSERT% *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com
--- a/Surge/Module/Unlock/TikTokTW.sgmodule
+++ b/Surge/Module/Unlock/TikTokTW.sgmodule
@ -1,13 +0,0 @@
-#!name=Unlock TikTok TW
-#!desc=Make Your Day - By wzw1997007 & Choler.Version < 17.9.0.
-#!system=ios
-
-[URL Rewrite]
-^https://api[\w-]*?.tiktokv.com/aweme/v\d/policy/notice/? - reject
-
-(?<=_region=)CN(?=&) TW 307
-(?<=&app_version=)1[6-9]..(?=.?.?&) 100. 307
-(?<=\?version_code=)1[6-9]..(?=.?.?&) 100. 307
-
-[MITM]
-hostname = %INSERT% *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com
--- a/Surge/Module/Unlock/TikTokUK.sgmodule
+++ b/Surge/Module/Unlock/TikTokUK.sgmodule
@ -1,13 +0,0 @@
-#!name=Unlock TikTok UK
-#!desc=Make Your Day - By wzw1997007 & Choler.Version < 17.9.0.
-#!system=ios
-
-[URL Rewrite]
-^https://api[\w-]*?.tiktokv.com/aweme/v\d/policy/notice/? - reject
-
-(?<=_region=)CN(?=&) UK 307
-(?<=&app_version=)1[6-9]..(?=.?.?&) 100. 307
-(?<=\?version_code=)1[6-9]..(?=.?.?&) 100. 307
-
-[MITM]
-hostname = %INSERT% *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com
--- a/Surge/Outbound.conf
+++ b/Surge/Outbound.conf
@ -11,6 +11,8 @@ proxy-test-url = http://www.gstatic.com/generate_204
 # test-timeout = 5
 # TLS 引擎
 tls-provider = openssl
+# GeoIP 数据库
+geoip-maxmind-url = https://raw.githubusercontent.com/JMVoid/ipip2mmdb/release/Country.mmdb
 # IPv6 支持（关闭）
 ipv6 = false
 # ------
@ -31,7 +33,7 @@ wifi-access-socks5-port = 6153
 # 兼容模式
 # compatibility-mode = 0
 # 跳过代理
-skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local, mfs.ykimg.com*.ttf
+skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
 # 排除简单主机名
 exclude-simple-hostnames = true
 # SSID 组策略
@ -112,8 +114,6 @@ hide-udp=0
 🎞Streaming = select,🌑Proxy,🕹AutoTest,🦆DuckDuckGo
 # 中国流媒体服务（面向海外版本）
 🎞StreamingSE = select,🌐Direct,🇭🇰Sandbox
-# 游戏模式（⚠️所用节点需开启 UDP 转发支持）
-# 🎮Game = select,🌐Direct,🇭🇰Sandbox
 # 防御
 🛡Guard = select,⛔️Reject,🌐Direct
 # 可用性自动测试
@ -172,12 +172,8 @@ RULE-SET,https://raw.githubusercontent.com/DivineEngine/Profiles/master/Surge/Ru
 # Local Area Network 局域网
 RULE-SET,LAN,🌐Direct

-# 使用来自 ipipdotnet 的 ChinaIP 以解决数据不准确的问题，使用 ChinaIP.list 时禁用「GEOIP,CN」规则
-RULE-SET,https://raw.githubusercontent.com/DivineEngine/Profiles/master/Surge/Ruleset/Extra/ChinaIP.list,🌐Direct
-# GeoIP China(若启用，则禁用 ChinaIP.list)
-# GEOIP,CN,🌐Direct
-
-# RULE-SET,https://raw.githubusercontent.com/DivineEngine/Profiles/master/Surge/Ruleset/Extra/Game/Game.list,🎮Game
+# GeoIP China
+GEOIP,CN,🌐Direct

 FINAL,🧭Final,dns-failed

@ -258,13 +254,6 @@ mtalk.google.com = 108.177.125.188
 ^(http|https):\/\/(www.)?yuanchengxiezuo\.com\/ https://www.teamviewer.com/ 302
 ^(http|https):\/\/(www.)?zbrushcn.com/ https://pixologic.com/ 302

-# TikTok - *.tiktokv.com, *.byteoversea.com, *.musical.ly, *.snssdk.com
-# ^https://api[\w-]*?.tiktokv.com/aweme/v\d/policy/notice/? - reject
-
-# (?<=_region=)CN(?=&) JP 307
-# (?<=&app_version=)1[6-9]..(?=.?.?&) 100. 307
-# (?<=\?version_code=)1[6-9]..(?=.?.?&) 100. 307
-
 # AbeamTV - api.abema.io
 ^(http|https):\/\/api\.abema\.io\/v\d\/ip\/check - reject

--- a/Surge/OutboundLegacy.conf
+++ b/Surge/OutboundLegacy.conf
--- a/Surge/Ruleset/China.list
+++ b/Surge/Ruleset/China.list
@ -296,6 +296,7 @@ DOMAIN-SUFFIX,myzaker.com
 DOMAIN-SUFFIX,nim-lang-cn.org
 DOMAIN-SUFFIX,nvidia.com
 DOMAIN-SUFFIX,oracle.com
+DOMAIN-SUFFIX,originlab.com
 DOMAIN-SUFFIX,plex.tv
 DOMAIN-SUFFIX,qdaily.com
 DOMAIN-SUFFIX,qidian.com
--- a/Surge/Ruleset/Global.list
+++ b/Surge/Ruleset/Global.list
@ -542,4 +542,5 @@ DOMAIN-SUFFIX,metapix.net
 DOMAIN-SUFFIX,s3.amazonaws.com
 DOMAIN-SUFFIX,zaobao.com.sg
 DOMAIN,international-gfe.download.nvidia.com
-DOMAIN,ocsp.apple.com
+DOMAIN,ocsp.apple.com
+DOMAIN,store-images.s-microsoft.com
--- a/Surge/Ruleset/Guard/Advertising.list
+++ b/Surge/Ruleset/Guard/Advertising.list
@ -191,6 +191,7 @@ DOMAIN-SUFFIX,shuzilm.cn
 DOMAIN-SUFFIX,smaato.net
 DOMAIN-SUFFIX,smartadserver.com
 DOMAIN-SUFFIX,smartnews-ads.com
+DOMAIN-SUFFIX,socdm.com
 DOMAIN-SUFFIX,supersonic.com
 DOMAIN-SUFFIX,supersonicads.com
 DOMAIN-SUFFIX,tagtic.cn
@ -239,7 +240,6 @@ DOMAIN-SUFFIX,zumobi.com

 DOMAIN-SUFFIX,ad.cmvideo.cn
 DOMAIN-SUFFIX,ad.daum.net
-DOMAIN-SUFFIX,aiseet.atianqi.com

 DOMAIN,abema-adx.ameba.jp
 DOMAIN,ad.12306.cn
--- a/Surge/Ruleset/StreamingMedia/Streaming.list
+++ b/Surge/Ruleset/StreamingMedia/Streaming.list
@ -70,9 +70,7 @@ DOMAIN,d1v5ir2lpwr8os.cloudfront.net
 DOMAIN,d27xxe7juh1us6.cloudfront.net
 DOMAIN-KEYWORD,avoddashs
 # > Apple TV
-DOMAIN-SUFFIX,tv.apple.com
-DOMAIN,hls.itunes.apple.com
-DOMAIN,hls-amt.itunes.apple.com
+DOMAIN,linear.tv.apple.com
 DOMAIN,play-edge.itunes.apple.com
 # > Bahamut
 USER-AGENT,Anime*
@ -221,7 +219,6 @@ USER-AGENT,Niconico*
 DOMAIN-SUFFIX,dmc.nico
 DOMAIN-SUFFIX,nicovideo.jp
 DOMAIN-SUFFIX,nimg.jp
-DOMAIN-SUFFIX,socdm.com
 # > Now E
 DOMAIN-SUFFIX,nowe.com
 DOMAIN-SUFFIX,nowestatic.com
--- a/Surge/Ruleset/StreamingMedia/StreamingSE.list
+++ b/Surge/Ruleset/StreamingMedia/StreamingSE.list
@ -16,6 +16,8 @@ IP-CIDR,103.44.56.0/22,no-resolve
 IP-CIDR,118.26.32.0/23,no-resolve
 IP-CIDR,118.26.120.0/24,no-resolve
 IP-CIDR,223.119.62.225/28,no-resolve
+IP-CIDR,23.40.242.10/32,no-resolve
+IP-CIDR,23.40.241.251/32,no-resolve
 # > 芒果TV国际
 DOMAIN-SUFFIX,api.mgtv.com
 # > WeTV
--- a/Surge/Ruleset/StreamingMedia/Video/niconico.list
+++ b/Surge/Ruleset/StreamingMedia/Video/niconico.list
@ -2,5 +2,4 @@
 USER-AGENT,Niconico*
 DOMAIN-SUFFIX,dmc.nico
 DOMAIN-SUFFIX,nicovideo.jp
-DOMAIN-SUFFIX,nimg.jp
-DOMAIN-SUFFIX,socdm.com
+DOMAIN-SUFFIX,nimg.jp