From 47f6409bb8bc49a50027b9579bb651c0506b6912 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 25 Apr 2019 11:27:13 +0200
Subject: Use apicache instead of our broken implementation

---
 server/middlewares/cache.ts | 73 +++++----------------------------------------
 1 file changed, 8 insertions(+), 65 deletions(-)

(limited to 'server/middlewares')

diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index 091c82d92..ef8611875 100644
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -1,73 +1,16 @@
-import * as express from 'express'
-import * as AsyncLock from 'async-lock'
-import { parseDurationToMs } from '../helpers/core-utils'
 import { Redis } from '../lib/redis'
-import { logger } from '../helpers/logger'
+import * as apicache from 'apicache'
 
-const lock = new AsyncLock({ timeout: 5000 })
+// Ensure Redis is initialized
+Redis.Instance.init()
 
-function cacheRoute (lifetimeArg: string | number) {
-  const lifetime = parseDurationToMs(lifetimeArg)
-
-  return async function (req: express.Request, res: express.Response, next: express.NextFunction) {
-    const redisKey = Redis.Instance.generateCachedRouteKey(req)
-
-    try {
-      await lock.acquire(redisKey, async (done) => {
-        const cached = await Redis.Instance.getCachedRoute(req)
-
-        // Not cached
-        if (!cached) {
-          logger.debug('No cached results for route %s.', req.originalUrl)
-
-          const sendSave = res.send.bind(res)
-          const redirectSave = res.redirect.bind(res)
-
-          res.send = (body) => {
-            if (res.statusCode >= 200 && res.statusCode < 400) {
-              const contentType = res.get('content-type')
-
-              Redis.Instance.setCachedRoute(req, body, lifetime, contentType, res.statusCode)
-                   .then(() => done())
-                   .catch(err => {
-                     logger.error('Cannot cache route.', { err })
-                     return done(err)
-                   })
-            } else {
-              done()
-            }
-
-            return sendSave(body)
-          }
-
-          res.redirect = url => {
-            done()
-
-            return redirectSave(url)
-          }
-
-          return next()
-        }
-
-        if (cached.contentType) res.set('content-type', cached.contentType)
-
-        if (cached.statusCode) {
-          const statusCode = parseInt(cached.statusCode, 10)
-          if (!isNaN(statusCode)) res.status(statusCode)
-        }
-
-        logger.debug('Use cached result for %s.', req.originalUrl)
-        res.send(cached.body).end()
-
-        return done()
-      })
-    } catch (err) {
-      logger.error('Cannot serve cached route.', { err })
-      return next()
-    }
-  }
+const options = {
+  redisClient: Redis.Instance.getClient(),
+  appendKey: () => Redis.Instance.getPrefix()
 }
 
+const cacheRoute = apicache.options(options).middleware
+
 // ---------------------------------------------------------------------------
 
 export {
-- 
cgit v1.2.3