summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/middlewares/ErrorHandler.ts39
-rw-r--r--src/middlewares/GlobalRateLimit.ts3
2 files changed, 25 insertions, 17 deletions
diff --git a/src/middlewares/ErrorHandler.ts b/src/middlewares/ErrorHandler.ts

index f10e56c3..52fa949c 100644 --- a/src/middlewares/ErrorHandler.ts +++ b/src/middlewares/ErrorHandler.ts
@@ -3,24 +3,29 @@ import { HTTPError } from "lambert-server"; import { FieldError } from "../util/instanceOf"; export function ErrorHandler(error: Error, req: Request, res: Response, next: NextFunction) { - let code = 400; - let httpcode = code; - let message = error?.toString(); - let errors = undefined; + try { + let code = 400; + let httpcode = code; + let message = error?.toString(); + let errors = undefined; - if (error instanceof HTTPError && error.code) code = httpcode = error.code; - else if (error instanceof FieldError) { - code = Number(error.code); - message = error.message; - errors = error.errors; - } else { - console.error(error); - if (req.server.options.production) { - message = "Internal Server Error"; + if (error instanceof HTTPError && error.code) code = httpcode = error.code; + else if (error instanceof FieldError) { + code = Number(error.code); + message = error.message; + errors = error.errors; + } else { + console.error(error); + if (req.server.options.production) { + message = "Internal Server Error"; + } + code = httpcode = 500; } - code = httpcode = 500; - } - res.status(httpcode).json({ code: code, message, errors }); - return next(); + res.status(httpcode).json({ code: code, message, errors }); + return next(); + } catch (error) { + console.error(error); + return res.status(500).json({ code: 500, message: "Internal Server Error" }); + } } diff --git a/src/middlewares/GlobalRateLimit.ts b/src/middlewares/GlobalRateLimit.ts
index 3d2d9d1b..c729987a 100644 --- a/src/middlewares/GlobalRateLimit.ts +++ b/src/middlewares/GlobalRateLimit.ts
@@ -2,6 +2,9 @@ import { NextFunction, Request, Response } from "express"; import Config from "../util/Config"; import { db } from "fosscord-server-util"; +// TODO: use mongodb ttl index +// TODO: increment count on serverside + export async function GlobalRateLimit(req: Request, res: Response, next: NextFunction) { if (!Config.get().limits.rate.ip.enabled) return next();