chore(deps): update dependency nodemon to v3.1.0

.env-example

@@ -1 +1 @@
-INFISCAL_TOKEN=set me
+INFISICAL_TOKEN=set me

package.json

@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {
-    "build": "tsup src/index.ts --format cjs",
+    "build": "tsup src/index.ts --format cjs --minify terser",
     "start": "node dist/index.js",
     "dev": "nodemon --exec ts-node src/index.ts"
   },
@@ -14,12 +14,13 @@
     "express": "^4.18.2",
     "infisical-node": "^1.5.0",
     "mongoose": "^8.0.1",
-    "tsup": "^8.0.0",
     "typescript": "^5.2.2"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
     "nodemon": "^3.0.1",
-    "ts-node": "^10.9.1"
+    "terser": "^5.24.0",
+    "ts-node": "^10.9.1",
+    "tsup": "^8.0.0"
   }
 }

src/database/models/player.ts

@@ -0,0 +1,41 @@
+import mongoose, { Model } from "mongoose";
+const { Schema } = mongoose;
+
+const schema = new Schema({
+  /**
+   * The ID of the player
+   */
+  _id: String,
+
+  scoresaber: {
+    name: String,
+    profilePicture: String,
+    country: String,
+    pp: Number,
+    rank: Number,
+    countryRank: Number,
+    role: String,
+    badges: [
+      {
+        image: String,
+        description: String,
+      },
+    ],
+    histories: String,
+    scoreStats: {
+      totalScore: Number,
+      totalRankedScore: Number,
+      averageRankedAccuracy: Number,
+      totalPlayCount: Number,
+      rankedPlayCount: Number,
+      replaysWatched: Number,
+    },
+    permissions: Number,
+    banned: Boolean,
+    inactive: Boolean,
+  },
+});
+
+export const PlayerSchema =
+  (mongoose.models.Player as Model<typeof schema>) ||
+  mongoose.model("Player", schema);

src/index.ts

@@ -8,15 +8,21 @@ import { createInfisicalClient } from "./util/secrets";
 // Load the environment variables
 dotenv.config();
 
-const isValid = checkEnvironmentVariables("INFISCAL_TOKEN");
+const isValid = checkEnvironmentVariables("INFISICAL_TOKEN");
 if (!isValid) {
   process.exit(1);
 }
 
 export const InfisicalClient = createInfisicalClient(
-  process.env.INFISCAL_TOKEN!
+  process.env.INFISICAL_TOKEN!
 );
 
+console.log("---");
+console.log(
+  "NOTE: If the infisical secret is invalid, it will say secrets are missing."
+);
+console.log("If this happens please check the env variable and/or the secret");
+console.log("---");
 // Load the secrets first so we ensure they are valid before starting the server
 initSecrets().then(async () => {
   await connectMongo();

src/route/messages.ts

@@ -0,0 +1,48 @@
+/**
+ * Creates the base message for web responses
+ *
+ * @param message the message to send
+ * @returns the message
+ */
+function baseMessage(error: boolean, message: string) {
+  return {
+    error,
+    message,
+  };
+}
+
+/**
+ * Creates an error message for web responses
+ *
+ * @param message the message to send
+ * @returns the message
+ */
+function errorMessage(message: string) {
+  return baseMessage(true, message);
+}
+
+/**
+ * Creates a success message for web responses
+ *
+ * @param message the message to send
+ * @returns the message
+ */
+function successMessage(message: string) {
+  return baseMessage(false, message);
+}
+
+/**
+ * Creates a message for an internal server error
+ *
+ * @returns the message
+ */
+function internalServerError() {
+  return errorMessage("Internal Server Error");
+}
+
+export const ServerMessages = {
+  baseMessage,
+  errorMessage,
+  successMessage,
+  internalServerError,
+};

src/secrets/secrets.ts

@@ -1,3 +1,4 @@
+import { GetOptions } from "infisical-node/src/types/InfisicalClient";
 import { InfisicalClient } from "..";
 
 let MONGO_URI: string;
@@ -6,15 +7,26 @@ let MONGO_URI: string;
  * Initialize the secrets
  */
 export async function initSecrets() {
-  const mongoUri = (await InfisicalClient.getSecret("MONGO_URI")).secretValue;
+  const options: GetOptions = {
+    environment: process.env.NODE_ENV === "production" ? "main" : "dev",
+    path: "/",
+    type: "shared",
+  };
+
+  const mongoUri = (await InfisicalClient.getSecret("MONGO_URI", options))
+    .secretValue;
 
   if (!mongoUri) {
-    throw new Error("MONGO_URI not set in secrets");
+    console.log("MONGO_URI not set in secrets");
+    process.exit(1);
   }
 
   MONGO_URI = mongoUri;
 }
 
+/**
+ * All of the Infisical secrets
+ */
 export const Secrets = {
   get MONGO_URI() {
     return MONGO_URI;

src/server/server.ts

@@ -1,4 +1,5 @@
 import express, { Express } from "express";
+import { ServerMessages } from "../route/messages";
 import { Route } from "../route/route";
 
 type ServerConfig = {
@@ -32,13 +33,26 @@ export default class Server {
     this.server = express();
     this.preInit();
 
+    // Setup route logging
+    this.server.use((req, res, next) => {
+      // TODO: make this look better?
+      console.log(`[${req.method}] ${req.path}`);
+      next();
+    });
+
     // Handle the routes
     for (const route of this.routes) {
       this.server.all(route.getPath(), (req, res, next) => {
         if (req.method.toUpperCase() !== route.getMethod().toUpperCase()) {
           return next(); // Skip this method
         }
+        try {
           route.handle(req, res, next);
+        } catch (ex) {
+          console.error(ex);
+          // Inform the user that an internal server error occurred
+          res.status(500).json(ServerMessages.internalServerError());
+        }
       });
     }