fix(deps): update dependency express to v4.19.2

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

@@ -10,10 +10,12 @@
       "license": "ISC",
       "dependencies": {
         "@influxdata/influxdb-client": "^1.33.2",
+        "@sentry/node": "^7.77.0",
+        "axios": "^1.6.0",
         "dotenv": "^16.3.1",
         "express": "^4.18.2",
-        "mongoose": "^7.6.3",
-        "node-fetch": "^2.6.1",
+        "mongoose": "^8.0.0",
+        "node-cron": "^3.0.2",
         "nodemon": "^3.0.1",
         "typescript": "^5.2.2",
         "websocket": "^1.0.34"
@@ -21,7 +23,7 @@
       "devDependencies": {
         "@types/express": "^4.17.20",
         "@types/node": "^20.8.9",
-        "@types/node-fetch": "^2.6.1",
+        "@types/node-cron": "^3.0.10",
         "@types/websocket": "^1.0.8"
       }
     },
@@ -34,11 +36,69 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz",
       "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==",
-      "optional": true,
       "dependencies": {
         "sparse-bitfield": "^3.0.3"
       }
     },
+    "node_modules/@sentry-internal/tracing": {
+      "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.83.0",
+        "@sentry/types": "7.83.0",
+        "@sentry/utils": "7.83.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/core": {
+      "version": "7.83.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.83.0.tgz",
+      "integrity": "sha512-fglvpw8aWM6nWXzCjAVXIMTiTEAQ9G9b85IpDd/7L8fuwaFTPQAUSJXupF2PfbpQ3FUYbJt80dxshbERVJG8vQ==",
+      "dependencies": {
+        "@sentry/types": "7.83.0",
+        "@sentry/utils": "7.83.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/node": {
+      "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.83.0",
+        "@sentry/core": "7.83.0",
+        "@sentry/types": "7.83.0",
+        "@sentry/utils": "7.83.0",
+        "https-proxy-agent": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/types": {
+      "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.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.83.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@types/body-parser": {
       "version": "1.19.4",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
@@ -59,9 +119,9 @@
       }
     },
     "node_modules/@types/express": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz",
-      "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dev": true,
       "dependencies": {
         "@types/body-parser": "*",
@@ -95,22 +155,18 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.8.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.9.tgz",
-      "integrity": "sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg==",
+      "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"
       }
     },
-    "node_modules/@types/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "form-data": "^3.0.0"
-      }
+    "node_modules/@types/node-cron": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@types/node-cron/-/node-cron-3.0.11.tgz",
+      "integrity": "sha512-0ikrnug3/IyneSHqCBeslAhlK2aBfYek1fGo4bP4QnZPmiqSGRK+Oy7ZMisLWkesffJvQ1cqAcBnJC+8+nxIAg==",
+      "dev": true
     },
     "node_modules/@types/qs": {
       "version": "6.9.9",
@@ -151,9 +207,9 @@
       "integrity": "sha512-uNv6b/uGRLlCVmelat2rA8bcVd3k/42mV2EmjhPh6JLkd35T5bgwR/t6xy7a9MWhd9sixIeBUzhBenvk3NO+DQ=="
     },
     "node_modules/@types/websocket": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.8.tgz",
-      "integrity": "sha512-wvkOpWApbuxVfHhSQ1XrjVN4363vsfLJwEo4AboIZk0g1vJA5nmLp8GXUHuIdf4/Fe7+/V0Efe2HvWiLqHtlqw==",
+      "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": "*"
@@ -185,6 +241,38 @@
         "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",
@@ -205,8 +293,17 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/axios": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+      "dependencies": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
@@ -222,12 +319,12 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -235,7 +332,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -278,11 +375,11 @@
       }
     },
     "node_modules/bson": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-5.5.1.tgz",
-      "integrity": "sha512-ix0EwukN2EpC0SRWIj/7B5+A6uQMQy6KMREI9qQqvgpkV2frH63T0UDVd1SYedL6dNCmDBYB3QtXi4ISk9YT+g==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-6.2.0.tgz",
+      "integrity": "sha512-ID1cI+7bazPDyL9wYy9GaQ8gEEohWvcUl/Yf0dIdutJxnmInEEyCsb4awy/OiBfall7zBA179Pahi3vCdFze3Q==",
       "engines": {
-        "node": ">=14.20.1"
+        "node": ">=16.20.1"
       }
     },
     "node_modules/bufferutil": {
@@ -348,7 +445,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -381,9 +477,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -427,7 +523,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -520,16 +615,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -627,11 +722,29 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "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==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dev": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -781,6 +894,39 @@
         "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",
@@ -805,7 +951,9 @@
     "node_modules/ip": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
+      "optional": true,
+      "peer": true
     },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
