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

Protocol/Network rule support

Browse Source
This commit is contained in:
SukkaW 2025-05-03 22:54:25 +08:00
parent c3e4a1a445
commit 76f56fa0e0
6 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ export class FileOutput {
protected sourceIpOrCidr = new Set<string>();
protected sourcePort = new Set<string>();
protected destPort = new Set<string>();
protected protocol = new Set<string>();
protected otherRules: string[] = [];
@ -199,6 +200,9 @@ export class FileOutput {
case 'DEST-PORT':
this.destPort.add(value);
break;
case 'PROTOCOL':
this.protocol.add(value.toUpperCase());
break;
default:
this.otherRules.push(line);
break;
@ -327,6 +331,9 @@ export class FileOutput {
if (this.domainWildcard.size) {
strategy.writeDomainWildcards(this.domainWildcard);
}
if (this.protocol.size) {
strategy.writeProtocols(this.protocol);
}
if (this.userAgent.size) {
strategy.writeUserAgents(this.userAgent);
}

1
Build/lib/writing-strategy/adguardhome.ts
View File

@ -105,5 +105,6 @@ export class AdGuardHome extends BaseWriteStrategy {
writeSourceIpCidrs = notSupported('writeSourceIpCidrs');
writeSourcePorts = notSupported('writeSourcePorts');
writeDestinationPorts = noop;
writeProtocols = noop;
writeOtherRules = noop;
}

1
Build/lib/writing-strategy/base.ts
View File

@ -42,6 +42,7 @@ export abstract class BaseWriteStrategy {
abstract writeSourceIpCidrs(sourceIpCidr: string[]): void;
abstract writeSourcePorts(port: Set<string>): void;
abstract writeDestinationPorts(port: Set<string>): void;
abstract writeProtocols(protocol: Set<string>): void;
abstract writeOtherRules(rule: string[]): void;
protected abstract withPadding(title: string, description: string[] | readonly string[], date: Date, content: string[]): string[];

14
Build/lib/writing-strategy/clash.ts
View File

@ -41,6 +41,7 @@ export class ClashDomainSet extends BaseWriteStrategy {
writeSourceIpCidrs = noop;
writeSourcePorts = noop;
writeDestinationPorts = noop;
writeProtocols = noop;
writeOtherRules = noop;
}
@ -80,6 +81,7 @@ export class ClashIPSet extends BaseWriteStrategy {
writeSourceIpCidrs = notSupported('writeSourceIpCidrs');
writeSourcePorts = notSupported('writeSourcePorts');
writeDestinationPorts = noop;
writeProtocols = noop;
writeOtherRules = noop;
}
@ -171,5 +173,17 @@ export class ClashClassicRuleSet extends BaseWriteStrategy {
appendSetElementsToArray(this.result, port, i => `DST-PORT,${i}`);
}
writeProtocols(protocol: Set<string>): void {
// Mihomo only matches UDP/TCP: https://wiki.metacubex.one/en/config/rules/#network
// protocol has already be normalized and will only contain upppercase
if (protocol.has('UDP')) {
this.result.push('NETWORK,UDP');
}
if (protocol.has('TCP')) {
this.result.push('NETWORK,TCP');
}
}
writeOtherRules = noop;
}

14
Build/lib/writing-strategy/singbox.ts
View File

@ -17,7 +17,8 @@ interface SingboxHeadlessRule {
port?: number[],
port_range?: string[],
process_name?: string[],
process_path?: string[]
process_path?: string[],
network?: string[]
}
export interface SingboxSourceFormat {
@ -154,5 +155,16 @@ export class SingboxSource extends BaseWriteStrategy {
}
}
writeProtocols(protocol: Set<string>): void {
this.singbox.network ??= [];
// protocol has already be normalized and will only be uppercase
if (protocol.has('UDP')) {
this.singbox.network.push('udp');
}
if (protocol.has('TCP')) {
this.singbox.network.push('tcp');
}
}
writeOtherRules = noop;
}

6
Build/lib/writing-strategy/surge.ts
View File

@ -44,6 +44,7 @@ export class SurgeDomainSet extends BaseWriteStrategy {
writeSourceIpCidrs = noop;
writeSourcePorts = noop;
writeDestinationPorts = noop;
writeProtocols = noop;
writeOtherRules = noop;
}
@ -130,6 +131,10 @@ export class SurgeRuleSet extends BaseWriteStrategy {
appendSetElementsToArray(this.result, port, i => `DEST-PORT,${i}`);
}
writeProtocols(protocol: Set<string>): void {
appendSetElementsToArray(this.result, protocol, i => `PROTOCOL,${i}`);
}
writeOtherRules(rule: string[]): void {
appendArrayInPlace(this.result, rule);
}
@ -268,5 +273,6 @@ export class SurgeMitmSgmodule extends BaseWriteStrategy {
writeSourceIpCidrs = noop;
writeSourcePorts = noop;
writeDestinationPorts = noop;
writeProtocols = noop;
writeOtherRules = noop;
}