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

Chore: move DOMAIN-WILDCARD below DOMAIN-KEYWORD
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.9) (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-06-20 23:31:31 +08:00
parent a8df847ca4
commit a971ab20c5
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,6 +353,7 @@ export class FileOutput {
} }
const strategiesLen = this.strategies.length; const strategiesLen = this.strategies.length;
this.domainTrie.dumpWithoutDot((domain, includeAllSubdomain) => { this.domainTrie.dumpWithoutDot((domain, includeAllSubdomain) => {
if (kwfilter(domain)) { if (kwfilter(domain)) {
return; return;
@ -374,6 +375,17 @@ export class FileOutput {
const whiteKwfilter = createKeywordFilter(Array.from(this.whitelistKeywords)); const whiteKwfilter = createKeywordFilter(Array.from(this.whitelistKeywords));
const whitelistedKeywords = Array.from(this.domainKeywords).filter(kw => !whiteKwfilter(kw)); const whitelistedKeywords = Array.from(this.domainKeywords).filter(kw => !whiteKwfilter(kw));
for (let i = 0; i < strategiesLen; i++) {
const strategy = this.strategies[i];
if (whitelistedKeywords.length) {
strategy.writeDomainKeywords(this.domainKeywords);
}
if (this.protocol.size) {
strategy.writeProtocols(this.protocol);
}
}
this.wildcardTrie.dumpWithoutDot((wildcard) => { this.wildcardTrie.dumpWithoutDot((wildcard) => {
if (kwfilter(wildcard)) { if (kwfilter(wildcard)) {
return; return;
@ -385,15 +397,11 @@ export class FileOutput {
} }
}); });
const sourceIpOrCidr = Array.from(this.sourceIpOrCidr);
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 (whitelistedKeywords.length) {
strategy.writeDomainKeywords(this.domainKeywords);
}
if (this.protocol.size) {
strategy.writeProtocols(this.protocol);
}
if (this.userAgent.size) { if (this.userAgent.size) {
strategy.writeUserAgents(this.userAgent); strategy.writeUserAgents(this.userAgent);
} }
@ -403,17 +411,11 @@ export class FileOutput {
if (this.processPath.size) { if (this.processPath.size) {
strategy.writeProcessPaths(this.processPath); strategy.writeProcessPaths(this.processPath);
} }
}
if (this.sourceIpOrCidr.size) { if (this.sourceIpOrCidr.size) {
const sourceIpOrCidr = Array.from(this.sourceIpOrCidr); strategy.writeSourceIpCidrs(sourceIpOrCidr);
for (let i = 0, len = this.strategies.length; i < len; i++) {
this.strategies[i].writeSourceIpCidrs(sourceIpOrCidr);
}
} }
for (let i = 0, len = this.strategies.length; i < len; i++) {
const strategy = this.strategies[i];
if (this.sourcePort.size) { if (this.sourcePort.size) {
strategy.writeSourcePorts(this.sourcePort); strategy.writeSourcePorts(this.sourcePort);
} }
@ -446,13 +448,13 @@ export class FileOutput {
ipcidr6NoResolve = Array.from(this.ipcidr6NoResolve); ipcidr6NoResolve = Array.from(this.ipcidr6NoResolve);
} }
for (let i = 0, len = this.strategies.length; i < len; i++) { for (let i = 0; i < strategiesLen; i++) {
const strategy = this.strategies[i]; const strategy = this.strategies[i];
// no-resolve // no-resolve
if (ipcidrNoResolve?.length) { if (ipcidrNoResolve) {
strategy.writeIpCidrs(ipcidrNoResolve, true); strategy.writeIpCidrs(ipcidrNoResolve, true);
} }
if (ipcidr6NoResolve?.length) { if (ipcidr6NoResolve) {
strategy.writeIpCidr6s(ipcidr6NoResolve, true); strategy.writeIpCidr6s(ipcidr6NoResolve, true);
} }
if (this.ipasnNoResolve.size) { if (this.ipasnNoResolve.size) {