diff --git a/Build/build-internal-cdn-rules.ts b/Build/build-internal-cdn-rules.ts index 91621101..f119141c 100644 --- a/Build/build-internal-cdn-rules.ts +++ b/Build/build-internal-cdn-rules.ts @@ -20,11 +20,11 @@ const processLocalDomainSet = async (domainSetPath: string, set: Set) => const processLocalRuleSet = async (ruleSetPath: string, set: Set, keywords: Set) => { for await (const line of readFileByLine(ruleSetPath)) { if (line.startsWith('DOMAIN-SUFFIX,')) { - set.add(line.replace('DOMAIN-SUFFIX,', '')); + set.add(line.slice(14)); } else if (line.startsWith('DOMAIN,')) { - set.add(line.replace('DOMAIN,', '')); + set.add(line.slice(7)); } else if (line.startsWith('DOMAIN-KEYWORD')) { - keywords.add(escapeRegExp(line.replace('DOMAIN-KEYWORD,', ''))); + keywords.add(escapeRegExp(line.slice(15))); } else if (line.includes('USER-AGENT,') || line.includes('PROCESS-NAME,') || line.includes('URL-REGEX,')) { // do nothing } else if (processLine(line)) { @@ -43,6 +43,7 @@ export const buildInternalCDNDomains = task(import.meta.path, async (span) => { processLocalRuleSet(path.resolve(import.meta.dir, '../List/non_ip/global.conf'), proxySet, proxyKeywords), processLocalRuleSet(path.resolve(import.meta.dir, '../List/non_ip/global_plus.conf'), proxySet, proxyKeywords), processLocalRuleSet(path.resolve(import.meta.dir, '../List/non_ip/my_proxy.conf'), proxySet, proxyKeywords), + processLocalRuleSet(path.resolve(import.meta.dir, '../List/non_ip/my_plus.conf'), proxySet, proxyKeywords), processLocalRuleSet(path.resolve(import.meta.dir, '../List/non_ip/stream.conf'), proxySet, proxyKeywords), processLocalRuleSet(path.resolve(import.meta.dir, '../List/non_ip/telegram.conf'), proxySet, proxyKeywords), processLocalDomainSet(path.resolve(import.meta.dir, '../List/domainset/cdn.conf'), proxySet), diff --git a/Build/lib/parse-dnsmasq.ts b/Build/lib/parse-dnsmasq.ts index 1c1081fb..66e183f6 100644 --- a/Build/lib/parse-dnsmasq.ts +++ b/Build/lib/parse-dnsmasq.ts @@ -10,7 +10,7 @@ export const parseFelixDnsmasq = async (url: string | URL): Promise => const res: string[] = []; for await (const line of await fetchRemoteTextByLine(url)) { if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) { - const domain = line.replace('server=/', '').replace('/114.114.114.114', ''); + const domain = line.slice(8, -16); if (isDomainLoose(domain)) { res.push(domain); } diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf index 4b894e33..ff7a293a 100644 --- a/Source/domainset/cdn.conf +++ b/Source/domainset/cdn.conf @@ -8,6 +8,9 @@ img.skk.moe cdn.skk.moe hv-monsterdb-data.skk.moe +# >> OHTTP Relay +ohttp-relay1.fastly-edge.com + # >> Open Source CDN .jsdelivr.net data.jsdelivr.com @@ -55,6 +58,7 @@ cdn.tailwindcss.com cdn.mathjax.org cdn.embed.ly gitpkg-fork.vercel.sh +cdn.redoc.ly # Open Source Website and Services docs.rs @@ -601,6 +605,7 @@ i.imgflip.com .iili.io .imageban.ru .cdn-uploads.huggingface.co +.missuo.ru # imgix custom domain www.datocms-assets.com images.pexels.com @@ -1637,6 +1642,7 @@ avatars.micro.blog images.wikia.com # Fastly assets.fastly.com +fiddle.fastly.dev # linkfire (lnk.to) services.linkfire.com static.assetlab.io @@ -2322,6 +2328,7 @@ wimg.rule34.xxx cf.shopee.tw .susercontent.com .substackcdn.com +cdn.substack.com cf.eip.telegraph.co.uk secure.telegraph.co.uk static.telegraph.co.uk @@ -2352,3 +2359,4 @@ cdn.ywxi.net .ftcdn.net .ezocdn.net .ezocdn.com +static.reo.dev diff --git a/Source/domainset/download.conf b/Source/domainset/download.conf index f6bc04b7..2f214d4b 100644 --- a/Source/domainset/download.conf +++ b/Source/domainset/download.conf @@ -146,6 +146,7 @@ dl.pstmn.io dl.nssurge.com # Docker desktop.docker.com +download.docker.com # Setapp dl.devmate.com store.setapp.com diff --git a/Source/non_ip/my_plus.conf b/Source/non_ip/my_plus.conf new file mode 100644 index 00000000..9b9529d8 --- /dev/null +++ b/Source/non_ip/my_plus.conf @@ -0,0 +1,100 @@ +# $ meta_title Sukka's Ruleset - Internal Special + +# Video CDN +DOMAIN-SUFFIX,mapi.4kvm.net +DOMAIN-SUFFIX,v82u1l.com +DOMAIN-SUFFIX,whweitao.com +DOMAIN-SUFFIX,fsvod1.com +DOMAIN-SUFFIX,szjal.cn +DOMAIN-SUFFIX,hdzyk-cdn.com +DOMAIN-SUFFIX,vip.ffzy-play6.com +DOMAIN,cdn.kin6c1.com +DOMAIN-SUFFIX,cdn.efhie.com +DOMAIN-SUFFIX,wolongzywcdn3.com +DOMAIN-SUFFIX,ceres9350.com +DOMAIN-SUFFIX,91pic.org +DOMAIN-SUFFIX,wolongcdnm3u8 +DOMAIN-SUFFIX,img.haiwaikan.com +DOMAIN-SUFFIX,cdn.iz8qkg.com +DOMAIN-SUFFIX,tokyvideo.com +DOMAIN-SUFFIX,ffzy-play6.com +DOMAIN-SUFFIX,lz-cdn1.com +DOMAIN-SUFFIX,hey10.cjkypo.com +DOMAIN-SUFFIX,yle888.vip +# Ziglang +DOMAIN-SUFFIX,ziglang.org +# NPM +DOMAIN,registry.npmjs.org +DOMAIN,registry.yarnpkg.com +DOMAIN,registry.npmjs.com +DOMAIN,npm.im +# Discord +DOMAIN-SUFFIX,discordapp.com +DOMAIN,images-ext-1.discordapp.net +DOMAIN,images-ext-2.discordapp.net +DOMAIN,media.discordapp.net +# CDN +DOMAIN-SUFFIX,jsdelivr.net +DOMAIN,cdnjs.cloudflare.com +DOMAIN,unpkg.com +DOMAIN-SUFFIX,esm.run +DOMAIN-SUFFIX,esm.sh +DOMAIN-SUFFIX,nodejs.org +DOMAIN-SUFFIX,workers.dev +DOMAIN-SUFFIX,pages.dev +# SKK.MOE +DOMAIN,ip.skk.moe +DOMAIN,hv-monster-submit.skk.moe +# Google +DOMAIN-SUFFIX,googleusercontent.com +DOMAIN-SUFFIX,ytimg.com +DOMAIN,dl.google.com +DOMAIN,fonts.gstatic.com +DOMAIN,fonts.googleapis.com +DOMAIN,ajax.googleapis.com +DOMAIN-SUFFIX,storage.googleapis.com +DOMAIN,safebrowsing.googleapis.com +# Facebook / Twitter +DOMAIN-SUFFIX,fbcdn.net +DOMAIN-SUFFIX,fbcdn.com +DOMAIN-SUFFIX,twimg.com +# Image Server +DOMAIN-SUFFIX,imgur.com +# GitHub +DOMAIN-SUFFIX,github.io +DOMAIN-SUFFIX,githubusercontent.com +DOMAIN-SUFFIX,githubassets.com +DOMAIN-SUFFIX,formulae.brew.sh +DOMAIN-SUFFIX,ghcr.io +# Netlify +DOMAIN-SUFFIX,netlify.app +# Vercel +DOMAIN-SUFFIX,vercel.app +# Sketch +DOMAIN,cdn.sketch.com +DOMAIN,resources-live.sketch.cloud +DOMAIN,resources-cache.prod.sketch.com +DOMAIN,prego-cache.prod.sketch.com +# Microsoft +DOMAIN-SUFFIX,download.prss.microsoft.com +# VSCode +DOMAIN,default.exp-tas.com +DOMAIN,vscode-sync.trafficmanager.net +DOMAIN,update.code.visualstudio.com +# Gravatar +DOMAIN-SUFFIX,gravatar.com +# Misc +DOMAIN,api.wakatime.com +DOMAIN-SUFFIX,cloudfront.net +DOMAIN-SUFFIX,adtidy.org +# Rust +DOMAIN-SUFFIX,crates.io +# Firefox +DOMAIN,detectportal.firefox.com +# Safari +DOMAIN,proxy.safebrowsing.apple +# SetApp +DOMAIN,store.setapp.com +# Files +DOMAIN-SUFFIX,catbox.moe +DOMAIN-SUFFIX,temp.sh