@@ -888,8 +1036,7 @@
     "node_modules/memory-pager": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
-      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
-      "optional": true
+      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="
     },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
@@ -946,26 +1093,25 @@
       }
     },
     "node_modules/mongodb": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.9.0.tgz",
-      "integrity": "sha512-g+GCMHN1CoRUA+wb1Agv0TI4YTSiWr42B5ulkiAfLLHitGK1R+PkSAf3Lr5rPZwi/3F04LiaZEW0Kxro9Fi2TA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.2.0.tgz",
+      "integrity": "sha512-d7OSuGjGWDZ5usZPqfvb36laQ9CPhnWkAGHT61x5P95p/8nMVeH8asloMwW6GcYFeB0Vj4CB/1wOTDG2RA9BFA==",
       "dependencies": {
-        "bson": "^5.5.0",
-        "mongodb-connection-string-url": "^2.6.0",
-        "socks": "^2.7.1"
+        "@mongodb-js/saslprep": "^1.1.0",
+        "bson": "^6.2.0",
+        "mongodb-connection-string-url": "^2.6.0"
       },
       "engines": {
-        "node": ">=14.20.1"
-      },
-      "optionalDependencies": {
-        "@mongodb-js/saslprep": "^1.1.0"
+        "node": ">=16.20.1"
       },
       "peerDependencies": {
         "@aws-sdk/credential-providers": "^3.188.0",
-        "@mongodb-js/zstd": "^1.0.0",
-        "kerberos": "^1.0.0 || ^2.0.0",
-        "mongodb-client-encryption": ">=2.3.0 <3",
-        "snappy": "^7.2.2"
+        "@mongodb-js/zstd": "^1.1.0",
+        "gcp-metadata": "^5.2.0",
+        "kerberos": "^2.0.1",
+        "mongodb-client-encryption": ">=6.0.0 <7",
+        "snappy": "^7.2.2",
+        "socks": "^2.7.1"
       },
       "peerDependenciesMeta": {
         "@aws-sdk/credential-providers": {
@@ -974,6 +1120,9 @@
         "@mongodb-js/zstd": {
           "optional": true
         },
+        "gcp-metadata": {
+          "optional": true
+        },
         "kerberos": {
           "optional": true
         },
@@ -982,6 +1131,9 @@
         },
         "snappy": {
           "optional": true
+        },
+        "socks": {
+          "optional": true
         }
       }
     },
