Merge branch 'master' of https://git.fascinated.cc/Fascinated/beatsaber-metrics-tracker

.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 ./
-RUN npm install
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm install
 COPY . .
-RUN npx tsc -b
+RUN pnpm run build
 ENV PORT=80
 EXPOSE 80
-CMD [ "npm", "start" ]
+CMD [ "pnpm", "start" ]

src/services/beatsaver.ts

@@ -11,6 +11,9 @@ let totalUpdated: number | undefined;
 let totalCreated: number | undefined;
 let totalDeleted: number | undefined;
 
+// Thee last time a map was heard
+let lastMap: number = Date.now();
+
 async function update() {
   if (totalCreated == undefined) {
     throw new Error("Total created is undefined");
@@ -125,3 +128,9 @@ async function connectWebsocket() {
 
 connectWebsocket();
 cron.schedule("*/5 * * * *", update);
+cron.schedule("*/1 * * * *", () => {
+  if (lastMap && Date.now() - lastMap > 10000) {
+    console.log("Beatsaver websocket is dead, reconnecting");
+    connectWebsocket();
+  }
+});

src/services/scoresaber.ts

@@ -10,6 +10,9 @@ import { normalizedRegionName } from "../utils/regionUtils";
 
 let totalScores: number | undefined;
 
+// Thee last time a score was heard
+let lastScore: number = Date.now();
+
 /**
  * Updates the player count and adds data to influx
  */
@@ -62,6 +65,7 @@ async function connectWebsocket() {
   };
 
   socket.onmessage = async (message) => {
+    lastScore = Date.now();
     const data = message.data;
     let json;
     try {
@@ -152,3 +156,9 @@ async function connectWebsocket() {
 update();
 connectWebsocket();
 cron.schedule("*/1 * * * *", update);
+cron.schedule("*/1 * * * *", () => {
+  if (lastScore && Date.now() - lastScore > 10000) {
+    console.log("Scoresaber websocket is dead, reconnecting");
+    connectWebsocket();
+  }
+});