7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-08 21:23:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: ⚡️ revert some overengineer code

Browse Source
This commit is contained in:
Qi Zhao
2024-06-13 23:39:12 +08:00
committed by Qi Zhao
parent 58533e8f06
commit 4941b17a46
4 changed files with 22 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/routers/api-router.js
View File

@@ -11,17 +11,7 @@ const { R } = require("redbean-node");
const apicache = require("../modules/apicache");
const Monitor = require("../model/monitor");
const dayjs = require("dayjs");
const {
UP,
MAINTENANCE,
DOWN,
PENDING,
flipStatus,
log,
badgeConstants,
durationUnits,
isNumeric,
} = require("../../src/util");
const { UP, MAINTENANCE, DOWN, PENDING, flipStatus, log, badgeConstants } = require("../../src/util");
const StatusPage = require("../model/status_page");
const { UptimeKumaServer } = require("../uptime-kuma-server");
const { makeBadge } = require("badge-maker");
@@ -239,13 +229,12 @@ router.get("/api/badge/:id/uptime/:duration?", cache("5 minutes"), async (reques
try {
const requestedMonitorId = parseInt(request.params.id, 10);
// if no duration is given, set value to 24 (h)
let requestedDuration = request.params.duration !== undefined ? request.params.duration : "24";
let requestedDuration = request.params.duration !== undefined ? request.params.duration : "24h";
const overrideValue = value && parseFloat(value);
if (isNumeric(requestedDuration)) { // all numeric only
requestedDuration = `${requestedDuration}${durationUnits.HOUR}`;
if (/^[0-9]+$/.test(requestedDuration)) {
requestedDuration = `${requestedDuration}h`;
}
const duration = requestedDuration.slice(0, -1);
let publicMonitor = await R.getRow(`
SELECT monitor_group.monitor_id FROM monitor_group, \`group\`
@@ -276,7 +265,7 @@ router.get("/api/badge/:id/uptime/:duration?", cache("5 minutes"), async (reques
// build a label string. If a custom label is given, override the default one (requestedDuration)
badgeValues.label = filterAndJoin([
labelPrefix,
label ?? `Uptime (${duration}${labelSuffix})`,
label ?? `Uptime (${requestedDuration.slice(0, -1)}${labelSuffix})`,
]);
badgeValues.message = filterAndJoin([ prefix, cleanUptime, suffix ]);
}
@@ -323,6 +312,7 @@ router.get("/api/badge/:id/ping/:duration?", cache("5 minutes"), async (request,
const publicAvgPing = uptimeCalculator.getDataByDuration(requestedDuration).avgPing;
const badgeValues = { style };
if (!publicAvgPing) {
// return a "N/A" badge in naColor (grey), if monitor is not public / not available / non exsitant

23
server/uptime-calculator.js
View File

@@ -1,12 +1,5 @@
const dayjs = require("dayjs");
const {
UP,
MAINTENANCE,
DOWN,
PENDING,
durationUnits,
isNumeric
} = require("../src/util");
const { UP, MAINTENANCE, DOWN, PENDING } = require("../src/util");
const { LimitQueue } = require("./utils/limit-queue");
const { log } = require("../src/util");
const { R } = require("redbean-node");
@@ -758,24 +751,24 @@ class UptimeCalculator {
getDataByDuration(duration) {
const durationNumStr = duration.slice(0, -1);
if (!isNumeric(durationNumStr)) {
if (!/^[0-9]+$/.test(durationNumStr)) {
throw new Error(`Invalid duration: ${duration}`);
}
const num = Number(durationNumStr);
const unit = duration.slice(-1);
switch (unit) {
case durationUnits.MINUTE:
case "m":
return this.getData(num, "minute");
case durationUnits.HOUR:
case "h":
return this.getData(num, "hour");
case durationUnits.DAY:
case "d":
return this.getData(num, "day");
case durationUnits.WEEK:
case "w":
return this.getData(7 * num, "day");
case durationUnits.MONTH:
case "M":
return this.getData(30 * num, "day");
case durationUnits.YEAR:
case "y":
return this.getData(365 * num, "day");
default:
throw new Error(`Unsupported unit (${unit}) for badge duration ${duration}`