mirror of
https://github.com/SukkaW/Surge.git
synced 2025-12-14 18:20:35 +08:00
Perf: use new hostname trie
This commit is contained in:
parent
59b86f706f
commit
a486910a26
@ -3,7 +3,7 @@ import { createTrie } from './trie';
|
|||||||
export function domainDeduper(inputDomains: string[], toArray?: true): string[];
|
export function domainDeduper(inputDomains: string[], toArray?: true): string[];
|
||||||
export function domainDeduper(inputDomains: string[], toArray: false): Set<string>;
|
export function domainDeduper(inputDomains: string[], toArray: false): Set<string>;
|
||||||
export function domainDeduper(inputDomains: string[], toArray = true): string[] | Set<string> {
|
export function domainDeduper(inputDomains: string[], toArray = true): string[] | Set<string> {
|
||||||
const trie = createTrie(inputDomains);
|
const trie = createTrie(inputDomains, true);
|
||||||
const sets = new Set(inputDomains);
|
const sets = new Set(inputDomains);
|
||||||
|
|
||||||
for (let i = 0, len1 = inputDomains.length; i < len1; i++) {
|
for (let i = 0, len1 = inputDomains.length; i < len1; i++) {
|
||||||
|
|||||||
@ -28,10 +28,10 @@ const compare = (a: string, b: string) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const sortDomains = (inputs: string[], gorhill: PublicSuffixList) => {
|
export const sortDomains = (inputs: string[], gorhill: PublicSuffixList) => {
|
||||||
const domains = inputs.reduce<Map<string, string | null>>((acc, cur) => {
|
const domains = inputs.reduce<Map<string, string>>((acc, cur) => {
|
||||||
if (!acc.has(cur)) {
|
if (!acc.has(cur)) {
|
||||||
const topD = gorhill.getDomain(cur[0] === '.' ? cur.slice(1) : cur);
|
const topD = gorhill.getDomain(cur[0] === '.' ? cur.slice(1) : cur);
|
||||||
acc.set(cur, topD === cur ? null : topD);
|
acc.set(cur, topD);
|
||||||
};
|
};
|
||||||
return acc;
|
return acc;
|
||||||
}, new Map());
|
}, new Map());
|
||||||
@ -39,10 +39,10 @@ export const sortDomains = (inputs: string[], gorhill: PublicSuffixList) => {
|
|||||||
const sorter = (a: string, b: string) => {
|
const sorter = (a: string, b: string) => {
|
||||||
if (a === b) return 0;
|
if (a === b) return 0;
|
||||||
|
|
||||||
const $a = domains.get(a);
|
const $a = domains.get(a)!;
|
||||||
const $b = domains.get(b);
|
const $b = domains.get(b)!;
|
||||||
|
|
||||||
if ($a == null || $b == null) {
|
if ($a === a && $b === b) {
|
||||||
return compare(a, b);
|
return compare(a, b);
|
||||||
}
|
}
|
||||||
return compare($a, $b) || compare(a, b);
|
return compare($a, $b) || compare(a, b);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user