Browse Source

Fix: domain deduper

SukkaW 2 years ago
parent
commit
ac41f1589d
2 changed files with 8 additions and 11 deletions
  1. 5 8
      Build/lib/domain-deduper.ts
  2. 3 3
      Build/lib/normalize-domain.ts

+ 5 - 8
Build/lib/domain-deduper.ts

@@ -6,22 +6,19 @@ export function domainDeduper(inputDomains: string[], toArray = true): string[]
   const trie = createTrie(inputDomains);
   const sets = new Set(inputDomains);
 
-  for (let i = 0, len = inputDomains.length; i < len; i++) {
+  for (let i = 0, len1 = inputDomains.length; i < len1; i++) {
     const d = inputDomains[i];
     if (d[0] !== '.') {
       continue;
     }
 
-    const found = trie.find(d, true);
-    for (let j = 0, len = found.length; j < len; j++) {
+    const found = trie.find(d, false);
+
+    for (let j = 0, len2 = found.length; j < len2; j++) {
       sets.delete(found[j]);
     }
 
-    const a: string = d.slice(1);
-
-    if (sets.has(a)) {
-      sets.delete(a);
-    }
+    sets.delete(d.slice(1));
   }
 
   if (toArray) {

+ 3 - 3
Build/lib/normalize-domain.ts

@@ -11,13 +11,13 @@ export const normalizeDomain = (domain: string) => {
 
   let h = parsed.hostname;
 
-  let sliceStart = 0;
-  let sliceEnd = h.length;
+  let sliceStart: number | undefined;
+  let sliceEnd: number | undefined;
 
   if (h[0] === '.') sliceStart = 1;
   if (h.endsWith('.')) sliceEnd = -1;
 
-  if (sliceStart !== 0 || sliceEnd !== h.length) {
+  if (sliceStart !== undefined || sliceEnd !== undefined) {
     h = h.slice(sliceStart, sliceEnd);
   }