diff --git a/package-lock.json b/package-lock.json
index 12c6f216..a6ae5c39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,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"
@@ -1088,9 +1088,9 @@
"integrity": "sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ=="
},
"node_modules/lambert-db": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/lambert-db/-/lambert-db-1.1.6.tgz",
- "integrity": "sha512-FbUNAbgPYUvfJSxLdcfIk6w8J+Z4IYZJasVURBMm4eOeLm//kgGeOi+SrJqqa5z+gaCJ65ENIVs2hd+Cj2Efbw==",
+ "version": "1.1.8",
+ "resolved": "https://registry.npmjs.org/lambert-db/-/lambert-db-1.1.8.tgz",
+ "integrity": "sha512-EyIEYLppS54tXsxIXGuS0l/0c+tF86KvaXRR92yRcGp5CHWRxPfUqV0KX/Ft7OkqtRTK5tDuJ/Bb4kUCXh2VUg==",
"dependencies": {
"missing-native-js-functions": "^1.1.8",
"mongodb": "^3.6.2",
@@ -3272,9 +3272,9 @@
"integrity": "sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ=="
},
"lambert-db": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/lambert-db/-/lambert-db-1.1.6.tgz",
- "integrity": "sha512-FbUNAbgPYUvfJSxLdcfIk6w8J+Z4IYZJasVURBMm4eOeLm//kgGeOi+SrJqqa5z+gaCJ65ENIVs2hd+Cj2Efbw==",
+ "version": "1.1.8",
+ "resolved": "https://registry.npmjs.org/lambert-db/-/lambert-db-1.1.8.tgz",
+ "integrity": "sha512-EyIEYLppS54tXsxIXGuS0l/0c+tF86KvaXRR92yRcGp5CHWRxPfUqV0KX/Ft7OkqtRTK5tDuJ/Bb4kUCXh2VUg==",
"requires": {
"missing-native-js-functions": "^1.1.8",
"mongodb": "^3.6.2",
diff --git a/package.json b/package.json
index 1768c04f..1e1afd93 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 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();
|
