GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2025-12-13 17:50:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Re-enable DOMAIN-KEYWORD overlapping DOMAIN-WILDCARD dedupe
Some checks failed
Build / Build (push) Has been cancelled
Details
Build / Diff output (push) Has been cancelled
Details
Build / Deploy to Cloudflare Pages (3.114.12) (push) Has been cancelled
Details
Build / Deploy to GitHub and GitLab (push) Has been cancelled
Details

Browse Source
This commit is contained in:
SukkaW 2025-10-17 20:58:59 +08:00
parent 5807e07608
commit 7ded88aaa3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,7 +259,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
rejectPhisingDomainsetOutput.whitelistDomain(arg); rejectPhisingDomainsetOutput.whitelistDomain(arg);
// e.g. .data.microsort.com can strip waston*.event.data.microsort.com // e.g. .data.microsort.com can strip waston*.event.data.microsort.com
rejectNonIpRulesetOutput.wildcardTrie.whitelist(arg); // rejectNonIpRulesetOutput.wildcardTrie.whitelist(arg);
}); });
}); });

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

@ -444,6 +444,11 @@ export class FileOutput {
if (this.wildcardSet.size) { if (this.wildcardSet.size) {
this.wildcardSet.forEach((wildcard) => { this.wildcardSet.forEach((wildcard) => {
// Overlapped w/ DOMAIN-kEYWORD
if (kwfilter(wildcard)) {
return;
}
for (let i = 0; i < strategiesLen; i++) { for (let i = 0; i < strategiesLen; i++) {
const strategy = this.strategies[i]; const strategy = this.strategies[i];
strategy.writeDomainWildcard(wildcard); strategy.writeDomainWildcard(wildcard);