diff --git a/Build/build-anti-bogus-domain.ts b/Build/build-anti-bogus-domain.ts index 90967ce3..94ae638c 100644 --- a/Build/build-anti-bogus-domain.ts +++ b/Build/build-anti-bogus-domain.ts @@ -1,8 +1,7 @@ // @ts-check import path from 'path'; import { createRuleset } from './lib/create-file'; -import { fetchRemoteTextByLine, readFileByLine, readFileIntoProcessedArray } from './lib/fetch-text-by-line'; -import { processLine } from './lib/process-line'; +import { fetchRemoteTextByLine, readFileIntoProcessedArray } from './lib/fetch-text-by-line'; import { task } from './trace'; import { SHARED_DESCRIPTION } from './lib/constants'; import { isProbablyIpv4, isProbablyIpv6 } from './lib/is-fast-ip'; diff --git a/Build/build-reject-domainset.ts b/Build/build-reject-domainset.ts index 5c0a56d6..36b71060 100644 --- a/Build/build-reject-domainset.ts +++ b/Build/build-reject-domainset.ts @@ -6,7 +6,6 @@ import { createTrie } from './lib/trie'; import { HOSTS, ADGUARD_FILTERS, PREDEFINED_WHITELIST, DOMAIN_LISTS } from './lib/reject-data-source'; import { createRuleset, compareAndWriteFile } from './lib/create-file'; -import { processLine } from './lib/process-line'; import { domainDeduper } from './lib/domain-deduper'; import createKeywordFilter from './lib/aho-corasick'; import { readFileByLine, readFileIntoProcessedArray } from './lib/fetch-text-by-line'; diff --git a/Build/download-mock-assets.ts b/Build/download-mock-assets.ts index bd0a8d09..02625889 100644 --- a/Build/download-mock-assets.ts +++ b/Build/download-mock-assets.ts @@ -1,4 +1,3 @@ -import picocolors from 'picocolors'; import { task } from './trace'; import path from 'path'; import { fetchWithRetry } from './lib/fetch-retry'; diff --git a/Build/lib/create-file.ts b/Build/lib/create-file.ts index 91d25291..c9b58186 100644 --- a/Build/lib/create-file.ts +++ b/Build/lib/create-file.ts @@ -1,7 +1,6 @@ // @ts-check import { readFileByLine } from './fetch-text-by-line'; import { surgeDomainsetToClashDomainset, surgeRulesetToClashClassicalTextRuleset } from './clash'; -import { traceAsync } from './trace-runner'; import picocolors from 'picocolors'; import type { Span } from '../trace'; import path from 'path'; diff --git a/Build/lib/fetch-text-by-line.ts b/Build/lib/fetch-text-by-line.ts index e012017c..59b5814e 100644 --- a/Build/lib/fetch-text-by-line.ts +++ b/Build/lib/fetch-text-by-line.ts @@ -1,8 +1,8 @@ import type { BunFile } from 'bun'; import { fetchWithRetry, defaultRequestInit } from './fetch-retry'; -import { TextLineStream } from './text-line-transform-stream'; -import { PolyfillTextDecoderStream } from './text-decoder-stream'; +// import { TextLineStream } from './text-line-transform-stream'; +// import { PolyfillTextDecoderStream } from './text-decoder-stream'; import { processLine } from './process-line'; // function createTextLineStreamFromStreamSource(stream: ReadableStream) { // return stream diff --git a/Build/lib/get-phishing-domains.ts b/Build/lib/get-phishing-domains.ts index 6ade79b5..91359719 100644 --- a/Build/lib/get-phishing-domains.ts +++ b/Build/lib/get-phishing-domains.ts @@ -1,6 +1,5 @@ import { getGorhillPublicSuffixPromise } from './get-gorhill-publicsuffix'; -import { processDomainLists, processHosts } from './parse-filter'; -import { traceAsync, traceSync } from './trace-runner'; +import { processDomainLists } from './parse-filter'; import * as tldts from 'tldts'; import { createTrie } from './trie'; import { createCachedGorhillGetDomain } from './cached-tld-parse'; @@ -182,8 +181,8 @@ export const getPhishingDomains = (parentSpan: Span) => parentSpan.traceChild('g const results = span.traceChild('get final phishing results').traceSyncFn(() => { const results: string[] = []; for (const domain in domainCountMap) { - if (domainCountMap[domain] > 5) { - results.push(domain); + if (domainCountMap[domain] >= 5) { + results.push(`.${domain}`); } } return results; diff --git a/Build/lib/parse-filter.ts b/Build/lib/parse-filter.ts index 106d3d7a..06aeb011 100644 --- a/Build/lib/parse-filter.ts +++ b/Build/lib/parse-filter.ts @@ -5,7 +5,6 @@ import { processLine } from './process-line'; import { getGorhillPublicSuffixPromise } from './get-gorhill-publicsuffix'; import type { PublicSuffixList } from '@gorhill/publicsuffixlist'; -import { traceAsync } from './trace-runner'; import picocolors from 'picocolors'; import { normalizeDomain } from './normalize-domain'; import { fetchAssets } from './fetch-assets'; diff --git a/Build/lib/trace-runner.ts b/Build/lib/trace-runner.ts index 5d1a760e..3bfe71f1 100644 --- a/Build/lib/trace-runner.ts +++ b/Build/lib/trace-runner.ts @@ -1,4 +1,3 @@ -import path from 'path'; import picocolors from 'picocolors'; type Formatter = (result: string) => string;