Merge branch 'master' into openapi

package.json

@@ -10,6 +10,7 @@
 		"start:cdn": "node dist/cdn/start.js",
 		"start:gateway": "node dist/gateway/start.js",
 		"build": "tsc -p .",
+		"test": "node scripts/test.js",
 		"lint": "eslint .",
 		"setup": "npm run build && npm run generate:schema",
 		"sync:db": "npm run build && node scripts/syncronise.js",

patches/body-parser+1.20.1.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/body-parser/lib/types/json.js b/node_modules/body-parser/lib/types/json.js
-index c2745be..7104cfa 100644
+index c2745be..17c2cfe 100644
 --- a/node_modules/body-parser/lib/types/json.js
 +++ b/node_modules/body-parser/lib/types/json.js
 @@ -18,6 +18,7 @@ var createError = require('http-errors')
@@ -28,3 +28,12 @@ index c2745be..7104cfa 100644
    } catch (e) {
      return normalizeJsonSyntaxError(e, {
        message: e.message.replace('#', char),
+@@ -216,7 +217,7 @@ function normalizeJsonSyntaxError (error, obj) {
+   }
+ 
+   // replace stack before message for Node.js 0.10 and below
+-  error.stack = obj.stack.replace(error.message, obj.message)
++  error.stack = obj.stack?.replace(error.message, obj.message)
+   error.message = obj.message
+ 
+   return error

scripts/test.js

@@ -0,0 +1,50 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+/*
+	Super simple script to check if the server starts at all, for use in gh actions.
+	Not a proper test framework by any means.
+*/
+
+const { spawn } = require("child_process");
+const path = require("path");
+
+const server = spawn("node", [
+	path.join(__dirname, "..", "dist", "bundle", "start.js"),
+]);
+
+server.stdout.on("data", (data) => {
+	process.stdout.write(data);
+
+	if (data.toString().toLowerCase().includes("listening")) {
+		// we good :)
+		console.log("we good");
+		process.exit();
+	}
+});
+
+server.stderr.on("data", (err) => {
+	process.stdout.write(err);
+	// we bad :(
+	process.kill(1);
+});
+
+server.on("close", (code) => {
+	console.log("closed with code", code);
+	process.exit(code);
+});

src/api/middlewares/ErrorHandler.ts

@@ -22,7 +22,7 @@ import { ApiError, FieldError } from "@spacebar/util";
 const EntityNotFoundErrorRegex = /"(\w+)"/;
 
 export function ErrorHandler(
-	error: Error,
+	error: Error & { type?: string },
 	req: Request,
 	res: Response,
 	next: NextFunction,
@@ -50,6 +50,11 @@ export function ErrorHandler(
 			code = Number(error.code);
 			message = error.message;
 			errors = error.errors;
+		} else if (error?.type == "entity.parse.failed") {
+			// body-parser failed
+			httpcode = 400;
+			code = 50109;
+			message = "The request body contains invalid JSON.";
 		} else {
 			console.error(
 				`[Error] ${code} ${req.url}\n`,