Merge branch 'master' into tls-expiry

# Conflicts:
#	server/model/monitor.js

.dockerignore

@@ -11,3 +11,4 @@
 LICENSE
 README.md
 .editorconfig
+.vscode

.gitignore

@@ -7,3 +7,4 @@ dist-ssr
 
 /data
 !/data/.gitkeep
+.vscode

db/patch3.sql

@@ -0,0 +1,37 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+-- Add maxretries column to monitor
+PRAGMA foreign_keys=off;
+
+BEGIN TRANSACTION;
+
+create table monitor_dg_tmp
+(
+    id INTEGER not null
+        primary key autoincrement,
+    name VARCHAR(150),
+    active BOOLEAN default 1 not null,
+    user_id INTEGER
+        references user
+                   on update cascade on delete set null,
+    interval INTEGER default 20 not null,
+    url TEXT,
+    type VARCHAR(20),
+    weight INTEGER default 2000,
+    hostname VARCHAR(255),
+    port INTEGER,
+    created_date DATETIME,
+    keyword VARCHAR(255),
+    maxretries INTEGER NOT NULL DEFAULT 0
+);
+
+insert into monitor_dg_tmp(id, name, active, user_id, interval, url, type, weight, hostname, port, created_date, keyword) select id, name, active, user_id, interval, url, type, weight, hostname, port, created_date, keyword from monitor;
+
+drop table monitor;
+
+alter table monitor_dg_tmp rename to monitor;
+
+create index user_id on monitor (user_id);
+
+COMMIT;
+
+PRAGMA foreign_keys=on;

server/model/monitor.js

@@ -6,6 +6,7 @@ var timezone = require('dayjs/plugin/timezone')
 dayjs.extend(utc)
 dayjs.extend(timezone)
 const axios = require("axios");
+const {UP, DOWN, PENDING} = require("../util");
 const {debug} = require("../util");
 const {tcping, ping, checkCertificate} = require("../util-server");
 const {R} = require("redbean-node");
