Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / server / middlewares / cache.ts

diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index 1e5a13b2e0394952409d71e6db8acb23cdf3a5ac..cb24d9e0e51698eb317b1c8cdfb9d9c7da38b700 100644 (file)
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -1,64 +1,24 @@
-import * as express from 'express'
-import * as AsyncLock from 'async-lock'
-import { parseDuration } from '../helpers/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 (lifetime: number) {
-  return async function (req: express.Request, res: express.Response, next: express.NextFunction) {
-    const redisKey = Redis.Instance.buildCachedRouteKey(req)
-
-    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)
-
-        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)
-                 })
-          }
-
-          return sendSave(body)
-        }
-
-        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()
-    })
+const defaultOptions = {
+  redisClient: Redis.Instance.getClient(),
+  appendKey: () => Redis.Instance.getPrefix(),
+  statusCodes: {
+    exclude: [ 404, 403 ]
   }
 }
 
-const cache = (duration: number | string) => {
-  const _lifetime = parseDuration(duration, 3600000)
-  return cacheRoute(_lifetime)
-}
+const cacheRoute = (extraOptions = {}) => apicache.options({
+  ...defaultOptions,
+  ...extraOptions
+}).middleware
 
 // ---------------------------------------------------------------------------
 
 export {
-  cacheRoute,
-  cache
+  cacheRoute
 }