Remove unnecessary image check in video upload

[oweals/peertube.git] / server / middlewares / cache.ts

diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index a2c7f7cbdb68b59677def0bae83bcb1bed39aa2d..1de44db703429a171386489a5914d474441141b4 100644 (file)
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -1,37 +1,53 @@
 import * as express from 'express'
+import * as AsyncLock from 'async-lock'
 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 (lifetime: 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)
+    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)
+
+        const sendSave = res.send.bind(res)
+
+        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)
+                 .then(() => done())
+                 .catch(err => {
+                   logger.error('Cannot cache route.', { err })
+                   return done(err)
+                 })
+          }
+
+          return sendSave(body)
+        }
+
+        return next()
       }
 
-      return sendSave(body)
-    }
+      if (cached.contentType) res.contentType(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()
+    })
   }
-
-  logger.debug('Use cached result for %s.', req.originalUrl)
-  return res.send(cached.body).end()
 }
 
 // ---------------------------------------------------------------------------