build(deps): bump prost from 0.12.6 to 0.13.1

clash_lib/Cargo.toml

@@ -30,7 +30,7 @@ hyper = { version = "0.14.28", features = ["http1","http2","client", "server", "
 http = { version = "1.1" }
 httparse = "1.9.4"
 h2 = "0.4.5"
-prost = "0.12"
+prost = "0.13"
 tower = { version = "0.4", features = ["util"] }
 libc = "0.2"
 foreign-types-shared = "0.3.1"

clash_lib/src/app/router/rules/geodata/matcher_group.rs

@@ -22,7 +22,10 @@ impl SuccinctMatcherGroup {
         let mut set = trie::StringTrie::new();
         let mut other_matchers = Vec::new();
         for domain in domains {
-            let t = Type::try_from(domain.r#type)?;
+            let t = Type::try_from(domain.r#type).map_err(|x| {
+                crate::Error::InvalidConfig(format!("invalid domain type: {}", x))
+            })?;
+
             match t {
                 Type::Plain | Type::Regex => {
                     let matcher = try_new_matcher(domain.value, t)?;

clash_lib/src/app/router/rules/geodata/str_matcher.rs

@@ -53,7 +53,11 @@ pub fn try_new_matcher(
 ) -> Result<Box<dyn Matcher>, crate::Error> {
     Ok(match t {
         Type::Plain => Box::new(SubStrMatcher(domain)),
-        Type::Regex => Box::new(RegexMatcher(regex::Regex::new(&domain)?)),
+        Type::Regex => {
+            Box::new(RegexMatcher(regex::Regex::new(&domain).map_err(|x| {
+                crate::Error::InvalidConfig(format!("invalid regex: {}", x))
+            })?))
+        }
         Type::Domain => Box::new(DomainMatcher(domain)),
         Type::Full => Box::new(FullMatcher(domain)),
     })

clash_lib/src/common/geodata/mod.rs

@@ -43,14 +43,20 @@ impl GeoData {
             }
         }
         let bytes = tokio::fs::read(path).await?;
-        let cache = geodata_proto::GeoSiteList::decode(bytes.as_slice())?;
+        let cache =
+            geodata_proto::GeoSiteList::decode(bytes.as_slice()).map_err(|x| {
+                Error::InvalidConfig(format!("geosite decode failed: {}", x))
+            })?;
         Ok(Self { cache })
     }
 
     #[cfg(test)]
     pub async fn from_file<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
         let bytes = tokio::fs::read(path).await?;
-        let cache = geodata_proto::GeoSiteList::decode(bytes.as_slice())?;
+        let cache =
+            geodata_proto::GeoSiteList::decode(bytes.as_slice()).map_err(|x| {
+                Error::InvalidConfig(format!("geosite decode failed: {}", x))
+            })?;
         Ok(Self { cache })
     }
 

clash_lib/src/lib.rs

@@ -45,10 +45,6 @@ pub enum Error {
     IpNet(#[from] ipnet::AddrParseError),
     #[error(transparent)]
     Io(#[from] io::Error),
-    #[error(transparent)]
-    Decode(#[from] prost::DecodeError),
-    #[error(transparent)]
-    Regex(#[from] regex::Error),
     #[error("invalid config: {0}")]
     InvalidConfig(String),
     #[error("profile error: {0}")]