Merge branch 'release/1.4.0' into develop

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

diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index a2c7f7cbdb68b59677def0bae83bcb1bed39aa2d..ef8611875b980c9768ceb137d1aaf6f6af0a6320 100644 (file)
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -1,39 +1,16 @@
-import * as express from 'express'
 import { Redis } from '../lib/redis'
-import { logger } from '../helpers/logger'
+import * as apicache from 'apicache'
 
-async function cacheRoute (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const cached = await Redis.Instance.getCachedRoute(req)
+// Ensure Redis is initialized
+Redis.Instance.init()
 
-  // Not cached
-  if (!cached) {
-    logger.debug('Not cached result for route %s.', req.originalUrl)
-
-    const sendSave = res.send.bind(res)
-
-    res.send = (body) => {
-      if (res.statusCode >= 200 && res.statusCode < 400) {
-        Redis.Instance.setCachedRoute(req, body, res.getHeader('content-type').toString(), res.statusCode)
-             .catch(err => logger.error('Cannot cache route.', { err }))
-      }
-
-      return sendSave(body)
-    }
-
-    return next()
-  }
-
-  if (cached.contentType) res.contentType(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)
-  return res.send(cached.body).end()
+const options = {
+  redisClient: Redis.Instance.getClient(),
+  appendKey: () => Redis.Instance.getPrefix()
 }
 
+const cacheRoute = apicache.options(options).middleware
+
 // ---------------------------------------------------------------------------
 
 export {