Fix Speedtest Hosts

This commit is contained in:
SukkaW 2024-07-07 17:39:46 +08:00
parent eb3c0c86d8
commit 9a352f884f

View File

@ -59,9 +59,10 @@ const querySpeedtestApi = async (keyword: string): Promise<Array<string | null>>
retry: { retry: {
retries: 2 retries: 2
} }
})).then(r => r.json() as any).then((data: Array<{ url: string }>) => data.reduce<string[]>( })).then(r => r.json() as any).then((data: Array<{ url: string, host: string }>) => data.reduce<string[]>(
(prev, cur) => { (prev, cur) => {
const hn = getHostname(cur.url, { detectIp: false, validateHostname: true }); const line = cur.host || cur.url;
const hn = getHostname(line, { detectIp: false, validateHostname: true });
if (hn) { if (hn) {
prev.push(hn); prev.push(hn);
} }
@ -146,6 +147,8 @@ export const buildSpeedtestDomainSet = task(import.meta.main, import.meta.path)(
'.speedtest.com.sg', '.speedtest.com.sg',
'.ookla.ddnsgeek.com', '.ookla.ddnsgeek.com',
'.speedtest.pni.tw', '.speedtest.pni.tw',
'.speedtest.cmcnetworks.net',
'.speedtestwnet.com.br',
// Cloudflare // Cloudflare
'.speed.cloudflare.com', '.speed.cloudflare.com',
// Wi-Fi Man // Wi-Fi Man
@ -178,14 +181,14 @@ export const buildSpeedtestDomainSet = task(import.meta.main, import.meta.path)(
'fetch previous speedtest domainset', 'fetch previous speedtest domainset',
async () => { async () => {
try { try {
const contents = await readFileIntoProcessedArray(path.resolve(import.meta.dir, '../List/domainset/speedtest.conf')); (
contents.reduce<string[]>((acc, line) => { await readFileIntoProcessedArray(path.resolve(import.meta.dir, '../List/domainset/speedtest.conf'))
) .forEach(line => {
const hn = getHostname(line, { detectIp: false, validateHostname: true }); const hn = getHostname(line, { detectIp: false, validateHostname: true });
if (hn) { if (hn) {
acc.push(hn); domainTrie.add(hn);
} }
return acc; });
}, []).forEach(domainTrie.add);
} catch { } } catch { }
} }
); );