GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: trie dump meta supports callback

Browse Source
This commit is contained in:
SukkaW
2024-10-12 13:24:27 +08:00
parent 7b3d422df6
commit 80ab4e69c1
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Build/lib/rules/base.ts
View File

@@ -12,7 +12,7 @@ import { readFileByLine } from '../fetch-text-by-line';
import { asyncWriteToStream } from '../async-write-to-stream';
export abstract class RuleOutput<TPreprocessed = unknown> {
protected domainTrie = createTrie<unknown>(null, true);
protected domainTrie = createTrie<string>(null, true);
protected domainKeywords = new Set<string>();
protected domainWildcard = new Set<string>();
protected userAgent = new Set<string>();
@@ -97,7 +97,7 @@ export abstract class RuleOutput<TPreprocessed = unknown> {
}
addDomain(domain: string) {
this.domainTrie.add(domain);
this.domainTrie.add(domain, domain);
return this;
}
@@ -109,8 +109,7 @@ export abstract class RuleOutput<TPreprocessed = unknown> {
}
addDomainSuffix(domain: string) {
this.domainTrie.add(domain[0] === '.' ? domain : '.' + domain);
return this;
return this.addDomain(domain[0] === '.' ? domain : '.' + domain);
}
bulkAddDomainSuffix(domains: string[]) {

4
Build/lib/rules/domainset.ts
View File

@@ -80,9 +80,7 @@ export class DomainsetOutput extends RuleOutput<Preprocessed> {
)
.entries())
.filter(a => a[1] > 9)
.sort(
(a, b) => (b[1] - a[1]) || a[0].localeCompare(b[0])
)
.sort((a, b) => (b[1] - a[1]) || a[0].localeCompare(b[0]))
.map(([domain, count]) => `${domain}${' '.repeat(100 - domain.length)}${count}`);
}

12
Build/lib/trie.ts
View File

@@ -316,12 +316,16 @@ abstract class Triebase<Meta = any> {
return results;
};
public dumpMeta() {
public dumpMeta(onMeta: (meta: Meta) => void): void;
public dumpMeta(): Meta[];
public dumpMeta(onMeta?: (meta: Meta) => void): Meta[] | void {
const results: Meta[] = [];
this.walk((_suffix, meta) => {
results.push(meta);
});
const handleMeta = onMeta
? (_suffix: string[], meta: Meta) => onMeta(meta)
: (_suffix: string[], meta: Meta) => results.push(meta);
this.walk(handleMeta);
return results;
};