graph: Use caching IPFS clients

Get the settings for CachingClient from the environment

Author: lutter

graph/src/ipfs/cache.rs

@@ -11,7 +11,7 @@ use lru_time_cache::LruCache;
 use object_store::{local::LocalFileSystem, path::Path, ObjectStore};
 use slog::{warn, Logger};
 
-use crate::prelude::CheapClone;
+use crate::{env::ENV_VARS, prelude::CheapClone};
 
 use super::{ContentPath, IpfsClient, IpfsRequest, IpfsResponse, IpfsResult, RetryPolicy};
 
@@ -119,14 +119,14 @@ pub struct CachingClient {
 }
 
 impl CachingClient {
-    #[allow(dead_code)]
-    pub fn new(
-        client: Arc<dyn IpfsClient>,
-        max_entry_size: usize,
-        cache_capacity: usize,
-        cache_path: Option<PathBuf>,
-    ) -> Self {
-        let cache = Cache::new(cache_capacity, max_entry_size, cache_path);
+    pub fn new(client: Arc<dyn IpfsClient>) -> Self {
+        let env = &ENV_VARS.mappings;
+
+        let cache = Cache::new(
+            env.max_ipfs_cache_size as usize,
+            env.max_ipfs_cache_file_size,
+            env.ipfs_cache_location.clone(),
+        );
         CachingClient { client, cache }
     }
 

graph/src/ipfs/gateway_client.rs

@@ -34,7 +34,7 @@ pub struct IpfsGatewayClient {
 impl IpfsGatewayClient {
     /// Creates a new [IpfsGatewayClient] with the specified server address.
     /// Verifies that the server is responding to IPFS gateway requests.
-    pub async fn new(server_address: impl AsRef<str>, logger: &Logger) -> IpfsResult<Self> {
+    pub(crate) async fn new(server_address: impl AsRef<str>, logger: &Logger) -> IpfsResult<Self> {
         let client = Self::new_unchecked(server_address, logger)?;
 
         client

graph/src/ipfs/mod.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use anyhow::anyhow;
+use cache::CachingClient;
 use futures03::future::BoxFuture;
 use futures03::stream::FuturesUnordered;
 use futures03::stream::StreamExt;
@@ -40,6 +41,8 @@ pub type IpfsResult<T> = Result<T, IpfsError>;
 /// If multiple IPFS server addresses are specified, an IPFS client pool is created internally
 /// and for each IPFS request, the fastest client that can provide the content is
 /// automatically selected and the response is streamed from that client.
+///
+/// All clients are set up to cache results
 pub async fn new_ipfs_client<I, S>(
     server_addresses: I,
     logger: &Logger,
@@ -59,7 +62,8 @@ where
             SafeDisplay(server_address)
         );
 
-        clients.push(use_first_valid_api(server_address, logger).await?);
+        let client = CachingClient::new(use_first_valid_api(server_address, logger).await?);
+        clients.push(Arc::new(client));
     }
 
     match clients.len() {