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: some minor changes

Browse Source
This commit is contained in:
SukkaW
2024-12-22 12:16:50 +08:00
parent af04018be9
commit d87c01ce5a
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Build/lib/rules/ip.ts
View File

@@ -22,7 +22,7 @@ export class IPListOutput extends RuleOutput<Preprocessed> {
appendArrayInPlace(
results,
merge(
appendArrayInPlace(Array.from(this.ipcidrNoResolve), Array.from(this.ipcidr)),
appendSetElementsToArray(Array.from(this.ipcidrNoResolve), this.ipcidr),
true
)
);

12
Build/lib/rules/ruleset.ts
View File

@@ -61,7 +61,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
appendArrayInPlace(
results,
merge(Array.from(this.ipcidrNoResolve)).map(i => `IP-CIDR,${i},no-resolve`, true)
merge(Array.from(this.ipcidrNoResolve), true).map(i => `IP-CIDR,${i},no-resolve`)
);
appendSetElementsToArray(results, this.ipcidr6NoResolve, i => `IP-CIDR6,${i},no-resolve`);
appendSetElementsToArray(results, this.ipasnNoResolve, i => `IP-ASN,${i},no-resolve`);
@@ -69,7 +69,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
appendArrayInPlace(
results,
merge(Array.from(this.ipcidr)).map(i => `IP-CIDR,${i}`, true)
merge(Array.from(this.ipcidr), true).map(i => `IP-CIDR,${i}`)
);
appendSetElementsToArray(results, this.ipcidr6, i => `IP-CIDR6,${i}`);
appendSetElementsToArray(results, this.ipasn, i => `IP-ASN,${i}`);
@@ -108,7 +108,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
appendArrayInPlace(
results,
merge(Array.from(this.ipcidrNoResolve)).map(i => `IP-CIDR,${i},no-resolve`, true)
merge(Array.from(this.ipcidrNoResolve), true).map(i => `IP-CIDR,${i},no-resolve`)
);
appendSetElementsToArray(results, this.ipcidr6NoResolve, i => `IP-CIDR6,${i},no-resolve`);
appendSetElementsToArray(results, this.ipasnNoResolve, i => `IP-ASN,${i},no-resolve`);
@@ -116,7 +116,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
appendArrayInPlace(
results,
merge(Array.from(this.ipcidr)).map(i => `IP-CIDR,${i}`, true)
merge(Array.from(this.ipcidr), true).map(i => `IP-CIDR,${i}`)
);
appendSetElementsToArray(results, this.ipcidr6, i => `IP-CIDR6,${i}`);
appendSetElementsToArray(results, this.ipasn, i => `IP-ASN,${i}`);
@@ -130,7 +130,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
appendArrayInPlace(
ip_cidr,
merge(
appendArrayInPlace(Array.from(this.ipcidrNoResolve), Array.from(this.ipcidr)),
appendSetElementsToArray(Array.from(this.ipcidrNoResolve), this.ipcidr),
true
)
);
@@ -143,7 +143,7 @@ export class RulesetOutput extends RuleOutput<Preprocessed> {
domain: appendArrayInPlace(['this_ruleset_is_made_by_sukkaw.ruleset.skk.moe'], this.$preprocessed[0]),
domain_suffix: this.$preprocessed[1],
domain_keyword: Array.from(this.domainKeywords),
domain_regex: Array.from(this.domainWildcard).map(RuleOutput.domainWildCardToRegex),
domain_regex: Array.from(this.domainWildcard, RuleOutput.domainWildCardToRegex),
ip_cidr,
source_ip_cidr: [...this.sourceIpOrCidr].reduce<string[]>((acc, cur) => {
if (cur.includes('/')) {