GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-03-15 07:26:42 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Refactor: remove domain wildcard to regex fallback

Browse Source 
This change will not affect widely used app like
Surge/Mihomo/QuanX/Shadowrocket, as they most likely already support
native `DOMAIN-WILDCARD`.
This commit is contained in:
SukkaW
2026-03-09 23:15:15 +08:00
parent 0c02e84a68
commit 5e9a2cc605
2 changed files with 1 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,27 +46,6 @@ export abstract class BaseWriteStrategy {
protected abstract withPadding(title: string, description: string[] | readonly string[], date: Date, content: string[]): string[]; protected abstract withPadding(title: string, description: string[] | readonly string[], date: Date, content: string[]): string[];
static readonly domainWildCardToRegex = (domain: string) => {
let result = '^';
for (let i = 0, len = domain.length; i < len; i++) {
switch (domain[i]) {
case '.':
result += String.raw`\.`;
break;
case '*':
result += String.raw`[\w.-]*?`;
break;
case '?':
result += String.raw`[\w.-]`;
break;
default:
result += domain[i];
}
}
result += '$';
return result;
};
public output( public output(
span: Span, span: Span,
title: string, title: string,

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

@@ -71,29 +71,10 @@ export class SingboxSource extends BaseWriteStrategy {
); );
} }
writeDomainWildcard(wildcard: string): void { writeDomainWildcard = noop;
this.singbox.domain_regex ??= [];
this.singbox.domain_regex.push(SingboxSource.domainWildCardToRegex(wildcard));
}
writeUserAgents = noop; writeUserAgents = noop;
writeProcessNames = noop; writeProcessNames = noop;
// writeProcessNames(processName: Set<string>): void {
// appendArrayInPlace(
// this.singbox.process_name ??= [],
// Array.from(processName)
// );
// }
writeProcessPaths = noop; writeProcessPaths = noop;
// writeProcessPaths(processPath: Set<string>): void {
// appendArrayInPlace(
// this.singbox.process_path ??= [],
// Array.from(processPath)
// );
// }
writeUrlRegexes = noop; writeUrlRegexes = noop;
writeIpCidrs(ipCidr: string[]): void { writeIpCidrs(ipCidr: string[]): void {
@@ -111,65 +92,10 @@ export class SingboxSource extends BaseWriteStrategy {
} }
writeGeoip = noop; writeGeoip = noop;
writeIpAsns = noop; writeIpAsns = noop;
writeSourceIpCidrs = noop; writeSourceIpCidrs = noop;
// writeSourceIpCidrs(sourceIpCidr: string[]): void {
// this.singbox.source_ip_cidr ??= [];
// for (let i = 0, len = sourceIpCidr.length; i < len; i++) {
// const value = sourceIpCidr[i];
// if (value.includes('/')) {
// this.singbox.source_ip_cidr.push(value);
// continue;
// }
// const v = fastIpVersion(value);
// if (v === 4) {
// this.singbox.source_ip_cidr.push(`${value}/32`);
// continue;
// }
// if (v === 6) {
// this.singbox.source_ip_cidr.push(`${value}/128`);
// continue;
// }
// }
// }
writeSourcePorts = noop; writeSourcePorts = noop;
// writeSourcePorts(port: Set<string>): void {
// this.singbox.source_port ??= [];
// for (const i of port) {
// const tmp = Number(i);
// if (!Number.isNaN(tmp)) {
// this.singbox.source_port.push(tmp);
// }
// }
// }
writeDestinationPorts = noop; writeDestinationPorts = noop;
// writeDestinationPorts(port: Set<string>): void {
// this.singbox.port ??= [];
// for (const i of port) {
// const tmp = Number(i);
// if (!Number.isNaN(tmp)) {
// this.singbox.port.push(tmp);
// }
// }
// }
writeProtocols = noop; writeProtocols = noop;
// 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; writeOtherRules = noop;
} }