X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fcache.ts;h=1b44957d3004ac8106ea30df3620d5150e35eb53;hb=60e74f80d87cdb366a70a48e4316bb0dff4cab16;hp=a2c7f7cbdb68b59677def0bae83bcb1bed39aa2d;hpb=4195cd2bc5046d4cdf1c677c27cd41f427d7a13a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index a2c7f7cbd..1b44957d3 100644
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -1,37 +1,63 @@
 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'
 
-async function cacheRoute (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const cached = await Redis.Instance.getCachedRoute(req)
+const lock = new AsyncLock({ timeout: 5000 })
 
-  // Not cached
-  if (!cached) {
-    logger.debug('Not cached result for route %s.', req.originalUrl)
+function cacheRoute (lifetimeArg: string | number) {
+  return async function (req: express.Request, res: express.Response, next: express.NextFunction) {
+    const redisKey = Redis.Instance.buildCachedRouteKey(req)
 
-    const sendSave = res.send.bind(res)
+    try {
+      await lock.acquire(redisKey, async (done) => {
+        const cached = await Redis.Instance.getCachedRoute(req)
 
-    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 }))
-      }
+        // Not cached
+        if (!cached) {
+          logger.debug('No cached results for route %s.', req.originalUrl)
 
-      return sendSave(body)
-    }
+          const sendSave = res.send.bind(res)
 
-    return next()
-  }
+          res.send = (body) => {
+            if (res.statusCode >= 200 && res.statusCode < 400) {
+              const contentType = res.get('content-type')
+              const lifetime = parseDuration(lifetimeArg)
 
-  if (cached.contentType) res.contentType(cached.contentType)
+              Redis.Instance.setCachedRoute(req, body, lifetime, contentType, res.statusCode)
+                   .then(() => done())
+                   .catch(err => {
+                     logger.error('Cannot cache route.', { err })
+                     return done(err)
+                   })
+            } else {
+              done()
+            }
 
-  if (cached.statusCode) {
-    const statusCode = parseInt(cached.statusCode, 10)
-    if (!isNaN(statusCode)) res.status(statusCode)
-  }
+            return sendSave(body)
+          }
+
+          return next()
+        }
+
+        if (cached.contentType) res.set('content-type', cached.contentType)
 
-  logger.debug('Use cached result for %s.', req.originalUrl)
-  return res.send(cached.body).end()
+        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()
+    }
+  }
 }
 
 // ---------------------------------------------------------------------------