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

use express types instead of custom versions

Browse Source
This commit is contained in:
rijkvanzanten
2021-01-12 16:06:35 -05:00
parent a41559b32f
commit c1f87113bf
3 changed files with 80998 additions and 35560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,32 +1,19 @@
import { NextFunction, Request, Response } from 'express';
export type AsyncHandler<T> = (req: Request, res: Response, ...others: any) => Promise<T>;
export type AsyncHandlerNext<T> = (req: Request, res: Response, next: NextFunction, ...others: any) => Promise<T>;
export type AsyncHandlerError<T> = (
err: Error,
req: Request,
res: Response,
next: NextFunction,
...others: any
) => Promise<T>;
export type AsyncMiddleware<T> = AsyncHandler<T> | AsyncHandlerNext<T> | AsyncHandlerError<T>;
import { RequestHandler, ErrorRequestHandler } from 'express';
/**
* Handles promises in routes.
*/
function asyncHandler<T>(handler: AsyncMiddleware<T>): any {
if (handler.length == 2) {
return function (req: Request, res: Response, next: NextFunction, ...others: any) {
return Promise.resolve((handler as AsyncHandler<T>)(req, res, ...others)).catch(next);
};
} else if (handler.length == 3) {
return function (req: Request, res: Response, next: NextFunction, ...others: any) {
return Promise.resolve((handler as AsyncHandlerNext<T>)(req, res, next, ...others)).catch(next);
};
} else if (handler.length == 4) {
return function (err: Error, req: Request, res: Response, next: NextFunction, ...others: any) {
return Promise.resolve((handler as AsyncHandlerError<T>)(err, req, res, next, ...others)).catch(next);
};
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}"`);
}