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

Disable Wildcard Dedupe

Browse Source
This commit is contained in:
SukkaW 2025-10-17 20:53:31 +08:00
parent bc747a22ae
commit 5807e07608
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ export class FileOutput {
protected dataSource = new Set<string>(); protected dataSource = new Set<string>();
public domainTrie = new HostnameSmolTrie(null); public domainTrie = new HostnameSmolTrie(null);
public wildcardTrie: HostnameSmolTrie = new HostnameSmolTrie(null); public wildcardSet = new Set<string>();
protected domainKeywords = new Set<string>(); protected domainKeywords = new Set<string>();
@ -51,7 +51,6 @@ export class FileOutput {
whitelistDomain = (domain: string) => { whitelistDomain = (domain: string) => {
this.domainTrie.whitelist(domain); this.domainTrie.whitelist(domain);
this.wildcardTrie.whitelist(domain);
return this; return this;
}; };
@ -150,7 +149,7 @@ export class FileOutput {
bulkAddDomainWildcard(domains: string[]) { bulkAddDomainWildcard(domains: string[]) {
for (let i = 0, len = domains.length; i < len; i++) { for (let i = 0, len = domains.length; i < len; i++) {
this.wildcardTrie.add(domains[i]); this.wildcardSet.add(domains[i]);
} }
return this; return this;
} }
@ -216,7 +215,7 @@ export class FileOutput {
this.addDomainKeyword(value); this.addDomainKeyword(value);
break; break;
case 'DOMAIN-WILDCARD': case 'DOMAIN-WILDCARD':
this.wildcardTrie.add(value); this.wildcardSet.add(value);
break; break;
case 'USER-AGENT': case 'USER-AGENT':
this.userAgent.add(value); this.userAgent.add(value);
@ -418,8 +417,6 @@ export class FileOutput {
return; return;
} }
this.wildcardTrie.whitelist(domain, includeAllSubdomain);
for (let i = 0; i < strategiesLen; i++) { for (let i = 0; i < strategiesLen; i++) {
const strategy = this.strategies[i]; const strategy = this.strategies[i];
if (includeAllSubdomain) { if (includeAllSubdomain) {
@ -445,16 +442,14 @@ export class FileOutput {
} }
} }
this.wildcardTrie.dumpWithoutDot((wildcard) => { if (this.wildcardSet.size) {
if (kwfilter(wildcard)) { this.wildcardSet.forEach((wildcard) => {
return; for (let i = 0; i < strategiesLen; i++) {
} const strategy = this.strategies[i];
strategy.writeDomainWildcard(wildcard);
for (let i = 0; i < strategiesLen; i++) { }
const strategy = this.strategies[i]; });
strategy.writeDomainWildcard(wildcard); }
}
}, true);
const sourceIpOrCidr = Array.from(this.sourceIpOrCidr); const sourceIpOrCidr = Array.from(this.sourceIpOrCidr);