5 Commits

Author SHA1 Message Date
29791d6fed fix(deps): update dependency nodemon to v3.1.0 2024-04-17 15:01:41 +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 877 additions and 766 deletions

92
package-lock.json generated
View File

@ -252,27 +252,6 @@
"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",
@ -499,12 +478,25 @@
}
},
"node_modules/debug": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
"dependencies": {
"ms": "^2.1.1"
"ms": "2.1.2"
},
"engines": {
"node": ">=6.0"
},
"peerDependenciesMeta": {
"supports-color": {
"optional": true
}
}
},
"node_modules/debug/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/define-data-property": {
"version": "1.1.1",
@ -906,27 +898,6 @@
"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",
@ -1186,27 +1157,6 @@
"node": ">=14.0.0"
}
},
"node_modules/mquery/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/mquery/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/ms": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@ -1247,12 +1197,12 @@
}
},
"node_modules/nodemon": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.1.tgz",
"integrity": "sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.0.tgz",
"integrity": "sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==",
"dependencies": {
"chokidar": "^3.5.2",
"debug": "^3.2.7",
"debug": "^4",
"ignore-by-default": "^1.0.1",
"minimatch": "^3.1.2",
"pstree.remy": "^1.1.8",

View File

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

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