fix: some tuff

Author: lostb1t

Cargo.lock

@@ -56,6 +56,7 @@ data-encoding = "2.4.0"
 reqwest-retry = "0.6"
 reqwest-middleware = "0.3"
 memory-stats = "1.2.0"
+graphql_client = { version = "0.14", features = ["reqwest"] }
 #format_serde_error = "0.3"
 
 [dev-dependencies]

Cargo.toml

@@ -31,7 +31,7 @@ run:
 	REPLEX_DISABLE_LEAF_COUNT=0 \
 	REPLEX_DISABLE_USER_STATE=0 \
 	REPLEX_ENABLE_CONSOLE=0 \
-	REPLEX_CACHE_TTL=0 \
+	REPLEX_CACHE_TTL=600 \
     REPLEX_NTF_WATCHLIST_FORCE=1 \
 	RUST_LOG="info,replex=info" \
     RUSTFLAGS=-Awarnings \

Makefile

@@ -7,6 +7,7 @@ use moka::{future::ConcurrentCacheExt, Expiry};
 use crate::headers;
 use once_cell::sync::Lazy;
 use salvo::cache::CachedBody;
+use regex::Regex;
 use salvo::cache::MethodSkipper;
 use salvo::conn::SocketAddr;
 use salvo::handler::Skipper;
@@ -157,6 +158,7 @@ pub struct RequestIssuer {
     use_authority: bool,
     use_local_addr: bool,
     use_path: bool,
+    path_strip_last_segment: bool,
     // TODO: Also make this like headers. So that we can dump unneeded query variables like X-Plex-Client-Identifier and have cross device caching
     use_query: bool,
     use_method: bool,
@@ -176,6 +178,7 @@ impl RequestIssuer {
             use_authority: true,
             use_local_addr: false,
             use_path: true,
+            path_strip_last_segment: false,
             use_query: true,
             use_method: true,
             use_mime: false,
@@ -189,6 +192,7 @@ impl RequestIssuer {
             use_authority: true,
             use_local_addr: false,
             use_path: true,
+            path_strip_last_segment: false,
             use_query: true,
             use_method: true,
             use_mime: false,
@@ -235,6 +239,10 @@ impl RequestIssuer {
         self.use_headers = value;
         self
     }
+    pub fn path_strip_last_segment(mut self, value: bool) -> Self {
+        self.path_strip_last_segment = value;
+        self
+    }
 }
 
 // #[derive(Encode, Decode, PartialEq, Debug)]
@@ -270,7 +278,15 @@ impl CacheIssuer for RequestIssuer {
             );
         }
         if self.use_path {
-            key.push_str(req.uri().path());
+            // strip last segment of an path. Used for paths that include tokens
+            if self.path_strip_last_segment{
+                // let re = Regex::new(format!(r"{}", self.path_regex.clone().unwrap()).as_str()).unwrap();
+                // req.uri().path()
+                //let k = req.uri().path().split('/').iter().join("/");
+                key.push_str(req.uri().path());
+            } else {
+                key.push_str(req.uri().path());
+            }
         }
         // TODO: Clean up query. Not everything needs a cache change.
         if self.use_query {

src/cache.rs

@@ -301,7 +301,7 @@ impl PlexClient {
         self,
         uuid: String,
     ) -> Option<String> {
-        let cache_key = format!("{}:cover_art", uuid);
+        let cache_key = format!("{}:hero_art", uuid);
 
         let cached_result: Option<Option<String>> =
             GLOBAL_CACHE.get(cache_key.as_str()).await;
@@ -333,12 +333,14 @@ impl PlexClient {
                 }
             }
         }
+        
+        image.as_ref()?; // dont return and dont cache, let us just retry next time.
 
         let mut cache_expiry = crate::cache::Expiration::Month;
-        image.as_ref()?; // dont return and dont cache, let us just retry next time.
         let _ = GLOBAL_CACHE
             .insert(cache_key, image.clone(), cache_expiry)
             .await;
+
         image
     }
 

src/plex_client.rs

@@ -156,10 +156,9 @@ pub fn route() -> Router {
         )
         .push(
             Router::new()
-                .path("/image/hero/<type>/<uuid>/<token>")
-                // .path("/image/hero.jpg")
+                .path("/replex/image/hero/<type>/<uuid>/<token>")
+                // .hoop(anonymous_cache(60 * 60 * 24 * 30))
                 .get(hero_image)
-                //.get(proxy_request),
         )
         .push(
             Router::new()
@@ -384,7 +383,6 @@ pub async fn hero_image(
     depot: &mut Depot,
 ) {
     let mut params: PlexContext = req.extract().await.unwrap();
-    
     let t = req.param::<String>("type").unwrap();
     let uuid = req.param::<String>("uuid").unwrap();
     let token = req.param::<String>("token");
@@ -861,6 +859,7 @@ pub fn auto_refresh_cache() -> Cache<MemoryStore<String>, RequestIssuer> {
     )
 }
 
+// cache that uses plex identifiers
 pub fn default_cache() -> Cache<MemoryStore<String>, RequestIssuer> {
     let config: Config = Config::figment().extract().unwrap();
     let ttl = if config.cache_rows {
@@ -879,6 +878,20 @@ pub fn default_cache() -> Cache<MemoryStore<String>, RequestIssuer> {
     )
 }
 
+// simple cache that doesnt use plex identifers
+pub fn anonymous_cache(ttl: u64) -> Cache<MemoryStore<String>, RequestIssuer> {
+    //let config: Config = Config::figment().extract().unwrap();
+
+    Cache::new(
+        MemoryStore::with_moka_cache(
+            MokaCacheSync::builder()
+                .time_to_live(Duration::from_secs(ttl))
+                .build(),
+        ),
+        RequestIssuer::new().use_scheme(false).use_query(false),
+    )
+}
+
 // const RESOLUTIONS: HashMap<&'static str, &'static str> =
 //     HashMap::from([("1080p", "1920x1080"), ("4k", "4096x2160")]);
 

src/routes.rs

@@ -800,7 +800,7 @@ impl Transform for MediaStyleTransform {
             guid = guid.replace("plex://", "");
 
             //let cover_art = item.get_hero_art(plex_client).await;
-            let cover_art = Some(format!("{}://{}/image/hero/{}/{}", 
+            let cover_art = Some(format!("{}://{}/replex/image/hero/{}/{}", 
                 match options.forwarded_proto {
                     Some(v) => v,
                     None => "http".to_string()