@@ -995,20 +1147,20 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.6.3.tgz",
-      "integrity": "sha512-moYP2qWCOdWRDeBxqB/zYwQmQnTBsF5DoolX5uPyI218BkiA1ujGY27P0NTd4oWIX+LLkZPw0LDzlc/7oh1plg==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.0.2.tgz",
+      "integrity": "sha512-Vsi9GzTXjdBVzheT1HZOZ2jHNzzR9Xwb5OyLz/FvDEAhlwrRnXnuqJf0QHINUOQSm7aoyvnPks0q85HJkd6yDw==",
       "dependencies": {
-        "bson": "^5.5.0",
+        "bson": "^6.2.0",
         "kareem": "2.5.1",
-        "mongodb": "5.9.0",
+        "mongodb": "6.2.0",
         "mpath": "0.9.0",
         "mquery": "5.0.0",
         "ms": "2.1.3",
         "sift": "16.0.1"
       },
       "engines": {
-        "node": ">=14.20.1"
+        "node": ">=16.20.1"
       },
       "funding": {
         "type": "opencollective",
@@ -1073,12 +1225,15 @@
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
       "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+    "node_modules/node-cron": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.3.tgz",
+      "integrity": "sha512-dOal67//nohNgYWb+nWmg5dkFdIwDm8EpeGYMekPMrngV3637lqnX0lbUcCtgibHTz6SEz7DAIjKvKDFYCnO1A==",
+      "dependencies": {
+        "uuid": "8.3.2"
+      },
       "engines": {
-        "node": "4.x || >=6.0.0"
+        "node": ">=6.0.0"
       }
     },
     "node_modules/node-gyp-build": {
@@ -1195,6 +1350,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "node_modules/pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -1231,9 +1391,9 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -1395,6 +1555,8 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -1404,6 +1566,8 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
       "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ip": "^2.0.0",
         "smart-buffer": "^4.2.0"
@@ -1417,7 +1581,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
       "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
-      "optional": true,
       "dependencies": {
         "memory-pager": "^1.0.2"
       }
@@ -1508,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"
@@ -1557,6 +1720,14 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",

package.json

@@ -6,16 +6,19 @@
   "scripts": {
     "start": "node dist/index.js",
     "tsc": "tsc -w",
+    "build": "tsc",
     "dev": "nodemon dist/index.js"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
     "@influxdata/influxdb-client": "^1.33.2",
+    "@sentry/node": "^7.77.0",
+    "axios": "^1.6.0",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
-    "mongoose": "^7.6.3",
-    "node-fetch": "^2.6.1",
+    "mongoose": "^8.0.0",
+    "node-cron": "^3.0.2",
     "nodemon": "^3.0.1",
     "typescript": "^5.2.2",
     "websocket": "^1.0.34"
@@ -23,7 +26,7 @@
   "devDependencies": {
     "@types/express": "^4.17.20",
     "@types/node": "^20.8.9",
-    "@types/node-fetch": "^2.6.1",
+    "@types/node-cron": "^3.0.10",
     "@types/websocket": "^1.0.8"
   }
 }

src/api/api.ts

@@ -0,0 +1,47 @@
+import * as Sentry from "@sentry/node";
+import express from "express";
+import analyticsRoute from "./routes/analytics";
+
+const app = express();
+const port = process.env.PORT || 3000;
+
+Sentry.init({
+  dsn: "https://19a8f6e661f41ed26ec9c221954594cf@sentry.fascinated.cc/3",
+  integrations: [
+    // enable HTTP calls tracing
+    new Sentry.Integrations.Http({ tracing: true }),
+    // enable Express.js middleware tracing
+    new Sentry.Integrations.Express({ app }),
+    new Sentry.Integrations.OnUncaughtException(),
+    new Sentry.Integrations.OnUnhandledRejection(),
+    new Sentry.Integrations.Mongo({
+      useMongoose: true,
+    }),
+  ],
+  // Performance Monitoring
+  tracesSampleRate: 1.0,
+});
+
+// Routes
+analyticsRoute(app);
+
+// The request handler must be the first middleware on the app
+app.use(Sentry.Handlers.requestHandler() as express.RequestHandler);
+
+// TracingHandler creates a trace for every incoming request
+app.use(Sentry.Handlers.tracingHandler());
+
+// The error handler must be registered before any other error middleware and after all controllers
+app.use(Sentry.Handlers.errorHandler() as express.ErrorRequestHandler);
+
+// Optional fallthrough error handler
+app.use(function onError(err: any, req: any, res: any, next: any) {
+  // The error id is attached to `res.sentry` to be returned
+  // and optionally displayed to the user for support.
+  res.statusCode = 500;
+  res.end(res.sentry + "\n");
+});
+
+app.listen(port, () => {
+  console.log(`API Server is running on http://localhost:${port}`);
+});

src/api/routes/analytics.ts

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

src/db/schemas/beatsaver.ts

@@ -0,0 +1,12 @@
+import mongoose from "mongoose";
+const { Schema } = mongoose;
+
+const beatSaverSchema = new Schema({
+  _id: String,
+  totalCreated: Number,
+  totalUpdated: Number,
+  totalDeleted: Number,
+});
+
+export const BeatSaverSchema =
+  mongoose.models.BeatSaver || mongoose.model("BeatSaver", beatSaverSchema);

src/headsets.ts

@@ -0,0 +1,11 @@
+export const Headsets: { [key: number]: string } = {
+  0: "Unknown",
+  1: "Rift CV1",
+  2: "Vive",
+  4: "Vive Pro",
+  8: "Windows Mixed Reality",
+  16: "Rift S",
+  32: "Oculus Quest",
+  64: "Valve Index",
+  128: "Vive Cosmos",
+};

src/index.ts

@@ -22,5 +22,6 @@ export const InfluxWriteAPI = influxClient.getWriteApi(
 );
 export const InfluxQueryAPI = influxClient.getQueryApi(INFLUXDB_ORG);
 
-require("./services/updateData");
-require("./services/api");
+require("./services/scoresaber");
+require("./services/beatsaver");
+require("./api/api");

src/services/api.ts

@@ -1,52 +0,0 @@
-import express from "express";
-import { INFLUXDB_BUCKET, InfluxQueryAPI } from "../index";
-import { formatString } from "../utils/stringUtils";
-
-const app = express();
-const port = process.env.PORT || 3000;
-
-// Query to get the player count history for tge last 24 hours in 1 hour intervals
-const getPlayerHistoryQuery = `from(bucket: "${INFLUXDB_BUCKET}")
-  |> range(start: {})
-  |> filter(fn: (r) => r["_measurement"] == "scoresaber")
-  |> filter(fn: (r) => r["_field"] == "value")
-  |> filter(fn: (r) => r["type"] == "player_count")
-  |> aggregateWindow(every: 1h, fn: mean)
-  |> yield()
-`;
-
-app.get("/", (req, res) => {
-  res.send("Hello!");
-});
-
-app.get("/analytics", async (req, res) => {
-  const before = new Date().getTime();
-
-  const timeQuery = req.query.time || "24h";
-  const timeInMs = parseTimeToMilliseconds(timeQuery.toString());
-  if (timeInMs > 30 * 24 * 60 * 60 * 1000) {
-    return res.status(400).json({
-      error: "Time range too large. Max time range is 30 days.",
-    });
-  }
-
-  const rows = await InfluxQueryAPI.collectRows(
-    formatString(getPlayerHistoryQuery, false, timeQuery)
-  );
-  let history = rows.map((row: any) => ({
-    time: row._time,
-    value: row._value !== null ? row._value.toFixed(0) : null,
-  }));
-  history = history.sort(
-    (a: any, b: any) => new Date(a.time).getTime() - new Date(b.time).getTime()
-  );
-
-  return res.json({
-    serverTimeTaken: new Date().getTime() - before + "ms",
-    history: history,
-  });
-});
-
-app.listen(port, () => {
-  console.log(`API Server is running on http://localhost:${port}`);
-});

src/services/beatsaver.ts

@@ -0,0 +1,139 @@
+import { Point } from "@influxdata/influxdb-client";
+import cron from "node-cron";
+import { w3cwebsocket as WebsocketClient } from "websocket";
+import { InfluxWriteAPI } from "..";
+import { connectMongo } from "../db/mongo";
+import { BeatSaverSchema } from "../db/schemas/beatsaver";
+
+const WEBSOCKET_URL = "wss://ws.beatsaver.com/maps";
+
+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");
+  }
+  if (totalUpdated == undefined) {
+    throw new Error("Total updated is undefined");
+  }
+  if (totalDeleted == undefined) {
+    throw new Error("Total deleted is undefined");
+  }
+  const totalCreatedPoint = new Point("beatsaver")
+    .tag("type", "maps_created")
+    .intField("value", totalCreated)
+    .timestamp(new Date());
+  const totalUpdatedPoint = new Point("beatsaver")
+    .tag("type", "maps_updated")
+    .intField("value", totalUpdated)
+    .timestamp(new Date());
+  const totalDeletedPoint = new Point("beatsaver")
+    .tag("type", "maps_deleted")
+    .intField("value", totalDeleted)
+    .timestamp(new Date());
+
+  InfluxWriteAPI.writePoints([
+    totalCreatedPoint,
+    totalUpdatedPoint,
+    totalDeletedPoint,
+  ]);
+}
+
+async function connectWebsocket() {
+  socket = new WebsocketClient(WEBSOCKET_URL);
+  await connectMongo();
+  let beatSaver = await BeatSaverSchema.findOne({ _id: "beatsaver" });
+  if (!beatSaver) {
+    beatSaver = await BeatSaverSchema.create({
+      _id: "beatsaver",
+      totalUpdated: 0,
+      totalCreated: 0,
+      totalDeleted: 0,
+    });
+  }
+  totalCreated = beatSaver.totalCreated || 0;
+  totalUpdated = beatSaver.totalUpdated || 0;
+  totalDeleted = beatSaver.totalDeleted || 0;
+
+  console.log(totalCreated, totalUpdated, totalDeleted);
+
+  socket.onopen = () => {
+    console.log("Connected to beatsaver websocket");
+  };
+
+  socket.onclose = () => {
+    console.log("Disconnected from beatsaver websocket");
+    setTimeout(connectWebsocket, 5000);
+  };
+
+  socket.onerror = (error) => {
+    console.error("Beatsaver Websocket error:", error);
+  };
+
+  socket.onmessage = async (message) => {
+    const json = JSON.parse(message.data.toString());
+    console.log(totalCreated, totalUpdated, totalDeleted);
+    if (totalCreated == undefined) {
+      throw new Error("Total created is undefined");
+    }
+    if (totalUpdated == undefined) {
+      throw new Error("Total updated is undefined");
+    }
+    if (totalDeleted == undefined) {
+      throw new Error("Total deleted is undefined");
+    }
+
+    const { type, msg } = json;
+    const { id, metadata, uploaded, updatedAt } = msg;
+    if (!metadata) {
+      console.log(msg);
+      throw new Error("Metadata is undefined for map " + id);
+    }
+    const { bpm, duration } = metadata;
+    // new map
+    if (type == "MAP_UPDATE" && uploaded == updatedAt) {
+      totalCreated++;
+      InfluxWriteAPI.writePoint(
+        new Point("beatsaver")
+          .tag("type", "map_create")
+          .intField("bpm", bpm)
+          .intField("duration", duration)
+      );
+    } else {
+      // updated map
+      totalUpdated++;
+    }
+    // deleted map
+    if (type == "MAP_DELETE") {
+      totalDeleted++;
+    }
+
+    BeatSaverSchema.updateOne(
+      { _id: "beatsaver" },
+      {
+        $set: {
+          totalUpdated: totalUpdated,
+          totalCreated: totalCreated,
+          totalDeleted: totalDeleted,
+        },
+      }
+    ).exec();
+  };
+}
+
+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

