attempt to close the old socket

Reviewed-on: #27

.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

@@ -41,39 +41,39 @@
       }
     },
     "node_modules/@sentry-internal/tracing": {
-      "version": "7.77.0",
+      "version": "7.83.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.77.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.83.0.tgz",
-      "integrity": "sha512-8HRF1rdqWwtINqGEdx8Iqs9UOP/n8E0vXUu3Nmbqj4p5sQPA7vvCfq+4Y4rTqZFc7sNdFpDsRION5iQEh8zfZw==",
+      "integrity": "sha512-fY1ZyOiQaaUTuoq5rO+G4/5Ov3n8BnfNK7ck97yAGxy3w+E1CwhVZkXHEvTngNfdYV3ArxvlrtPRb9STFRqXvQ==",
       "dependencies": {
-        "@sentry/core": "7.77.0",
+        "@sentry/core": "7.83.0",
-        "@sentry/types": "7.77.0",
+        "@sentry/types": "7.83.0",
-        "@sentry/utils": "7.77.0"
+        "@sentry/utils": "7.83.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/core": {
-      "version": "7.77.0",
+      "version": "7.83.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.77.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.83.0.tgz",
-      "integrity": "sha512-Tj8oTYFZ/ZD+xW8IGIsU6gcFXD/gfE+FUxUaeSosd9KHwBQNOLhZSsYo/tTVf/rnQI/dQnsd4onPZLiL+27aTg==",
+      "integrity": "sha512-fglvpw8aWM6nWXzCjAVXIMTiTEAQ9G9b85IpDd/7L8fuwaFTPQAUSJXupF2PfbpQ3FUYbJt80dxshbERVJG8vQ==",
       "dependencies": {
-        "@sentry/types": "7.77.0",
+        "@sentry/types": "7.83.0",
-        "@sentry/utils": "7.77.0"
+        "@sentry/utils": "7.83.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/node": {
-      "version": "7.77.0",
+      "version": "7.83.0",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.77.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.83.0.tgz",
-      "integrity": "sha512-Ob5tgaJOj0OYMwnocc6G/CDLWC7hXfVvKX/ofkF98+BbN/tQa5poL+OwgFn9BA8ud8xKzyGPxGU6LdZ8Oh3z/g==",
+      "integrity": "sha512-ibnON+5ovoGOsvcLxcWQu5XAc4rbkvDkzCP74YGnME3/NzRuo3cKam8bUL5Wlm15h68QzxskyNOLuj6BEJ6AfQ==",
       "dependencies": {
-        "@sentry-internal/tracing": "7.77.0",
+        "@sentry-internal/tracing": "7.83.0",
-        "@sentry/core": "7.77.0",
+        "@sentry/core": "7.83.0",
-        "@sentry/types": "7.77.0",
+        "@sentry/types": "7.83.0",
-        "@sentry/utils": "7.77.0",
+        "@sentry/utils": "7.83.0",
         "https-proxy-agent": "^5.0.0"
       },
       "engines": {
@@ -81,19 +81,19 @@
       }
     },
     "node_modules/@sentry/types": {
-      "version": "7.77.0",
+      "version": "7.83.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.77.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.83.0.tgz",
-      "integrity": "sha512-nfb00XRJVi0QpDHg+JkqrmEBHsqBnxJu191Ded+Cs1OJ5oPXEW6F59LVcBScGvMqe+WEk1a73eH8XezwfgrTsA==",
+      "integrity": "sha512-Bd+zJcy8p1VgCfQqUprmUaw0QPWUV+GmCt6zJRHrHTb2pwLahXv6sHJvQ8F8Va6S7Keuy088U+kHzUFGQLMZMQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/utils": {
-      "version": "7.77.0",
+      "version": "7.83.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.77.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.83.0.tgz",
-      "integrity": "sha512-NmM2kDOqVchrey3N5WSzdQoCsyDkQkiRxExPaNI2oKQ/jMWHs9yt0tSy7otPBcXs0AP59ihl75Bvm1tDRcsp5g==",
+      "integrity": "sha512-7SrZtgAn3pHFBqSSvV/VL0CWTBQ7VenJjok4+WGWd6/FhP3fKrEEd9rjVTUb2Pzq9WLJJYzdvxAG8RlggG+H4g==",
       "dependencies": {
-        "@sentry/types": "7.77.0"
+        "@sentry/types": "7.83.0"
       },
       "engines": {
         "node": ">=8"
@@ -155,9 +155,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.9.0",
+      "version": "20.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.1.tgz",
-      "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==",
+      "integrity": "sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -207,9 +207,9 @@
       "integrity": "sha512-uNv6b/uGRLlCVmelat2rA8bcVd3k/42mV2EmjhPh6JLkd35T5bgwR/t6xy7a9MWhd9sixIeBUzhBenvk3NO+DQ=="
     },
     "node_modules/@types/websocket": {
-      "version": "1.0.9",
+      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.10.tgz",
-      "integrity": "sha512-xrMBdqdKdlE+7L9Wg2PQblIkZGSgiMlEoP6UAaYKMHbbxqCJ6PV/pTZ2RcMcSSERurU2TtGbmO4lqpFOJd01ww==",
+      "integrity": "sha512-svjGZvPB7EzuYS94cI7a+qhwgGU1y89wUgjT6E2wVUfmAGIvRfT7obBvRtnhXCSsoMdlG4gBFGE7MfkIXZLoww==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -296,9 +296,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.6.1",
+      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
+      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -1147,9 +1147,9 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "8.0.0",
+      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.0.2.tgz",
-      "integrity": "sha512-PzwkLgm1Jhj0NQdgGfnFsu0QP9V1sBFgbavEgh/IPAUzKAagzvEhuaBuAQOQGjczVWnpIU9tBqyd02cOTgsPlA==",
+      "integrity": "sha512-Vsi9GzTXjdBVzheT1HZOZ2jHNzzR9Xwb5OyLz/FvDEAhlwrRnXnuqJf0QHINUOQSm7aoyvnPks0q85HJkd6yDw==",
       "dependencies": {
         "bson": "^6.2.0",
         "kareem": "2.5.1",
@@ -1671,9 +1671,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.2.2",
+      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"

package.json

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

src/api/routes/analytics.ts

@@ -1,85 +1,85 @@
-import { INFLUXDB_BUCKET, InfluxQueryAPI } from "../..";
+import { INFLUXDB_BUCKET, InfluxQueryAPI } from "../..";
-import { formatString } from "../../utils/stringUtils";
+import { formatString } from "../../utils/stringUtils";
-import { parseTimeToMilliseconds } from "../../utils/timeUtils";
+import { parseTimeToMilliseconds } from "../../utils/timeUtils";
-
+
-// Query to get the player count history for tge last 24 hours in 1 hour intervals
+// Query to get the player count history for tge last 24 hours in 1 hour intervals
-const getPlayerHistoryQuery = `from(bucket: "${INFLUXDB_BUCKET}")
+const getPlayerHistoryQuery = `from(bucket: "${INFLUXDB_BUCKET}")
-|> range(start: -{})
+|> range(start: -{})
-|> filter(fn: (r) => r["_measurement"] == "scoresaber")
+|> filter(fn: (r) => r["_measurement"] == "scoresaber")
-|> filter(fn: (r) => r["type"] == "score")
+|> filter(fn: (r) => r["type"] == "score")
-|> filter(fn: (r) => r["_field"] == "player_id")
+|> filter(fn: (r) => r["_field"] == "player_id")
-|> unique()
+|> unique()
-|> aggregateWindow(every: {}, fn: count)
+|> aggregateWindow(every: {}, fn: count)
-`;
+`;
-
+
-const getScoreCountHistoryQuery = `from(bucket: "${INFLUXDB_BUCKET}")
+const getScoreCountHistoryQuery = `from(bucket: "${INFLUXDB_BUCKET}")
-  |> range(start: -{})
+  |> range(start: -{})
-  |> filter(fn: (r) => r["_measurement"] == "scoresaber")
+  |> filter(fn: (r) => r["_measurement"] == "scoresaber")
-  |> filter(fn: (r) => r["_field"] == "value")
+  |> filter(fn: (r) => r["_field"] == "value")
-  |> filter(fn: (r) => r["type"] == "score_count")
+  |> filter(fn: (r) => r["type"] == "score_count")
-  |> aggregateWindow(every: {}, fn: spread, createEmpty: true)
+  |> aggregateWindow(every: {}, fn: spread, createEmpty: true)
-`;
+`;
-
+
-export default function analyticsRoute(app: any) {
+export default function analyticsRoute(app: any) {
-  app.get("/analytics", async (req: any, res: any) => {
+  app.get("/analytics", async (req: any, res: any) => {
-    const before = new Date().getTime();
+    const before = new Date().getTime();
-
+
-    const timeQuery = req.query.time || "30d";
+    const timeQuery = req.query.time || "30d";
-    const timeInMs = parseTimeToMilliseconds(timeQuery.toString());
+    const timeInMs = parseTimeToMilliseconds(timeQuery.toString());
-    if (timeInMs > 30 * 24 * 60 * 60 * 1000) {
+    if (timeInMs > 30 * 24 * 60 * 60 * 1000) {
-      return res.status(400).json({
+      return res.status(400).json({
-        error: "Time range too large. Max time range is 30 days.",
+        error: "Time range too large. Max time range is 30 days.",
-      });
+      });
-    }
+    }
-    const shouldUseLongerIntervals = timeInMs > 24 * 60 * 60 * 1000 * 7; // 7 days
+    const shouldUseLongerIntervals = timeInMs > 24 * 60 * 60 * 1000 * 7; // 7 days
-
+
-    const getActivePlayersHistory = async () => {
+    const getActivePlayersHistory = async () => {
-      const rows = await InfluxQueryAPI.collectRows(
+      const rows = await InfluxQueryAPI.collectRows(
-        formatString(
+        formatString(
-          getPlayerHistoryQuery,
+          getPlayerHistoryQuery,
-          false,
+          false,
-          timeQuery,
+          timeQuery,
-          shouldUseLongerIntervals ? "1d" : "1h"
+          shouldUseLongerIntervals ? "1d" : "1h"
-        )
+        )
-      );
+      );
-      let history = rows.map((row: any) => ({
+      let history = rows.map((row: any) => ({
-        time: row._time,
+        time: row._time,
-        value: row._value !== null ? row._value.toFixed(0) : null,
+        value: row._value !== null ? row._value.toFixed(0) : null,
-      }));
+      }));
-      return history.sort(
+      return history.sort(
-        (a: any, b: any) =>
+        (a: any, b: any) =>
-          new Date(a.time).getTime() - new Date(b.time).getTime()
+          new Date(a.time).getTime() - new Date(b.time).getTime()
-      );
+      );
-    };
+    };
-
+
-    const getScoreCountHistory = async () => {
+    const getScoreCountHistory = async () => {
-      const rows = await InfluxQueryAPI.collectRows(
+      const rows = await InfluxQueryAPI.collectRows(
-        formatString(
+        formatString(
-          getScoreCountHistoryQuery,
+          getScoreCountHistoryQuery,
-          false,
+          false,
-          timeQuery,
+          timeQuery,
-          shouldUseLongerIntervals ? "1d" : "1h"
+          shouldUseLongerIntervals ? "1d" : "1h"
-        )
+        )
-      );
+      );
-      let history = rows.map((row: any) => ({
+      let history = rows.map((row: any) => ({
-        time: row._time,
+        time: row._time,
-        value: row._value !== null ? row._value.toFixed(0) : null,
+        value: row._value !== null ? row._value.toFixed(0) : null,
-      }));
+      }));
-      return history.sort(
+      return history.sort(
-        (a: any, b: any) =>
+        (a: any, b: any) =>
-          new Date(a.time).getTime() - new Date(b.time).getTime()
+          new Date(a.time).getTime() - new Date(b.time).getTime()
-      );
+      );
-    };
+    };
-
+
-    const [activePlayersHistory, scoreCountHistory] = await Promise.all([
+    const [activePlayersHistory, scoreCountHistory] = await Promise.all([
-      getActivePlayersHistory(),
+      getActivePlayersHistory(),
-      getScoreCountHistory(),
+      getScoreCountHistory(),
-    ]);
+    ]);
-
+
-    return res.json({
+    return res.json({
-      serverTimeTaken: new Date().getTime() - before + "ms",
+      serverTimeTaken: new Date().getTime() - before + "ms",
-      activePlayersHistory,
+      activePlayersHistory,
-      scoreCountHistory,
+      scoreCountHistory,
-    });
+    });
-  });
+  });
-}
+}

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();
+  }
+});