github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-12 12:34:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reduce overengineering on async-handler (#15340)

Browse Source
This commit is contained in:
Rijk van Zanten
2022-08-31 12:17:53 -04:00
committed by GitHub
parent 1f66049c42
commit f17b96cf3b
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/src/utils/async-handler.ts
View File

@@ -1,22 +1,6 @@
import { ErrorRequestHandler, RequestHandler } from 'express';
import type { RequestHandler, Request, Response, NextFunction } from 'express';
/**
* Handles promises in routes.
*/
function asyncHandler(handler: RequestHandler): RequestHandler;
function asyncHandler(handler: ErrorRequestHandler): ErrorRequestHandler;
function asyncHandler(handler: RequestHandler | ErrorRequestHandler): RequestHandler | ErrorRequestHandler {
if (handler.length === 2 || handler.length === 3) {
const scoped: RequestHandler = (req, res, next) =>
Promise.resolve((handler as RequestHandler)(req, res, next)).catch(next);
return scoped;
} else if (handler.length === 4) {
const scoped: ErrorRequestHandler = (err, req, res, next) =>
Promise.resolve((handler as ErrorRequestHandler)(err, req, res, next)).catch(next);
return scoped;
} else {
throw new Error(`Failed to asyncHandle() function "${handler.name}"`);
}
}
const asyncHandler = (fn: RequestHandler) => (req: Request, res: Response, next: NextFunction) =>
Promise.resolve(fn(req, res, next)).catch(next);
export default asyncHandler;