@@ -0,0 +1,167 @@
+import { Point } from "@influxdata/influxdb-client";
+import axios from "axios";
+import cron from "node-cron";
+import { w3cwebsocket as WebsocketClient } from "websocket";
+import { InfluxWriteAPI } from "..";
+import { connectMongo } from "../db/mongo";
+import { LeaderboardSchema } from "../db/schemas/leaderboard";
+import { Headsets } from "../headsets";
+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
+ */
+async function update() {
+  const response = await axios.get("https://scoresaber.com/api/players/count");
+  const count = response.data;
+
+  const point = new Point("scoresaber")
+    .tag("type", "player_count")
+    .intField("value", parseInt(count))
+    .timestamp(new Date());
+  InfluxWriteAPI.writePoint(point);
+  console.log(`Updated player count to ${count}`);
+
+  if (totalScores) {
+    InfluxWriteAPI.writePoint(
+      new Point("scoresaber")
+        .tag("type", "score_count")
+        .intField("value", totalScores)
+        .timestamp(new Date())
+    );
+    console.log(`Updated score count to ${totalScores}`);
+  }
+}
+
+/**
+ * Connects to the scoresaber websocket and listens for new scores
+ */
+async function connectWebsocket() {
+  await connectMongo();
+  const leaderboard = await LeaderboardSchema.findOne({ _id: "scoresaber" });
+  if (!leaderboard) {
+    await LeaderboardSchema.create({ _id: "scoresaber", totalPlays: 0 });
+  }
+  // set total scores to the current total plays in the database
+  totalScores = leaderboard?.totalPlays || 0;
+
+  socket = new WebsocketClient("wss://scoresaber.com/ws");
+  socket.onopen = () => {
+    console.log("Connected to scoresaber websocket");
+  };
+
+  socket.onclose = () => {
+    console.log("Disconnected from scoresaber websocket");
+    setTimeout(connectWebsocket, 5000);
+  };
+
+  socket.onerror = (error) => {
+    console.error("Scoresaber Websocket error:", error);
+  };
+
+  socket.onmessage = async (message) => {
+    lastScore = Date.now();
+    const data = message.data;
+    let json;
+    try {
+      json = JSON.parse(data.toString());
+    } catch (e) {
+      return;
+    }
+
+    const commandName = json.commandName;
+    const commandData = json.commandData;
+    if (commandName == "score") {
+      const { score, leaderboard } = commandData;
+      if (!totalScores) {
+        throw new Error("totalScores is undefined");
+      }
+      totalScores++;
+
+      const {
+        id,
+        hmd,
+        baseScore,
+        missedNotes,
+        badCuts,
+        rank,
+        maxCombo,
+        leaderboardPlayerInfo: player,
+        pp,
+      } = score;
+      const { maxScore, stars } = leaderboard;
+
+      const hmdName = Headsets[hmd] || "Unknown";
+      const countryId = normalizedRegionName(player.country) || "Unknown";
+
+      // Update the leaderboard data in the database
+      await LeaderboardSchema.updateOne(
+        { _id: "scoresaber" },
+        {
+          $set: {
+            totalPlays: totalScores,
+          },
+        }
+      ).exec();
+
+      const scorePoint = new Point("scoresaber")
+        .tag("type", "score")
+
+        .intField("id", id)
+        .timestamp(new Date());
+
+      if (baseScore && maxScore) {
+        scorePoint.floatField("acc", ((baseScore / maxScore) * 100).toFixed(2));
+      }
+      if (stars) {
+        scorePoint.floatField("stars", stars);
+      }
+      if (pp) {
+        scorePoint.floatField("pp", pp.toFixed(2));
+      }
+      if (missedNotes) {
+        scorePoint.intField("missed_notes", missedNotes);
+      }
+      if (badCuts) {
+        scorePoint.intField("bad_cuts", badCuts);
+      }
+      if (rank) {
+        scorePoint.intField("rank", rank);
+      }
+      // if (leaderboardId) {
+      //   scorePoint.intField("leaderboard_id", leaderboardId);
+      // }
+      if (hmdName) {
+        scorePoint.stringField("hmd", hmdName);
+      }
+      if (countryId) {
+        scorePoint.stringField("country", countryId);
+      }
+      if (maxCombo) {
+        scorePoint.intField("max_combo", maxCombo);
+      }
+      scorePoint.intField("player_id", player.id);
+
+      // Write the data to influx
+      InfluxWriteAPI.writePoint(scorePoint);
+    }
+  };
+}
+
+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();
+  }
+});

