diff --git a/Build/lib/parse-filter.ts b/Build/lib/parse-filter.ts index ddbfdab6..a5fb6402 100644 --- a/Build/lib/parse-filter.ts +++ b/Build/lib/parse-filter.ts @@ -78,9 +78,6 @@ export function processHosts(span: Span, hostsUrl: string, mirrors: string[] | n lineCb(l); } } else { - // Avoid event loop starvation, so we wait for a macrotask before we start fetching. - await Promise.resolve(); - const filterRules = await childSpan .traceChild('download hosts') .traceAsyncFn(() => fetchAssets(hostsUrl, mirrors).then(text => text.split('\n'))); @@ -198,9 +195,6 @@ export async function processFilterRules( lineCb(line); } } 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(() => { return fetchAssets(filterRulesUrl, fallbackUrls).then(text => text.split('\n')); }); diff --git a/Build/validate-gfwlist.ts b/Build/validate-gfwlist.ts index 72c25b4a..6eb8f87b 100644 --- a/Build/validate-gfwlist.ts +++ b/Build/validate-gfwlist.ts @@ -89,6 +89,7 @@ export const parseGfwList = async () => { }; 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, '../List/non_ip/stream.conf')) ]); diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf index 3ae82302..7c1e9575 100644 --- a/Source/domainset/cdn.conf +++ b/Source/domainset/cdn.conf @@ -787,6 +787,7 @@ cdn.wishpond.net app.viral-loops.com widget.cluster.groovehq.com bot.ivy.ai +cdn.dotaoutpost.com staticw2.yotpo.com cdn-yotpo-images-production.yotpo.com @@ -1120,6 +1121,8 @@ info.cloudflare.com cf-assets.www.cloudflare.com .nel.cloudflare.com favicons.teams.cloudflare.com +# ByteDance +sf-flow-web-cdn.ciciai.com # Tumblr assets.tumblr.com static.tumblr.com @@ -1425,6 +1428,8 @@ scripts.dailymail.co.uk # washington post gfx-data.news-engineering.aws.wapo.pub talk.washingtonpost.com +# booking.com +.bstatic.com # The Guardian i.guim.co.uk interactive.guim.co.uk @@ -2365,3 +2370,5 @@ cdn.ywxi.net .ezocdn.com static.reo.dev assets.buttondown.email +.uvcdn.com +.xda-cdn.com diff --git a/Source/non_ip/domestic.conf b/Source/non_ip/domestic.conf index 06daea10..1d7d201e 100644 --- a/Source/non_ip/domestic.conf +++ b/Source/non_ip/domestic.conf @@ -146,6 +146,7 @@ DOMAIN-SUFFIX,qy.net DOMAIN-SUFFIX,qiyipic.com # >> JD +DOMAIN-SUFFIX,3.cn DOMAIN-SUFFIX,360buyimg.com DOMAIN-SUFFIX,jd.com DOMAIN-SUFFIX,jd.com.cn @@ -395,6 +396,8 @@ DOMAIN-SUFFIX,huxiucdn.com DOMAIN-SUFFIX,huya.com DOMAIN-SUFFIX,ibreader.com DOMAIN-SUFFIX,icourse163.org +DOMAIN-SUFFIX,ifeng.com +DOMAIN-SUFFIX,ifengimg.com DOMAIN-SUFFIX,infinitynewtab.com DOMAIN-SUFFIX,ithome.com DOMAIN-SUFFIX,jianshu.com @@ -416,6 +419,8 @@ DOMAIN-SUFFIX,mobike.com DOMAIN-SUFFIX,msstatic.com DOMAIN-SUFFIX,mubu.com DOMAIN-SUFFIX,myzaker.com +DOMAIN-SUFFIX,oray.com +DOMAIN-SUFFIX,oray-img.com DOMAIN-SUFFIX,peiluyou.com DOMAIN-SUFFIX,pingan.com DOMAIN-SUFFIX,pplive.com diff --git a/Source/non_ip/domestic.ts b/Source/non_ip/domestic.ts index d7b799b7..f29060d4 100644 --- a/Source/non_ip/domestic.ts +++ b/Source/non_ip/domestic.ts @@ -12,6 +12,7 @@ export const DOMESTICS = { 'aliyun.com', 'aliyuncs.com', 'alikunlun.com', + 'alikunlun.net', 'cdngslb.com', 'alipay.com', 'alipay.cn', @@ -46,6 +47,7 @@ export const DOMESTICS = { 'xiami.net', 'ykimg.com', 'youku.com', + 'tudou.com', 'cibntv.net', 'ele.me', 'elemecdn.com', @@ -87,6 +89,7 @@ export const DOMESTICS = { 'qq.com', 'qq.com.cn', 'qq.wang', + 'qqmail.cn', 'qqmail.com', 'qzone.com', 'tencent-cloud.net', @@ -127,6 +130,7 @@ export const DOMESTICS = { 'biliapi.net', 'biligame.cn', 'biligame.com', + 'biligame.net', 'bilicomics.com', 'bilibilipay.cn', 'bilibilipay.com' @@ -206,6 +210,7 @@ export const DOMESTICS = { 'iqiyi.com', 'iqiyipic.com', 'baidubce.com', + 'bcelive.com', 'baiducontent.com', 'baidustatic.com', 'bdstatic.com', diff --git a/Source/non_ip/global.conf b/Source/non_ip/global.conf index 74031f9e..8ac82486 100644 --- a/Source/non_ip/global.conf +++ b/Source/non_ip/global.conf @@ -67,6 +67,7 @@ DOMAIN-SUFFIX,github.blog DOMAIN-SUFFIX,github.community DOMAIN-SUFFIX,githubstatus.com DOMAIN-SUFFIX,git.io +DOMAIN-SUFFIX,githubapp.com # >> News DOMAIN-SUFFIX,globo.com @@ -116,7 +117,7 @@ DOMAIN-SUFFIX,codepen.io DOMAIN-SUFFIX,istatmenus.app -DOMAIN-SUFFIX,xing.com +DOMAIN-SUFFIX,themoviedb.org USER-AGENT,Roam* diff --git a/Source/non_ip/global_plus.conf b/Source/non_ip/global_plus.conf index a6d7d685..1742a88b 100644 --- a/Source/non_ip/global_plus.conf +++ b/Source/non_ip/global_plus.conf @@ -11,8 +11,10 @@ DOMAIN-SUFFIX,appspot.com DOMAIN-SUFFIX,blogger.com DOMAIN-SUFFIX,blogblog.com DOMAIN-SUFFIX,cloudfunctions.net +DOMAIN-SUFFIX,feedburner.com DOMAIN-SUFFIX,firebaseio.com DOMAIN-SUFFIX,getoutline.org +DOMAIN-SUFFIX,gcr.io DOMAIN-SUFFIX,gvt0.com DOMAIN-SUFFIX,gvt1.com DOMAIN-SUFFIX,gvt2.com @@ -166,6 +168,7 @@ DOMAIN-SUFFIX,dailymotion.com DOMAIN-SUFFIX,dailymail.co.uk DOMAIN-SUFFIX,deezer.com DOMAIN-SUFFIX,deviantart.com +DOMAIN-SUFFIX,deviantart.net DOMAIN-SUFFIX,disqus.com DOMAIN-SUFFIX,dropbox.com DOMAIN-SUFFIX,dropboxapi.com @@ -234,6 +237,7 @@ DOMAIN-SUFFIX,saucenao.com DOMAIN-SUFFIX,scribd.com DOMAIN-SUFFIX,shadowsocks.org DOMAIN-SUFFIX,shopee.tw +DOMAIN-SUFFIX,shutterstock.com DOMAIN-SUFFIX,slideshare.net DOMAIN-SUFFIX,soundcloud.com DOMAIN-SUFFIX,spankbang.com @@ -280,6 +284,7 @@ DOMAIN-SUFFIX,wsj.com DOMAIN-SUFFIX,wsj.net DOMAIN-SUFFIX,xfinity.com DOMAIN-SUFFIX,xhamster.com +DOMAIN-SUFFIX,xing.com DOMAIN-SUFFIX,xnxx.com DOMAIN-SUFFIX,xvideos.com DOMAIN-SUFFIX,xvideos-cdn.com