Browse Source

Update CDN / Domestic / Global Hosts

SukkaW 2 years ago
parent
commit
067d19f488

+ 0 - 6
Build/lib/parse-filter.ts

@@ -78,9 +78,6 @@ export function processHosts(span: Span, hostsUrl: string, mirrors: string[] | n
           lineCb(l);
           lineCb(l);
         }
         }
       } else {
       } else {
-        // Avoid event loop starvation, so we wait for a macrotask before we start fetching.
-        await Promise.resolve();
-
         const filterRules = await childSpan
         const filterRules = await childSpan
           .traceChild('download hosts')
           .traceChild('download hosts')
           .traceAsyncFn(() => fetchAssets(hostsUrl, mirrors).then(text => text.split('\n')));
           .traceAsyncFn(() => fetchAssets(hostsUrl, mirrors).then(text => text.split('\n')));
@@ -198,9 +195,6 @@ export async function processFilterRules(
           lineCb(line);
           lineCb(line);
         }
         }
       } else {
       } else {
-        // Avoid event loop starvation, so we wait for a macrotask before we start fetching.
-        await Promise.resolve();
-
         const filterRules = await span.traceChild('download adguard filter').traceAsyncFn(() => {
         const filterRules = await span.traceChild('download adguard filter').traceAsyncFn(() => {
           return fetchAssets(filterRulesUrl, fallbackUrls).then(text => text.split('\n'));
           return fetchAssets(filterRulesUrl, fallbackUrls).then(text => text.split('\n'));
         });
         });

+ 1 - 0
Build/validate-gfwlist.ts

@@ -89,6 +89,7 @@ export const parseGfwList = async () => {
   };
   };
 
 
   await Promise.all([
   await Promise.all([
+    runAgainstRuleset(path.resolve(import.meta.dir, '../Source/non_ip/global.conf')),
     runAgainstRuleset(path.resolve(import.meta.dir, '../Source/non_ip/global_plus.conf')),
     runAgainstRuleset(path.resolve(import.meta.dir, '../Source/non_ip/global_plus.conf')),
     runAgainstRuleset(path.resolve(import.meta.dir, '../List/non_ip/stream.conf'))
     runAgainstRuleset(path.resolve(import.meta.dir, '../List/non_ip/stream.conf'))
   ]);
   ]);

+ 7 - 0
Source/domainset/cdn.conf

@@ -787,6 +787,7 @@ cdn.wishpond.net
 app.viral-loops.com
 app.viral-loops.com
 widget.cluster.groovehq.com
 widget.cluster.groovehq.com
 bot.ivy.ai
 bot.ivy.ai
+cdn.dotaoutpost.com
 
 
 staticw2.yotpo.com
 staticw2.yotpo.com
 cdn-yotpo-images-production.yotpo.com
 cdn-yotpo-images-production.yotpo.com
@@ -1120,6 +1121,8 @@ info.cloudflare.com
 cf-assets.www.cloudflare.com
 cf-assets.www.cloudflare.com
 .nel.cloudflare.com
 .nel.cloudflare.com
 favicons.teams.cloudflare.com
 favicons.teams.cloudflare.com
+# ByteDance
+sf-flow-web-cdn.ciciai.com
 # Tumblr
 # Tumblr
 assets.tumblr.com
 assets.tumblr.com
 static.tumblr.com
 static.tumblr.com
@@ -1425,6 +1428,8 @@ scripts.dailymail.co.uk
 # washington post
 # washington post
 gfx-data.news-engineering.aws.wapo.pub
 gfx-data.news-engineering.aws.wapo.pub
 talk.washingtonpost.com
 talk.washingtonpost.com
+# booking.com
+.bstatic.com
 # The Guardian
 # The Guardian
 i.guim.co.uk
 i.guim.co.uk
 interactive.guim.co.uk
 interactive.guim.co.uk
@@ -2365,3 +2370,5 @@ cdn.ywxi.net
 .ezocdn.com
 .ezocdn.com
 static.reo.dev
 static.reo.dev
 assets.buttondown.email
 assets.buttondown.email
+.uvcdn.com
+.xda-cdn.com

+ 5 - 0
Source/non_ip/domestic.conf

@@ -146,6 +146,7 @@ DOMAIN-SUFFIX,qy.net
 DOMAIN-SUFFIX,qiyipic.com
 DOMAIN-SUFFIX,qiyipic.com
 
 
 # >> JD
 # >> JD
