perf(mem): optimise domain set mem footprint

clash_lib/src/app/dns/config.rs

@@ -45,7 +45,7 @@ pub struct FallbackFilter {
     pub domain: Vec<String>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 #[serde(rename_all = "kebab-case")]
 pub struct DoHConfig {
     pub addr: SocketAddr,
@@ -54,7 +54,7 @@ pub struct DoHConfig {
     pub hostname: Option<String>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 #[serde(rename_all = "kebab-case")]
 pub struct DoH3Config {
     pub addr: SocketAddr,
@@ -63,7 +63,7 @@ pub struct DoH3Config {
     pub hostname: Option<String>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Clone)]
 #[serde(rename_all = "kebab-case")]
 pub struct DoTConfig {
     pub addr: SocketAddr,
@@ -74,7 +74,7 @@ pub struct DoTConfig {
 pub type DnsServerKey = Option<String>;
 pub type DnsServerCert = Option<String>;
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct DNSListenAddr {
     pub udp: Option<SocketAddr>,
     pub tcp: Option<SocketAddr>,

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

@@ -84,7 +84,7 @@ impl EnhancedResolver {
     }
 
     pub async fn new(
-        cfg: &Config,
+        cfg: Config,
         store: ThreadSafeCacheFile,
         mmdb: Arc<Mmdb>,
     ) -> Self {
@@ -110,7 +110,7 @@ impl EnhancedResolver {
                 Some(default_resolver.clone()),
             )
             .await,
-            hosts: cfg.hosts.clone(),
+            hosts: cfg.hosts,
             fallback: if !cfg.fallback.is_empty() {
                 Some(
                     make_clients(

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

@@ -17,7 +17,7 @@ use crate::{app::profile::ThreadSafeCacheFile, common::mmdb::Mmdb};
 use super::{Config, ThreadSafeDNSResolver};
 
 pub async fn new(
-    cfg: &Config,
+    cfg: Config,
     store: Option<ThreadSafeCacheFile>,
     mmdb: Option<Arc<Mmdb>>,
 ) -> ThreadSafeDNSResolver {

clash_lib/src/app/remote_content_manager/providers/rule_provider/provider.rs

@@ -20,7 +20,9 @@ use crate::{
         },
         router::{map_rule_type, RuleMatcher},
     },
-    common::{errors::map_io_error, geodata::GeoData, mmdb::Mmdb, trie},
+    common::{
+        errors::map_io_error, geodata::GeoData, mmdb::Mmdb, succinct_set, trie,
+    },
     config::internal::rule::RuleType,
     session::Session,
     Error,
@@ -52,7 +54,8 @@ impl Display for RuleSetBehavior {
 }
 
 enum RuleContent {
-    Domain(trie::StringTrie<bool>),
+    // the left will converted into a right
+    Domain(succinct_set::DomainSet),
     Ipcidr(Box<CidrTrie>),
     Classical(Vec<Box<dyn RuleMatcher>>),
 }
@@ -91,7 +94,7 @@ impl RuleProviderImpl {
         let inner = Arc::new(tokio::sync::RwLock::new(Inner {
             content: match behovior {
                 RuleSetBehavior::Domain => {
-                    RuleContent::Domain(trie::StringTrie::new())
+                    RuleContent::Domain(succinct_set::DomainSet::default())
                 }
                 RuleSetBehavior::Ipcidr => {
                     RuleContent::Ipcidr(Box::new(CidrTrie::new()))
@@ -150,9 +153,7 @@ impl RuleProvider for RuleProviderImpl {
 
         match inner {
             Ok(inner) => match &inner.content {
-                RuleContent::Domain(trie) => {
-                    trie.search(&sess.destination.host()).is_some()
-                }
+                RuleContent::Domain(set) => set.has(&sess.destination.host()),
                 RuleContent::Ipcidr(trie) => trie.contains(
                     sess.destination
                         .ip()
@@ -243,7 +244,8 @@ fn make_rules(
 ) -> Result<RuleContent, Error> {
     match behavior {
         RuleSetBehavior::Domain => {
-            Ok(RuleContent::Domain(make_domain_rules(rules)?))
+            let s = make_domain_rules(rules)?;
+            Ok(RuleContent::Domain(s.into()))
         }
         RuleSetBehavior::Ipcidr => {
             Ok(RuleContent::Ipcidr(Box::new(make_ip_cidr_rules(rules)?)))

clash_lib/src/common/mod.rs

@@ -6,6 +6,7 @@ pub mod geodata;
 pub mod http;
 pub mod io;
 pub mod mmdb;
+pub mod succinct_set;
 pub mod timed_future;
 pub mod tls;
 pub mod trie;