diff --git a/Build/build-speedtest-domainset.ts b/Build/build-speedtest-domainset.ts index 07aaef4b..32c20400 100644 --- a/Build/build-speedtest-domainset.ts +++ b/Build/build-speedtest-domainset.ts @@ -172,7 +172,9 @@ export const buildSpeedtestDomainSet = task(import.meta.path, async (span) => { // Google Fiber legacy speedtest site (new fiber speedtest use speedtestcustom.com) '.speed.googlefiber.net', // librespeed - '.backend.librespeed.org' + '.backend.librespeed.org', + // Apple, + 'mensura.cdn-apple.com' // From netQuality command ]); await span.traceChildAsync('fetch previous speedtest domainset', async () => { diff --git a/Build/validate-gfwlist.ts b/Build/validate-gfwlist.ts index 1f26fd7b..1e9d6903 100644 --- a/Build/validate-gfwlist.ts +++ b/Build/validate-gfwlist.ts @@ -1,8 +1,8 @@ import { processLine } from './lib/process-line'; import { normalizeDomain } from './lib/normalize-domain'; import { createTrie } from './lib/trie'; -import { Readable } from 'stream'; -import { parse } from 'csv-parse'; +// import { Readable } from 'stream'; +import { parse } from 'csv-parse/sync'; import { readFileByLine } from './lib/fetch-text-by-line'; import path from 'path'; @@ -56,12 +56,25 @@ export const parseGfwList = async () => { const top500Gfwed = new Set(); - const res = await fetch('https://radar.cloudflare.com/charts/LargerTopDomainsTable/attachment?id=1077&top=10000'); - const stream = Readable.fromWeb(res.body!).pipe(parse()); + const res = await (await fetch('https://radar.cloudflare.com/charts/LargerTopDomainsTable/attachment?id=1077&top=10000', { + headers: { + accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', + 'accept-language': 'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,zh-TW;q=0.6,es;q=0.5', + 'sec-ch-ua': '"Google Chrome";v="123", "Not:A-Brand";v="8", "Chromium";v="123"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"macOS"', + 'sec-fetch-dest': 'document', + 'sec-fetch-mode': 'navigate', + 'sec-fetch-site': 'none', + 'sec-fetch-user': '?1', + 'upgrade-insecure-requests': '1' + } + })).text(); + const topDomains = parse(res); const trie = createTrie(blackSet); - for await (const [domain] of stream) { + for await (const [domain] of topDomains) { if (trie.has(domain)) { top500Gfwed.add(domain); } diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf index c1970edc..4d4c7a72 100644 --- a/Source/domainset/cdn.conf +++ b/Source/domainset/cdn.conf @@ -625,6 +625,7 @@ img.hcloud.lat www.datocms-assets.com images.pexels.com image.nmb.best +img.urlnode.com # >> Shopify cdn.shopify.com @@ -754,7 +755,6 @@ cdn.calibermind.com cdn.livechatinc.com assets.canny.io assets2.canny.io -cdn.neverbounce.com assets.poool.fr cdns.gigya.com disco.headliner.link @@ -811,6 +811,8 @@ widget.uservoice.com cdnjs.buymeacoffee.com .cdn.getfeedback.com assets.positional-bucket.com +js.chilipiper.com +cdn.neverbounce.com cdn.transcend.io .transcend-cdn.com @@ -2463,3 +2465,5 @@ assets.sitescdn.net i.xozilla.xxx cdn.myfonts.net static-community.tp-link.com +.sxccdn.com +.ttcache.com diff --git a/Source/domainset/reject_sukka.conf b/Source/domainset/reject_sukka.conf index 229d4e0a..a9184dcb 100644 --- a/Source/domainset/reject_sukka.conf +++ b/Source/domainset/reject_sukka.conf @@ -575,7 +575,6 @@ tags.rfa.org t.ghostboard.io jobs.date-fns.org adm.meiguo.com -tags.rfa.org t.ghostboard.io .youxiaoad.com diff --git a/Source/non_ip/domestic.conf b/Source/non_ip/domestic.conf index b1696dc4..ed868cf1 100644 --- a/Source/non_ip/domestic.conf +++ b/Source/non_ip/domestic.conf @@ -383,6 +383,7 @@ DOMAIN-SUFFIX,air-matters.io DOMAIN-SUFFIX,ali213.net DOMAIN-SUFFIX,anjuke.com DOMAIN-SUFFIX,appsimg.com +DOMAIN-SUFFIX,asus.com.cn DOMAIN-SUFFIX,autohome.com.cn DOMAIN-SUFFIX,authing.cn DOMAIN-SUFFIX,authing.co @@ -430,6 +431,7 @@ DOMAIN-SUFFIX,eudic.net DOMAIN-SUFFIX,fang.com DOMAIN-SUFFIX,feng.com DOMAIN-SUFFIX,fengkongcloud.com +DOMAIN-SUFFIX,firefox.com.cn DOMAIN-SUFFIX,frdic.com DOMAIN-SUFFIX,futu5.com DOMAIN-SUFFIX,futunn.com @@ -478,6 +480,7 @@ DOMAIN-SUFFIX,mihoyo.com DOMAIN-SUFFIX,miyoushe.com DOMAIN-SUFFIX,mobike.com DOMAIN-SUFFIX,mobileservice.cn +DOMAIN-SUFFIX,moegirl.org.cn DOMAIN-SUFFIX,msstatic.com DOMAIN-SUFFIX,mubu.com DOMAIN-SUFFIX,myzaker.com diff --git a/Source/non_ip/global.conf b/Source/non_ip/global.conf index 13f31f93..230912ca 100644 --- a/Source/non_ip/global.conf +++ b/Source/non_ip/global.conf @@ -53,12 +53,14 @@ DOMAIN-SUFFIX,gwtproject.org DOMAIN-SUFFIX,itasoftware.com DOMAIN-SUFFIX,madewithcode.com DOMAIN-SUFFIX,material.io +DOMAIN-SUFFIX,page.link DOMAIN-SUFFIX,polymer-project.org DOMAIN-SUFFIX,recaptcha.net DOMAIN-SUFFIX,shattered.io DOMAIN-SUFFIX,synergyse.com DOMAIN-SUFFIX,tensorflow.org DOMAIN-SUFFIX,tiltbrush.com +DOMAIN-SUFFIX,translate.goog DOMAIN-SUFFIX,waveprotocol.org DOMAIN-SUFFIX,waymo.com DOMAIN-SUFFIX,webmproject.org @@ -115,6 +117,10 @@ DOMAIN-SUFFIX,github.community DOMAIN-SUFFIX,githubstatus.com DOMAIN-SUFFIX,git.io DOMAIN-SUFFIX,githubapp.com +DOMAIN-SUFFIX,githubusercontent.com +DOMAIN-SUFFIX,github.io +DOMAIN-SUFFIX,githubapp.com +DOMAIN-SUFFIX,githubassets.com # >> News DOMAIN-SUFFIX,globo.com @@ -249,6 +255,7 @@ DOMAIN-SUFFIX,apk-dl.com DOMAIN-SUFFIX,apkmirror.com DOMAIN-SUFFIX,apkpure.com DOMAIN-SUFFIX,aptoide.com +DOMAIN-SUFFIX,arc.net DOMAIN-SUFFIX,archiveofourown.org DOMAIN-SUFFIX,ask.com DOMAIN-SUFFIX,avg.com @@ -298,6 +305,7 @@ DOMAIN-SUFFIX,dropboxmail.com DOMAIN-SUFFIX,getdropbox.com DOMAIN-SUFFIX,dropboxusercontent.com DOMAIN-SUFFIX,duckduckgo.com +DOMAIN-SUFFIX,dw.com DOMAIN-SUFFIX,e-hentai.org DOMAIN-SUFFIX,exhentai.org DOMAIN-SUFFIX,etsy.com @@ -315,40 +323,53 @@ DOMAIN-SUFFIX,goodreads.com DOMAIN-SUFFIX,grammarly.com DOMAIN-SUFFIX,greasyfork.org DOMAIN-SUFFIX,grindr.com +DOMAIN-SUFFIX,hanime.tv +DOMAIN-SUFFIX,hanime1.me DOMAIN-SUFFIX,he.net +DOMAIN-SUFFIX,hinet.net DOMAIN-SUFFIX,homedepot.com +DOMAIN-SUFFIX,hostloc.com DOMAIN-SUFFIX,huggingface.co +DOMAIN-SUFFIX,huobi.com DOMAIN-SUFFIX,ibb.co DOMAIN-SUFFIX,imgur.com DOMAIN-SUFFIX,initiummall.com +DOMAIN-SUFFIX,ipfs.io DOMAIN-SUFFIX,issuu.com DOMAIN-SUFFIX,istatmenus.app DOMAIN-SUFFIX,iwara.tv +DOMAIN-SUFFIX,ixxx.com +DOMAIN-SUFFIX,jable.tv DOMAIN-SUFFIX,jkforum.net DOMAIN-SUFFIX,jsdelivr.com DOMAIN-SUFFIX,jsdelivr.net -DOMAIN-SUFFIX,hinet.net -DOMAIN-SUFFIX,hostloc.com DOMAIN-SUFFIX,kagi.com DOMAIN-SUFFIX,kakao.com DOMAIN-SUFFIX,kik.com DOMAIN-SUFFIX,kucoin.com DOMAIN-SUFFIX,kwai.com +DOMAIN-SUFFIX,launchdarkly.com DOMAIN-SUFFIX,live.com +DOMAIN-SUFFIX,mastodon.social DOMAIN-SUFFIX,matrix.org +DOMAIN-SUFFIX,meetup.com DOMAIN-SUFFIX,medium.com DOMAIN-SUFFIX,mega.nz DOMAIN-SUFFIX,mega.co.nz DOMAIN-SUFFIX,mega.io DOMAIN-SUFFIX,missav.com +DOMAIN-SUFFIX,moegirl.uk DOMAIN-SUFFIX,mojang.com DOMAIN-SUFFIX,mozilla.com +DOMAIN-SUFFIX,mozilla.org +DOMAIN-SUFFIX,mypikpak.com DOMAIN-SUFFIX,naver.com DOMAIN-SUFFIX,nbcnews.com DOMAIN-SUFFIX,newsblur.com DOMAIN-SUFFIX,nhentai.net DOMAIN-SUFFIX,npm.im DOMAIN-SUFFIX,npmjs.com +DOMAIN-SUFFIX,nyaa.si DOMAIN-SUFFIX,nypost.com DOMAIN-SUFFIX,nyt.com DOMAIN-SUFFIX,nytco.com @@ -356,7 +377,9 @@ DOMAIN-SUFFIX,nytlog.com DOMAIN-SUFFIX,nytimes.com DOMAIN-SUFFIX,nytstyle.com DOMAIN-SUFFIX,ok.ru +DOMAIN-SUFFIX,opensea.io DOMAIN-SUFFIX,openstreetmap.org +DOMAIN-SUFFIX,pastebin.com DOMAIN-SUFFIX,patreon.com DOMAIN-SUFFIX,perplexity.ai DOMAIN-SUFFIX,pinterest.com @@ -369,24 +392,30 @@ DOMAIN-SUFFIX,proton.me DOMAIN-SUFFIX,phncdn.com DOMAIN-SUFFIX,quora.com DOMAIN-SUFFIX,quoracdn.net +DOMAIN-SUFFIX,rawgit.com DOMAIN-SUFFIX,redd.it DOMAIN-SUFFIX,reddit.com DOMAIN-SUFFIX,redditmail.com DOMAIN-SUFFIX,redditmedia.com DOMAIN-SUFFIX,redditstatic.com +DOMAIN-SUFFIX,redtube.com DOMAIN-SUFFIX,render.com DOMAIN-SUFFIX,reuters.com +DOMAIN-SUFFIX,rfa.org DOMAIN-SUFFIX,rule34.xxx DOMAIN-SUFFIX,saucenao.com +DOMAIN-SUFFIX,schema.org DOMAIN-SUFFIX,scribd.com DOMAIN-SUFFIX,setapp.com DOMAIN-SUFFIX,sendbird.com DOMAIN-SUFFIX,sentry.io +DOMAIN-SUFFIX,sex.com DOMAIN-SUFFIX,shadowsocks.org DOMAIN-SUFFIX,shopee.tw DOMAIN-SUFFIX,shutterstock.com DOMAIN-SUFFIX,sketch.cloud DOMAIN-SUFFIX,sketch.com +DOMAIN-SUFFIX,skk.moe DOMAIN-SUFFIX,sleazyfork.org DOMAIN-SUFFIX,slideshare.net DOMAIN-SUFFIX,soundcloud.com @@ -401,6 +430,8 @@ DOMAIN-SUFFIX,stripchat.com DOMAIN-SUFFIX,substack.com DOMAIN-SUFFIX,surfshark.com DOMAIN-SUFFIX,t66y.com +DOMAIN-SUFFIX,tenor.com +DOMAIN-SUFFIX,textnow.me DOMAIN-SUFFIX,tgstat.ru DOMAIN-SUFFIX,theinitium.com DOMAIN-SUFFIX,themoviedb.org