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

attempt to close the old socket
e
2024-04-17 15:01:04 +00:00 · 2024-01-16 15:37:58 +00:00 · 2024-01-16 15:36:30 +00:00 · 2024-01-16 15:33:50 +00:00 · 2024-01-16 15:33:11 +00:00 · 2024-01-16 15:31:32 +00:00
8 changed files with 1525 additions and 136 deletions
--- a/.gitignore
+++ b/.gitignore
@ -144,3 +144,7 @@ dist
 # Built Visual Studio Code Extensions
 *.vsix

+# lock files
+package-lock.json
+yarn.lock
+
--- a/11
+++ b/11
@ -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" ]
--- a/package-lock.json
+++ b/package-lock.json
@ -41,39 +41,39 @@
      }
    },
    "node_modules/@sentry-internal/tracing": {
-      "version": "7.80.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.80.0.tgz",
-      "integrity": "sha512-P1Ab9gamHLsbH9D82i1HY8xfq9dP8runvc4g50AAd6OXRKaJ45f2KGRZUmnMEVqBQ7YoPYp2LFMkrhNYbcZEoQ==",
+      "version": "7.83.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.83.0.tgz",
+      "integrity": "sha512-fY1ZyOiQaaUTuoq5rO+G4/5Ov3n8BnfNK7ck97yAGxy3w+E1CwhVZkXHEvTngNfdYV3ArxvlrtPRb9STFRqXvQ==",
      "dependencies": {
-        "@sentry/core": "7.80.0",
-        "@sentry/types": "7.80.0",
-        "@sentry/utils": "7.80.0"
+        "@sentry/core": "7.83.0",
+        "@sentry/types": "7.83.0",
+        "@sentry/utils": "7.83.0"
      },
      "engines": {
        "node": ">=8"
      }
    },
    "node_modules/@sentry/core": {
-      "version": "7.80.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.80.0.tgz",
-      "integrity": "sha512-nJiiymdTSEyI035/rdD3VOq6FlOZ2wWLR5bit9LK8a3rzHU3UXkwScvEo6zYgs0Xp1sC0yu1S9+0BEiYkmi29A==",
+      "version": "7.83.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.83.0.tgz",
+      "integrity": "sha512-fglvpw8aWM6nWXzCjAVXIMTiTEAQ9G9b85IpDd/7L8fuwaFTPQAUSJXupF2PfbpQ3FUYbJt80dxshbERVJG8vQ==",
      "dependencies": {
-        "@sentry/types": "7.80.0",
-        "@sentry/utils": "7.80.0"
+        "@sentry/types": "7.83.0",
+        "@sentry/utils": "7.83.0"
      },
      "engines": {
        "node": ">=8"
      }
    },
    "node_modules/@sentry/node": {
-      "version": "7.80.0",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.80.0.tgz",
-      "integrity": "sha512-J35fqe8J5ac/17ZXT0ML3opYGTOclqYNE9Sybs1y9n6BqacHyzH8By72YrdI03F7JJDHwrcGw+/H8hGpkCwi0Q==",
+      "version": "7.83.0",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.83.0.tgz",
+      "integrity": "sha512-ibnON+5ovoGOsvcLxcWQu5XAc4rbkvDkzCP74YGnME3/NzRuo3cKam8bUL5Wlm15h68QzxskyNOLuj6BEJ6AfQ==",
      "dependencies": {
-        "@sentry-internal/tracing": "7.80.0",
-        "@sentry/core": "7.80.0",
-        "@sentry/types": "7.80.0",
-        "@sentry/utils": "7.80.0",
+        "@sentry-internal/tracing": "7.83.0",
+        "@sentry/core": "7.83.0",
+        "@sentry/types": "7.83.0",
+        "@sentry/utils": "7.83.0",
        "https-proxy-agent": "^5.0.0"
      },
      "engines": {
@ -81,19 +81,19 @@
      }
    },
    "node_modules/@sentry/types": {
-      "version": "7.80.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.80.0.tgz",
-      "integrity": "sha512-4bpMO+2jWiWLDa8zbTASWWNLWe6yhjfPsa7/6VH5y9x1NGtL8oRbqUsTgsvjF3nmeHEMkHQsC8NHPaQ/ibFmZQ==",
+      "version": "7.83.0",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.83.0.tgz",
+      "integrity": "sha512-Bd+zJcy8p1VgCfQqUprmUaw0QPWUV+GmCt6zJRHrHTb2pwLahXv6sHJvQ8F8Va6S7Keuy088U+kHzUFGQLMZMQ==",
      "engines": {
        "node": ">=8"
      }
    },
    "node_modules/@sentry/utils": {
-      "version": "7.80.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.80.0.tgz",
-      "integrity": "sha512-XbBCEl6uLvE50ftKwrEo6XWdDaZXHXu+kkHXTPWQEcnbvfZKLuG9V0Hxtxxq3xQgyWmuF05OH1GcqYqiO+v5Yg==",
+      "version": "7.83.0",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.83.0.tgz",
+      "integrity": "sha512-7SrZtgAn3pHFBqSSvV/VL0CWTBQ7VenJjok4+WGWd6/FhP3fKrEEd9rjVTUb2Pzq9WLJJYzdvxAG8RlggG+H4g==",
      "dependencies": {
-        "@sentry/types": "7.80.0"
+        "@sentry/types": "7.83.0"
      },
      "engines": {
        "node": ">=8"
@ -155,9 +155,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "20.9.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz",
-      "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==",
+      "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"
      }
@ -207,9 +207,9 @@
      "integrity": "sha512-uNv6b/uGRLlCVmelat2rA8bcVd3k/42mV2EmjhPh6JLkd35T5bgwR/t6xy7a9MWhd9sixIeBUzhBenvk3NO+DQ=="
    },
    "node_modules/@types/websocket": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.9.tgz",
