add crappy global catch

ebs/src/index.ts

@@ -11,7 +11,7 @@ dotenv();
 const port = 3000;
 
 export const { app } = expressWs(express());
-app.use(cors({ origin: "*" }))
+app.use(cors({ origin: "*" }));
 app.use(bodyParser.json());
 app.use("/public/*", publicApiAuth);
 app.use("/private/*", privateApiAuth);

ebs/src/modules/config.ts

@@ -3,6 +3,7 @@ import { app } from "../index";
 import { sendPubSubMessage } from "../util/pubsub";
 import { strToU8, compressSync, strFromU8 } from "fflate";
 import { getBannedUsers } from "../util/db";
+import { asyncCatch } from "../util/middleware";
 
 let activeConfig: Config | undefined;
 let configData: Config | undefined;
@@ -76,17 +77,17 @@ async function refreshConfig() {
     activeConfig = processConfig(configData);
 }
 
-app.get("/private/refresh", async (_, res) => {
+app.get("/private/refresh", asyncCatch(async (_, res, next) => {
     await refreshConfig();
     console.log("Refreshed config, new config version is ", activeConfig!.version);
     await broadcastConfigRefresh(activeConfig!);
     res.sendStatus(200);
-});
+}));
 
-app.get("/public/config", async (req, res) => {
+app.get("/public/config", asyncCatch(async (req, res) => {
     const config = await getConfig();
     res.send(JSON.stringify(config));
-});
+}));
 
 (async () => {
     const config = await getConfig();

ebs/src/modules/game/connection.ts

@@ -59,7 +59,7 @@ export class GameConnection {
             console.log(`Game socket error\n${error}`);
         })
     }
-    public async processMessage(msg: GameMessage) {
+    public processMessage(msg: GameMessage) {
         switch (msg.messageType) {
             case MessageType.Hello:
                 this.handshake = true;

ebs/src/modules/game/index.ts

@@ -1,4 +1,5 @@
 import { app } from "../../index";
+import { asyncCatch } from "../../util/middleware";
 import { GameConnection } from "./connection";
 import { MessageType } from "./messages";
 import { ResultMessage } from "./messages.game";
@@ -7,11 +8,11 @@ import { StressTestRequest, isStressTesting, startStressTest } from "./stresstes
 
 export let connection: GameConnection = new GameConnection();
 
-app.ws("/private/socket", async (ws, req) => {
+app.ws("/private/socket", (ws, req) => {
     connection.setSocket(ws);
-})
+});
 
-app.post("/private/redeem", async (req, res) => {
+app.post("/private/redeem", asyncCatch(async (req, res) => {
     //console.log(req.body);
     const msg = {
         ...connection.makeMessage(MessageType.Redeem),
@@ -29,9 +30,9 @@ app.post("/private/redeem", async (req, res) => {
     } catch (e) {
         res.status(500).send(e);
     }
-})
+}));
 
-app.post("/private/setresult", async (req, res) => {
+app.post("/private/setresult", (req, res) => {
     //console.log(req.body);
     const msg = {
         ...connection.makeMessage(MessageType.Result),
@@ -46,7 +47,7 @@ app.post("/private/setresult", async (req, res) => {
     res.sendStatus(200);
 });
 
-app.post("/private/stress", async (req, res) => {
+app.post("/private/stress", (req, res) => {
     if (!process.env.ENABLE_STRESS_TEST) {
         res.status(501).send("Disabled unless you set the ENABLE_STRESS_TEST env var\nREMEMBER TO REMOVE IT FROM PROD");
         return;
@@ -72,12 +73,12 @@ app.post("/private/stress", async (req, res) => {
     res.sendStatus(200);
 })
 
-app.get("/private/unsent", async (req, res) => {
+app.get("/private/unsent", (req, res) => {
     const unsent = connection.getUnsent();
     res.send(JSON.stringify(unsent));
 })
 
-app.get("/private/outstanding", async (req, res) => {
+app.get("/private/outstanding", (req, res) => {
     const outstanding = connection.getOutstanding();
     res.send(JSON.stringify(outstanding));
 })

ebs/src/modules/transactions.ts

@@ -9,8 +9,9 @@ import { logToDiscord } from "../util/logger";
 import { connection } from "./game";
 import { TwitchUser } from "./game/messages";
 import { getHelixUser } from "../util/twitch";
+import { asyncCatch } from "../util/middleware";
 
-app.post("/public/prepurchase", async (req, res) => {
+app.post("/public/prepurchase", asyncCatch(async (req, res) => {
     const cart = req.body as Cart;
     const idCart = { ...cart, userId: req.twitchAuthorization!.user_id! };
 
@@ -88,9 +89,9 @@ app.post("/public/prepurchase", async (req, res) => {
     }).then();
 
     res.status(200).send(token);
-});
+}));
 
-app.post("/public/transaction", async (req, res) => {
+app.post("/public/transaction", asyncCatch(async (req, res) => {
     const transaction = req.body as Transaction;
 
     if (!transaction.receipt) {
@@ -297,9 +298,9 @@ app.post("/public/transaction", async (req, res) => {
         }).then();
         res.status(500).send(`Failed to process redeem - ${error}`);
     }
-});
+}));
 
-app.post("/public/transaction/cancel", async (req, res) => {
+app.post("/public/transaction/cancel", asyncCatch(async (req, res) => {
     const token = req.body.token as string;
 
     // remove transaction from db
@@ -324,7 +325,7 @@ app.post("/public/transaction/cancel", async (req, res) => {
 
         res.sendStatus(404);
     }
-});
+}));
 
 async function getTwitchUser(id: string): Promise<TwitchUser | null> {
     const user = await getHelixUser(id);

ebs/src/util/middleware.ts

@@ -55,3 +55,13 @@ declare global {
         }
     }
 }
+
+export function asyncCatch(fn: (req: Request, res: Response, next: NextFunction) => Promise<void>) {
+    return async (req: Request, res: Response, next: NextFunction) => {
+        try {
+            await fn(req, res, next);
+        } catch (err) {
+            next(err);
+        }
+    };
+}