From 4e50b6a1c9a3eb261e04ede73241648e6edf21d6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 27 Nov 2017 14:44:51 +0100 Subject: Add shares forward and collection on videos/video channels --- server/middlewares/async.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'server/middlewares/async.ts') diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts index 29ebd169d..9692f9be7 100644 --- a/server/middlewares/async.ts +++ b/server/middlewares/async.ts @@ -1,10 +1,18 @@ -import { Request, Response, NextFunction } from 'express' +import { Request, Response, NextFunction, RequestHandler } from 'express' +import { eachSeries } from 'async' // 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) { +function asyncMiddleware (fun: RequestHandler | RequestHandler[]) { return (req: Request, res: Response, next: NextFunction) => { - return Promise.resolve(fn(req, res, next)) + if (Array.isArray(fun) === true) { + return eachSeries(fun as RequestHandler[], (f, cb) => { + Promise.resolve(f(req, res, cb)) + .catch(next) + }, next) + } + + return Promise.resolve((fun as RequestHandler)(req, res, next)) .catch(next) } } -- cgit v1.2.3