Fix cache removal queue processing

8e66ab4d5122ff3cb0b438fb31694e0c2a9e34ef

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 4490c3edd5b68104d35a947da2fbc1b28fe31034

src/endpoints/characters.js+38 -11 Viewed

 const useDiskCache = !!getConfigValue('performance.useDiskCache', true, 'boolean');
 class DiskCache {
+    /**
+     * @typedef {object} CacheRemovalQueueItem
+     * @property {string} item Path to the character file
+     * @property {number} timestamp Timestamp of the last access
+     */
     /** @type {string} */
     static DIRECTORY = 'characters';

     /**
      * Queue for removal of cache entries.
-     * @type {Set<string>}
+     * @type {CacheRemovalQueueItem[]}
      */
-    removalQueue = new Set();
+    removalQueue = [];
     /**
      * Processes the removal queue.

      */
     async #removeCacheEntries() {
         try {
-            if (!useDiskCache || this.removalQueue.size === 0) {
+            if (!useDiskCache || this.removalQueue.length === 0) {
                 return;
+            }
-            const keys = await this.instance().then(i => i.keys());
+            /** @type {Map<string, number>} */
-            for (const item of this.removalQueue) {
+            const latestTimestamps = new Map();
-                const key = keys.find(k => k.startsWith(item));
+            for (const { item, timestamp } of this.removalQueue) {
-                if (key) {
+                if (!latestTimestamps.has(item) || timestamp > (latestTimestamps.get(item) ?? 0)) {
-                    await this.instance().then(i => i.removeItem(key));
+                    latestTimestamps.set(item, timestamp);
+                }
+            }
+            this.removalQueue.length = 0;
+            const cache = await this.instance();
+            const keys = await cache.keys();
+            for (const [item, timestamp] of latestTimestamps.entries()) {
+                const itemKeys = keys.filter(k => k.startsWith(item));
+                if (!itemKeys.length) {
+                    continue;
+                }
+                for (const key of itemKeys) {
+                    const datumPath = cache.getDatumPath(key);
+                    if (!fs.existsSync(datumPath)) {
+                        continue;
+                    }
+                    const stat = fs.statSync(datumPath);
+                    if (stat.mtimeMs > timestamp) {
+                        continue;
+                    }
+                    await cache.removeItem(key);
+                }
+            }
-            this.removalQueue.clear();
         } catch (error) {
             console.error('Error while removing cache entries:', error);
+        }
-    };
+    }
     /**
      * Gets the disk cache instance.

@@ -176,7 +203,7 @@ async function writeCharacterData(inputFile, data, outputFile, request, crop = u
176	}	203	}
177	}	204	}
178	if (useDiskCache && !Buffer.isBuffer(inputFile)) {	205	if (useDiskCache && !Buffer.isBuffer(inputFile)) {
179	diskCache.removalQueue.add(inputFile);	206	diskCache.removalQueue.push({ item: inputFile, timestamp: Date.now() });
180	}	207	}
181	/**	208	/**
182	* Read the image, resize, and save it as a PNG into the buffer.	209	* Read the image, resize, and save it as a PNG into the buffer.