From 24cb212a37cd50b50f9bc1463e7b48bb484475b7 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 15 Oct 2022 20:15:50 +0800 Subject: [PATCH] Fix recurring --- server/model/maintenance_timeslot.js | 81 ++++++++++++++++------------ server/model/monitor.js | 2 + server/uptime-kuma-server.js | 9 +++- 3 files changed, 55 insertions(+), 37 deletions(-) diff --git a/server/model/maintenance_timeslot.js b/server/model/maintenance_timeslot.js index b20b9473e..2babe6bca 100644 --- a/server/model/maintenance_timeslot.js +++ b/server/model/maintenance_timeslot.js @@ -57,30 +57,37 @@ class MaintenanceTimeslot extends BeanModel { return await this.handleRecurringType(maintenance, minDate, (startDateTime) => { return startDateTime.add(maintenance.interval_day, "day"); + }, () => { + return true; }); } else if (maintenance.strategy === "recurring-weekday") { let dayOfWeekList = maintenance.getDayOfWeekList(); + log.debug("timeslot", dayOfWeekList); if (dayOfWeekList.length <= 0) { log.debug("timeslot", "No weekdays selected?"); return null; } + const isValid = (startDateTime) => { + log.debug("timeslot", "nextDateTime: " + startDateTime); + + let day = startDateTime.local().day(); + log.debug("timeslot", "nextDateTime.day(): " + day); + + return dayOfWeekList.includes(day); + }; + return await this.handleRecurringType(maintenance, minDate, (startDateTime) => { while (true) { startDateTime = startDateTime.add(1, "day"); - log.debug("timeslot", "nextDateTime: " + startDateTime); - - let day = startDateTime.local().day(); - log.debug("timeslot", "nextDateTime.day(): " + day); - - if (dayOfWeekList.includes(day)) { + if (isValid(startDateTime)) { return startDateTime; } } - }); + }, isValid); } else if (maintenance.strategy === "recurring-day-of-month") { let dayOfMonthList = maintenance.getDayOfMonthList(); @@ -89,36 +96,38 @@ class MaintenanceTimeslot extends BeanModel { return null; } + const isValid = (startDateTime) => { + let day = parseInt(startDateTime.local().format("D")); + + log.debug("timeslot", "day: " + day); + + // Check 1-31 + if (dayOfMonthList.includes(day)) { + return startDateTime; + } + + // Check "lastDay1","lastDay2"... + let daysInMonth = startDateTime.daysInMonth(); + let lastDayList = []; + + // Small first, e.g. 28 > 29 > 30 > 31 + for (let i = 4; i >= 1; i--) { + if (dayOfMonthList.includes("lastDay" + i)) { + lastDayList.push(daysInMonth - i + 1); + } + } + log.debug("timeslot", lastDayList); + return lastDayList.includes(day); + }; + return await this.handleRecurringType(maintenance, minDate, (startDateTime) => { while (true) { - startDateTime = startDateTime.add(1, "day"); - - let day = parseInt(startDateTime.local().format("D")); - - log.debug("timeslot", "day: " + day); - - // Check 1-31 - if (dayOfMonthList.includes(day)) { - return startDateTime; - } - - // Check "lastDay1","lastDay2"... - let daysInMonth = startDateTime.daysInMonth(); - let lastDayList = []; - - // Small first, e.g. 28 > 29 > 30 > 31 - for (let i = 4; i >= 1; i--) { - if (dayOfMonthList.includes("lastDay" + i)) { - lastDayList.push(daysInMonth - i + 1); - } - } - log.debug("timeslot", "lastDayList: " + lastDayList); - if (lastDayList.includes(day)) { + if (isValid(startDateTime)) { return startDateTime; } } - }); + }, isValid); } else { throw new Error("Unknown maintenance strategy"); } @@ -128,10 +137,11 @@ class MaintenanceTimeslot extends BeanModel { * Generate a next timeslot for all recurring types * @param maintenance * @param minDate - * @param nextDayCallback The logic how to get the next possible day + * @param {function} nextDayCallback The logic how to get the next possible day + * @param {function} isValidCallback Check the day whether is matched the current strategy * @returns {Promise} */ - static async handleRecurringType(maintenance, minDate, nextDayCallback) { + static async handleRecurringType(maintenance, minDate, nextDayCallback, isValidCallback) { let bean = R.dispense("maintenance_timeslot"); let duration = maintenance.getDuration(); @@ -157,13 +167,14 @@ class MaintenanceTimeslot extends BeanModel { // If minDate is set, the endDateTime must be bigger than it. // And the endDateTime must be bigger current time + // Is valid under current recurring strategy if ( (!minDate || endDateTime.diff(minDate) > 0) && - endDateTime.diff(dayjs()) > 0 + endDateTime.diff(dayjs()) > 0 && + isValidCallback(startDateTime) ) { break; } - startDateTime = nextDayCallback(startDateTime); } diff --git a/server/model/monitor.js b/server/model/monitor.js index 43e9e358e..e8342b09c 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -623,6 +623,8 @@ class Monitor extends BeanModel { log.debug("monitor", `[${this.name}] apicache clear`); apicache.clear(); + UptimeKumaServer.getInstance().sendMaintenanceListByUserID(this.user_id); + } else { bean.important = false; diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js index f84bf312d..078cc31d9 100644 --- a/server/uptime-kuma-server.js +++ b/server/uptime-kuma-server.js @@ -10,6 +10,7 @@ const util = require("util"); const { CacheableDnsHttpAgent } = require("./cacheable-dns-http-agent"); const { Settings } = require("./settings"); const dayjs = require("dayjs"); +// DO NOT IMPORT HERE IF THE MODULES USED `UptimeKumaServer.getInstance()` /** * `module.exports` (alias: `server`) should be inside this class, in order to avoid circular dependency issue. @@ -130,8 +131,12 @@ class UptimeKumaServer { * @returns {Object} */ async sendMaintenanceList(socket) { - let list = await this.getMaintenanceJSONList(socket.userID); - this.io.to(socket.userID).emit("maintenanceList", list); + return await this.sendMaintenanceListByUserID(socket.userID); + } + + async sendMaintenanceListByUserID(userID) { + let list = await this.getMaintenanceJSONList(userID); + this.io.to(userID).emit("maintenanceList", list); return list; }