X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fasync.ts;h=3d6e388096b1a91dbcaa3c1a63aeab57885cae59;hb=636d73c58866ed235c207719e41fdde3c2d6c969;hp=534891899cab0364af5a41a0a37bf82a5b1dcf9c;hpb=a2431b7dcbc72c05101dcdbe631ff84a823aeb51;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index 534891899..3d6e38809 100644
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,27 +1,39 @@
 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
 
-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))
-          .catch(next)
+        Promise.resolve(f(req, res, err => cb(err)))
+          .catch(err => next(err))
       }, next)
     }
 
     return Promise.resolve((fun as RequestHandler)(req, res, next))
-      .catch(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(
+      retryTransactionWrapper(fun, req, res, next)
+    ).catch(err => next(err))
   }
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  asyncMiddleware
+  asyncMiddleware,
+  asyncRetryTransactionMiddleware
 }