Merge pull request #179 from TeamPiped/error-handling

refactor: simplify error handling

src/main.rs

@@ -34,7 +34,7 @@ async fn main() -> std::io::Result<()> {
 
     // get socket/port from env
     // backwards compat when only UDS is set
-    if get_env_bool("UDS") {
+    if utils::get_env_bool("UDS") {
         let socket_path =
             env::var("BIND_UNIX").unwrap_or_else(|_| "./socket/actix.sock".to_string());
         server.bind_uds(socket_path)?
@@ -57,7 +57,7 @@ static CLIENT: Lazy<Client> = Lazy::new(|| {
         .user_agent("Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101 Firefox/102.0");
 
     let proxy = if let Ok(proxy) = env::var("PROXY") {
-        Some(reqwest::Proxy::all(proxy).unwrap())
+        reqwest::Proxy::all(proxy).ok()
     } else {
         None
     };
@@ -74,14 +74,13 @@ static CLIENT: Lazy<Client> = Lazy::new(|| {
         builder
     };
 
-    if get_env_bool("IPV4_ONLY") {
+    if utils::get_env_bool("IPV4_ONLY") {
-        builder
+        builder.local_address("0.0.0.0".parse().ok())
-            .local_address(Some("0.0.0.0".parse().unwrap()))
-            .build()
-            .unwrap()
     } else {
-        builder.build().unwrap()
+        builder
     }
+    .build()
+    .unwrap()
 });
 
 const ANDROID_USER_AGENT: &str = "com.google.android.youtube/1537338816 (Linux; U; Android 13; en_US; ; Build/TQ2A.230505.002; Cronet/113.0.5672.24)";
@@ -129,13 +128,6 @@ fn is_header_allowed(header: &str) -> bool {
     )
 }
 
-fn get_env_bool(key: &str) -> bool {
-    match env::var(key) {
-        Ok(val) => val.to_lowercase() == "true" || val == "1",
-        Err(_) => false,
-    }
-}
-
 async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
     if req.method() == Method::OPTIONS {
         let mut response = HttpResponse::Ok();
@@ -156,13 +148,9 @@ async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
 
         let secret = env::var("HASH_SECRET");
         if let Ok(secret) = secret {
-            let qhash = query.get("qhash");
+            let Some(qhash) = query.get("qhash") else {
-
-            if qhash.is_none() {
                 return Err("No qhash provided".into());
-            }
+            };
-
-            let qhash = qhash.unwrap();
 
             if qhash.len() != 8 {
                 return Err("Invalid qhash provided".into());
@@ -220,29 +208,24 @@ async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
         }
     }
 
-    let res = query.get("host");
+    let Some(host) = query.get("host").map(|s| s.to_string()) else {
-    let res = res.map(|s| s.to_string());
-
-    if res.is_none() {
         return Err("No host provided".into());
-    }
+    };
 
     #[cfg(any(feature = "webp", feature = "avif"))]
-    let disallow_image_transcoding = get_env_bool("DISALLOW_IMAGE_TRANSCODING");
+    let disallow_image_transcoding = utils::get_env_bool("DISALLOW_IMAGE_TRANSCODING");
 
     let rewrite = query.get("rewrite") != Some("false");
 
     #[cfg(feature = "avif")]
     let avif = query.get("avif") == Some("true");
 
-    let host = res.unwrap();
+    let Some(domain) = RE_DOMAIN
-    let domain = RE_DOMAIN.captures(host.as_str());
+        .captures(host.as_str())
-
+        .map(|domain| domain.get(1).unwrap().as_str())
-    if domain.is_none() {
+    else {
         return Err("Invalid host provided".into());
-    }
+    };
-
-    let domain = domain.unwrap().get(1).unwrap().as_str();
 
     if !ALLOWED_DOMAINS.contains(&domain) {
         return Err("Domain not allowed".into());
@@ -325,13 +308,7 @@ async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
         request_headers.insert("User-Agent", ANDROID_USER_AGENT.parse().unwrap());
     }
 
-    let resp = CLIENT.execute(request).await;
+    let resp = CLIENT.execute(request).await?;
-
-    if resp.is_err() {
-        return Err(resp.err().unwrap().into());
-    }
-
-    let resp = resp?;
 
     let mut response = HttpResponse::build(resp.status());
 

src/utils.rs

@@ -2,6 +2,7 @@ use qstring::QString;
 use reqwest::Url;
 use std::borrow::Cow;
 use std::collections::BTreeMap;
+use std::env;
 
 pub fn read_buf(buf: &[u8], pos: &mut usize) -> u8 {
     let byte = buf[*pos];
@@ -13,7 +14,6 @@ fn finalize_url(path: &str, query: BTreeMap<String, String>) -> String {
     #[cfg(feature = "qhash")]
     {
         use std::collections::BTreeSet;
-        use std::env;
 
         let qhash = {
             let secret = env::var("HASH_SECRET");
@@ -43,9 +43,9 @@ fn finalize_url(path: &str, query: BTreeMap<String, String>) -> String {
             }
         };
 
-        if qhash.is_some() {
+        if let Some(qhash) = qhash {
             let mut query = QString::new(query.into_iter().collect::<Vec<_>>());
-            query.add_pair(("qhash", qhash.unwrap()));
+            query.add_pair(("qhash", qhash));
             return format!("{}?{}", path, query);
         }
     }
@@ -94,3 +94,10 @@ pub fn escape_xml(raw: &str) -> Cow<'_, str> {
         Cow::Owned(escaped)
     }
 }
+
+pub fn get_env_bool(key: &str) -> bool {
+    match env::var(key) {
+        Ok(val) => val.to_lowercase() == "true" || val == "1",
+        Err(_) => false,
+    }
+}