fix(deps): update dependency @sentry/node to v7.110.1

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 ./
-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" ]

package-lock.json

@@ -41,59 +41,58 @@
       }
     },
     "node_modules/@sentry-internal/tracing": {
-      "version": "7.82.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.82.0.tgz",
-      "integrity": "sha512-kgZVHYbZCeOb5apTDZJG9bioaKNPImmHTggZSWMmZj1Q037ft4481EleIVtKWOUvJzmEndEmD91mglkXBGPQwA==",
+      "version": "7.110.1",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.110.1.tgz",
+      "integrity": "sha512-4kTd6EM0OP1SVWl2yLn3KIwlCpld1lyhNDeR8G1aKLm1PN+kVsR6YB/jy9KPPp4Q3lN3W9EkTSES3qhP4jVffQ==",
       "dependencies": {
-        "@sentry/core": "7.82.0",
-        "@sentry/types": "7.82.0",
-        "@sentry/utils": "7.82.0"
+        "@sentry/core": "7.110.1",
+        "@sentry/types": "7.110.1",
+        "@sentry/utils": "7.110.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/core": {
-      "version": "7.82.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.82.0.tgz",
-      "integrity": "sha512-Wc+AYPzDIgFbuKkyYd/8tFm4E8CQboDkxefsz26N66CU1Ueqlk0RA8nVbzhbklhO/SuPJeR+fVOOx1spXYoybg==",
+      "version": "7.110.1",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.110.1.tgz",
+      "integrity": "sha512-yC1yeUFQlmHj9u/KxKmwOMVanBmgfX+4MZnZU31QPqN95adyZTwpaYFZl4fH5kDVnz7wXJI0qRP8SxuMePtqhw==",
       "dependencies": {
-        "@sentry/types": "7.82.0",
-        "@sentry/utils": "7.82.0"
+        "@sentry/types": "7.110.1",
+        "@sentry/utils": "7.110.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/node": {
-      "version": "7.82.0",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.82.0.tgz",
-      "integrity": "sha512-/Eg8FxXaXbthoU6NaAilWMzQQuyG48oeeZKMKqFEKnul334GX+vNEOp8Xlnd72FMiACMKjFJqgb+amBVh5jOxw==",
+      "version": "7.110.1",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.110.1.tgz",
+      "integrity": "sha512-n6sNzZJ/ChfyCI1FxuGWgloeevC8j2vax3vXM4IZrSIm5hS1d9L2oCJ4HEPuxGUxCkQ1f4kXPcdmNaQsWH0JBw==",
       "dependencies": {
-        "@sentry-internal/tracing": "7.82.0",
-        "@sentry/core": "7.82.0",
-        "@sentry/types": "7.82.0",
-        "@sentry/utils": "7.82.0",
-        "https-proxy-agent": "^5.0.0"
+        "@sentry-internal/tracing": "7.110.1",
+        "@sentry/core": "7.110.1",
+        "@sentry/types": "7.110.1",
+        "@sentry/utils": "7.110.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/types": {
-      "version": "7.82.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.82.0.tgz",
-      "integrity": "sha512-mWiSaWXas2zAyO7Kt5Eb9/W2vEiDiTw56NGRjKWsZnmKyl9bK3Mnxuk0TR7M6F+q8OoAFZPK1rECnyGIcb0fqQ==",
+      "version": "7.110.1",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.110.1.tgz",
+      "integrity": "sha512-sZxOpM5gfyxvJeWVvNpHnxERTnlqcozjqNcIv29SZ6wonlkekmxDyJ3uCuPv85VO54WLyA4uzskPKnNFHacI8A==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/utils": {
-      "version": "7.82.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.82.0.tgz",
-      "integrity": "sha512-Tba4yemyePW+bwKO/UR5/hlY3CBuBWc/PiKMLLfE6VNhFgZN/Ei9T/Wfp2ld/ANhfC0imqSd2iCv2rUuDPNRpQ==",
+      "version": "7.110.1",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.110.1.tgz",
+      "integrity": "sha512-eibLo2m1a7sHkOHxYYmRujr3D7ek2l9sv26F1SLoQBVDF7Afw5AKyzPmtA1D+4M9P/ux1okj7cGj3SaBrVpxXA==",
       "dependencies": {
-        "@sentry/types": "7.82.0"
+        "@sentry/types": "7.110.1"
       },
       "engines": {
         "node": ">=8"
@@ -155,9 +154,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
-      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
+      "version": "20.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.1.tgz",
+      "integrity": "sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -241,38 +240,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/agent-base/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/agent-base/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -894,39 +861,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/https-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",

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