+DOMAIN-SUFFIX,3.cn
 DOMAIN-SUFFIX,360buyimg.com
 DOMAIN-SUFFIX,360buyimg.com
 DOMAIN-SUFFIX,jd.com
 DOMAIN-SUFFIX,jd.com
 DOMAIN-SUFFIX,jd.com.cn
 DOMAIN-SUFFIX,jd.com.cn
@@ -395,6 +396,8 @@ DOMAIN-SUFFIX,huxiucdn.com
 DOMAIN-SUFFIX,huya.com
 DOMAIN-SUFFIX,huya.com
 DOMAIN-SUFFIX,ibreader.com
 DOMAIN-SUFFIX,ibreader.com
 DOMAIN-SUFFIX,icourse163.org
 DOMAIN-SUFFIX,icourse163.org
+DOMAIN-SUFFIX,ifeng.com
+DOMAIN-SUFFIX,ifengimg.com
 DOMAIN-SUFFIX,infinitynewtab.com
 DOMAIN-SUFFIX,infinitynewtab.com
 DOMAIN-SUFFIX,ithome.com
 DOMAIN-SUFFIX,ithome.com
 DOMAIN-SUFFIX,jianshu.com
 DOMAIN-SUFFIX,jianshu.com
@@ -416,6 +419,8 @@ DOMAIN-SUFFIX,mobike.com
 DOMAIN-SUFFIX,msstatic.com
 DOMAIN-SUFFIX,msstatic.com
 DOMAIN-SUFFIX,mubu.com
 DOMAIN-SUFFIX,mubu.com
 DOMAIN-SUFFIX,myzaker.com
 DOMAIN-SUFFIX,myzaker.com
+DOMAIN-SUFFIX,oray.com
+DOMAIN-SUFFIX,oray-img.com
 DOMAIN-SUFFIX,peiluyou.com
 DOMAIN-SUFFIX,peiluyou.com
 DOMAIN-SUFFIX,pingan.com
 DOMAIN-SUFFIX,pingan.com
 DOMAIN-SUFFIX,pplive.com
 DOMAIN-SUFFIX,pplive.com

+ 5 - 0
Source/non_ip/domestic.ts

