Add DNS override

Fixed some bugs
Optimize more detail
This commit is contained in:
chen08209
2024-08-26 20:44:30 +08:00
parent 3783c3c650
commit aca4a3e979
59 changed files with 4053 additions and 1000 deletions

View File

@@ -26,84 +26,84 @@ class Tun with _$Tun {
factory Tun.fromJson(Map<String, Object?> json) => _$TunFromJson(json);
}
@JsonSerializable()
class Dns {
bool enable;
bool ipv6;
@JsonKey(name: "default-nameserver")
List<String> defaultNameserver;
@JsonKey(name: "enhanced-mode")
String enhancedMode;
@JsonKey(name: "fake-ip-range")
String fakeIpRange;
@JsonKey(name: "use-hosts")
bool useHosts;
List<String> nameserver;
List<String> fallback;
@JsonKey(name: "fake-ip-filter")
List<String> fakeIpFilter;
@freezed
class FallbackFilter with _$FallbackFilter {
const factory FallbackFilter({
@Default(true) bool geoip,
@Default("CN") @JsonKey(name: "geoip-code") String geoipCode,
@Default(["gfw"]) List<String> geosite,
@Default(["240.0.0.0/4"]) List<String> ipcidr,
@Default([
"+.google.com",
"+.facebook.com",
"+.youtube.com",
])
List<String> domain,
}) = _FallbackFilter;
Dns()
: enable = true,
ipv6 = false,
defaultNameserver = [
"223.5.5.5",
"119.29.29.29",
"8.8.4.4",
"1.0.0.1",
],
enhancedMode = "fake-ip",
fakeIpRange = "198.18.0.1/16",
useHosts = true,
nameserver = [
"8.8.8.8",
"114.114.114.114",
"https://doh.pub/dns-query",
"https://dns.alidns.com/dns-query",
],
fallback = [
'https://doh.dns.sb/dns-query',
'https://dns.cloudflare.com/dns-query',
'https://dns.twnic.tw/dns-query',
'tls://8.8.4.4:853',
],
fakeIpFilter = [
// Stun Services
"+.stun.*.*",
"+.stun.*.*.*",
"+.stun.*.*.*.*",
"+.stun.*.*.*.*.*",
factory FallbackFilter.fromJson(Map<String, Object?> json) =>
_$FallbackFilterFromJson(json);
}
// Google Voices
"lens.l.google.com",
@freezed
class Dns with _$Dns {
const factory Dns({
@Default(true) bool enable,
@Default(false) @JsonKey(name: "prefer-h3") bool preferH3,
@Default(true) @JsonKey(name: "use-hosts") bool useHosts,
@Default(true) @JsonKey(name: "use-system-hosts") bool useSystemHosts,
@Default(true) @JsonKey(name: "respect-rules") bool respectRules,
@Default(false) bool ipv6,
@Default(["223.5.5.5"])
@JsonKey(name: "default-nameserver")
List<String> defaultNameserver,
@Default(DnsMode.fakeIp)
@JsonKey(name: "enhanced-mode")
DnsMode enhancedMode,
@Default("198.18.0.1/16")
@JsonKey(name: "fake-ip-range")
String fakeIpRange,
@Default([
"*.lan",
"localhost.ptlogin2.qq.com",
])
@JsonKey(name: "fake-ip-filter")
List<String> fakeIpFilter,
@Default({
"www.baidu.com": "114.114.114.114",
"+.internal.crop.com": "10.0.0.1",
"geosite:cn": "https://doh.pub/dns-query"
})
@JsonKey(name: "nameserver-policy")
Map<String, String> nameserverPolicy,
@Default([
"https://doh.pub/dns-query",
"https://dns.alidns.com/dns-query",
])
List<String> nameserver,
@Default([
"tls://8.8.4.4",
"tls://1.1.1.1",
])
List<String> fallback,
@Default([
"https://doh.pub/dns-query",
])
@JsonKey(name: "proxy-server-nameserver")
List<String> proxyServerNameserver,
@Default(FallbackFilter())
@JsonKey(name: "fallback-filter")
FallbackFilter fallbackFilter,
}) = _Dns;
// Nintendo Switch STUN
"*.n.n.srv.nintendo.net",
factory Dns.fromJson(Map<String, Object?> json) => _$DnsFromJson(json);
// PlayStation STUN
"+.stun.playstation.net",
// XBox
"xbox.*.*.microsoft.com",
"*.*.xboxlive.com",
// Microsoft Captive Portal
"*.msftncsi.com",
"*.msftconnecttest.com",
// Bilibili CDN
"*.mcdn.bilivideo.cn",
// Windows Default LAN WorkGroup
"WORKGROUP",
];
factory Dns.fromJson(Map<String, dynamic> json) {
return _$DnsFromJson(json);
}
Map<String, dynamic> toJson() {
return _$DnsToJson(this);
factory Dns.safeDnsFromJson(Map<String, Object?> json) {
try {
return Dns.fromJson(json);
} catch (_) {
return const Dns();
}
}
}
@@ -144,7 +144,7 @@ class ClashConfig extends ChangeNotifier {
_geodataLoader = geodataLoaderMemconservative,
_externalController = '',
_keepAliveInterval = 30,
_dns = Dns(),
_dns = const Dns(),
_geoXUrl = defaultGeoXMap,
_rules = [],
_hosts = {};
@@ -273,6 +273,7 @@ class ClashConfig extends ChangeNotifier {
}
}
@JsonKey(fromJson: Dns.safeDnsFromJson)
Dns get dns => _dns;
set dns(Dns value) {