hls reverse proxy handling refactored

src/processing/parser/hls.rs

@@ -1,9 +1,6 @@
 use crate::model::api_proxy::ProxyUserCredentials;
-use crate::model::config::TargetType;
-use crate::model::hls::HlsEntry;
-use std::collections::HashMap;
+use crate::utils::crypto_utils::encrypt_text;
 use std::str;
-use tokio::time::Instant;
 
 pub const HLS_PREFIX: &str = "hls";
 
@@ -13,9 +10,7 @@ pub struct RewriteHlsProps<'a> {
     pub content: &'a str,
     pub hls_url: String,
     pub virtual_id: u32,
-    pub token: u32,
-    pub target_type: TargetType,
-    pub input_id: u16
+    pub input_id: u16,
 }
 
 
@@ -23,52 +18,32 @@ fn rewrite_hls_url(input: &str, replacement: &str) -> String {
     if replacement.starts_with('/') {
         let parts = input.splitn(4, '/').collect::<Vec<&str>>();
         if parts.len() < 4 {
-            return replacement.to_string(); // wenn weniger als 3 Slashes → alles ersetzen
+            return replacement.to_string(); // less than 3 Slashes → replace all
         }
         format!("{}/{}/{}{}", parts[0], parts[1], parts[2], replacement)
     } else {
         match input.rsplitn(2, '/').collect::<Vec<&str>>().as_slice() {
-            [_after, before] => format!("{}/{}", before, replacement),
+            [_after, before] => format!("{before}/{replacement}"),
             [_only] => replacement.to_string(),
             _ => input.to_string(),
         }
     }
-    // match input.rsplitn(2, '/').collect::<Vec<&str>>().as_slice() {
-    //     [_after, before] => format!("{before}/{replacement}"),
-    //     [_only] => replacement.to_string(), // if there is no slash, replace complete
-    //     _ => input.to_string(), // fallback, should never happen
-    // }
 }
 
-pub fn rewrite_hls(user: &ProxyUserCredentials, props: &RewriteHlsProps ) -> (HlsEntry, String) {
+pub fn rewrite_hls(user: &ProxyUserCredentials, props: &RewriteHlsProps) -> String {
     let username = &user.username;
     let password = &user.password;
-    let mut chunk: u32 = 1;
-    let mut chunks = HashMap::new();
     let mut result = Vec::new();
     for line in props.content.lines() {
         if line.starts_with('#') {
             result.push(line.to_string());
+        } else if let Ok(token) = if line.starts_with("http") {
+            encrypt_text(line)
         } else {
-            let url = if line.starts_with("http") {
-                line.to_string()
-            } else {
-               rewrite_hls_url(&props.hls_url, line)
-            };
-            chunks.insert(chunk, url);
-            result.push(format!("{}/{HLS_PREFIX}/{}/{username}/{password}/{}/{chunk}", props.base_url, props.token, props.virtual_id));
-            chunk += 1;
+            encrypt_text(&rewrite_hls_url(&props.hls_url, line))
+        } {
+            result.push(format!("{}/{HLS_PREFIX}/{username}/{password}/{}/{}/{token}", props.base_url, props.input_id, props.virtual_id));
         }
     }
-
-    let hls = HlsEntry {
-        ts: Instant::now(),
-        token: props.token,
-        target_type: props.target_type,
-        input_id: props.input_id,
-        virtual_id: props.virtual_id,
-        chunk,
-        chunks,
-    };
-    (hls, result.join("\r\n"))
+    result.join("\r\n")
 }