src/services/updateData.ts

@@ -1,71 +0,0 @@
-import { Point } from "@influxdata/influxdb-client";
-import { w3cwebsocket as WebsocketClient } from "websocket";
-import { InfluxWriteAPI } from "..";
-import { connectMongo } from "../db/mongo";
-import { LeaderboardSchema } from "../db/schemas/leaderboard";
-const fetch = require("node-fetch");
-
-async function update() {
-  const response = await fetch("https://scoresaber.com/api/players/count");
-  const count = await response.text();
-
-  const point = new Point("scoresaber")
-    .tag("type", "player_count")
-    .intField("value", parseInt(count))
-    .timestamp(new Date());
-  InfluxWriteAPI.writePoint(point);
-
-  console.log(`Updated player count to ${count}`);
-}
-
-async function connectWebsocket() {
-  await connectMongo();
-  const leaderboard = await LeaderboardSchema.findOne({ _id: "scoresaber" });
-  if (!leaderboard) {
-    await LeaderboardSchema.create({ _id: "scoresaber", totalPlays: 0 });
-  }
-  let totalScores = leaderboard?.totalPlays || 0;
-
-  const socket = new WebsocketClient("wss://scoresaber.com/ws");
-  socket.onopen = () => {
-    console.log("Connected to websocket");
-  };
-
-  socket.onclose = () => {
-    console.log("Disconnected from websocket");
-    setTimeout(connectWebsocket, 5000);
-  };
-
-  socket.onerror = (error) => {
-    console.error("Websocket error:", error);
-  };
-
-  socket.onmessage = (message) => {
-    const data = message.data;
-    let json;
-    try {
-      json = JSON.parse(data.toString());
-    } catch (e) {
-      return;
-    }
-
-    const commandName = json.commandName;
-    const commandData = json.commandData;
-    if (commandName == "score") {
-      totalScores++;
-      LeaderboardSchema.updateOne(
-        { _id: "scoresaber" },
-        { totalPlays: totalScores }
-      ).exec();
-      const point = new Point("scoresaber")
-        .tag("type", "score_count")
-        .intField("value", totalScores)
-        .timestamp(new Date());
-      InfluxWriteAPI.writePoint(point);
-    }
-  };
-}
-
-update();
-connectWebsocket();
-setInterval(update, 60_000); // 1 minute

src/utils/regionUtils.ts

@@ -0,0 +1,11 @@
+let regionNames = new Intl.DisplayNames(["en"], { type: "region" });
+
+/**
+ * Returns the normalized region name
+ *
+ * @param region the region to normalize
+ * @returns the normalized region name
+ */
+export function normalizedRegionName(region: string) {
+  return regionNames.of(region);
+}

src/utils/timeUtils.ts

@@ -4,7 +4,7 @@
  * @param time the time to parse
  * @returns the time in milliseconds
  */
-function parseTimeToMilliseconds(time: string) {
+export function parseTimeToMilliseconds(time: string) {
   // Regular expression to match the numeric value and unit
   const regex = /^(\d+)([smhdwMy])$/;