Compare commits
26 Commits
d34c35ef5e
...
renovate/n
Author | SHA1 | Date | |
---|---|---|---|
29791d6fed | |||
f621f6c5ae | |||
3621941a0d | |||
fe15f660e6 | |||
5c2416e7ee | |||
46efd6b6dc | |||
7749a570d6 | |||
62cbe6141d | |||
b8f0d84f69 | |||
5a8b3556b3 | |||
9a12e65f8a | |||
b99e8e979c | |||
6d213dd3eb | |||
454e1f2914 | |||
7f0ab00e3b | |||
b291c10402 | |||
06ea301120 | |||
7943fabcca | |||
9189f510db | |||
4afbb8f468 | |||
19dbd63c33 | |||
6ed9d3e3b5 | |||
3b76431cb9 | |||
cd33aae6ce | |||
a086f540ad | |||
b9dedbc603 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -144,3 +144,7 @@ dist
|
||||
# Built Visual Studio Code Extensions
|
||||
*.vsix
|
||||
|
||||
# lock files
|
||||
package-lock.json
|
||||
yarn.lock
|
||||
|
||||
|
11
Dockerfile
11
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" ]
|
166
package-lock.json
generated
166
package-lock.json
generated
@ -41,39 +41,39 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sentry-internal/tracing": {
|
||||
"version": "7.80.1",
|
||||
"resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.80.1.tgz",
|
||||
"integrity": "sha512-5gZ4LPIj2vpQl2/dHBM4uXMi9OI5E0VlOhJQt0foiuN6JJeiOjdpJFcfVqJk69wrc0deVENTtgKKktxqMwVeWQ==",
|
||||
"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.1",
|
||||
"@sentry/types": "7.80.1",
|
||||
"@sentry/utils": "7.80.1"
|
||||
"@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.1",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.80.1.tgz",
|
||||
"integrity": "sha512-3Yh+O9Q86MxwIuJFYtuSSoUCpdx99P1xDAqL0FIPTJ+ekaVMiUJq9NmyaNh9uN2myPSmxvEXW6q3z37zta9ZHg==",
|
||||
"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.1",
|
||||
"@sentry/utils": "7.80.1"
|
||||
"@sentry/types": "7.83.0",
|
||||
"@sentry/utils": "7.83.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/@sentry/node": {
|
||||
"version": "7.80.1",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.80.1.tgz",
|
||||
"integrity": "sha512-0NWfcZMlyQphKWsvyzfhGm2dCBk5DUPqOGW/vGx18G4tCCYtFcAIj/mCp/4XOEcZRPQgb9vkm+sidGD6DnwWlA==",
|
||||
"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.1",
|
||||
"@sentry/core": "7.80.1",
|
||||
"@sentry/types": "7.80.1",
|
||||
"@sentry/utils": "7.80.1",
|
||||
"@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.1",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.80.1.tgz",
|
||||
"integrity": "sha512-CVu4uPVTOI3U9kYiOdA085R7jX5H1oVODbs9y+A8opJ0dtJTMueCXgZyE8oXQ0NjGVs6HEeaLkOuiV0mj8X3yw==",
|
||||
"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.1",
|
||||
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.80.1.tgz",
|
||||
"integrity": "sha512-bfFm2e/nEn+b9++QwjNEYCbS7EqmteT8uf0XUs7PljusSimIqqxDtK1pfD9zjynPgC8kW/fVBKv0pe2LufomeA==",
|
||||
"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.1"
|
||||
"@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": "*"
|
||||
@ -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,13 +478,26 @@
|
||||
}
|
||||
},
|
||||
"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",
|
||||
"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
|
||||
@ -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",
|
||||
@ -1147,9 +1118,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",
|
||||
@ -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",
|
||||
@ -1671,9 +1621,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"
|
||||
|
@ -6,6 +6,7 @@
|
||||
"scripts": {
|
||||
"start": "node dist/index.js",
|
||||
"tsc": "tsc -w",
|
||||
"build": "tsc",
|
||||
"dev": "nodemon dist/index.js"
|
||||
},
|
||||
"author": "",
|
||||
|
1346
pnpm-lock.yaml
generated
Normal file
1346
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,85 +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,
|
||||
});
|
||||
});
|
||||
}
|
||||
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,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
});
|
||||
|
@ -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();
|
||||
}
|
||||
});
|
||||
|
Reference in New Issue
Block a user