Chore: re-use code

This commit is contained in:
SukkaW 2024-05-02 18:52:25 +08:00
parent 986cfc8ff4
commit fa0cb48bf0
3 changed files with 17 additions and 9 deletions

View File

@ -5,6 +5,7 @@ import { fetchRemoteTextByLine } from './lib/fetch-text-by-line';
import { createTrie } from './lib/trie'; import { createTrie } from './lib/trie';
import { SHARED_DESCRIPTION } from './lib/constants'; import { SHARED_DESCRIPTION } from './lib/constants';
import { createMemoizedPromise } from './lib/memo-promise'; import { createMemoizedPromise } from './lib/memo-promise';
import { extractDomainsFromFelixDnsmasq } from './lib/parse-dnsmasq';
const PROBE_DOMAINS = ['.microsoft.com', '.windows.net', '.windows.com', '.windowsupdate.com', '.windowssearch.com', '.office.net']; const PROBE_DOMAINS = ['.microsoft.com', '.windows.net', '.windows.com', '.windowsupdate.com', '.windowssearch.com', '.office.net'];
@ -26,8 +27,8 @@ export const getMicrosoftCdnRulesetPromise = createMemoizedPromise(async () => {
// First trie is to find the microsoft domains that matches probe domains // First trie is to find the microsoft domains that matches probe domains
const trie = createTrie(); const trie = createTrie();
for await (const line of await fetchRemoteTextByLine('https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf')) { for await (const line of await fetchRemoteTextByLine('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 = extractDomainsFromFelixDnsmasq(line);
const domain = line.slice(8, -16); if (domain) {
trie.add(domain); trie.add(domain);
} }
} }

View File

@ -6,14 +6,19 @@ const isDomainLoose = (domain: string): boolean => {
return !!(!isIp && (isIcann || isPrivate)); return !!(!isIp && (isIcann || isPrivate));
}; };
export const extractDomainsFromFelixDnsmasq = (line: string): string | null => {
if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) {
return line.slice(8, -16);
}
return null;
};
export const parseFelixDnsmasq = async (url: string | URL): Promise<string[]> => { export const parseFelixDnsmasq = async (url: string | URL): Promise<string[]> => {
const res: string[] = []; const res: string[] = [];
for await (const line of await fetchRemoteTextByLine(url)) { for await (const line of await fetchRemoteTextByLine(url)) {
if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) { const domain = extractDomainsFromFelixDnsmasq(line);
const domain = line.slice(8, -16); if (domain && isDomainLoose(domain)) {
if (isDomainLoose(domain)) { res.push(domain);
res.push(domain);
}
} }
} }

View File

@ -3,12 +3,14 @@ import { parse } from 'csv-parse/sync';
import { createTrie } from './lib/trie'; import { createTrie } from './lib/trie';
import path from 'path'; import path from 'path';
import { processLine } from './lib/process-line'; import { processLine } from './lib/process-line';
import { extract } from 'tar-stream';
import { extractDomainsFromFelixDnsmasq } from './lib/parse-dnsmasq';
export const parseDomesticList = async () => { export const parseDomesticList = async () => {
const set = new Set<string>(); const set = new Set<string>();
for await (const line of await fetchRemoteTextByLine('https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf')) { for await (const line of await fetchRemoteTextByLine('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 = extractDomainsFromFelixDnsmasq(line);
const domain = line.slice(8, -16); if (domain) {
set.add(domain); set.add(domain);
} }
} }