Chore: simplify build infra

Build/build-mitm-hostname.js

@@ -94,7 +94,7 @@ const PRESET_MITM_HOSTNAMES = [
     );
   }));
 
-  let mitmDomains = new Set(PRESET_MITM_HOSTNAMES); // Special case for parsed failed
+  const mitmDomains = new Set(PRESET_MITM_HOSTNAMES); // Special case for parsed failed
   const parsedFailures = [];
 
   const dedupedUrlRegexPaths = [...new Set(urlRegexPaths)];
@@ -109,7 +109,9 @@ const PRESET_MITM_HOSTNAMES = [
     }
   });
 
-  mitmDomains = [...mitmDomains].filter(i => {
+  const mitmDomainsRegExpArray = mitmDomains
+    .slice()
+    .filter(i => {
       return i.length > 3
         && !i.includes('.mp4') // Special Case
         && i !== '(www.)' // Special Case
@@ -117,9 +119,8 @@ const PRESET_MITM_HOSTNAMES = [
         && !i.startsWith('.')
         && !i.endsWith('.')
         && !i.endsWith('*');
-  });
+    })
-
+    .map(i => {
-  const mitmDomainsRegExpArray = mitmDomains.map(i => {
       return new RegExp(
         escapeRegExp(i)
           .replaceAll('{www or not}', '(www.)?')

Build/build-reject-domainset.ts

@@ -108,18 +108,18 @@ export const buildRejectDomainSet = task(import.meta.path, async () => {
   console.log(`Import ${previousSize} rules from reject_sukka.conf!`);
 
   for await (const line of readFileByLine(path.resolve(import.meta.dir, '../Source/non_ip/reject.conf'))) {
-    if (line.startsWith('DOMAIN-KEYWORD')) {
+    const [type, keyword] = line.split(',');
-      const [, ...keywords] = line.split(',');
+
-      domainKeywordsSet.add(keywords.join(',').trim());
+    if (type === 'DOMAIN-KEYWORD') {
-    } else if (line.startsWith('DOMAIN-SUFFIX')) {
+      domainKeywordsSet.add(keyword.trim());
-      const [, ...keywords] = line.split(',');
+    } else if (type === 'DOMAIN-SUFFIX') {
-      domainSuffixSet.add(keywords.join(',').trim());
+      domainSuffixSet.add(keyword.trim());
     }
   }
 
   for await (const line of readFileByLine(path.resolve(import.meta.dir, '../List/domainset/reject_phishing.conf'))) {
     const l = processLine(line);
-    if (l && l[0] === '.') {
+    if (l?.[0] === '.') {
       domainSuffixSet.add(l.slice(1));
     }
   }

Build/lib/fetch-remote-text-by-line.ts

@@ -23,9 +23,11 @@ import { fetchWithRetry, defaultRequestInit } from './fetch-retry';
 
 const decoder = new TextDecoder('utf-8');
 
-export async function *readFileByLine(file: string | BunFile): AsyncGenerator<string> {
+export async function *readFileByLine(file: string | URL | BunFile): AsyncGenerator<string> {
   if (typeof file === 'string') {
     file = Bun.file(file);
+  } else if (!('writer' in file)) {
+    file = Bun.file(file);
   }
 
   let buf = '';

Build/lib/parse-filter.ts

@@ -111,29 +111,6 @@ export async function processFilterRules(
   const whitelistDomainSets = new Set<string>();
   const blacklistDomainSets = new Set<string>();
 
-  /**
-   * @param {string} domainToBeAddedToBlack
-   * @param {boolean} isSubDomain
-   */
-  const addToBlackList = (domainToBeAddedToBlack: string, isSubDomain: boolean) => {
-    if (isSubDomain && domainToBeAddedToBlack[0] !== '.') {
-      blacklistDomainSets.add(`.${domainToBeAddedToBlack}`);
-    } else {
-      blacklistDomainSets.add(domainToBeAddedToBlack);
-    }
-  };
-  /**
-   * @param {string} domainToBeAddedToWhite
-   * @param {boolean} [isSubDomain]
-   */
-  const addToWhiteList = (domainToBeAddedToWhite: string, isSubDomain = true) => {
-    if (isSubDomain && domainToBeAddedToWhite[0] !== '.') {
-      whitelistDomainSets.add(`.${domainToBeAddedToWhite}`);
-    } else {
-      whitelistDomainSets.add(domainToBeAddedToWhite);
-    }
-  };
-
   let downloadTime = 0;
   const gorhill = await getGorhillPublicSuffixPromise();
 
@@ -142,7 +119,10 @@ export async function processFilterRules(
    */
   const lineCb = (line: string) => {
     const result = parse(line, gorhill);
-    if (result) {
+    if (!result) {
+      return;
+    }
+
     const flag = result[1];
     const hostname = result[0];
 
@@ -157,21 +137,28 @@ export async function processFilterRules(
 
     switch (flag) {
       case 0:
-          addToWhiteList(hostname, true);
+        if (hostname[0] !== '.') {
+          whitelistDomainSets.add(`.${hostname}`);
+        } else {
+          whitelistDomainSets.add(hostname);
+        }
         break;
       case -1:
-          addToWhiteList(hostname, false);
+        whitelistDomainSets.add(hostname);
         break;
       case 1:
-          addToBlackList(hostname, false);
+        blacklistDomainSets.add(hostname);
         break;
       case 2:
-          addToBlackList(hostname, true);
+        if (hostname[0] !== '.') {
+          blacklistDomainSets.add(`.${hostname}`);
+        } else {
+          blacklistDomainSets.add(hostname);
+        }
         break;
       default:
         throw new Error(`Unknown flag: ${flag as any}`);
     }
-    }
   };
 
   if (!fallbackUrls || fallbackUrls.length === 0) {
@@ -302,7 +289,6 @@ function parse($line: string, gorhill: PublicSuffixList): null | [hostname: stri
     ) {
       const hostname = normalizeDomain(filter.hostname);
       if (!hostname) {
-        console.log('      * [parse-filter E0000] invalid domain:', filter.hostname);
         return null;
       }