5 Commits

Author SHA1 Message Date
c7b6daa78d fix(deps): update dependency @sentry/node to v7.110.1 2024-04-17 15:01:15 +00:00
f621f6c5ae attempt to close the old socket
All checks were successful
deploy / deploy (push) Successful in 20s
2024-01-16 15:37:58 +00:00
3621941a0d e
All checks were successful
deploy / deploy (push) Successful in 22s
2024-01-16 15:36:30 +00:00
fe15f660e6 e
All checks were successful
deploy / deploy (push) Successful in 36s
2024-01-16 15:33:50 +00:00
5c2416e7ee e
Some checks failed
deploy / deploy (push) Has been cancelled
2024-01-16 15:33:11 +00:00
5 changed files with 881 additions and 798 deletions

116
package-lock.json generated
View File

@ -41,59 +41,58 @@
}
},
"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==",
"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.83.0",
"@sentry/types": "7.83.0",
"@sentry/utils": "7.83.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.83.0",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.83.0.tgz",
"integrity": "sha512-fglvpw8aWM6nWXzCjAVXIMTiTEAQ9G9b85IpDd/7L8fuwaFTPQAUSJXupF2PfbpQ3FUYbJt80dxshbERVJG8vQ==",
"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.83.0",
"@sentry/utils": "7.83.0"
"@sentry/types": "7.110.1",
"@sentry/utils": "7.110.1"
},
"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==",
"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.83.0",
"@sentry/core": "7.83.0",
"@sentry/types": "7.83.0",
"@sentry/utils": "7.83.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.83.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.83.0.tgz",
"integrity": "sha512-Bd+zJcy8p1VgCfQqUprmUaw0QPWUV+GmCt6zJRHrHTb2pwLahXv6sHJvQ8F8Va6S7Keuy088U+kHzUFGQLMZMQ==",
"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.83.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.83.0.tgz",
"integrity": "sha512-7SrZtgAn3pHFBqSSvV/VL0CWTBQ7VenJjok4+WGWd6/FhP3fKrEEd9rjVTUb2Pzq9WLJJYzdvxAG8RlggG+H4g==",
"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.83.0"
"@sentry/types": "7.110.1"
},
"engines": {
"node": ">=8"
@ -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",

View File

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

1466
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -13,6 +13,7 @@ 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) {
@ -45,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) {
@ -129,8 +130,10 @@ async function connectWebsocket() {
connectWebsocket();
cron.schedule("*/5 * * * *", update);
cron.schedule("*/1 * * * *", () => {
if (lastMap && Date.now() - lastMap > 10000) {
// 1 minute
if (lastMap && Date.now() - lastMap > 60_000) {
console.log("Beatsaver websocket is dead, reconnecting");
socket?.close();
connectWebsocket();
}
});

View File

@ -12,6 +12,7 @@ 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
@ -50,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");
};
@ -157,8 +158,10 @@ update();
connectWebsocket();
cron.schedule("*/1 * * * *", update);
cron.schedule("*/1 * * * *", () => {
if (lastScore && Date.now() - lastScore > 10000) {
// 1 minute
if (lastScore && Date.now() - lastScore > 60_000) {
console.log("Scoresaber websocket is dead, reconnecting");
socket?.close();
connectWebsocket();
}
});