Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Chore: auto build microsoft_cdn
Browse files Browse the repository at this point in the history
SukkaW committed Dec 19, 2023
1 parent 9a9daf0 commit 5064dff
Showing 6 changed files with 67 additions and 49 deletions.
21 changes: 0 additions & 21 deletions Build/build-internal-chn-domains.ts

This file was deleted.

60 changes: 60 additions & 0 deletions Build/build-microsoft-cdn.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import path from 'path';
import { task, traceAsync } from './lib/trace-runner';
import { createRuleset } from './lib/create-file';
import { fetchRemoteTextAndReadByLine } from './lib/fetch-text-by-line';
import { createTrie } from './lib/trie';
import { SHARED_DESCRIPTION } from './lib/constants';

const WHITELIST = [
'DOMAIN-SUFFIX,download.prss.microsoft.com',
'DOMAIN,res.cdn.office.net'
];

const BLACKLIST = [
'www.microsoft.com',
'learn.microsoft.com',
'devblogs.microsoft.com',
'docs.microsoft.com',
'developer.microsoft.com'
];

export const buildMicrosoftCdn = task(import.meta.path, async () => {
const set = await traceAsync('fetch accelerated-domains.china.conf', async () => {
const trie = createTrie();
for await (const line of await fetchRemoteTextAndReadByLine('https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf')) {
if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) {
const domain = line.slice(8, -16);
trie.add(domain);
}
}
return new Set(['.microsoft.com', '.windows.net', '.windows.com', '.windowsupdate.com', '.windowssearch.com', '.office.net'].flatMap(domain => trie.find(domain, false)));
});

const trie2 = createTrie(set);
BLACKLIST.flatMap(domain => trie2.find(domain, true)).forEach(d => set.delete(d));

const description = [
...SHARED_DESCRIPTION,
'',
'This file contains Microsoft\'s domains using their China mainland CDN servers.',
'',
'Data from:',
' - https://github.com/felixonmars/dnsmasq-china-list'
];

const ruleset = Array.from(set).map(d => `DOMAIN-SUFFIX,${d}`).concat(WHITELIST);

return Promise.all(createRuleset(
'Sukka\'s Ruleset - Microsoft CDN',
description,
new Date(),
ruleset,
'ruleset',
path.resolve(import.meta.dir, '../List/non_ip/microsoft_cdn.conf'),
path.resolve(import.meta.dir, '../Clash/non_ip/microsoft_cdn.txt')
));
});

if (import.meta.main) {
buildMicrosoftCdn();
}
6 changes: 3 additions & 3 deletions Build/build-sspanel-appprofile.ts
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ export const buildSSPanelUIMAppProfile = task(import.meta.path, async () => {
const [
domesticDomains,
appleCdnDomains,
microsoftCdnDomains,
// microsoftCdnDomains,
appleCnDomains,
neteaseMusicDomains,
microsoftDomains,
@@ -47,7 +47,7 @@ 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/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
@@ -79,7 +79,7 @@ export const buildSSPanelUIMAppProfile = task(import.meta.path, async () => {
[
...domesticDomains,
...appleCdnDomains,
...microsoftCdnDomains,
// ...microsoftCdnDomains,
...appleCnDomains,
...neteaseMusicDomains
],
8 changes: 2 additions & 6 deletions Build/lib/get-gorhill-publicsuffix.ts
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import { toASCII } from 'punycode';
import path from 'path';
import { traceAsync } from './trace-runner';
import { defaultRequestInit, fetchWithRetry } from './fetch-retry';
import type { PublicSuffixList } from '@gorhill/publicsuffixlist';
import { createMemoizedPromise } from './memo-promise';

const publicSuffixPath = path.resolve(import.meta.dir, '../../node_modules/.cache/public_suffix_list_dat.txt');

@@ -27,8 +27,4 @@ const getGorhillPublicSuffix = () => traceAsync('create gorhill public suffix in
return gorhill;
});

let gorhillPublicSuffixPromise: Promise<PublicSuffixList> | null = null;
export const getGorhillPublicSuffixPromise = () => {
gorhillPublicSuffixPromise ||= getGorhillPublicSuffix();
return gorhillPublicSuffixPromise;
};
export const getGorhillPublicSuffixPromise = createMemoizedPromise(getGorhillPublicSuffix);
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -384,8 +384,9 @@ rules:

#### Microsoft CDN

- 人工维护
- 自动生成
- 规则组包含 Microsoft 在中华人民共和国完成工信部 ICP 备案和公安网备、且在中华人民共和国境内提供 HTTP 服务的域名,如果由于某些原因需要代理其中部分域名,请自行针对域名编写规则、并添加到当前规则组之前。
- 数据来源 [`felixonmars/dnsmasq-china-list`](https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf)

**Surge**

18 changes: 0 additions & 18 deletions Source/non_ip/microsoft_cdn.conf

This file was deleted.

0 comments on commit 5064dff

Please sign in to comment.