fix(deps): update dependency axios to v1.6.8

.gitignore

@@ -144,3 +144,7 @@ dist
 # Built Visual Studio Code Extensions
 *.vsix
 
+# lock files
+package-lock.json
+yarn.lock
+

Dockerfile

@@ -1,9 +1,10 @@
-FROM node:alpine
+FROM fascinated/docker-images:node-pnpm-latest
+
 WORKDIR /usr/src/app
-COPY package*.json ./
+COPY package.json pnpm-lock.yaml ./
-RUN npm install
+RUN pnpm install
 COPY . .
-RUN npx tsc -b
+RUN pnpm run build
 ENV PORT=80
 EXPOSE 80
-CMD [ "npm", "start" ]
+CMD [ "pnpm", "start" ]

package-lock.json

@@ -296,11 +296,11 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.6.2",
+      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
       "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -723,9 +723,9 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
+      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "start": "node dist/index.js",
     "tsc": "tsc -w",
+    "build": "tsc",
     "dev": "nodemon dist/index.js"
   },
   "author": "",

src/services/beatsaver.ts

@@ -11,6 +11,10 @@ let totalUpdated: number | undefined;
 let totalCreated: number | undefined;
 let totalDeleted: number | undefined;
 
+// Thee last time a map was heard
+let lastMap: number = Date.now();
+let socket: WebsocketClient | undefined;
+
 async function update() {
   if (totalCreated == undefined) {
     throw new Error("Total created is undefined");
@@ -42,7 +46,7 @@ async function update() {
 }
 
 async function connectWebsocket() {
-  const socket = new WebsocketClient(WEBSOCKET_URL);
+  socket = new WebsocketClient(WEBSOCKET_URL);
   await connectMongo();
   let beatSaver = await BeatSaverSchema.findOne({ _id: "beatsaver" });
   if (!beatSaver) {
@@ -125,3 +129,11 @@ async function connectWebsocket() {
 
 connectWebsocket();
 cron.schedule("*/5 * * * *", update);
+cron.schedule("*/1 * * * *", () => {
+  // 1 minute
+  if (lastMap && Date.now() - lastMap > 60_000) {
+    console.log("Beatsaver websocket is dead, reconnecting");
+    socket?.close();
+    connectWebsocket();
+  }
+});

src/services/scoresaber.ts

@@ -10,6 +10,10 @@ import { normalizedRegionName } from "../utils/regionUtils";
 
 let totalScores: number | undefined;
 
+// Thee last time a score was heard
+let lastScore: number = Date.now();
+let socket: WebsocketClient | undefined;
+
 /**
  * Updates the player count and adds data to influx
  */
@@ -47,7 +51,7 @@ async function connectWebsocket() {
   // set total scores to the current total plays in the database
   totalScores = leaderboard?.totalPlays || 0;
 
-  const socket = new WebsocketClient("wss://scoresaber.com/ws");
+  socket = new WebsocketClient("wss://scoresaber.com/ws");
   socket.onopen = () => {
     console.log("Connected to scoresaber websocket");
   };
@@ -62,6 +66,7 @@ async function connectWebsocket() {
   };
 
   socket.onmessage = async (message) => {
+    lastScore = Date.now();
     const data = message.data;
     let json;
     try {
@@ -152,3 +157,11 @@ async function connectWebsocket() {
 update();
 connectWebsocket();
 cron.schedule("*/1 * * * *", update);
+cron.schedule("*/1 * * * *", () => {
+  // 1 minute
+  if (lastScore && Date.now() - lastScore > 60_000) {
+    console.log("Scoresaber websocket is dead, reconnecting");
+    socket?.close();
+    connectWebsocket();
+  }
+});