-      "integrity": "sha512-xrMBdqdKdlE+7L9Wg2PQblIkZGSgiMlEoP6UAaYKMHbbxqCJ6PV/pTZ2RcMcSSERurU2TtGbmO4lqpFOJd01ww==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.10.tgz",
+      "integrity": "sha512-svjGZvPB7EzuYS94cI7a+qhwgGU1y89wUgjT6E2wVUfmAGIvRfT7obBvRtnhXCSsoMdlG4gBFGE7MfkIXZLoww==",
      "dev": true,
      "dependencies": {
        "@types/node": "*"
@ -296,11 +296,11 @@
      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
    },
    "node_modules/axios": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
-      "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+      "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",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
      "funding": [
        {
          "type": "individual",
@ -1147,9 +1147,9 @@
      }
    },
    "node_modules/mongoose": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.0.1.tgz",
-      "integrity": "sha512-O3TJrtLCt4H1eGf2HoHGcnOcCTWloQkpmIP3hA9olybX3OX2KUjdIIq135HD5paGjZEDJYKn9fw4eH5N477zqQ==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.0.2.tgz",
+      "integrity": "sha512-Vsi9GzTXjdBVzheT1HZOZ2jHNzzR9Xwb5OyLz/FvDEAhlwrRnXnuqJf0QHINUOQSm7aoyvnPks0q85HJkd6yDw==",
      "dependencies": {
        "bson": "^6.2.0",
        "kareem": "2.5.1",
@ -1671,9 +1671,9 @@
      }
    },
    "node_modules/typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
+      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
--- a/package.json
+++ b/package.json
@ -6,6 +6,7 @@
  "scripts": {
    "start": "node dist/index.js",
    "tsc": "tsc -w",
+    "build": "tsc",
    "dev": "nodemon dist/index.js"
  },
  "author": "",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/services/beatsaver.ts
