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

Merge branch 'master' into uptime-badges

Browse Source 
# Conflicts:
#	package-lock.json
#	server/routers/api-router.js
This commit is contained in:
Louis Lam
2022-05-01 17:03:11 +08:00
parent 42ea3fb412 63c8d24d6f
commit d962ab7a1c
69 changed files with 2443 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ const { R } = require("redbean-node");
const apicache = require("../modules/apicache");
const Monitor = require("../model/monitor");
const dayjs = require("dayjs");
const { UP, flipStatus, log } = require("../../src/util");
const { UP, DOWN, flipStatus, log } = require("../../src/util");
const StatusPage = require("../model/status_page");
const { UptimeKumaServer } = require("../uptime-kuma-server");
const { makeBadge } = require("badge-maker");
@@ -37,6 +37,8 @@ router.get("/api/push/:pushToken", async (request, response) => {
let pushToken = request.params.pushToken;
let msg = request.query.msg || "OK";
let ping = request.query.ping || null;
let statusString = request.query.status || "up";
let status = (statusString === "up") ? UP : DOWN;
let monitor = await R.findOne("monitor", " push_token = ? AND active = 1 ", [
pushToken
@@ -48,7 +50,6 @@ router.get("/api/push/:pushToken", async (request, response) => {
const previousHeartbeat = await Monitor.getPreviousHeartbeat(monitor.id);
let status = UP;
if (monitor.isUpsideDown()) {
status = flipStatus(status);
}
@@ -399,6 +400,11 @@ async function isPublished() {
return value;
}
/**
* Send a 403 response
* @param {Object} res Express response object
* @param {string} [msg=""] Message to send
*/
function send403(res, msg = "") {
res.status(403).json({
"status": "fail",