simpler cache

hanydd · Dec 5, 2024 · 7371f72 · 7371f72
1 parent 5f3209e
commit 7371f72
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/src/document.ts b/src/document.ts
@@ -30,11 +30,9 @@ function overwriteFetch() {
                 if (url.pathname.includes("/player/wbi/playurl")) {
                     const cid = url.searchParams.get("cid");
                     if (!playInfoCache.getFromCache(cid) && res?.data?.dash?.video) {
-                        playInfoCache.setupCache(cid).push(
-                            ...res.data.dash.video.map((v) => ({
-                                id: v.id,
-                                frameRate: parseFloat(v.frameRate),
-                            }))
+                        playInfoCache.set(
+                            cid,
+                            res.data.dash.video.map((v) => ({ id: v.id, frameRate: parseFloat(v.frameRate) }))
                         );
                     }
                 }

diff --git a/src/utils/cache.ts b/src/utils/cache.ts
@@ -7,7 +7,7 @@ export class DataCache<T extends string, V> {
     private init: () => V;
     private cacheLimit: number;
 
-    constructor(init: () => V, cacheLimit = 2000) {
+    constructor(init?: () => V, cacheLimit = 2000) {
         this.cache = {};
         this.init = init;
         this.cacheLimit = cacheLimit;
@@ -17,17 +17,17 @@ export class DataCache<T extends string, V> {
         return this.cache[key];
     }
 
+    public set(key: T, value: V): void {
+        this.cache[key] = {
+            ...value,
+            lastUsed: Date.now(),
+        };
+        this.gc();
+    }
+
     public setupCache(key: T): V & CacheRecord {
-        if (!this.cache[key]) {
-            this.cache[key] = {
-                ...this.init(),
-                lastUsed: Date.now(),
-            };
-
-            if (Object.keys(this.cache).length > this.cacheLimit) {
-                const oldest = Object.entries(this.cache).reduce((a, b) => (a[1].lastUsed < b[1].lastUsed ? a : b));
-                delete this.cache[oldest[0]];
-            }
+        if (!this.cache[key] && this.init) {
+            this.set(key, this.init());
         }
 
         return this.cache[key];
@@ -38,4 +38,11 @@ export class DataCache<T extends string, V> {
 
         return !!this.cache[key];
     }
+
+    private gc(): void {
+        if (Object.keys(this.cache).length > this.cacheLimit) {
+            const oldest = Object.entries(this.cache).reduce((a, b) => (a[1].lastUsed < b[1].lastUsed ? a : b));
+            delete this.cache[oldest[0]];
+        }
+    }
 }