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

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

@@ -14,7 +14,7 @@
         "axios": "^1.6.0",
         "dotenv": "^16.3.1",
         "express": "^4.18.2",
-        "mongoose": "^7.6.3",
+        "mongoose": "^8.0.0",
         "node-cron": "^3.0.2",
         "nodemon": "^3.0.1",
         "typescript": "^5.2.2",
@@ -36,45 +36,44 @@
       "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.77.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.77.0.tgz",
-      "integrity": "sha512-8HRF1rdqWwtINqGEdx8Iqs9UOP/n8E0vXUu3Nmbqj4p5sQPA7vvCfq+4Y4rTqZFc7sNdFpDsRION5iQEh8zfZw==",
+      "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.77.0",
-        "@sentry/types": "7.77.0",
-        "@sentry/utils": "7.77.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.77.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.77.0.tgz",
-      "integrity": "sha512-Tj8oTYFZ/ZD+xW8IGIsU6gcFXD/gfE+FUxUaeSosd9KHwBQNOLhZSsYo/tTVf/rnQI/dQnsd4onPZLiL+27aTg==",
+      "version": "7.83.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.83.0.tgz",
+      "integrity": "sha512-fglvpw8aWM6nWXzCjAVXIMTiTEAQ9G9b85IpDd/7L8fuwaFTPQAUSJXupF2PfbpQ3FUYbJt80dxshbERVJG8vQ==",
       "dependencies": {
-        "@sentry/types": "7.77.0",
-        "@sentry/utils": "7.77.0"
+        "@sentry/types": "7.83.0",
+        "@sentry/utils": "7.83.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@sentry/node": {
-      "version": "7.77.0",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.77.0.tgz",
-      "integrity": "sha512-Ob5tgaJOj0OYMwnocc6G/CDLWC7hXfVvKX/ofkF98+BbN/tQa5poL+OwgFn9BA8ud8xKzyGPxGU6LdZ8Oh3z/g==",
+      "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.77.0",
-        "@sentry/core": "7.77.0",
-        "@sentry/types": "7.77.0",
-        "@sentry/utils": "7.77.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": {
@@ -82,19 +81,19 @@
       }
     },
     "node_modules/@sentry/types": {
-      "version": "7.77.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.77.0.tgz",
-      "integrity": "sha512-nfb00XRJVi0QpDHg+JkqrmEBHsqBnxJu191Ded+Cs1OJ5oPXEW6F59LVcBScGvMqe+WEk1a73eH8XezwfgrTsA==",
+      "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.77.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.77.0.tgz",
-      "integrity": "sha512-NmM2kDOqVchrey3N5WSzdQoCsyDkQkiRxExPaNI2oKQ/jMWHs9yt0tSy7otPBcXs0AP59ihl75Bvm1tDRcsp5g==",
+      "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.77.0"
+        "@sentry/types": "7.83.0"
       },
       "engines": {
         "node": ">=8"
@@ -120,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": "*",
@@ -156,17 +155,17 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.8.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz",
-      "integrity": "sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==",
+      "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-cron": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/node-cron/-/node-cron-3.0.10.tgz",
-      "integrity": "sha512-8thdLSpV7na8+bsmiyMH/KKQWOBg4WmoLInlGxWz7JJn8Mie+53QWaygSlc7f/AsMsCB5bBTVjoueAU6tRutTw==",
+      "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": {
@@ -208,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": "*"
@@ -297,28 +296,15 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
-      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
+      "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"
       }
     },
-    "node_modules/axios/node_modules/form-data": {
-      "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",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -389,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": {
@@ -737,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",
@@ -755,6 +741,19 @@
         }
       }
     },
+    "node_modules/form-data": {
+      "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",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -952,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",
@@ -1035,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",
@@ -1093,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": {
@@ -1121,6 +1120,9 @@
         "@mongodb-js/zstd": {
           "optional": true
         },
+        "gcp-metadata": {
+          "optional": true
+        },
         "kerberos": {
           "optional": true
         },
@@ -1129,6 +1131,9 @@
         },
         "snappy": {
           "optional": true
+        },
+        "socks": {
+          "optional": true
         }
       }
     },
@@ -1142,20 +1147,20 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.6.4.tgz",
-      "integrity": "sha512-kadPkS/f5iZJrrMxxOvSoOAErXmdnb28lMvHmuYgmV1ZQTpRqpp132PIPHkJMbG4OC2H0eSXYw/fNzYTH+LUcw==",
+      "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",
@@ -1221,9 +1226,9 @@
       "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
     },
     "node_modules/node-cron": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.2.tgz",
-      "integrity": "sha512-iP8l0yGlNpE0e6q1o185yOApANRe47UPbLf4YxfbiNHt/RU5eBcGB/e0oudruheSf+LQeDMezqC5BVAb5wwRcQ==",
+      "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"
       },
@@ -1550,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"
@@ -1559,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"
@@ -1572,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"
       }
@@ -1663,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"

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "start": "node dist/index.js",
     "tsc": "tsc -w",
+    "build": "tsc",
     "dev": "nodemon dist/index.js"
   },
   "author": "",
@@ -16,7 +17,7 @@
     "axios": "^1.6.0",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
-    "mongoose": "^7.6.3",
+    "mongoose": "^8.0.0",
     "node-cron": "^3.0.2",
     "nodemon": "^3.0.1",
     "typescript": "^5.2.2",

src/api/routes/analytics.ts

@@ -4,12 +4,12 @@ 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["_field"] == "value")
-  |> filter(fn: (r) => r["type"] == "player_count")
-  |> aggregateWindow(every: {}, fn: mean)
-  |> yield()
+|> 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}")

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/index.ts

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

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

@@ -10,6 +10,13 @@ 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;
@@ -32,6 +39,9 @@ async function update() {
   }
 }
 
+/**
+ * Connects to the scoresaber websocket and listens for new scores
+ */
 async function connectWebsocket() {
   await connectMongo();
   const leaderboard = await LeaderboardSchema.findOne({ _id: "scoresaber" });
@@ -41,21 +51,22 @@ 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 websocket");
+    console.log("Connected to scoresaber websocket");
   };
 
   socket.onclose = () => {
-    console.log("Disconnected from websocket");
+    console.log("Disconnected from scoresaber websocket");
     setTimeout(connectWebsocket, 5000);
   };
 
   socket.onerror = (error) => {
-    console.error("Websocket error:", error);
+    console.error("Scoresaber Websocket error:", error);
   };
 
   socket.onmessage = async (message) => {
+    lastScore = Date.now();
     const data = message.data;
     let json;
     try {
@@ -135,7 +146,7 @@ async function connectWebsocket() {
       if (maxCombo) {
         scorePoint.intField("max_combo", maxCombo);
       }
-      //scorePoint.intField("player_id", player.id);
+      scorePoint.intField("player_id", player.id);
 
       // Write the data to influx
       InfluxWriteAPI.writePoint(scorePoint);
@@ -146,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();
+  }
+});