X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fcache.ts;h=8ffe7570098100b25df2a9393b8e78020885f082;hb=8d4273463fb19d503b1aa0a32dc289f292ed614e;hp=c589ef683c1b1d64e4b04d4f28bb3bb7380f5993;hpb=fd4484f19eae8b0a0c30d5d30e98880c8708516a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index c589ef683..8ffe75700 100644
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -1,39 +1,69 @@
 import * as express from 'express'
+import * as AsyncLock from 'async-lock'
+import { parseDuration } from '../helpers/core-utils'
 import { Redis } from '../lib/redis'
 import { logger } from '../helpers/logger'
 
-function cacheRoute (lifetime: number) {
+const lock = new AsyncLock({ timeout: 5000 })
+
+function cacheRoute (lifetimeArg: string | number) {
   return async function (req: express.Request, res: express.Response, next: express.NextFunction) {
-    const cached = await Redis.Instance.getCachedRoute(req)
+    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')
+              const lifetime = parseDuration(lifetimeArg)
+
+              Redis.Instance.setCachedRoute(req, body, lifetime, contentType, res.statusCode)
+                   .then(() => done())
+                   .catch(err => {
+                     logger.error('Cannot cache route.', { err })
+                     return done(err)
+                   })
+            } else {
+              done()
+            }
 
-    // Not cached
-    if (!cached) {
-      logger.debug('Not cached result for route %s.', req.originalUrl)
+            return sendSave(body)
+          }
 
-      const sendSave = res.send.bind(res)
+          res.redirect = url => {
+            done()
 
-      res.send = (body) => {
-        if (res.statusCode >= 200 && res.statusCode < 400) {
-          const contentType = res.getHeader('content-type').toString()
-          Redis.Instance.setCachedRoute(req, body, lifetime, contentType, res.statusCode)
-               .catch(err => logger.error('Cannot cache route.', { err }))
+            return redirectSave(url)
+          }
+
+          return next()
         }
 
-        return sendSave(body)
-      }
+        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.contentType(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()
+      })
+    } catch (err) {
+      logger.error('Cannot serve cached route.', { err })
+      return next()
     }
-
-    logger.debug('Use cached result for %s.', req.originalUrl)
-    return res.send(cached.body).end()
   }
 }