Housekeeping & Make ESLint Happy

2026-01-28 09:31:54 +08:00 · 2025-10-15 00:31:27 +08:00
parent b0ca03cd26
commit a3f98c2f29
6 changed files with 293 additions and 277 deletions
--- a/Build/build-reject-domainset.ts
+++ b/Build/build-reject-domainset.ts
@@ -24,6 +24,7 @@ import type { MaybePromise } from './lib/misc';
 import { RulesetOutput } from './lib/rules/ruleset';
 import { fetchAssets } from './lib/fetch-assets';
 import { AUGUST_ASN, HUIZE_ASN } from '../Source/ip/badboy_asn';
+import { arrayPushNonNullish } from 'foxts/array-push-non-nullish';

 const readLocalRejectDomainsetPromise = readFileIntoProcessedArray(path.join(SOURCE_DIR, 'domainset/reject.conf'));
 const readLocalRejectExtraDomainsetPromise = readFileIntoProcessedArray(path.join(SOURCE_DIR, 'domainset/reject_extra.conf'));
@@ -117,102 +118,112 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
  // Parse from AdGuard Filters
  await span
    .traceChild('download and process hosts / adblock filter rules')
-    .traceAsyncFn((childSpan) => Promise.all([
-
+    .traceAsyncFn((childSpan) => {
+      const promises: Array<Promise<void>> = [];
      // Parse from remote hosts & domain lists
-      hostsDownloads.map(task => task(childSpan).then(appendArrayToRejectOutput)),
-      hostsExtraDownloads.map(task => task(childSpan).then(appendArrayToRejectExtraOutput)),

-      domainListsDownloads.map(task => task(childSpan).then(appendArrayToRejectOutput)),
-      domainListsExtraDownloads.map(task => task(childSpan).then(appendArrayToRejectExtraOutput)),
+      arrayPushNonNullish(promises, hostsDownloads.map(task => task(childSpan).then(appendArrayToRejectOutput)));
+      arrayPushNonNullish(promises, hostsExtraDownloads.map(task => task(childSpan).then(appendArrayToRejectExtraOutput)));
+      arrayPushNonNullish(promises, domainListsDownloads.map(task => task(childSpan).then(appendArrayToRejectOutput)));
+      arrayPushNonNullish(promises, domainListsExtraDownloads.map(task => task(childSpan).then(appendArrayToRejectExtraOutput)));

-      rejectPhisingDomainsetOutput.addFromDomainset(getPhishingDomains(childSpan)),
+      rejectPhisingDomainsetOutput.addFromDomainset(getPhishingDomains(childSpan));

-      adguardFiltersDownloads.map(
-        task => task(childSpan).then(({
-          filterRulesUrl,
-          whiteDomains, whiteDomainSuffixes,
-          blackDomains, blackDomainSuffixes,
-          blackIPs, blackWildcard,
-          whiteKeyword, blackKeyword
-        }) => {
-          addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomains);
-          addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomainSuffixes, suffix => '.' + suffix);
+      arrayPushNonNullish(
+        promises,
+        adguardFiltersDownloads.map(
+          task => task(childSpan).then(({
+            filterRulesUrl,
+            whiteDomains, whiteDomainSuffixes,
+            blackDomains, blackDomainSuffixes,
+            blackIPs, blackWildcard,
+            whiteKeyword, blackKeyword
+          }) => {
+            addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomains);
+            addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomainSuffixes, suffix => '.' + suffix);

-          addArrayElementsToSet(filterRuleWhiteKeywords, whiteKeyword);
+            addArrayElementsToSet(filterRuleWhiteKeywords, whiteKeyword);

-          rejectDomainsetOutput.bulkAddDomain(blackDomains);
-          rejectDomainsetOutput.bulkAddDomainSuffix(blackDomainSuffixes);
+            rejectDomainsetOutput.bulkAddDomain(blackDomains);
+            rejectDomainsetOutput.bulkAddDomainSuffix(blackDomainSuffixes);

-          rejectDomainsetOutput.bulkAddDomainKeyword(blackKeyword);
+            rejectDomainsetOutput.bulkAddDomainKeyword(blackKeyword);

-          rejectDomainsetOutput.appendDataSource(filterRulesUrl);
+            rejectDomainsetOutput.appendDataSource(filterRulesUrl);

-          rejectNonIpRulesetOutput.bulkAddDomainWildcard(blackWildcard);
-          rejectNonIpRulesetOutput.appendDataSource(filterRulesUrl);
+            rejectNonIpRulesetOutput.bulkAddDomainWildcard(blackWildcard);
+            rejectNonIpRulesetOutput.appendDataSource(filterRulesUrl);

-          rejectIPOutput.bulkAddAnyCIDR(blackIPs, false);
-          rejectIPOutput.appendDataSource(filterRulesUrl);
-        })
-      ),
-      adguardFiltersExtraDownloads.map(
-        task => task(childSpan).then(({
-          filterRulesUrl,
-          whiteDomains, whiteDomainSuffixes,
-          blackDomains, blackDomainSuffixes,
-          blackIPs, blackWildcard, whiteKeyword, blackKeyword
-        }) => {
-          addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomains);
-          addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomainSuffixes, suffix => '.' + suffix);
-          addArrayElementsToSet(filterRuleWhiteKeywords, whiteKeyword);
-
-          rejectExtraDomainsetOutput.bulkAddDomain(blackDomains);
-          rejectExtraDomainsetOutput.bulkAddDomainSuffix(blackDomainSuffixes);
-
-          rejectExtraDomainsetOutput.bulkAddDomainKeyword(blackKeyword);
-
-          rejectExtraDomainsetOutput.appendDataSource(filterRulesUrl);
-
-          rejectIPOutput.bulkAddAnyCIDR(blackIPs, false);
-          rejectIPOutput.appendDataSource(filterRulesUrl);
-
-          rejectNonIpRulesetOutput.bulkAddDomainWildcard(blackWildcard);
-          rejectNonIpRulesetOutput.appendDataSource(filterRulesUrl);
-        })
-      ),
-      adguardFiltersWhitelistsDownloads.map(
-        task => task(childSpan).then(({ whiteDomains, whiteDomainSuffixes, blackDomains, blackDomainSuffixes, whiteKeyword, blackKeyword }) => {
-          addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomains);
-          addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomainSuffixes, suffix => '.' + suffix);
-          addArrayElementsToSet(filterRuleWhitelistDomainSets, blackDomains);
-          addArrayElementsToSet(filterRuleWhitelistDomainSets, blackDomainSuffixes, suffix => '.' + suffix);
-          addArrayElementsToSet(filterRuleWhiteKeywords, whiteKeyword);
-          addArrayElementsToSet(filterRuleWhiteKeywords, blackKeyword);
-        })
-      ),
-
-      span.traceChildAsync(
-        'get bogus nxdomain ips',
-        () => fetchAssets(...BOGUS_NXDOMAIN_DNSMASQ, true, false)
-          .then(arr => {
-            for (let i = 0, len = arr.length; i < len; i++) {
-              const line = arr[i];
-              if (line.startsWith('bogus-nxdomain=')) {
-                // bogus nxdomain needs to be blocked even after resolved
-                rejectIPOutput.addAnyCIDR(
-                  line.slice(15).trim(),
-                  false
-                );
-              }
-            }
-
-            return arr;
+            rejectIPOutput.bulkAddAnyCIDR(blackIPs, false);
+            rejectIPOutput.appendDataSource(filterRulesUrl);
          })
-      )
-    ].flat()));
+        )
+      );
+
+      arrayPushNonNullish(
+        promises,
+        adguardFiltersExtraDownloads.map(
+          task => task(childSpan).then(({
+            filterRulesUrl,
+            whiteDomains, whiteDomainSuffixes,
+            blackDomains, blackDomainSuffixes,
+            blackIPs, blackWildcard, whiteKeyword, blackKeyword
+          }) => {
+            addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomains);
+            addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomainSuffixes, suffix => '.' + suffix);
+            addArrayElementsToSet(filterRuleWhiteKeywords, whiteKeyword);
+
+            rejectExtraDomainsetOutput.bulkAddDomain(blackDomains);
+            rejectExtraDomainsetOutput.bulkAddDomainSuffix(blackDomainSuffixes);
+
+            rejectExtraDomainsetOutput.bulkAddDomainKeyword(blackKeyword);
+
+            rejectExtraDomainsetOutput.appendDataSource(filterRulesUrl);
+
+            rejectIPOutput.bulkAddAnyCIDR(blackIPs, false);
+            rejectIPOutput.appendDataSource(filterRulesUrl);
+
+            rejectNonIpRulesetOutput.bulkAddDomainWildcard(blackWildcard);
+            rejectNonIpRulesetOutput.appendDataSource(filterRulesUrl);
+          })
+        )
+      );
+      arrayPushNonNullish(
+        promises,
+        adguardFiltersWhitelistsDownloads.map(
+          task => task(childSpan).then(({ whiteDomains, whiteDomainSuffixes, blackDomains, blackDomainSuffixes, whiteKeyword, blackKeyword }) => {
+            addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomains);
+            addArrayElementsToSet(filterRuleWhitelistDomainSets, whiteDomainSuffixes, suffix => '.' + suffix);
+            addArrayElementsToSet(filterRuleWhitelistDomainSets, blackDomains);
+            addArrayElementsToSet(filterRuleWhitelistDomainSets, blackDomainSuffixes, suffix => '.' + suffix);
+            addArrayElementsToSet(filterRuleWhiteKeywords, whiteKeyword);
+            addArrayElementsToSet(filterRuleWhiteKeywords, blackKeyword);
+          })
+        )
+      );
+
+      promises.push(span.traceChildAsync(
+        'get bogus nxdomain ips',
+        () => fetchAssets(...BOGUS_NXDOMAIN_DNSMASQ, true, false).then(arr => {
+          for (let i = 0, len = arr.length; i < len; i++) {
+            const line = arr[i];
+            if (line.startsWith('bogus-nxdomain=')) {
+              // bogus nxdomain needs to be blocked even after resolved
+              rejectIPOutput.addAnyCIDR(
+                line.slice(15).trim(),
+                false
+              );
+            }
+          }
+          // return arr;
+        })
+      ));
+
+      return Promise.all(promises);
+    });

  if (foundDebugDomain.value) {
-  // eslint-disable-next-line sukka/unicorn/no-process-exit -- cli App
+    // eslint-disable-next-line sukka/unicorn/no-process-exit -- cli App
    process.exit(1);
  }

