refactor(dns): extrat dns server (#632)

* extrat dns server

* f

* f

clash_lib/Cargo.toml

@@ -98,9 +98,9 @@ serde_json = "1"
 erased-serde = "0.4"
 
 # DNS
+watfaq-dns = { version = "0.1" }
 hickory-client = "0.25.0-alpha.2"
 hickory-resolver = "0.25.0-alpha.2"
-hickory-server = { version = "0.25.0-alpha.2", features = ["dns-over-rustls", "dns-over-https-rustls", "dns-over-h3"] }
 hickory-proto = { version = "0.25.0-alpha.2", features = ["dns-over-rustls", "dns-over-https-rustls", "dns-over-h3"]}
 
 dhcproto = "0.12"

clash_lib/src/app/api/handlers/dns.rs

@@ -52,7 +52,7 @@ async fn query_dns(
 
     m.add_query(hickory_proto::op::Query::query(name.unwrap(), typ));
 
-    match state.resolver.exchange(m).await {
+    match state.resolver.exchange(&m).await {
         Ok(response) => {
             let mut resp = Map::new();
             resp.insert("Status".to_owned(), response.response_code().low().into());

clash_lib/src/app/dns/config.rs

@@ -10,6 +10,7 @@ use regex::Regex;
 
 use serde::Deserialize;
 use url::Url;
+use watfaq_dns::{DNSListenAddr, DoH3Config, DoHConfig, DoTConfig};
 
 use crate::{
     common::trie,
@@ -45,44 +46,6 @@ pub struct FallbackFilter {
     pub domain: Vec<String>,
 }
 
-#[derive(Debug, Deserialize, Clone)]
-#[serde(rename_all = "kebab-case")]
-pub struct DoHConfig {
-    pub addr: SocketAddr,
-    pub ca_cert: DnsServerCert,
-    pub ca_key: DnsServerKey,
-    pub hostname: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-#[serde(rename_all = "kebab-case")]
-pub struct DoH3Config {
-    pub addr: SocketAddr,
-    pub ca_cert: DnsServerCert,
-    pub ca_key: DnsServerKey,
-    pub hostname: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-#[serde(rename_all = "kebab-case")]
-pub struct DoTConfig {
-    pub addr: SocketAddr,
-    pub ca_cert: DnsServerCert,
-    pub ca_key: DnsServerKey,
-}
-
-pub type DnsServerKey = Option<String>;
-pub type DnsServerCert = Option<String>;
-
-#[derive(Debug, Default, Clone)]
-pub struct DNSListenAddr {
-    pub udp: Option<SocketAddr>,
-    pub tcp: Option<SocketAddr>,
-    pub doh: Option<DoHConfig>,
-    pub dot: Option<DoTConfig>,
-    pub doh3: Option<DoH3Config>,
-}
-
 #[derive(Default)]
 pub struct Config {
     pub enable: bool,

clash_lib/src/app/dns/mod.rs

@@ -65,16 +65,15 @@ pub trait ClashResolver: Sync + Send {
     async fn cached_for(&self, ip: std::net::IpAddr) -> Option<String>;
 
     /// Used for DNS Server
-    async fn exchange(&self, message: op::Message) -> anyhow::Result<op::Message>;
+    async fn exchange(&self, message: &op::Message) -> anyhow::Result<op::Message>;
 
     /// Only used for look up fake IP
     async fn reverse_lookup(&self, ip: std::net::IpAddr) -> Option<String>;
     async fn is_fake_ip(&self, ip: std::net::IpAddr) -> bool;
+    fn fake_ip_enabled(&self) -> bool;
 
     fn ipv6(&self) -> bool;
     fn set_ipv6(&self, enable: bool);
 
     fn kind(&self) -> ResolverKind;
-
-    fn fake_ip_enabled(&self) -> bool;
 }

clash_lib/src/app/dns/resolver/enhanced.rs

@@ -437,7 +437,7 @@ impl EnhancedResolver {
 
     fn domain_name_of_message(m: &op::Message) -> Option<String> {
         m.query()
-            .map(|x| x.name().to_ascii().trim_matches('.').to_owned())
+            .map(|x| x.name().to_ascii().trim_end_matches('.').to_owned())
     }
 
     pub(crate) fn ip_list_of_message(m: &op::Message) -> Vec<net::IpAddr> {
@@ -581,8 +581,8 @@ impl ClashResolver for EnhancedResolver {
         None
     }
 
-    async fn exchange(&self, message: op::Message) -> anyhow::Result<op::Message> {
-        let rv = self.exchange(&message).await?;
+    async fn exchange(&self, message: &op::Message) -> anyhow::Result<op::Message> {
+        let rv = self.exchange(message).await?;
         let hostname = message
             .query()
             .unwrap()

clash_lib/src/app/dns/resolver/system_linux.rs

@@ -62,7 +62,7 @@ impl ClashResolver for SystemResolver {
 
     async fn exchange(
         &self,
-        _: hickory_proto::op::Message,
+        _: &hickory_proto::op::Message,
     ) -> anyhow::Result<hickory_proto::op::Message> {
         Err(anyhow::anyhow!("unsupported"))
     }

clash_lib/src/app/dns/resolver/system_non_linux.rs

@@ -81,7 +81,7 @@ impl ClashResolver for SystemResolver {
 
     async fn exchange(
         &self,
-        _: hickory_proto::op::Message,
+        _: &hickory_proto::op::Message,
     ) -> anyhow::Result<hickory_proto::op::Message> {
         Err(anyhow::anyhow!("unsupported"))
     }