chore: Use ttl for lru cache as well

blowfishxyz · Jun 24, 2024 · 62f4e56 · 62f4e56
1 parent 29e2e41
commit 62f4e56
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/packages/explorerkit-server/src/components/idls.ts b/packages/explorerkit-server/src/components/idls.ts
@@ -15,7 +15,7 @@ export async function loadAllIdls(programIds: string[]): Promise<IdlsMap> {
   }
 
   const cache = getSharedDep("cache");
-  const cachedIdls = await cache.multiGet(programIds);
+  const cachedIdls = await cache.multiGet(programIds, IDL_CACHE_TTL);
 
   await Promise.allSettled(
     cachedIdls.map(async (res, i) => {
@@ -28,7 +28,7 @@ export async function loadAllIdls(programIds: string[]): Promise<IdlsMap> {
       }
 
       const idl = await getProgramIdl(programId);
-      void cache.set(programId, serializeIdl(idl), { EX: IDL_CACHE_TTL });
+      void cache.set(programId, serializeIdl(idl), IDL_CACHE_TTL);
       idls.set(programId, idl && new SolanaFMParser(idl, programId));
     })
   );

diff --git a/packages/explorerkit-server/src/core/cache.ts b/packages/explorerkit-server/src/core/cache.ts
@@ -6,7 +6,7 @@ import { register } from "@/components/metrics";
 import { config } from "@/core/config";
 import { onTeardown } from "@/utils/teardown";
 
-const LRU_CACHE_MAX_ITEMS_COUNT = 100;
+const LRU_CACHE_MAX_ITEMS_COUNT = 1000;
 
 type CacheMetricGauges = {
   redisHits: Gauge<string>;
@@ -21,7 +21,7 @@ class MultiCache {
     private guages: CacheMetricGauges
   ) {}
 
-  async multiGet(keys: string[]): Promise<(string | null)[]> {
+  async multiGet(keys: string[], ttlInS: number = 0): Promise<(string | null)[]> {
     const items: Record<string, string | null> = {};
     const missingLruKeys: string[] = [];
 
@@ -44,7 +44,9 @@ class MultiCache {
         items[key] = maybeIdl;
         if (maybeIdl) {
           this.guages.redisHits.inc();
-          this.lruCache.set(key, maybeIdl);
+          this.lruCache.set(key, maybeIdl, {
+            ttl: ttlInS * 1000,
+          });
         } else {
           this.guages.misses.inc();
         }
@@ -54,9 +56,14 @@ class MultiCache {
     return keys.map((key) => items[key] ?? null);
   }
 
-  async set(key: string, value: string, options: { EX: number }): Promise<void> {
-    this.lruCache.set(key, value);
-    await this.redis.set(key, value, options);
+  async set(key: string, value: string, ttlInS: number = 0): Promise<void> {
+    this.lruCache.set(key, value, {
+      ttl: ttlInS * 1000,
+    });
+
+    await this.redis.set(key, value, {
+      EX: ttlInS,
+    });
   }
 
   async teardown() {
@@ -72,6 +79,7 @@ export async function createCache(): Promise<MultiCache> {
 
   const lruCache = new LRUCache<string, string>({
     max: LRU_CACHE_MAX_ITEMS_COUNT,
+    updateAgeOnGet: true,
   });
 
   const multiCache = new MultiCache(redisClient as RedisClientType, lruCache, {