diff options
Diffstat (limited to 'src/api/middlewares/ErrorHandler.ts')
| -rw-r--r-- | src/api/middlewares/ErrorHandler.ts | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/api/middlewares/ErrorHandler.ts b/src/api/middlewares/ErrorHandler.ts index c417e64f..4d61b745 100644 --- a/src/api/middlewares/ErrorHandler.ts +++ b/src/api/middlewares/ErrorHandler.ts @@ -21,12 +21,7 @@ import { HTTPError } from "lambert-server"; import { ApiError, FieldError } from "@spacebar/util"; const EntityNotFoundErrorRegex = /"(\w+)"/; -export function ErrorHandler( - error: Error & { type?: string }, - req: Request, - res: Response, - next: NextFunction, -) { +export function ErrorHandler(error: Error & { type?: string }, req: Request, res: Response, next: NextFunction) { if (!error) return next(); try { @@ -35,16 +30,13 @@ export function ErrorHandler( let message = error?.toString(); let errors = undefined; - if (error instanceof HTTPError && error.code) - code = httpcode = error.code; + if (error instanceof HTTPError && error.code) code = httpcode = error.code; else if (error instanceof ApiError) { code = error.code; message = error.message; httpcode = error.httpStatus; } else if (error.name === "EntityNotFoundError") { - message = `${ - error.message.match(EntityNotFoundErrorRegex)?.[1] || "Item" - } could not be found`; + message = `${error.message.match(EntityNotFoundErrorRegex)?.[1] || "Item"} could not be found`; code = httpcode = 404; } else if (error instanceof FieldError) { code = Number(error.code); @@ -56,12 +48,7 @@ export function ErrorHandler( code = 50109; message = "The request body contains invalid JSON."; } else { - console.error( - `[Error] ${code} ${req.url}\n`, - errors || error, - "\nbody:", - req.body, - ); + console.error(`[Error] ${code} ${req.url}\n`, errors || error, "\nbody:", req.body); if (req.server?.options?.production) { // don't expose internal errors to the user, instead human errors should be thrown as HTTPError @@ -75,8 +62,6 @@ export function ErrorHandler( res.status(httpcode).json({ code: code, message, errors }); } catch (error) { console.error(`[Internal Server Error] 500`, error); - return res - .status(500) - .json({ code: 500, message: "Internal Server Error" }); + return res.status(500).json({ code: 500, message: "Internal Server Error" }); } } |