+++ b/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();
+  }
+});
--- a/src/services/scoresaber.ts
+++ b/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();
+  }
+});
Author	SHA1	Message	Date
Renovate Bot	564cfd11cc	fix(deps): update dependency axios to v1.6.8	2024-04-17 15:01:04 +00:00
Liam	f621f6c5ae	attempt to close the old socket All checks were successful deploy / deploy (push) Successful in 20s Details	2024-01-16 15:37:58 +00:00
Liam	3621941a0d	e All checks were successful deploy / deploy (push) Successful in 22s Details	2024-01-16 15:36:30 +00:00
Liam	fe15f660e6	e All checks were successful deploy / deploy (push) Successful in 36s Details	2024-01-16 15:33:50 +00:00
Liam	5c2416e7ee	e Some checks failed deploy / deploy (push) Has been cancelled Details	2024-01-16 15:33:11 +00:00
Liam	46efd6b6dc	Merge branch 'master' of https://git.fascinated.cc/Fascinated/beatsaber-metrics-tracker Some checks failed deploy / deploy (push) Failing after 23s Details	2024-01-16 15:31:32 +00:00
Liam	7749a570d6	impl a simple dead socket handler	2024-01-16 15:29:59 +00:00
Lee	62cbe6141d	Merge pull request 'fix(deps): update dependency @sentry/node to v7.83.0' (#27 ) from renovate/sentry-javascript-monorepo into master All checks were successful deploy / deploy (push) Successful in 34s Details Reviewed-on: #27	2023-11-30 08:31:23 +00:00
Lee	b8f0d84f69	Merge pull request 'chore(deps): update dependency @types/node to v20.10.1' (#29 ) from renovate/node-20.x-lockfile into master Some checks failed deploy / deploy (push) Has been cancelled Details Reviewed-on: #29	2023-11-30 08:31:18 +00:00
Lee	5a8b3556b3	Merge pull request 'fix(deps): update dependency mongoose to v8.0.2' (#28 ) from renovate/mongoose-8.x-lockfile into master All checks were successful deploy / deploy (push) Successful in 1m1s Details Reviewed-on: #28	2023-11-30 08:29:32 +00:00
Renovate Bot	9a12e65f8a	chore(deps): update dependency @types/node to v20.10.1	2023-11-29 20:00:57 +00:00
Renovate Bot	b99e8e979c	fix(deps): update dependency mongoose to v8.0.2	2023-11-28 22:00:58 +00:00
Renovate Bot	6d213dd3eb	fix(deps): update dependency @sentry/node to v7.83.0	2023-11-28 12:00:55 +00:00
Lee	454e1f2914	Merge pull request 'chore(deps): update dependency @types/node to v20.10.0' (#25 ) from renovate/node-20.x-lockfile into master Some checks failed deploy / deploy (push) Failing after 5s Details Reviewed-on: #25	2023-11-27 18:11:02 +00:00
Lee	7f0ab00e3b	Merge pull request 'chore(deps): update dependency @types/websocket to v1.0.10' (#24 ) from renovate/websocket-1.x-lockfile into master Some checks failed deploy / deploy (push) Has been cancelled Details Reviewed-on: #24	2023-11-27 18:10:56 +00:00
Lee	b291c10402	Merge pull request 'fix(deps): update dependency typescript to v5.3.2' (#23 ) from renovate/typescript-5.x-lockfile into master Some checks failed deploy / deploy (push) Has been cancelled Details Reviewed-on: #23	2023-11-27 18:10:50 +00:00
Lee	06ea301120	Merge pull request 'fix(deps): update dependency @sentry/node to v7.82.0' (#26 ) from renovate/sentry-javascript-monorepo into master Some checks are pending deploy / deploy (push) Waiting to run Details Reviewed-on: #26	2023-11-27 18:10:45 +00:00
Renovate Bot	7943fabcca	fix(deps): update dependency @sentry/node to v7.82.0	2023-11-27 18:00:41 +00:00
Renovate Bot	9189f510db	fix(deps): update dependency typescript to v5.3.2	2023-11-24 10:00:42 +00:00
Renovate Bot	4afbb8f468	chore(deps): update dependency @types/node to v20.10.0	2023-11-24 10:00:39 +00:00
Renovate Bot	19dbd63c33	chore(deps): update dependency @types/websocket to v1.0.10	2023-11-24 10:00:36 +00:00
Lee	6ed9d3e3b5	Merge pull request 'fix(deps): update dependency @sentry/node to v7.81.1' (#22 ) from renovate/sentry-javascript-monorepo into master All checks were successful deploy / deploy (push) Successful in 1m2s Details Reviewed-on: #22	2023-11-24 09:15:41 +00:00
Lee	3b76431cb9	Merge pull request 'chore(deps): update dependency @types/node to v20.9.5' (#21 ) from renovate/node-20.x-lockfile into master Some checks failed deploy / deploy (push) Has been cancelled Details Reviewed-on: #21	2023-11-24 09:15:29 +00:00
Renovate Bot	cd33aae6ce	chore(deps): update dependency @types/node to v20.9.5	2023-11-24 01:00:59 +00:00
Renovate Bot	a086f540ad	fix(deps): update dependency @sentry/node to v7.81.1	2023-11-23 23:00:47 +00:00
Lee	d34c35ef5e	Merge pull request 'fix(deps): update dependency @sentry/node to v7.80.1' (#18 ) from renovate/sentry-javascript-monorepo into master All checks were successful deploy / deploy (push) Successful in 33s Details Reviewed-on: #18	2023-11-16 06:51:33 +00:00
Lee	7e2db095ec	Merge pull request 'fix(deps): update dependency axios to v1.6.2' (#19 ) from renovate/axios-1.x-lockfile into master All checks were successful deploy / deploy (push) Successful in 33s Details Reviewed-on: #19	2023-11-16 06:50:25 +00:00
Renovate Bot	cdbe6e519d	fix(deps): update dependency axios to v1.6.2	2023-11-14 21:01:17 +00:00
Renovate Bot	afd65d2e91	fix(deps): update dependency @sentry/node to v7.80.1	2023-11-14 11:01:05 +00:00
Liam	b9dedbc603	switch to pnpm	2023-11-08 06:45:46 +00:00