Changes from testing

Author: thehabes

cache/index.js

@@ -135,6 +135,7 @@ class LRUCache {
 
         // Check if expired
         if (this.isExpired(node)) {
+            console.log("Expired node will be removed.")
             this.delete(key)
             this.stats.misses++
             return null
@@ -379,7 +380,7 @@ class LRUCache {
             ...this.stats,
             length: this.cache.size,
             bytes: Buffer.byteLength(JSON.stringify(this.cache), 'utf8'),
-            lifespan: readableAge(Date.now() - this.life),
+            lifespan: this.readableAge(Date.now() - this.life),
             maxLength: this.maxLength,
             maxBytes: this.maxBytes,
             hitRate: `${hitRate}%`,
@@ -400,7 +401,7 @@ class LRUCache {
             entries.push({
                 position,
                 key: current.key,
-                age: readableAge(Date.now() - current.timestamp),
+                age: this.readableAge(Date.now() - current.timestamp),
                 hits: current.hits,
                 length: JSON.stringify(current.value).length,
                 bytes: Buffer.byteLength(JSON.stringify(current.value), 'utf8')
@@ -417,9 +418,10 @@ class LRUCache {
         const minutes = Math.floor(seconds / 60)
         const hours = Math.floor(minutes / 60)
         const days = Math.floor(hours / 24)
-        parts.push(`${Math.floor(days)} day${Math.floor(dats) !== 1 ? 's' : ''}`)
-        parts.push(`${hours} hour${hours !== 1 ? 's' : ''}`)
-        parts.push(`${minutes} minute${minutes !== 1 ? 's' : ''}`)
+        let parts = []
+        if (days > 0) parts.push(`${Math.floor(days)} day${Math.floor(days) !== 1 ? 's' : ''}`)
+        if (hours > 0) parts.push(`${hours} hour${hours !== 1 ? 's' : ''}`)
+        if (minutes > 0) parts.push(`${minutes} minute${minutes !== 1 ? 's' : ''}`)
         parts.push(`${seconds} second${seconds !== 1 ? 's' : ''}`)
         return parts.join(", ")
     }
@@ -429,7 +431,7 @@ class LRUCache {
 // Configuration can be adjusted via environment variables
 const CACHE_MAX_LENGTH = parseInt(process.env.CACHE_MAX_LENGTH ?? 1000)
 const CACHE_MAX_BYTES = parseInt(process.env.CACHE_MAX_BYTES ?? 1000000000) // 1000 MB
-const CACHE_TTL = parseInt(process.env.CACHE_TTL ?? 10000) // 5 minutes default
-const cache = new LRUCache(CACHE_MAX_LENGTH, CACHE_TTL)
-// Could also export this 'cache' as a instance of the LRUCache Class, but no use case for it yet.
+const CACHE_TTL = parseInt(process.env.CACHE_TTL ?? 300000) // 5 minutes default
+const cache = new LRUCache(CACHE_MAX_LENGTH, CACHE_MAX_BYTES, CACHE_TTL)
+
 export default cache

cache/middleware.js

@@ -35,7 +35,7 @@ const cacheQuery = (req, res, next) => {
         console.log(`Cache HIT: query`)
         res.set("Content-Type", "application/json; charset=utf-8")
         res.set('X-Cache', 'HIT')
-        res.json(cachedResult)
+        res.status(200).json(cachedResult)
         return
     }
 
@@ -54,8 +54,8 @@ const cacheQuery = (req, res, next) => {
         return originalJson(data)
     }
 
-    console.log("CACHE DETAILS")
-    console.log(cache.getDetails())
+    console.log("CACHE STATS")
+    console.log(cache.getStats())
     next()
 }
 
@@ -86,7 +86,7 @@ const cacheSearch = (req, res, next) => {
         console.log(`Cache HIT: search "${searchText}"`)
         res.set("Content-Type", "application/json; charset=utf-8")
         res.set('X-Cache', 'HIT')
-        res.json(cachedResult)
+        res.status(200).json(cachedResult)
         return
     }
 
@@ -101,8 +101,8 @@ const cacheSearch = (req, res, next) => {
         return originalJson(data)
     }
 
-    console.log("CACHE DETAILS")
-    console.log(cache.getDetails())
+    console.log("CACHE STATS")
+    console.log(cache.getStats())
     next()
 }
 
@@ -133,7 +133,7 @@ const cacheSearchPhrase = (req, res, next) => {
         console.log(`Cache HIT: search phrase "${searchText}"`)
         res.set("Content-Type", "application/json; charset=utf-8")
         res.set('X-Cache', 'HIT')
-        res.json(cachedResult)
+        res.status(200).json(cachedResult)
         return
     }
 
@@ -148,8 +148,8 @@ const cacheSearchPhrase = (req, res, next) => {
         return originalJson(data)
     }
 
-    console.log("CACHE DETAILS")
-    console.log(cache.getDetails())
+    console.log("CACHE STATS")
+    console.log(cache.getStats())
     next()
 }
 
@@ -176,7 +176,7 @@ const cacheId = (req, res, next) => {
         res.set('X-Cache', 'HIT')
         // Apply same headers as the original controller
         res.set("Cache-Control", "max-age=86400, must-revalidate")
-        res.json(cachedResult)
+        res.status(200).json(cachedResult)
         return
     }
 
@@ -191,8 +191,8 @@ const cacheId = (req, res, next) => {
         return originalJson(data)
     }
 
-    console.log("CACHE DETAILS")
-    console.log(cache.getDetails())
+    console.log("CACHE STATS")
+    console.log(cache.getStats())
     next()
 }
 
@@ -450,7 +450,7 @@ const invalidateCache = (req, res, next) => {
  */
 const cacheStats = (req, res) => {
     const stats = cache.getStats()
-    const details = req.query.details === 'true' ? cache.getDetails() : undefined
+    const details = req.query.details === 'true' ? cache.getStats() : undefined
 
     res.json({
         stats,