X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fcache.ts;h=091c82d92cdad17f6e23ff94013120aee33e1791;hb=8519cc92341545468104f0704fff64a05c84bec0;hp=1e5a13b2e0394952409d71e6db8acb23cdf3a5ac;hpb=3f6d68d9671ddb7ba1c4f3a35021b84856dafb6a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index 1e5a13b2e..091c82d92 100644
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -1,64 +1,75 @@
 import * as express from 'express'
 import * as AsyncLock from 'async-lock'
-import { parseDuration } from '../helpers/utils'
+import { parseDurationToMs } from '../helpers/core-utils'
 import { Redis } from '../lib/redis'
 import { logger } from '../helpers/logger'
 
 const lock = new AsyncLock({ timeout: 5000 })
 
-function cacheRoute (lifetime: number) {
+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.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)
-                 })
+    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)
           }
 
-          return sendSave(body)
-        }
+          res.redirect = url => {
+            done()
 
-        return next()
-      }
+            return redirectSave(url)
+          }
 
-      if (cached.contentType) res.set('content-type', cached.contentType)
+          return next()
+        }
 
-      if (cached.statusCode) {
-        const statusCode = parseInt(cached.statusCode, 10)
-        if (!isNaN(statusCode)) res.status(statusCode)
-      }
+        if (cached.contentType) res.set('content-type', cached.contentType)
 
-      logger.debug('Use cached result for %s.', req.originalUrl)
-      res.send(cached.body).end()
+        if (cached.statusCode) {
+          const statusCode = parseInt(cached.statusCode, 10)
+          if (!isNaN(statusCode)) res.status(statusCode)
+        }
 
-      return done()
-    })
-  }
-}
+        logger.debug('Use cached result for %s.', req.originalUrl)
+        res.send(cached.body).end()
 
-const cache = (duration: number | string) => {
-  const _lifetime = parseDuration(duration, 3600000)
-  return cacheRoute(_lifetime)
+        return done()
+      })
+    } catch (err) {
+      logger.error('Cannot serve cached route.', { err })
+      return next()
+    }
+  }
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  cacheRoute,
-  cache
+  cacheRoute
 }