GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-28 17:41:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: prefer tldts-experimental

Browse Source
This commit is contained in:
SukkaW
2024-12-16 22:52:20 +08:00
parent 730eec003e
commit ecc635a455
6 changed files with 130 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Build/lib/normalize-domain.ts
View File

@@ -1,4 +1,5 @@
// https://github.com/remusao/tldts/issues/2121
// In short, single label domain suffix is ignored due to the size optimization, so no isIcann
// import tldts from 'tldts-experimental';
import tldts from 'tldts';
import { normalizeTldtsOpt } from '../constants/loose-tldts-opt';

10
Build/lib/parse-dnsmasq.ts
View File

@@ -1,12 +1,16 @@
import { createReadlineInterfaceFromResponse } from './fetch-text-by-line';
import { parse as tldtsParse } from 'tldts';
// https://github.com/remusao/tldts/issues/2121
// In short, single label domain suffix is ignored due to the size optimization, so no isIcann
// import tldts from 'tldts-experimental';
import tldts from 'tldts';
import type { NodeFetchResponse } from './make-fetch-happen';
import type { UndiciResponseData } from './fetch-retry';
import type { Response } from 'undici';
function isDomainLoose(domain: string): boolean {
const { isIcann, isPrivate, isIp } = tldtsParse(domain);
return !!(!isIp && (isIcann || isPrivate));
const r = tldts.parse(domain);
return !!(!r.isIp && (r.isIcann || r.isPrivate));
}
export function extractDomainsFromFelixDnsmasq(line: string): string | null {

2
Build/validate-domain-alive.ts
View File

@@ -1,7 +1,7 @@
import DNS2 from 'dns2';
import { readFileByLine } from './lib/fetch-text-by-line';
import { processLine } from './lib/process-line';
import tldts from 'tldts';
import tldts from 'tldts-experimental';
import { looseTldtsOpt } from './constants/loose-tldts-opt';
import { fdir as Fdir } from 'fdir';
import { SOURCE_DIR } from './constants/dir';

2
Build/validate-global-tld.ts
View File

@@ -3,7 +3,7 @@ import { readFileByLine } from './lib/fetch-text-by-line';
import { HostnameSmolTrie } from './lib/trie';
import { OUTPUT_SURGE_DIR, SOURCE_DIR } from './constants/dir';
import { ICP_TLD } from './constants/domains';
import tldts from 'tldts';
import tldts from 'tldts-experimental';
import { looseTldtsOpt } from './constants/loose-tldts-opt';
(async () => {