-import { eachSeries } from 'async'
+import Bluebird from 'bluebird'
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
+// Syntactic sugar to avoid try/catch in express controllers/middlewares
-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(err => next(err))
- }, next)
+ return Bluebird.each(fun as RequestPromiseHandler[], f => {
+ return new Promise<void>((resolve, reject) => {
+ return asyncMiddleware(f)(req, res, err => {
+ if (err) return reject(err)
+
+ return resolve()
+ })
+ })
+ }).then(() => next())
+ .catch(err => next(err))
}
return Promise.resolve((fun as RequestHandler)(req, res, next))
}
}
-function asyncRetryTransactionMiddleware (fun: 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)