From 154fcf1e92fe40512bc15fde2473758667122e63 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Mon, 18 Dec 2023 14:49:58 +0800 Subject: [PATCH] Add `microsoft.conf` and `microsoft_cdn.conf` --- Build/build-sspanel-appprofile.ts | 5 +- README.md | 53 +++++++++++++++++++ Source/non_ip/apple_services.conf | 2 +- Source/non_ip/direct.conf | 7 +-- Source/non_ip/domestic.conf | 20 ++----- ...internal_microsoft.conf => microsoft.conf} | 11 ++-- Source/non_ip/microsoft_cdn.conf | 18 +++++++ Source/non_ip/my_reject.conf | 5 +- 8 files changed, 94 insertions(+), 27 deletions(-) rename Source/non_ip/{internal_microsoft.conf => microsoft.conf} (88%) create mode 100644 Source/non_ip/microsoft_cdn.conf diff --git a/Build/build-sspanel-appprofile.ts b/Build/build-sspanel-appprofile.ts index 5a1009c7..59210fe9 100644 --- a/Build/build-sspanel-appprofile.ts +++ b/Build/build-sspanel-appprofile.ts @@ -31,6 +31,7 @@ export const buildSSPanelUIMAppProfile = task(import.meta.path, async () => { const [ domesticDomains, appleCdnDomains, + microsoftCdnDomains, appleCnDomains, neteaseMusicDomains, microsoftDomains, @@ -46,10 +47,11 @@ export const buildSSPanelUIMAppProfile = task(import.meta.path, async () => { // domestic - domains getDomesticDomainsRulesetPromise().then(surgeRulesetToClashClassicalTextRuleset), getAppleCdnDomainsPromise().then(domains => domains.map(domain => `DOMAIN-SUFFIX,${domain}`)), + processLineFromReadline(readFileByLine(path.resolve(import.meta.dir, '../Source/non_ip/microsoft_cdn.conf'))), processLineFromReadline(readFileByLine(path.resolve(import.meta.dir, '../Source/non_ip/apple_cn.conf'))), processLineFromReadline(readFileByLine(path.resolve(import.meta.dir, '../Source/non_ip/neteasemusic.conf'))).then(surgeRulesetToClashClassicalTextRuleset), // microsoft & apple - domains - processLineFromReadline(readFileByLine(path.resolve(import.meta.dir, '../Source/non_ip/internal_microsoft.conf'))), + processLineFromReadline(readFileByLine(path.resolve(import.meta.dir, '../Source/non_ip/microsoft.conf'))), (processLineFromReadline(readFileByLine(path.resolve(import.meta.dir, '../Source/non_ip/apple_services.conf')))).then(surgeRulesetToClashClassicalTextRuleset), // stream - domains surgeRulesetToClashClassicalTextRuleset(AllStreamServices.flatMap((i) => i.rules)), @@ -77,6 +79,7 @@ export const buildSSPanelUIMAppProfile = task(import.meta.path, async () => { [ ...domesticDomains, ...appleCdnDomains, + ...microsoftCdnDomains, ...appleCnDomains, ...neteaseMusicDomains ], diff --git a/README.md b/README.md index 2938353d..e55f49f1 100644 --- a/README.md +++ b/README.md @@ -382,6 +382,59 @@ rules: - RULE-SET,apple_services,[Replace with your policy] ``` +#### Microsoft CDN + +- 人工维护 +- 规则组包含 Microsoft 在中华人民共和国完成工信部 ICP 备案和公安网备、且在中华人民共和国境内提供 HTTP 服务的域名，如果由于某些原因需要代理其中部分域名，请自行针对域名编写规则、并添加到当前规则组之前。 + +**Surge** + +```ini +RULE-SET,https://ruleset.skk.moe/List/non_ip/microsoft_cdn.conf,[Replace with your policy] +``` + +**Clash Premium** + +```yaml +rule-providers: + microsoft_cdn_non_ip: + type: http + behavior: classical + format: text + interval: 43200 + url: https://ruleset.skk.moe/Clash/non_ip/microsoft_cdn.txt + path: ./sukkaw_ruleset/microsoft_cdn_non_ip.txt + +rules: + - RULE-SET,microsoft_cdn_non_ip,[Replace with your policy] +``` + +#### Microsoft + +- 人工维护 + +**Surge** + +```ini +RULE-SET,https://ruleset.skk.moe/List/non_ip/microsoft.conf,[Replace with your policy] +``` + +**Clash Premium** + +```yaml +rule-providers: + microsoft_non_ip: + type: http + behavior: classical + format: text + interval: 43200 + url: https://ruleset.skk.moe/Clash/non_ip/microsoft.txt + path: ./sukkaw_ruleset/microsoft_non_ip.txt + +rules: + - RULE-SET,microsoft_non_ip,[Replace with your policy] +``` + #### 网易云音乐 - 人工维护 diff --git a/Source/non_ip/apple_services.conf b/Source/non_ip/apple_services.conf index 869f3238..097d8869 100644 --- a/Source/non_ip/apple_services.conf +++ b/Source/non_ip/apple_services.conf @@ -1,5 +1,5 @@ # $ meta_title Sukka's Ruleset - Apple Domains -# $ meta_description This file contains domains of Apple, Inc that have PoP inside the Mainland China. +# $ meta_description This file contains domains of Apple, Inc. # >> Apple DOMAIN-SUFFIX,aaplimg.com diff --git a/Source/non_ip/direct.conf b/Source/non_ip/direct.conf index 8a2ba5ad..666b358c 100644 --- a/Source/non_ip/direct.conf +++ b/Source/non_ip/direct.conf @@ -62,6 +62,7 @@ PROCESS-NAME,Logi Options Daemon # >> PT DOMAIN-SUFFIX,52pt.site DOMAIN-SUFFIX,acg.rip +DOMAIN-SUFFIX,animebytes.tv DOMAIN-SUFFIX,aidoru-online.me DOMAIN-SUFFIX,alpharatio.cc DOMAIN-SUFFIX,animebytes.tv @@ -138,7 +139,6 @@ DOMAIN-SUFFIX,ncore.cc DOMAIN-SUFFIX,nebulance.io DOMAIN-SUFFIX,nicept.net DOMAIN-SUFFIX,npupt.com -# DOMAIN-SUFFIX,nwsuaf6.edu.cn DOMAIN-SUFFIX,open.cd DOMAIN-SUFFIX,oppaiti.me DOMAIN-SUFFIX,orpheus.network @@ -151,7 +151,6 @@ DOMAIN-SUFFIX,pthome.net DOMAIN-SUFFIX,ptsbao.club DOMAIN-SUFFIX,redacted.ch DOMAIN-SUFFIX,sdbits.org -# DOMAIN-SUFFIX,sjtu.edu.cn DOMAIN-SUFFIX,skyey2.com DOMAIN-SUFFIX,soulvoice.club DOMAIN-SUFFIX,springsunday.net @@ -160,10 +159,6 @@ DOMAIN-SUFFIX,totheglory.im DOMAIN-SUFFIX,trontv.com DOMAIN-SUFFIX,u2.dmhy.org DOMAIN-SUFFIX,uhdbits.org -# DOMAIN-SUFFIX,xauat6.edu.cn -# DOMAIN-KEYWORD,announce -# DOMAIN-KEYWORD,torrent -# DOMAIN-KEYWORD,tracker # >> Academic diff --git a/Source/non_ip/domestic.conf b/Source/non_ip/domestic.conf index ec0f2857..03d44bf4 100644 --- a/Source/non_ip/domestic.conf +++ b/Source/non_ip/domestic.conf @@ -143,21 +143,6 @@ DOMAIN-SUFFIX,meitu.com DOMAIN-SUFFIX,meitudata.com DOMAIN-SUFFIX,meitustat.com -# >> Microsoft -DOMAIN-KEYWORD,officecdn - -DOMAIN-SUFFIX,microsoft.com -DOMAIN-SUFFIX,microsoftstore.com.cn -DOMAIN-SUFFIX,msftconnecttest.com -DOMAIN-SUFFIX,msftncsi.com -DOMAIN-SUFFIX,outlook.com -DOMAIN-SUFFIX,s-microsoft.com -DOMAIN-SUFFIX,sfx.ms -DOMAIN-SUFFIX,sharepoint.com -# DOMAIN-SUFFIX,visualstudio.com -DOMAIN-SUFFIX,windows.com -DOMAIN-SUFFIX,windowsupdate.com - # Rainway DOMAIN-SUFFIX,cya.gg DOMAIN-SUFFIX,ipv4.rainway.com @@ -244,8 +229,13 @@ DOMAIN,cdn.bootcss.com DOMAIN,www.layuicdn.com DOMAIN-SUFFIX,staticfile.org +DOMAIN,assets1.xboxlive.cn +DOMAIN,assets2.xboxlive.cn DOMAIN,dl.steam.clngaa.com DOMAIN,dl.steam.ksyna.com +DOMAIN-SUFFIX,content.steamchina.com +DOMAIN-SUFFIX,cdn.ubionline.com.cn +DOMAIN-SUFFIX,pdl.wow.battlenet.com.cn # >> Zhihu DOMAIN-SUFFIX,zhihu.com diff --git a/Source/non_ip/internal_microsoft.conf b/Source/non_ip/microsoft.conf similarity index 88% rename from Source/non_ip/internal_microsoft.conf rename to Source/non_ip/microsoft.conf index 1c1a8eaa..55e23bc5 100644 --- a/Source/non_ip/internal_microsoft.conf +++ b/Source/non_ip/microsoft.conf @@ -1,11 +1,15 @@ -# $ custom_build_script +# $ meta_title Sukka's Ruleset - Microsoft Domains +# $ meta_description This file contains domains of Microsoft. DOMAIN,officecdn-microsoft-com.akamaized.net +DOMAIN-KEYWORD,1drv +DOMAIN-KEYWORD,microsoft DOMAIN-SUFFIX,aadrm.com DOMAIN-SUFFIX,acompli.com DOMAIN-SUFFIX,acompli.net DOMAIN-SUFFIX,aka.ms -DOMAIN-SUFFIX,akadns.net +DOMAIN-SUFFIX,aria.ms +DOMAIN-SUFFIX,asp.net DOMAIN-SUFFIX,aspnetcdn.com DOMAIN-SUFFIX,assets-yammer.com DOMAIN-SUFFIX,azure.com @@ -15,9 +19,10 @@ DOMAIN-SUFFIX,azurerms.com DOMAIN-SUFFIX,bing.com DOMAIN-SUFFIX,cloudapp.net DOMAIN-SUFFIX,cloudappsecurity.com +DOMAIN-SUFFIX,docs.com DOMAIN-SUFFIX,edgesuite.net DOMAIN-SUFFIX,gfx.ms -DOMAIN-SUFFIX,hotmail.com +DOMAIN-KEYWORD,hotmail DOMAIN-SUFFIX,live.com DOMAIN-SUFFIX,live.net DOMAIN-SUFFIX,lync.com diff --git a/Source/non_ip/microsoft_cdn.conf b/Source/non_ip/microsoft_cdn.conf new file mode 100644 index 00000000..fdbd1a29 --- /dev/null +++ b/Source/non_ip/microsoft_cdn.conf @@ -0,0 +1,18 @@ +# $ meta_title Sukka's Ruleset - Microsoft Domains +# $ meta_description This file contains domains of Microsoft that have PoP inside the Mainland China. + +DOMAIN-SUFFIX,dl.delivery.mp.microsoft.com +DOMAIN-SUFFIX,download.windowsupdate.com +DOMAIN-SUFFIX,download.prss.microsoft.com +DOMAIN,res.cdn.office.net +DOMAIN,build.microsoft.com +DOMAIN,cn.windowssearch.com +DOMAIN,ctldl.windowsupdate.com +DOMAIN,download.microsoft.com +DOMAIN,download.visualstudio.microsoft.com +DOMAIN,fs.microsoft.com +DOMAIN,officecdn.microsoft.com +DOMAIN,sdx.microsoft.com +DOMAIN,storeedgefd.dsx.mp.microsoft.com +DOMAIN,wscont1.apps.microsoft.com +DOMAIN,wscont2.apps.microsoft.com diff --git a/Source/non_ip/my_reject.conf b/Source/non_ip/my_reject.conf index b87a8666..242df6de 100644 --- a/Source/non_ip/my_reject.conf +++ b/Source/non_ip/my_reject.conf @@ -1,4 +1,4 @@ -# $ meta_title Sukka's Ruleset - Reject +# $ meta_title Sukka's Ruleset - Reject (REJECT-DROP) DOMAIN-SUFFIX,parallels.com.cdn.cloudflare.net DOMAIN-SUFFIX,www.parallelskorea.com @@ -25,3 +25,6 @@ PROCESS-NAME,LemonMonitor PROCESS-NAME,LemonDaemon PROCESS-NAME,LemonAgent PROCESS-NAME,LemonService + +# >> Windows Update Delivery Optimization (WUDO) use 7680 port +DEST-PORT,7680