X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fasync.ts;h=3d6e388096b1a91dbcaa3c1a63aeab57885cae59;hb=b46cf4b920984492df598c1b61179acfc7f6f22e;hp=29ebd169d4a3e911adc2f86a22226394fcc4068b;hpb=eb08047657e739bcd9e592d76307befa3998482b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index 29ebd169d..3d6e38809 100644
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,16 +1,39 @@
-import { Request, Response, NextFunction } from 'express'
+import { eachSeries } from 'async'
+import { NextFunction, Request, RequestHandler, Response } from 'express'
+import { ValidationChain } from 'express-validator'
+import { ExpressPromiseHandler } from '@server/types/express'
+import { retryTransactionWrapper } from '../helpers/database-utils'
 
 // Syntactic sugar to avoid try/catch in express controllers
 // Thanks: https://medium.com/@Abazhenov/using-async-await-in-express-with-node-8-b8af872c0016
-function asyncMiddleware (fn: (req: Request, res: Response, next: NextFunction) => Promise<any>) {
+
+export type RequestPromiseHandler = ValidationChain | ExpressPromiseHandler
+
+function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[]) {
+  return (req: Request, res: Response, next: NextFunction) => {
+    if (Array.isArray(fun) === true) {
+      return eachSeries(fun as RequestHandler[], (f, cb) => {
+        Promise.resolve(f(req, res, err => cb(err)))
+          .catch(err => next(err))
+      }, next)
+    }
+
+    return Promise.resolve((fun as RequestHandler)(req, res, next))
+      .catch(err => next(err))
+  }
+}
+
+function asyncRetryTransactionMiddleware (fun: (req: Request, res: Response, next: NextFunction) => Promise<any>) {
   return (req: Request, res: Response, next: NextFunction) => {
-    return Promise.resolve(fn(req, res, next))
-      .catch(next)
+    return Promise.resolve(
+      retryTransactionWrapper(fun, req, res, next)
+    ).catch(err => next(err))
   }
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  asyncMiddleware
+  asyncMiddleware,
+  asyncRetryTransactionMiddleware
 }