feat: enhance domain fetching logic with custom matches and exclusions

Author: piquark6046

builder/source/build.ts

@@ -24,8 +24,8 @@ export async function Build(OptionsParam?: BuildOptions): Promise<void> {
     Version: Zod.string().optional()
   }).parseAsync(OptionsParam)
 
-  let MatchingDomains: Set<string> = new Set<string>()
-  MatchingDomains = await FetchAdShieldDomains()
+  const FetchedDomains = await FetchAdShieldDomains()
+  let MatchingDomains: Set<string> = new Set<string>(FetchedDomains.get('Normal'))
   CustomDefinedMatches.forEach(Domain => MatchingDomains.add(Domain))
 
   MatchingDomains = new Set<string>([...MatchingDomains].map(Domain => TLDTS.parse(Domain).domain ?? Domain).filter((D): D is string => D !== null))

builder/source/references/custom-defined.ts

@@ -1 +1,3 @@
-export const CustomDefinedMatches: Set<string> = new Set(['nicovideo.jp'])
+export const CustomDefinedMatches: Set<string> = new Set(['nicovideo.jp'])
+
+export const CustomExcludeMatches: Set<string> = new Set(['kio.ac'])

builder/source/references/index.ts

@@ -1,12 +1,29 @@
 import { FetchAdShieldDomainsFromFiltersLists } from './filterslists.js'
 import { FetchIABSellersJsonData } from './iabsellers.js'
+import { DiscardResolvedDupWildcard } from '@builder/utils/discard-resolved-dup-wildcard.js'
+import { RegroupDomainTldLevel } from '@builder/utils/regroup-domain-tldlevel.js'
+import { ConvertWildcardSuffixToRegexPattern } from '@builder/utils/wildcard-suffix-converter.js'
+import { CustomDefinedMatches, CustomExcludeMatches } from './custom-defined.js'
 
-export async function FetchAdShieldDomains(): Promise<Set<string>> {
+type TASDomainContainer = Map<'Normal', Set<string>> & Map<'Full', Set<string>> & Map<'EachDomain', Set<Set<string>>> & Map<'EachDomainFull', Set<Set<string>>>
+
+export async function FetchAdShieldDomains(): Promise<TASDomainContainer> {
   const [IABSellersDomains, FiltersListsDomains] = await Promise.all([
     FetchIABSellersJsonData(),
     FetchAdShieldDomainsFromFiltersLists()
   ])
 
   const CombinedDomains = new Set<string>([...IABSellersDomains, ...FiltersListsDomains])
-  return CombinedDomains
-}
+  const Result: TASDomainContainer = new Map()
+  const NormalDomains = DiscardResolvedDupWildcard(CombinedDomains)
+  CustomDefinedMatches.forEach(Match => NormalDomains.add(Match))
+  CustomExcludeMatches.forEach(Match => NormalDomains.delete(Match))
+  const FullDomains = new Set<string>([...NormalDomains].flatMap(Domain => ConvertWildcardSuffixToRegexPattern(Domain)))
+
+  Result.set('Normal', NormalDomains)
+  Result.set('Full', FullDomains)
+  Result.set('EachDomain', RegroupDomainTldLevel(NormalDomains))
+  Result.set('EachDomainFull', RegroupDomainTldLevel(FullDomains))
+
+  return Result
+}