@helia/verified-fetch 2.6.17 → 2.6.18

package/src/utils/tlru.ts

@@ -1,4 +1,4 @@
-import hashlru from 'hashlru'
+import QuickLRU from 'quick-lru'
 
 /**
  * Time Aware Least Recent Used Cache
@@ -6,30 +6,20 @@ import hashlru from 'hashlru'
  * @see https://arxiv.org/pdf/1801.00390
  */
 export class TLRU<T> {
-  private readonly lru: ReturnType<typeof hashlru>
+  private readonly lru: QuickLRU<string, T>
 
   constructor (maxSize: number) {
-    this.lru = hashlru(maxSize)
+    this.lru = new QuickLRU({ maxSize })
   }
 
   get (key: string): T | undefined {
-    const value = this.lru.get(key)
-
-    if (value != null) {
-      if (value.expire != null && value.expire < Date.now()) {
-        this.lru.remove(key)
-
-        return undefined
-      }
-
-      return value.value
-    }
-
-    return undefined
+    return this.lru.get(key)
   }
 
   set (key: string, value: T, ttlMs: number): void {
-    this.lru.set(key, { value, expire: Date.now() + ttlMs })
+    this.lru.set(key, value, {
+      maxAge: Date.now() + ttlMs
+    })
   }
 
   has (key: string): boolean {
@@ -43,7 +33,7 @@ export class TLRU<T> {
   }
 
   remove (key: string): void {
-    this.lru.remove(key)
+    this.lru.delete(key)
   }
 
   clear (): void {

package/src/verified-fetch.ts

@@ -1,7 +1,7 @@
 import { ipns as heliaIpns } from '@helia/ipns'
 import { prefixLogger } from '@libp2p/logger'
-import { LRUCache } from 'lru-cache'
 import { CustomProgressEvent } from 'progress-events'
+import QuickLRU from 'quick-lru'
 import { ByteRangeContextPlugin } from './plugins/plugin-handle-byte-range-context.js'
 import { CarPlugin } from './plugins/plugin-handle-car.js'
 import { DagCborPlugin } from './plugins/plugin-handle-dag-cbor.js'
@@ -62,7 +62,7 @@ export class VerifiedFetch {
   private readonly ipns: IPNS
   private readonly log: Logger
   private readonly contentTypeParser: ContentTypeParser | undefined
-  private readonly blockstoreSessions: LRUCache<string, SessionBlockstore>
+  private readonly blockstoreSessions: QuickLRU<string, SessionBlockstore>
   private serverTimingHeaders: string[] = []
   private readonly withServerTiming: boolean
   private readonly plugins: VerifiedFetchPlugin[] = []
@@ -72,10 +72,10 @@ export class VerifiedFetch {
     this.log = helia.logger.forComponent('helia:verified-fetch')
     this.ipns = ipns ?? heliaIpns(helia)
     this.contentTypeParser = init?.contentTypeParser ?? contentTypeParser
-    this.blockstoreSessions = new LRUCache({
-      max: init?.sessionCacheSize ?? SESSION_CACHE_MAX_SIZE,
-      ttl: init?.sessionTTLms ?? SESSION_CACHE_TTL_MS,
-      dispose: (store) => {
+    this.blockstoreSessions = new QuickLRU({
+      maxSize: init?.sessionCacheSize ?? SESSION_CACHE_MAX_SIZE,
+      maxAge: init?.sessionTTLms ?? SESSION_CACHE_TTL_MS,
+      onEviction: (key, store) => {
         store.close()
       }
     })