X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fasync.ts;h=9d01935366725ac3b5d28a20b37c5f1152507939;hb=927c5fb00ce203f06da73cdeca07bd9e03a6b793;hp=dd209b115d2d46cb4701896dbdf5900e7c9d13a8;hpb=e3a682a877a10833cb54ac3595e55110bda95647;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index dd209b115..9d0193536 100644
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,16 +1,19 @@
 import { eachSeries } from 'async'
 import { NextFunction, Request, RequestHandler, Response } from 'express'
+import { ValidationChain } from 'express-validator'
+import { ExpressPromiseHandler } from '@server/types/express-handler'
+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
 
-export type RequestPromiseHandler = (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, cb))
+        Promise.resolve(f(req, res, err => cb(err)))
           .catch(err => next(err))
       }, next)
     }
@@ -20,8 +23,17 @@ function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[])
   }
 }
 
+function asyncRetryTransactionMiddleware (fun: (req: Request, res: Response, next: NextFunction) => Promise<any>) {
+  return (req: Request, res: Response, next: NextFunction) => {
+    return Promise.resolve(
+      retryTransactionWrapper(fun, req, res, next)
+    ).catch(err => next(err))
+  }
+}
+
 // ---------------------------------------------------------------------------
 
 export {
-  asyncMiddleware
+  asyncMiddleware,
+  asyncRetryTransactionMiddleware
 }