@@ -231,8 +242,8 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
      rejectExtraDomainsetOutput.whitelistDomain(domain);
      rejectPhisingDomainsetOutput.whitelistDomain(domain);

-    // DON'T Whitelist reject non_ip ruleset, we are force blocking thingshere
-    // rejectNonIpRulesetOutput.whitelistDomain(domain);
+      // DON'T Whitelist reject non_ip ruleset, we are force blocking thingshere
+      // rejectNonIpRulesetOutput.whitelistDomain(domain);
    }

    // we use "whitelistKeyword" method, this will be used to create kwfilter internally
@@ -271,7 +282,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
  rejectOutputAdGuardHome.domainTrie = rejectDomainsetOutput.domainTrie;

  await rejectOutputAdGuardHome
-  // .addFromRuleset(readLocalMyRejectRulesetPromise)
+    // .addFromRuleset(readLocalMyRejectRulesetPromise)
    .addFromRuleset(readLocalRejectRulesetPromise)
    .addFromRuleset(readFileIntoProcessedArray(path.join(SOURCE_DIR, 'non_ip/reject-drop.conf')))
    .addFromRuleset(readFileIntoProcessedArray(path.join(SOURCE_DIR, 'non_ip/reject-no-drop.conf')))
--- a/Build/build-sspanel-appprofile.ts
+++ b/Build/build-sspanel-appprofile.ts
@@ -30,6 +30,16 @@ const steamDomainsPromise = readFileIntoProcessedArray(path.join(SOURCE_DIR, 'do
 * This only generates a simplified version, for under-used users only.
 */
 export const buildSSPanelUIMAppProfile = task(require.main === module, __filename)(async (span) => {
+  const streamRules = AllStreamServices.flatMap((i) => i.rules);
+  const [streamCidrs4, streamCidrs6] = AllStreamServices.reduce<[cidr4: string[], cidr6: string[]]>((acc, i) => {
+    if (i.ip) {
+      appendArrayInPlace(acc[0], i.ip.v4);
+      appendArrayInPlace(acc[1], i.ip.v6);
+    }
+
+    return acc;
+  }, [[], []]);
+
  const [
    [domesticRules, directRules, lanRules],
    appleCdnDomains,
@@ -38,12 +48,12 @@ export const buildSSPanelUIMAppProfile = task(require.main === module, __filenam
    neteaseMusicRules,
    microsoftRules,
    appleRules,
-    streamRules,
+    // streamRules,
    steamDomainset,
    globalRules,
    telegramRules,
    [domesticCidrs4, domesticCidrs6],
-    [streamCidrs4, streamCidrs6],
+    // [streamCidrs4, streamCidrs6],
    { ipcidr: telegramCidrs4, ipcidr6: telegramCidrs6 },
    rawLanCidrs
  ] = await Promise.all([
@@ -56,8 +66,6 @@ export const buildSSPanelUIMAppProfile = task(require.main === module, __filenam
    // microsoft & apple - domains
    readFileIntoProcessedArray(path.join(OUTPUT_SURGE_DIR, 'non_ip/microsoft.conf')),
    readFileIntoProcessedArray(path.join(OUTPUT_SURGE_DIR, 'non_ip/apple_services.conf')),
-    // stream - domains
-    AllStreamServices.flatMap((i) => i.rules),
    // steam - domains
    steamDomainsPromise,
    // global - domains
@@ -65,14 +73,6 @@ export const buildSSPanelUIMAppProfile = task(require.main === module, __filenam
    readFileIntoProcessedArray(path.join(OUTPUT_SURGE_DIR, 'non_ip/telegram.conf')),
    // domestic - ip cidr
    getChnCidrPromise(),
-    AllStreamServices.reduce<[cidr4: string[], cidr6: string[]]>((acc, i) => {
-      if (i.ip) {
-        appendArrayInPlace(acc[0], i.ip.v4);
-        appendArrayInPlace(acc[1], i.ip.v6);
-      }
-
-      return acc;
-    }, [[], []]),
    // global - ip cidr
    getTelegramCIDRPromise(),
    // lan - ip cidr
--- a/Build/constants/reject-data-source.ts
+++ b/Build/constants/reject-data-source.ts
@@ -145,6 +145,11 @@ export const DOMAIN_LISTS_EXTRA: HostsSource[] = [
      'https://curbengh.github.io/urlhaus-filter/urlhaus-filter-domains-online.txt'
    ],
    true
+  ],
+  [
+    'https://raw.githubusercontent.com/DandelionSprout/adfilt/refs/heads/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareDomains.txt',
+    [],
+    true
  ]
  // Spam404
  // Not actively maintained, let's consider it is dead
@@ -254,12 +259,6 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
    ]
  ]
  //
-  // [
-  //   'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt',
-  //   [
-  //     'https://adguardteam.github.io/HostlistsRegistry/assets/filter_12.txt'
-  //   ]
-  // ]
  // Stalkerware
  // [
  //   'https://raw.githubusercontent.com/AssoEchap/stalkerware-indicators/master/generated/hosts',
--- a/Build/lib/rules/base.ts
+++ b/Build/lib/rules/base.ts
@@ -546,7 +546,7 @@ export class FileOutput {
      childSpan.traceChildSync('write to strategies', () => this.writeToStrategies());

      return childSpan.traceChildAsync('output to disk', (childSpan) => {
-        const promises: Array<Promise<void> | void> = [];
+        const promises: Array<Promise<void>> = [];

        const descriptions = nullthrow(this.description, 'Missing description');