Perf: repalce aho-corasick w/ regexp

This commit is contained in:
SukkaW
2025-01-03 22:30:39 +08:00
parent 090f055677
commit ef1b80fb90
7 changed files with 14 additions and 14 deletions

View File

@@ -7,7 +7,7 @@ import { appendArrayInPlaceCurried } from './append-array-in-place';
import { DEBUG_DOMAIN_TO_FIND, PHISHING_DOMAIN_LISTS_EXTRA, PHISHING_HOSTS_EXTRA } from '../constants/reject-data-source';
import { loosTldOptWithPrivateDomains } from '../constants/loose-tldts-opt';
import picocolors from 'picocolors';
import { createAhoCorasick as createKeywordFilter } from 'foxts/ahocorasick';
import { createRetrieKeywordFilter as createKeywordFilter } from 'foxts/retrie';
import { createCacheKey, deserializeArray, serializeArray } from './cache-filesystem';
import { cache } from './fs-memo';
import { isCI } from 'ci-info';

View File

@@ -1,5 +1,5 @@
import { invariant } from 'foxts/guard';
import { createAhoCorasick as createKeywordFilter } from 'foxts/ahocorasick';
import { createRetrieKeywordFilter as createKeywordFilter } from 'foxts/retrie';
import { RuleOutput } from './base';
import type { SingboxSourceFormat } from '../singbox';
@@ -17,7 +17,7 @@ export class DomainsetOutput extends RuleOutput<string[]> {
private $singbox_domains_suffixes: string[] = ['this_ruleset_is_made_by_sukkaw.ruleset.skk.moe'];
private $adguardhome: string[] = [];
preprocess() {
const kwfilter = createKeywordFilter(this.domainKeywords);
const kwfilter = createKeywordFilter(Array.from(this.domainKeywords));
this.domainTrie.dumpWithoutDot((domain, subdomain) => {
if (kwfilter(domain)) {

View File

@@ -1,6 +1,6 @@
import { merge } from 'fast-cidr-tools';
import type { Span } from '../../trace';
import { createAhoCorasick as createKeywordFilter } from 'foxts/ahocorasick';
import { createRetrieKeywordFilter as createKeywordFilter } from 'foxts/retrie';
import { appendArrayInPlace } from '../append-array-in-place';
import { appendSetElementsToArray } from 'foxts/append-set-elements-to-array';
import type { SingboxSourceFormat } from '../singbox';
@@ -17,7 +17,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
}
protected preprocess() {
const kwfilter = createKeywordFilter(this.domainKeywords);
const kwfilter = createKeywordFilter(Array.from(this.domainKeywords));
const domains: string[] = [];
const domainSuffixes: string[] = [];

View File

@@ -10,7 +10,7 @@ import { newQueue } from '@henrygd/queue';
import asyncRetry from 'async-retry';
import * as whoiser from 'whoiser';
import picocolors from 'picocolors';
import { createAhoCorasick as createKeywordFilter } from 'foxts/ahocorasick';
import { createRetrieKeywordFilter as createKeywordFilter } from 'foxts/retrie';
import './lib/fetch-retry';
const dohServers: Array<[string, DNS2.DnsResolver]> = ([

View File

@@ -7,7 +7,7 @@ import { readFileByLine } from './lib/fetch-text-by-line';
import path from 'node:path';
import { OUTPUT_SURGE_DIR } from './constants/dir';
import { $fetch } from './lib/make-fetch-happen';
import { createAhoCorasick as createKeywordFilter } from 'foxts/ahocorasick';
import { createRetrieKeywordFilter as createKeywordFilter } from 'foxts/retrie';
export async function parseGfwList() {
const whiteSet = new Set<string>();
@@ -117,7 +117,7 @@ export async function parseGfwList() {
whiteSet.forEach(domain => trie.whitelist(domain));
const kwfilter = createKeywordFilter(keywordSet);
const kwfilter = createKeywordFilter([...keywordSet]);
const missingTop10000Gfwed = new Set<string>();