GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-09-12 10:34:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Perf: faster reject building flow

Browse Source
This commit is contained in:
SukkaW
2026-09-02 20:32:26 +08:00
parent 9b155695e7
commit d07c8b1ed9
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Build/build-reject-domainset.ts
View File

@@ -15,6 +15,7 @@ import { SHARED_DESCRIPTION } from './constants/description';
import { addArrayElementsToSet } from 'foxts/add-array-elements-to-set'; import { addArrayElementsToSet } from 'foxts/add-array-elements-to-set';
import { OUTPUT_INTERNAL_DIR, SOURCE_DIR } from './constants/dir'; import { OUTPUT_INTERNAL_DIR, SOURCE_DIR } from './constants/dir';
import { DomainsetOutput, AdGuardHomeOutput } from './lib/rules/domainset'; import { DomainsetOutput, AdGuardHomeOutput } from './lib/rules/domainset';
import { HostnameSmolTrie } from 'hntrie/smol';
import { getBuildWorkerFarm } from './lib/build-worker-farm'; import { getBuildWorkerFarm } from './lib/build-worker-farm';
import { RulesetOutput } from './lib/rules/ruleset'; import { RulesetOutput } from './lib/rules/ruleset';
import { fetchAssets } from './lib/fetch-assets'; import { fetchAssets } from './lib/fetch-assets';
@@ -247,32 +248,39 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
}); });
}); });
// each write() opens its own RuleOutput#<id> span under the task span // reject-adguardhome starts from the (whitelisted) reject trie and adds to it.
await Promise.all([ // Cloning (~70ms, ~25ms once hntrie ships a native clone()) instead of sharing
rejectDomainsetOutput.write(), // the trie lets its write run alongside the others instead of waiting for the
rejectExtraDomainsetOutput.write(), // reject write to finish first (~0.4s serial on CI). See lib/trie-clone.bench.ts.
rejectPhisingDomainsetOutput.write(),
rejectIPOutput.write(),
rejectNonIpRulesetOutput.write()
]);
// we are going to re-use rejectOutput's domainTrie and mutate it
// so we must wait until we write rejectOutput to disk after we can mutate its trie
const rejectOutputAdGuardHome = new AdGuardHomeOutput(span, 'reject-adguardhome', OUTPUT_INTERNAL_DIR) const rejectOutputAdGuardHome = new AdGuardHomeOutput(span, 'reject-adguardhome', OUTPUT_INTERNAL_DIR)
.withTitle('Sukka\'s Ruleset - AdGuardHome Blocklist') .withTitle('Sukka\'s Ruleset - AdGuardHome Blocklist')
.withDescription([ .withDescription([
'The AdGuardHome ruleset supports AD blocking, tracking protection, privacy protection, anti-mining' 'The AdGuardHome ruleset supports AD blocking, tracking protection, privacy protection, anti-mining'
]); ]);
rejectOutputAdGuardHome.domainTrie = rejectDomainsetOutput.domainTrie; rejectOutputAdGuardHome.domainTrie = span.traceChildSync(
'clone reject trie for adguardhome',
// TODO: HostnameSmolTrie#clone() once available, the binary round trip is the public-API stand-in
() => HostnameSmolTrie.deserializeTransferable(rejectDomainsetOutput.domainTrie.serializeTransferable()),
SpanCategory.Compute
);
await rejectOutputAdGuardHome rejectOutputAdGuardHome
// .addFromRuleset(readLocalMyRejectRulesetPromise) // .addFromRuleset(readLocalMyRejectRulesetPromise)
.addFromRuleset(readLocalRejectRulesetPromise) .addFromRuleset(readLocalRejectRulesetPromise)
.addFromRuleset(readFileIntoProcessedArray(path.join(SOURCE_DIR, 'non_ip/reject-drop.conf'))) .addFromRuleset(readFileIntoProcessedArray(path.join(SOURCE_DIR, 'non_ip/reject-drop.conf')))
.addFromRuleset(readFileIntoProcessedArray(path.join(SOURCE_DIR, 'non_ip/reject-no-drop.conf'))) .addFromRuleset(readFileIntoProcessedArray(path.join(SOURCE_DIR, 'non_ip/reject-no-drop.conf')))
.addFromDomainset(readLocalRejectExtraDomainsetPromise) .addFromDomainset(readLocalRejectExtraDomainsetPromise);
.write();
// each write() opens its own RuleOutput#<id> span under the task span
await Promise.all([
rejectDomainsetOutput.write(),
rejectExtraDomainsetOutput.write(),
rejectPhisingDomainsetOutput.write(),
rejectIPOutput.write(),
rejectNonIpRulesetOutput.write(),
rejectOutputAdGuardHome.write()
]);
const myRejectOutputAdGuardHome = new AdGuardHomeOutput(span, 'my-reject-adguardhome', OUTPUT_INTERNAL_DIR) const myRejectOutputAdGuardHome = new AdGuardHomeOutput(span, 'my-reject-adguardhome', OUTPUT_INTERNAL_DIR)
.withTitle('Sukka\'s Ruleset - AdGuardHome Blocklist for Myself (Sukka)') .withTitle('Sukka\'s Ruleset - AdGuardHome Blocklist for Myself (Sukka)')