From 9b95834b4bd7568d42cace469fcfc179093d96e5 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:34:54 +0100
Subject: [PATCH] :bug: fix error handler

---
 package-lock.json                  | Bin 151949 -> 151949 bytes
 package.json                       |   2 +-
 src/middlewares/ErrorHandler.ts    |  39 ++++++++++++++++-------------
 src/middlewares/GlobalRateLimit.ts |   3 +++
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 366b5b8ea15df25af8f7bc19eb5e7caccf90f47c..e2e794a2f27b869808b8f5688c8b5a4f4affc1e9 100644
GIT binary patch
delta 268
zcmeBO%-Oq`bAv7uqs3-Drpc40ACzU%pZsBp%;X|#g;3W@PuEDFf`VXElah$y3eO1l
z(qMxeeS>7}5;qGo@3O>*pdd@5%AjQT0#j#?@Suu-w9vvZ1MdiZw-R&z?81_u5O32G
zmr^f%rzDf?Q0IsYqp;A)7wr`$hchWnFFC;2J-J{e-{b{T*r&4}Wc)PQT3@U=d;0e5
Y>5SYOba2UZL31V<kW;n;ogz6A02?w}{{R30

delta 278
zcmeBO%-Oq`bAv7uquFLXrpc40GcID(pZsBp%=Awi8D%CHu&{)>C58GqCZz{NhL)vy
z1y}f_B&T_1o0VI5X-AoOMn-uh7KeofIr-+Ar241&<m&5Zr@N>6XKDu*c@-8WnpSD2
zCpvqXnY#LUh7}uSq-Z;58M&q<P5$^>VRAT=()5x8jNOw9X7Wv5Fok_O`$5J}ldbi|
enzN^G&z{c6twAs6Oy9`CBm;8KcA$GCCjtP;Ct*wg

diff --git a/package.json b/package.json
index c37b12a1..59c162c6 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
 		"i18next-http-middleware": "^3.1.0",
 		"i18next-node-fs-backend": "^2.1.3",
 		"jsonwebtoken": "^8.5.1",
-		"lambert-db": "^1.1.6",
+		"lambert-db": "^1.1.8",
 		"lambert-server": "^1.0.10",
 		"missing-native-js-functions": "^1.2.2",
 		"node-fetch": "^2.6.1"
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 121616f8..73a8c08a 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 "discord-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();