@@ -12,6 +12,7 @@ export const DOMESTICS = {
       'aliyun.com',
       'aliyun.com',
       'aliyuncs.com',
       'aliyuncs.com',
       'alikunlun.com',
       'alikunlun.com',
+      'alikunlun.net',
       'cdngslb.com',
       'cdngslb.com',
       'alipay.com',
       'alipay.com',
       'alipay.cn',
       'alipay.cn',
@@ -46,6 +47,7 @@ export const DOMESTICS = {
       'xiami.net',
       'xiami.net',
       'ykimg.com',
       'ykimg.com',
       'youku.com',
       'youku.com',
+      'tudou.com',
       'cibntv.net',
       'cibntv.net',
       'ele.me',
       'ele.me',
       'elemecdn.com',
       'elemecdn.com',
@@ -87,6 +89,7 @@ export const DOMESTICS = {
       'qq.com',
       'qq.com',
       'qq.com.cn',
       'qq.com.cn',
       'qq.wang',
       'qq.wang',
+      'qqmail.cn',
       'qqmail.com',
       'qqmail.com',
       'qzone.com',
       'qzone.com',
       'tencent-cloud.net',
       'tencent-cloud.net',
@@ -127,6 +130,7 @@ export const DOMESTICS = {
       'biliapi.net',
       'biliapi.net',
       'biligame.cn',
       'biligame.cn',
       'biligame.com',
       'biligame.com',
+      'biligame.net',
       'bilicomics.com',
       'bilicomics.com',
       'bilibilipay.cn',
       'bilibilipay.cn',
       'bilibilipay.com'
       'bilibilipay.com'
@@ -206,6 +210,7 @@ export const DOMESTICS = {
       'iqiyi.com',
       'iqiyi.com',
       'iqiyipic.com',
       'iqiyipic.com',
       'baidubce.com',
       'baidubce.com',
+      'bcelive.com',
       'baiducontent.com',
       'baiducontent.com',
       'baidustatic.com',
       'baidustatic.com',
       'bdstatic.com',
       'bdstatic.com',

+ 2 - 1
Source/non_ip/global.conf

@@ -67,6 +67,7 @@ DOMAIN-SUFFIX,github.blog
 DOMAIN-SUFFIX,github.community
 DOMAIN-SUFFIX,github.community
 DOMAIN-SUFFIX,githubstatus.com
 DOMAIN-SUFFIX,githubstatus.com
 DOMAIN-SUFFIX,git.io
 DOMAIN-SUFFIX,git.io
+DOMAIN-SUFFIX,githubapp.com
 
 
 # >> News
 # >> News
 DOMAIN-SUFFIX,globo.com
 DOMAIN-SUFFIX,globo.com
@@ -116,7 +117,7 @@ DOMAIN-SUFFIX,codepen.io
 
 
 DOMAIN-SUFFIX,istatmenus.app
 DOMAIN-SUFFIX,istatmenus.app
 
 
-DOMAIN-SUFFIX,xing.com
+DOMAIN-SUFFIX,themoviedb.org
 
 
 USER-AGENT,Roam*
 USER-AGENT,Roam*
 
 

+ 5 - 0
Source/non_ip/global_plus.conf

@@ -11,8 +11,10 @@ DOMAIN-SUFFIX,appspot.com
 DOMAIN-SUFFIX,blogger.com
 DOMAIN-SUFFIX,blogger.com
 DOMAIN-SUFFIX,blogblog.com
 DOMAIN-SUFFIX,blogblog.com
 DOMAIN-SUFFIX,cloudfunctions.net
 DOMAIN-SUFFIX,cloudfunctions.net
+DOMAIN-SUFFIX,feedburner.com
 DOMAIN-SUFFIX,firebaseio.com
 DOMAIN-SUFFIX,firebaseio.com
 DOMAIN-SUFFIX,getoutline.org
 DOMAIN-SUFFIX,getoutline.org
+DOMAIN-SUFFIX,gcr.io
 DOMAIN-SUFFIX,gvt0.com
 DOMAIN-SUFFIX,gvt0.com
 DOMAIN-SUFFIX,gvt1.com
 DOMAIN-SUFFIX,gvt1.com
 DOMAIN-SUFFIX,gvt2.com
 DOMAIN-SUFFIX,gvt2.com
@@ -166,6 +168,7 @@ DOMAIN-SUFFIX,dailymotion.com
 DOMAIN-SUFFIX,dailymail.co.uk
 DOMAIN-SUFFIX,dailymail.co.uk
 DOMAIN-SUFFIX,deezer.com
 DOMAIN-SUFFIX,deezer.com
 DOMAIN-SUFFIX,deviantart.com
 DOMAIN-SUFFIX,deviantart.com
+DOMAIN-SUFFIX,deviantart.net
 DOMAIN-SUFFIX,disqus.com
 DOMAIN-SUFFIX,disqus.com
 DOMAIN-SUFFIX,dropbox.com
 DOMAIN-SUFFIX,dropbox.com
 DOMAIN-SUFFIX,dropboxapi.com
 DOMAIN-SUFFIX,dropboxapi.com
@@ -234,6 +237,7 @@ DOMAIN-SUFFIX,saucenao.com
 DOMAIN-SUFFIX,scribd.com
 DOMAIN-SUFFIX,scribd.com
 DOMAIN-SUFFIX,shadowsocks.org
 DOMAIN-SUFFIX,shadowsocks.org
 DOMAIN-SUFFIX,shopee.tw
 DOMAIN-SUFFIX,shopee.tw
+DOMAIN-SUFFIX,shutterstock.com
 DOMAIN-SUFFIX,slideshare.net
 DOMAIN-SUFFIX,slideshare.net
 DOMAIN-SUFFIX,soundcloud.com
 DOMAIN-SUFFIX,soundcloud.com
 DOMAIN-SUFFIX,spankbang.com
 DOMAIN-SUFFIX,spankbang.com
@@ -280,6 +284,7 @@ DOMAIN-SUFFIX,wsj.com
 DOMAIN-SUFFIX,wsj.net
 DOMAIN-SUFFIX,wsj.net
 DOMAIN-SUFFIX,xfinity.com
 DOMAIN-SUFFIX,xfinity.com
 DOMAIN-SUFFIX,xhamster.com
 DOMAIN-SUFFIX,xhamster.com
+DOMAIN-SUFFIX,xing.com
 DOMAIN-SUFFIX,xnxx.com
 DOMAIN-SUFFIX,xnxx.com
 DOMAIN-SUFFIX,xvideos.com
 DOMAIN-SUFFIX,xvideos.com
 DOMAIN-SUFFIX,xvideos-cdn.com
 DOMAIN-SUFFIX,xvideos-cdn.com