@@ -24,7 +25,6 @@ const customAgent = new https.Agent({
  *      1 = UP
  */
 class Monitor extends BeanModel {
-
     async toJSON() {
 
         let notificationIDList = {};
@@ -43,6 +43,7 @@ class Monitor extends BeanModel {
             url: this.url,
             hostname: this.hostname,
             port: this.port,
+            maxretries: this.maxretries,
             weight: this.weight,
             active: this.active,
             type: this.type,
@@ -54,21 +55,25 @@ class Monitor extends BeanModel {
 
     start(io) {
         let previousBeat = null;
+        let retries = 0;
 
         const beat = async () => {
+
             if (! previousBeat) {
                 previousBeat = await R.findOne("heartbeat", " monitor_id = ? ORDER BY time DESC", [
                     this.id
                 ])
             }
 
+            const isFirstBeat = !previousBeat;
+
             let bean = R.dispense("heartbeat")
             bean.monitor_id = this.id;
             bean.time = R.isoDateTime(dayjs.utc());
-            bean.status = 0;
+            bean.status = DOWN;
 
             // Duration
-            if (previousBeat) {
+            if (! isFirstBeat) {
                 bean.duration = dayjs(bean.time).diff(dayjs(previousBeat.time), 'second');
             } else {
                 bean.duration = 0;
@@ -98,7 +103,7 @@ class Monitor extends BeanModel {
                     debug("Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms")
 
                     if (this.type === "http") {
-                        bean.status = 1;
+                        bean.status = UP;
                     } else {
 
                         let data = res.data;
@@ -110,7 +115,7 @@ class Monitor extends BeanModel {
 
                         if (data.includes(this.keyword)) {
                             bean.msg += ", keyword is found"
-                            bean.status = 1;
+                            bean.status = UP;
                         } else {
                             throw new Error(bean.msg + ", but keyword is not found")
                         }
@@ -121,30 +126,52 @@ class Monitor extends BeanModel {
                 } else if (this.type === "port") {
                     bean.ping = await tcping(this.hostname, this.port);
                     bean.msg = ""
-                    bean.status = 1;
+                    bean.status = UP;
 
                 } else if (this.type === "ping") {
                     bean.ping = await ping(this.hostname);
                     bean.msg = ""
-                    bean.status = 1;
+                    bean.status = UP;
                 }
 
+                retries = 0;
+
             } catch (error) {
+                if ((this.maxretries > 0) && (retries < this.maxretries)) {
+                    retries++;
+                    bean.status = PENDING;
+                }
                 bean.msg = error.message;
             }
 
-            // Mark as important if status changed
-            if (! previousBeat || previousBeat.status !== bean.status) {
+            // * ? -> ANY STATUS = important [isFirstBeat]
+            // UP -> PENDING = not important
+            // * UP -> DOWN = important
+            // UP -> UP = not important
+            // PENDING -> PENDING = not important
+            // * PENDING -> DOWN = important
+            // PENDING -> UP = not important
+            // DOWN -> PENDING = this case not exists
+            // DOWN -> DOWN = not important
+            // * DOWN -> UP = important
+            let isImportant = isFirstBeat ||
+                (previousBeat.status === UP && bean.status === DOWN) ||
+                (previousBeat.status === DOWN && bean.status === UP) ||
+                (previousBeat.status === PENDING && bean.status === DOWN);
+
+            // Mark as important if status changed, ignore pending pings,
+            // Don't notify if disrupted changes to up
+            if (isImportant) {
                 bean.important = true;
 
-                // Do not send if first beat is UP
-                if (previousBeat || bean.status !== 1) {
+                // Send only if the first beat is DOWN
+                if (!isFirstBeat || bean.status === DOWN) {
                     let notificationList = await R.getAll(`SELECT notification.* FROM notification, monitor_notification WHERE monitor_id = ? AND monitor_notification.notification_id = notification.id `, [
                         this.id
                     ])
 
                     let text;
-                    if (bean.status === 1) {
+                    if (bean.status === UP) {
                         text = "✅ Up"
                     } else {
                         text = "🔴 Down"
@@ -165,8 +192,10 @@ class Monitor extends BeanModel {
                 bean.important = false;
             }
 
-            if (bean.status === 1) {
+            if (bean.status === UP) {
                 console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${this.interval} seconds | Type: ${this.type}`)
+            } else if (bean.status === PENDING) {
+                console.warn(`Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Type: ${this.type}`)
             } else {
                 console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Type: ${this.type}`)
             }
@@ -293,7 +322,7 @@ class Monitor extends BeanModel {
                 }
 
                 total += value;
-                if (row.status === 0) {
+                if (row.status === 0 || row.status === 2) {
                     downtime += value;
                 }
             }

server/notification.js

@@ -204,7 +204,7 @@ class Notification {
                 }
 
                 let data = {
-                    "message": "<b>Uptime Kuma Alert</b>\n\n<b>Message</b>:" +msg + '\n<b>Time (UTC)</b>:' +time,
+                    "message": "<b>Uptime Kuma Alert</b>\n\n<b>Message</b>:"+msg+ '\n<b>Time (UTC)</b>:' +heartbeatJSON["time"],
                     "user":notification.pushoveruserkey,
                     "token": notification.pushoverapptoken,
                     "sound": notification.pushoversounds,

server/server.js

@@ -233,6 +233,7 @@ let needSetup = false;
                 bean.url = monitor.url
                 bean.interval = monitor.interval
                 bean.hostname = monitor.hostname;
+                bean.maxretries = monitor.maxretries;
                 bean.port = monitor.port;
                 bean.keyword = monitor.keyword;
 

server/util.js

@@ -1,6 +1,10 @@
 // Common JS cannot be used in frontend sadly
 // sleep, ucfirst is duplicated in ../src/util-frontend.js
 
+exports.DOWN = 0;
+exports.UP = 1;
+exports.PENDING = 2;
+
 exports.sleep = function (ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }

src/assets/vars.scss

@@ -1,7 +1,8 @@
 $primary: #5CDD8B;
 $danger: #DC3545;
+$warning: #f8a306;
 $link-color: #111;
 $border-radius: 50rem;
 
 $highlight: #7ce8a4;
-$highlight-white: #e7faec;
+$highlight-white: #e7faec;

src/components/HeartbeatBar.vue

@@ -3,7 +3,7 @@
         <div class="hp-bar-big" :style="barStyle">
             <div
                 class="beat"
-                :class="{ 'empty' : (beat === 0), 'down' : (beat.status === 0) }"
+                :class="{ 'empty' : (beat === 0), 'down' : (beat.status === 0), 'pending' : (beat.status === 2) }"
                 :style="beatStyle"
                 v-for="(beat, index) in shortBeatList"
                 :key="index"
@@ -166,6 +166,10 @@ export default {
             background-color: $danger;
         }
 
+        &.pending {
+            background-color: $warning;
+        }
+
         &:not(.empty):hover {
             transition: all ease-in-out 0.15s;
             opacity: 0.8;

src/components/NotificationDialog.vue

@@ -223,16 +223,22 @@
 
                         <template v-if="notification.type === 'pushover'">
                             <div class="mb-3">
-                                <label for="pushover-app-token" class="form-label">Application Token<span style="color:red;"><sup>*</sup></span></label>
-                                <input type="text" class="form-control" id="pushover-app-token" required v-model="notification.pushoverapptoken">
                                 <label for="pushover-user" class="form-label">User Key<span style="color:red;"><sup>*</sup></span></label>
                                 <input type="text" class="form-control" id="pushover-user" required v-model="notification.pushoveruserkey">
+                                <label for="pushover-app-token" class="form-label">Application Token<span style="color:red;"><sup>*</sup></span></label>
+                                <input type="text" class="form-control" id="pushover-app-token" required v-model="notification.pushoverapptoken">
                                 <label for="pushover-device" class="form-label">Device</label>
                                 <input type="text" class="form-control" id="pushover-device" v-model="notification.pushoverdevice">
                                 <label for="pushover-device" class="form-label">Message Title</label>
                                 <input type="text" class="form-control" id="pushover-title" v-model="notification.pushovertitle">
                                 <label for="pushover-priority" class="form-label">Priority</label>
-                                <input type="text" class="form-control" id="pushover-priority" v-model="notification.pushoverpriority">
+                                <select class="form-select"  id="pushover-priority" v-model="notification.pushoverpriority">
+                                    <option>-2</option>
+                                    <option>-1</option>
+                                    <option>0</option>
+                                    <option>1</option>
+                                    <option>2</option>
+                                </select>
                                 <label for="pushover-sound" class="form-label">Notification Sound</label>
                                 <select class="form-select"  id="pushover-sound" v-model="notification.pushoversounds">
                                     <option>pushover</option>
@@ -264,17 +270,19 @@
                                         More info on: <a href="https://pushover.net/api" target="_blank">https://pushover.net/api</a>
                                 </p>
                                  <p style="margin-top: 8px;">
-                                        Emergency priority(2) has default 30 second timeout between retries and will expire after 1 hour.
+                                        Emergency priority (2) has default 30 second timeout between retries and will expire after 1 hour.
+                                </p>
+                                 <p style="margin-top: 8px;">
+                                        If you want to send notifications to different devices, fill out Device field.
                                 </p>
                                 </div>
                             </div>
                         </template>
 
                         <template v-if="notification.type === 'apprise'">
-
                             <div class="mb-3">
-                                <label for="gotify-application-token" class="form-label">Apprise URL</label>
-                                <input type="text" class="form-control" id="gotify-application-token" required v-model="notification.appriseURL">
+                                <label for="apprise-url" class="form-label">Apprise URL</label>
+                                <input type="text" class="form-control" id="apprise-url" required v-model="notification.appriseURL">
                                 <div class="form-text">
                                     <p>Example: twilio://AccountSid:AuthToken@FromPhoneNo</p>
                                     <p>
@@ -282,7 +290,6 @@
                                     </p>
                                 </div>
                             </div>
-
                             <div class="mb-3">
                                 <p>
                                     Status:
@@ -290,7 +297,6 @@
                                     <span class="text-danger" v-else>Apprise is not installed. <a href="https://github.com/caronc/apprise">Read more</a></span>
                                 </p>
                             </div>
-
                         </template>
 
                     </div>

src/components/Status.vue

@@ -14,6 +14,8 @@ export default {
                 return "danger"
             } else if (this.status === 1) {
                 return "primary"
+            } else if (this.status === 2) {
+                return "warning"
             } else {
                 return "secondary"
             }
@@ -24,6 +26,8 @@ export default {
                 return "Down"
             } else if (this.status === 1) {
                 return "Up"
+            } else if (this.status === 2) {
+                return "Pending"
             } else {
                 return "Unknown"
             }
@@ -34,6 +38,6 @@ export default {
 
 <style scoped>
     span {
-        width: 45px;
+        width: 54px;
     }
 </style>

src/components/Uptime.vue

@@ -30,6 +30,8 @@ export default {
                 return "danger"
             } else if (this.lastHeartBeat.status === 1) {
                 return "primary"
+            } else if (this.lastHeartBeat.status === 2) {
+                return "warning"
             } else {
                 return "secondary"
             }

src/mixins/socket.js

@@ -294,6 +294,11 @@ export default {
                         text: "Down",
                         color: "danger"
                     };
+                } else if (lastHeartBeat.status === 2) {
+                    result[monitorID] = {
+                        text: "Pending",
+                        color: "warning"
+                    };
                 } else {
                     result[monitorID] = unknown;
                 }

src/pages/DashboardHome.vue

@@ -110,6 +110,8 @@ export default {
                         result.up++;
                     } else if (beat.status === 0) {
                         result.down++;
+                    } else if (beat.status === 2) {
+                        result.up++;                
                     } else {
                         result.unknown++;
                     }

src/pages/EditMonitor.vue

@@ -48,6 +48,12 @@
                         <input type="number" class="form-control" id="interval" v-model="monitor.interval" required min="20" step="1">
                     </div>
 
+                    <div class="mb-3">
+                        <label for="maxRetries" class="form-label">Retries</label>
+                        <input type="number" class="form-control" id="maxRetries" v-model="monitor.maxretries" required min="0" step="1">
+                        <div class="form-text">Maximum retries before the service is marked as down and a notification is sent</div>
+                    </div>
+
                     <div>
                         <button class="btn btn-primary" type="submit" :disabled="processing">Save</button>
                     </div>
@@ -61,7 +67,7 @@
                 <h2>Notifications</h2>
                 <p v-if="$root.notificationList.length === 0">Not available, please setup.</p>
 
-                <div class="form-check form-switch mb-3" v-for="(notification, index) in $root.notificationList" :key="index">
+                <div class="form-check form-switch mb-3" :key="notification.id" v-for="notification in $root.notificationList">
                     <input class="form-check-input" type="checkbox" :id=" 'notification' + notification.id" v-model="monitor.notificationIDList[notification.id]">
 
                     <label class="form-check-label" :for=" 'notification' + notification.id">
@@ -119,6 +125,7 @@ export default {
                     name: "",
                     url: "https://",
                     interval: 60,
+                    maxretries: 0,
                     notificationIDList: {},
                 }
             } else if (this.isEdit) {

src/pages/Settings.vue

@@ -36,7 +36,7 @@
                         <label for="repeat-new-password" class="form-label">Repeat New Password</label>
                         <input type="password" class="form-control" :class="{ 'is-invalid' : invalidPassword }" id="repeat-new-password" required v-model="password.repeatNewPassword">
                         <div class="invalid-feedback">
-                            The repeat password is not match.
+                            The repeat password does not match.
                         </div>
                     </div>
 
@@ -56,7 +56,7 @@
 
                 <h2>Notifications</h2>
                 <p v-if="$root.notificationList.length === 0">Not available, please setup.</p>
-                <p v-else>Please assign the notification to monitor(s) to get it works.</p>
+                <p v-else>Please assign a notification to monitor(s) to get it to work.</p>
 
                 <ul class="list-group mb-3" style="border-radius: 1rem;">
                     <li class="list-group-item" v-for="(notification, index) in $root.notificationList" :key="index">