From a173700cd43d804927a4cdce460d159847d46357 Mon Sep 17 00:00:00 2001
From: Adam Stachowicz <adam.stachowicz@fingo.info>
Date: Sun, 18 Jul 2021 03:04:40 +0200
Subject: [PATCH 01/17] Add pagination

---
 package.json                |  1 +
 src/pages/DashboardHome.vue | 34 +++++++++++++++++++++++++++++++---
 src/pages/Details.vue       | 23 ++++++++++++++++++++---
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 8c03f9d3b..4a0cd42cc 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
         "socket.io-client": "^4.1.2",
         "sqlite3": "^5.0.0",
         "tcp-ping": "^0.1.1",
+        "v-pagination-3": "^0.1.6",
         "vue": "^3.0.5",
         "vue-confirm-dialog": "^1.0.2",
         "vue-router": "^4.0.10",
diff --git a/src/pages/DashboardHome.vue b/src/pages/DashboardHome.vue
index 820842bac..4c6c82e2b 100644
--- a/src/pages/DashboardHome.vue
+++ b/src/pages/DashboardHome.vue
@@ -47,7 +47,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                <tr v-for="beat in importantHeartBeatList">
+                <tr v-for="(beat, index) in displayedRecords" :key="index">
                     <td>{{ beat.name }}</td>
                     <td><Status :status="beat.status" /></td>
                     <td><Datetime :value="beat.time" /></td>
@@ -59,6 +59,13 @@
                 </tr>
                 </tbody>
             </table>
+
+            <div class="d-flex justify-content-center kuma_pagination">
+                <pagination
+                    v-model="page"
+                    :records=importantHeartBeatList.length
+                    :per-page="perPage" />
+            </div>
         </div>
     </div>
 
@@ -68,8 +75,21 @@
 <script>
 import Status from "../components/Status.vue";
 import Datetime from "../components/Datetime.vue";
+import Pagination from "v-pagination-3";
+
 export default {
-    components: {Datetime, Status},
+    components: {
+        Datetime,
+        Status,
+        Pagination,
+    },
+    data() {
+        return {
+            page: 1,
+            perPage: 25,
+            heartBeatList: [],
+        }
+    },
     computed: {
         stats() {
             let result = {
@@ -127,8 +147,16 @@ export default {
                 }
             });
 
+            this.heartBeatList = result;
+
             return result;
-        }
+        },
+
+        displayedRecords() {
+            const startIndex = this.perPage * (this.page - 1);
+            const endIndex = startIndex + this.perPage;
+            return this.heartBeatList.slice(startIndex, endIndex);
+        },
     }
 }
 </script>
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index f925c2849..56b6427d7 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -64,7 +64,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="beat in importantHeartBeatList">
+                <tr v-for="(beat, index) in displayedRecords" :key="index">
                     <td><Status :status="beat.status" /></td>
                     <td><Datetime :value="beat.time" /></td>
                     <td>{{ beat.msg }}</td>
@@ -75,6 +75,13 @@
                 </tr>
             </tbody>
         </table>
+
+        <div class="d-flex justify-content-center kuma_pagination">
+            <pagination
+                v-model="page"
+                :records=importantHeartBeatList.length
+                :per-page="perPage" />
+        </div>
     </div>
 
     <Confirm ref="confirmPause" @yes="pauseMonitor">
@@ -95,6 +102,7 @@ import Status from "../components/Status.vue";
 import Datetime from "../components/Datetime.vue";
 import CountUp from "../components/CountUp.vue";
 import Uptime from "../components/Uptime.vue";
+import Pagination from "v-pagination-3";
 
 export default {
     components: {
@@ -104,13 +112,16 @@ export default {
         HeartbeatBar,
         Confirm,
         Status,
+        Pagination,
     },
     mounted() {
 
     },
     data() {
         return {
-
+            page: 1,
+            perPage: 25,
+            heartBeatList: [],
         }
     },
     computed: {
@@ -154,6 +165,7 @@ export default {
 
         importantHeartBeatList() {
             if (this.$root.importantHeartbeatList[this.monitor.id]) {
+                this.heartBeatList = this.$root.importantHeartbeatList[this.monitor.id];
                 return this.$root.importantHeartbeatList[this.monitor.id]
             } else {
                 return [];
@@ -166,8 +178,13 @@ export default {
             } else {
                 return { }
             }
-        }
+        },
 
+        displayedRecords() {
+            const startIndex = this.perPage * (this.page - 1);
+            const endIndex = startIndex + this.perPage;
+            return this.heartBeatList.slice(startIndex, endIndex);
+        },
     },
     methods: {
         testNotification() {

From d94894b7e0b57f345203918f1af3665cca2be00a Mon Sep 17 00:00:00 2001
From: Adam Stachowicz <adam.stachowicz@fingo.info>
Date: Sun, 18 Jul 2021 03:10:15 +0200
Subject: [PATCH 02/17] Fix `require-v-for-key`, remove unused declarations and
 double spaces

---
 server/model/heartbeat.js             |  2 --
 server/notification.js                | 15 ++++++++-------
 server/server.js                      |  4 ----
 src/components/Datetime.vue           |  6 +++---
 src/components/NotificationDialog.vue | 10 +++++-----
 src/pages/Dashboard.vue               |  2 +-
 src/pages/Details.vue                 |  2 +-
 src/pages/EditMonitor.vue             |  2 +-
 src/pages/Settings.vue                |  8 ++++----
 src/util-frontend.js                  |  6 +++---
 10 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/server/model/heartbeat.js b/server/model/heartbeat.js
index 74e329811..01fb71ff9 100644
--- a/server/model/heartbeat.js
+++ b/server/model/heartbeat.js
@@ -3,8 +3,6 @@ const utc = require('dayjs/plugin/utc')
 var timezone = require('dayjs/plugin/timezone')
 dayjs.extend(utc)
 dayjs.extend(timezone)
-const axios = require("axios");
-const {R} = require("redbean-node");
 const {BeanModel} = require("redbean-node/dist/bean-model");
 
 
diff --git a/server/notification.js b/server/notification.js
index 99cc1568c..9e6c5e065 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -58,7 +58,7 @@ class Notification {
                     finalData = data;
                 }
 
-                let res = await axios.post(notification.webhookURL, finalData, config)
+                await axios.post(notification.webhookURL, finalData, config)
                 return true;
             } catch (error) {
                 console.log(error)
@@ -102,7 +102,8 @@ class Notification {
                   ]
                 }]
               }
-              let res = await axios.post(notification.discordWebhookUrl, data)
+
+              await axios.post(notification.discordWebhookUrl, data)
               return true;
             } catch(error) {
               console.log(error)
@@ -118,18 +119,18 @@ class Notification {
             };
             let config = {};
 
-            let res = await axios.post(notification.signalURL, data, config)
+            await axios.post(notification.signalURL, data, config)
             return true;
         } catch (error) {
             console.log(error)
             return false;
         }
-            
+
         } else if (notification.type === "slack") {
             try {
                 if (heartbeatJSON == null) {
                     let data = {'text': "Uptime Kuma Slack testing successful."}
-                    let res = await axios.post(notification.slackwebhookURL, data)
+                    await axios.post(notification.slackwebhookURL, data)
                     return true;
                 }
 
@@ -170,7 +171,7 @@ class Notification {
                             }
                         ]
                     }
-                let res = await axios.post(notification.slackwebhookURL, data)
+                await axios.post(notification.slackwebhookURL, data)
                 return true;
             } catch (error) {
                 console.log(error)
@@ -231,7 +232,7 @@ class Notification {
         });
 
         // send mail with defined transport object
-        let info = await transporter.sendMail({
+        await transporter.sendMail({
             from: `"Uptime Kuma" <${notification.smtpFrom}>`,
             to: notification.smtpTo,
             subject: msg,
diff --git a/server/server.js b/server/server.js
index 93e43cd6e..a64ff512e 100644
--- a/server/server.js
+++ b/server/server.js
@@ -162,10 +162,6 @@ let needSetup = false;
                     msg: e.message
                 });
             }
-
-
-
-
         });
 
         // Auth Only API
diff --git a/src/components/Datetime.vue b/src/components/Datetime.vue
index 47702236a..e84c877bc 100644
--- a/src/components/Datetime.vue
+++ b/src/components/Datetime.vue
@@ -4,9 +4,9 @@
 
 <script>
 import dayjs from "dayjs";
-import relativeTime  from "dayjs/plugin/relativeTime"
-import utc  from 'dayjs/plugin/utc'
-import timezone  from 'dayjs/plugin/timezone' // dependent on utc plugin
+import relativeTime from "dayjs/plugin/relativeTime"
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone' // dependent on utc plugin
 dayjs.extend(utc)
 dayjs.extend(timezone)
 dayjs.extend(relativeTime)
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 159915177..114042b16 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -12,7 +12,7 @@
 
                             <div class="mb-3">
                                 <label for="type" class="form-label">Notification Type</label>
-                                <select class="form-select"  id="type" v-model="notification.type">
+                                <select class="form-select" id="type" v-model="notification.type">
                                     <option value="telegram">Telegram</option>
                                     <option value="webhook">Webhook</option>
                                     <option value="smtp">Email (SMTP)</option>
@@ -67,13 +67,13 @@
                         <template v-if="notification.type === 'webhook'">
                             <div class="mb-3">
                                 <label for="webhook-url" class="form-label">Post URL</label>
-                                <input type="url" pattern="https?://.+"  class="form-control" id="webhook-url" required v-model="notification.webhookURL">
+                                <input type="url" pattern="https?://.+" class="form-control" id="webhook-url" required v-model="notification.webhookURL">
 
                             </div>
 
                             <div class="mb-3">
                                 <label for="webhook-content-type" class="form-label">Content Type</label>
-                                <select class="form-select"  id="webhook-content-type" v-model="notification.webhookContentType" required>
+                                <select class="form-select" id="webhook-content-type" v-model="notification.webhookContentType" required>
                                     <option value="json">application/json</option>
                                     <option value="form-data">multipart/form-data</option>
                                 </select>
@@ -98,7 +98,7 @@
 
                             <div class="mb-3">
                                 <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" value="" id="secure"  v-model="notification.smtpSecure">
+                                    <input class="form-check-input" type="checkbox" value="" id="secure" v-model="notification.smtpSecure">
                                     <label class="form-check-label" for="secure">
                                         Secure
                                     </label>
@@ -139,7 +139,7 @@
                         <template v-if="notification.type === 'signal'">
                             <div class="mb-3">
                                 <label for="signal-url" class="form-label">Post URL</label>
-                                <input type="url" pattern="https?://.+"  class="form-control" id="signal-url" required v-model="notification.signalURL">
+                                <input type="url" pattern="https?://.+" class="form-control" id="signal-url" required v-model="notification.signalURL">
 
                             </div>
 
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index c42f27656..7084c467a 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -13,7 +13,7 @@
                         No Monitors, please <router-link to="/add">add one</router-link>.
                     </div>
 
-                    <router-link :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }" v-for="item in sortedMonitorList" @click="$root.cancelActiveList">
+                    <router-link :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }" v-for="(item, index) in sortedMonitorList" @click="$root.cancelActiveList" :key="index">
 
                         <div class="row">
                         	<div class="col-6 col-md-8 small-padding">
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index f925c2849..ba4f9478a 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -12,7 +12,7 @@
 
     <div class="functions">
         <button class="btn btn-light" @click="pauseDialog" v-if="monitor.active">Pause</button>
-        <button class="btn btn-primary" @click="resumeMonitor"  v-if="! monitor.active">Resume</button>
+        <button class="btn btn-primary" @click="resumeMonitor" v-if="! monitor.active">Resume</button>
         <router-link :to=" '/edit/' + monitor.id " class="btn btn-secondary">Edit</router-link>
         <button class="btn btn-danger" @click="deleteDialog">Delete</button>
     </div>
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 01af50610..7a72cd139 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -61,7 +61,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 in $root.notificationList">
+                <div class="form-check form-switch mb-3" v-for="(notification, index) in $root.notificationList" :key="index">
                     <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">
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index e5670f507..daa521981 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -11,7 +11,7 @@
                         <label for="timezone" class="form-label">Timezone</label>
                         <select class="form-select" id="timezone" v-model="$root.userTimezone">
                             <option value="auto">Auto: {{ guessTimezone }}</option>
-                            <option v-for="timezone in timezoneList" :value="timezone.value">{{ timezone.name }}</option>
+                            <option v-for="(timezone, index) in timezoneList" :value="timezone.value" :key="index">{{ timezone.name }}</option>
                         </select>
                     </div>
 
@@ -59,7 +59,7 @@
                 <p v-else>Please assign the notification to monitor(s) to get it works.</p>
 
                 <ul class="list-group mb-3" style="border-radius: 1rem;">
-                    <li  class="list-group-item"  v-for="notification in $root.notificationList">
+                    <li class="list-group-item" v-for="(notification, index) in $root.notificationList" :key="index">
                         {{ notification.name }}<br />
                         <a href="#" @click="$refs.notificationDialog.show(notification.id)">Edit</a>
                     </li>
@@ -77,8 +77,8 @@
 
 <script>
 import dayjs from "dayjs";
-import utc  from 'dayjs/plugin/utc'
-import timezone  from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone'
 import NotificationDialog from "../components/NotificationDialog.vue";
 dayjs.extend(utc)
 dayjs.extend(timezone)
diff --git a/src/util-frontend.js b/src/util-frontend.js
index 7094c159b..a2c31f45e 100644
--- a/src/util-frontend.js
+++ b/src/util-frontend.js
@@ -1,6 +1,6 @@
 import dayjs from "dayjs";
-import utc  from 'dayjs/plugin/utc'
-import timezone  from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone'
 
 dayjs.extend(utc)
 dayjs.extend(timezone)
@@ -29,6 +29,7 @@ function getTimezoneOffset(timeZone) {
 }
 
 // From: https://stackoverflow.com/questions/38399465/how-to-get-list-of-all-timezones-in-javascript
+// TODO: Move to separate file
 const aryIannaTimeZones = [
     'Europe/Andorra',
     'Asia/Dubai',
@@ -412,4 +413,3 @@ export function timezoneList() {
 
     return result;
 };
-

From 7c94c3b50298eb2de64aefeaf313ea4ed88f19ad Mon Sep 17 00:00:00 2001
From: Adam Stachowicz <saibamenppl@gmail.com>
Date: Sun, 18 Jul 2021 09:42:34 +0000
Subject: [PATCH 03/17] Update server/notification.js

---
 server/notification.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/notification.js b/server/notification.js
index 63811be7a..1435614aa 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -131,7 +131,6 @@ class Notification {
                 if (heartbeatJSON == null) {
                     let data = {'text': "Uptime Kuma Slack testing successful.", 'channel': notification.slackchannel, 'username': notification.slackusername, 'icon_emoji': notification.slackiconemo}
                     await axios.post(notification.slackwebhookURL, data)
-
                     return true;
                 }
 

From 71dd68bb6df1e14b512c8d11611d09dd15ec3ba5 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 20 Jul 2021 13:04:21 +0800
Subject: [PATCH 04/17] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c544f3bb9..24c507992 100644
--- a/README.md
+++ b/README.md
@@ -112,7 +112,7 @@ If you love this project, please consider giving me a ⭐.
 
 # Contribute
 
-If you want to report a bug or request a new featue. Free feel to open a new issue.
+If you want to report a bug or request a new feature. Free feel to open a new issue.
 
 If you want to modify Uptime Kuma, this guideline maybe useful for you: https://github.com/louislam/uptime-kuma/wiki/%5BDev%5D-Setup-Development-Environment
 

From 657acf748bd6af1a3e6bfcb306500b216c953f7c Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Tue, 20 Jul 2021 20:04:54 +0800
Subject: [PATCH 05/17] update to 1.0.6

---
 README.md    | 2 +-
 package.json | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 24c507992..7d3159d86 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ PS: For every new release, it takes some time to build the docker image, please
 
 ```bash
 git fetch --all
-git checkout 1.0.5 --force
+git checkout 1.0.6 --force
 npm install
 npm run build
 pm2 restart uptime-kuma
diff --git a/package.json b/package.json
index cd416f77d..02095fd8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -12,10 +12,10 @@
         "update": "",
         "build": "vite build",
         "vite-preview-dist": "vite preview --host",
-        "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.0.5 --target release . --push",
+        "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.0.6 --target release . --push",
         "build-docker-nightly": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
         "build-docker-nightly-amd64": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push",
-        "setup": "git checkout 1.0.5 && npm install && npm run build",
+        "setup": "git checkout 1.0.6 && npm install && npm run build",
         "version-global-replace": "node extra/version-global-replace.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js"
     },

From 02b4dfc100d3b828fc7c1aba6b0f18c1d0892653 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Tue, 20 Jul 2021 20:18:56 +0800
Subject: [PATCH 06/17] prevent the telegram getUpdates URL go out of box

---
 src/components/NotificationDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 6477ef766..fa99a19f2 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -55,7 +55,7 @@
                                     <p style="margin-top: 8px;">
 
                                         <template v-if="notification.telegramBotToken">
-                                            <a :href="telegramGetUpdatesURL" target="_blank">{{ telegramGetUpdatesURL }}</a>
+                                            <a :href="telegramGetUpdatesURL" target="_blank" style="word-break: break-word;">{{ telegramGetUpdatesURL }}</a>
                                         </template>
 
                                         <template v-else>

From 62e231e92baaffa2c890215c2e1c51e4b75149e7 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 20 Jul 2021 20:27:15 +0800
Subject: [PATCH 07/17] Update README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 7d3159d86..dc32f41bd 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,11 @@ npm run build
 pm2 restart uptime-kuma
 ```
 
+## What's Next?
+
+I will mark requests/issues to the next milestone. 
+https://github.com/louislam/uptime-kuma/milestones
+
 # More Screenshots
 
 Settings Page:

From fa57d40c3c572b70d1e1bc6cd3fb6c99e4a6df38 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Tue, 20 Jul 2021 20:27:34 +0800
Subject: [PATCH 08/17] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dc32f41bd..7777cb2c5 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ npm run build
 pm2 restart uptime-kuma
 ```
 
-## What's Next?
+# What's Next?
 
 I will mark requests/issues to the next milestone. 
 https://github.com/louislam/uptime-kuma/milestones

From c4ca8e2acbfe6b768932e403a2c910b189919bcd Mon Sep 17 00:00:00 2001
From: Adam Stachowicz <adam.stachowicz@fingo.info>
Date: Wed, 21 Jul 2021 00:41:38 +0200
Subject: [PATCH 09/17] More info in server logs

---
 server/model/monitor.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 162772875..f81f6e00e 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -48,8 +48,6 @@ class Monitor extends BeanModel {
         let previousBeat = null;
 
         const beat = async () => {
-            console.log(`Monitor ${this.id}: Heartbeat`)
-
             if (! previousBeat) {
                 previousBeat = await R.findOne("heartbeat", " monitor_id = ? ORDER BY time DESC", [
                     this.id
@@ -145,6 +143,12 @@ class Monitor extends BeanModel {
                 bean.important = false;
             }
 
+            if (bean.status === 1) {
+                console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${this.interval} seconds | Type: ${this.type}`)
+            } else {
+                console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Type: ${this.type}`)
+            }
+
             io.to(this.user_id).emit("heartbeat", bean.toJSON());
 
             await R.store(bean)

From fd90458e77d3389502b720df8289b55a560b05a8 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 21 Jul 2021 16:25:58 +0800
Subject: [PATCH 10/17] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..cea1fc16e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - Uptime Kuma Version:
+ - Using Docker?: Yes/No
+ - OS: 
+ - Browser:
+
+
+**Additional context**
+Add any other context about the problem here.

From 32345fcbe9f758a9242e92df89b64572b971776d Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 21 Jul 2021 16:28:31 +0800
Subject: [PATCH 11/17] Update issue templates

---
 ...ssion--tab-if-you-want-to-ask-or-share-something.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/--please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md

diff --git a/.github/ISSUE_TEMPLATE/--please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md b/.github/ISSUE_TEMPLATE/--please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md
new file mode 100644
index 000000000..45a2e2876
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/--please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md
@@ -0,0 +1,10 @@
+---
+name: ⚠ Please go to "Discussion" Tab if you want to ask or share something
+about: BUG REPORT ONLY HERE
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+BUG REPORT ONLY HERE

From c00612c1a918c7f61e751dfaf239468a6fc1b30f Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 21 Jul 2021 16:29:15 +0800
Subject: [PATCH 12/17] Update
 --please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md

---
 ...to--discussion--tab-if-you-want-to-ask-or-share-something.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/--please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md b/.github/ISSUE_TEMPLATE/--please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md
index 45a2e2876..eb8623709 100644
--- a/.github/ISSUE_TEMPLATE/--please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md
+++ b/.github/ISSUE_TEMPLATE/--please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md
@@ -1,5 +1,5 @@
 ---
-name: ⚠ Please go to "Discussion" Tab if you want to ask or share something
+name: ⚠ Please go to "Discussions" Tab if you want to ask or share something
 about: BUG REPORT ONLY HERE
 title: ''
 labels: ''

From e02eb728635d54139bc0473efdd6704db5d06b6f Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Thu, 22 Jul 2021 02:02:35 +0800
Subject: [PATCH 13/17] add db migration

---
 db/patch1.sql         |  37 +++++++++++++
 server/database.js    | 119 ++++++++++++++++++++++++++++++++++++++++++
 server/server.js      |  58 ++++++++++----------
 server/util-server.js |  12 +++++
 4 files changed, 198 insertions(+), 28 deletions(-)
 create mode 100644 db/patch1.sql
 create mode 100644 server/database.js

diff --git a/db/patch1.sql b/db/patch1.sql
new file mode 100644
index 000000000..1ab6cc0cf
--- /dev/null
+++ b/db/patch1.sql
@@ -0,0 +1,37 @@
+-- You should not modify if this have pushed to Github, unless it do serious wrong with the db.
+-- Change Monitor.created_date from "TIMESTAMP" to "DATETIME"
+-- SQL Generated by Intellij Idea
+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)
+);
+
+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;
diff --git a/server/database.js b/server/database.js
new file mode 100644
index 000000000..49659e613
--- /dev/null
+++ b/server/database.js
@@ -0,0 +1,119 @@
+const fs = require("fs");
+const {sleep} = require("./util");
+const {R} = require("redbean-node");
+const {setSetting, setting} = require("./util-server");
+
+
+class Database {
+
+    static templatePath = "./db/kuma.db"
+    static path =  './data/kuma.db';
+    static latestVersion = 1;
+    static noReject = true;
+
+    static async patch() {
+        let version = parseInt(await setting("database_version"));
+
+        if (! version) {
+            version = 0;
+        }
+
+        console.info("Your database version: " + version);
+        console.info("Latest database version: " + this.latestVersion);
+
+        if (version === this.latestVersion) {
+            console.info("Database no need to patch");
+        } else {
+            console.info("Database patch is needed")
+
+            console.info("Backup the db")
+            const backupPath = "./data/kuma.db.bak" + version;
+            fs.copyFileSync(Database.path, backupPath);
+
+            // Try catch anything here, if gone wrong, restore the backup
+            try {
+                for (let i = version + 1; i <= this.latestVersion; i++) {
+                    const sqlFile = `./db/patch${i}.sql`;
+                    console.info(`Patching ${sqlFile}`);
+                    await Database.importSQLFile(sqlFile);
+                    console.info(`Patched ${sqlFile}`);
+                    await setSetting("database_version", i);
+                }
+                console.log("Database Patched Successfully");
+            } catch (ex) {
+                await Database.close();
+                console.error("Patch db failed!!! Restoring the backup")
+                fs.copyFileSync(backupPath, Database.path);
+                console.error(ex)
+
+                console.error("Start Uptime-Kuma failed due to patch db failed")
+                console.error("Please submit the bug report if you still encounter the problem after restart: https://github.com/louislam/uptime-kuma/issues")
+                process.exit(1);
+            }
+        }
+    }
+
+    /**
+     * Sadly, multi sql statements is not supported by many sqlite libraries, I have to implement it myself
+     * @param filename
+     * @returns {Promise<void>}
+     */
+    static async importSQLFile(filename) {
+
+        await R.getCell("SELECT 1");
+
+        let text = fs.readFileSync(filename).toString();
+
+        // Remove all comments (--)
+        let lines = text.split("\n");
+        lines = lines.filter((line) => {
+            return ! line.startsWith("--")
+        });
+
+        // Split statements by semicolon
+        // Filter out empty line
+        text = lines.join("\n")
+
+        let statements = text.split(";")
+            .map((statement) => {
+                return statement.trim();
+            })
+            .filter((statement) => {
+                return statement !== "";
+            })
+
+        for (let statement of statements) {
+            await R.exec(statement);
+        }
+    }
+
+    /**
+     * Special handle, because tarn.js throw a promise reject that cannot be caught
+     * @returns {Promise<void>}
+     */
+    static async close() {
+        const listener = (reason, p) => {
+            Database.noReject = false;
+        };
+        process.addListener('unhandledRejection', listener);
+
+        console.log("Closing DB")
+
+        while (true) {
+            Database.noReject = true;
+            await R.close()
+            await sleep(2000)
+
+            if (Database.noReject) {
+                break;
+            } else {
+                console.log("Waiting to close the db")
+            }
+        }
+        console.log("SQLite closed")
+
+        process.removeListener('unhandledRejection', listener);
+    }
+}
+
+module.exports = Database;
diff --git a/server/server.js b/server/server.js
index 0d0ce51f1..342397cfc 100644
--- a/server/server.js
+++ b/server/server.js
@@ -12,6 +12,7 @@ const fs = require("fs");
 const {getSettings} = require("./util-server");
 const {Notification} = require("./notification")
 const gracefulShutdown = require('http-graceful-shutdown');
+const Database = require("./database");
 const {sleep} = require("./util");
 const args = require('args-parser')(process.argv);
 
@@ -27,9 +28,28 @@ const server = http.createServer(app);
 const io = new Server(server);
 app.use(express.json())
 
+/**
+ * Total WebSocket client connected to server currently, no actual use
+ * @type {number}
+ */
 let totalClient = 0;
+
+/**
+ * Use for decode the auth object
+ * @type {null}
+ */
 let jwtSecret = null;
+
+/**
+ * Main monitor list
+ * @type {{}}
+ */
 let monitorList = {};
+
+/**
+ * Show Setup Page
+ * @type {boolean}
+ */
 let needSetup = false;
 
 (async () => {
@@ -555,19 +575,21 @@ function checkLogin(socket) {
 }
 
 async function initDatabase() {
-    const path = './data/kuma.db';
-
-    if (! fs.existsSync(path)) {
+    if (! fs.existsSync(Database.path)) {
         console.log("Copying Database")
-        fs.copyFileSync("./db/kuma.db", path);
+        fs.copyFileSync(Database.templatePath, Database.path);
     }
 
     console.log("Connecting to Database")
     R.setup('sqlite', {
-        filename: path
+        filename: Database.path
     });
     console.log("Connected")
 
+    // Patch the database
+    await Database.patch()
+
+    // Auto map the model to a bean object
     R.freeze(true)
     await R.autoloadModels("./server/model");
 
@@ -587,6 +609,7 @@ async function initDatabase() {
         console.log("Load JWT secret from database.")
     }
 
+    // If there is no record in user table, it is a new Uptime Kuma instance, need to setup
     if ((await R.count("user")) === 0) {
         console.log("No user, need setup")
         needSetup = true;
@@ -705,11 +728,6 @@ const startGracefulShutdown = async () => {
 
 }
 
-let noReject = true;
-process.on('unhandledRejection', (reason, p) => {
-    noReject = false;
-});
-
 async function shutdownFunction(signal) {
     console.log('Called signal: ' + signal);
 
@@ -718,24 +736,8 @@ async function shutdownFunction(signal) {
         let monitor = monitorList[id]
         monitor.stop()
     }
-    await sleep(2000)
-
-    console.log("Closing DB")
-
-    // Special handle, because tarn.js throw a promise reject that cannot be caught
-    while (true) {
-        noReject = true;
-        await R.close()
-        await sleep(2000)
-
-        if (noReject) {
-            break;
-        } else {
-            console.log("Waiting...")
-        }
-    }
-
-    console.log("OK")
+    await sleep(2000);
+    await Database.close();
 }
 
 function finalFunction() {
diff --git a/server/util-server.js b/server/util-server.js
index 6904a65a4..b387f4c7c 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -45,6 +45,18 @@ exports.setting = async function (key) {
     ])
 }
 
+exports.setSetting = async function (key, value) {
+    let bean = await R.findOne("setting", " `key` = ? ", [
+        key
+    ])
+    if (! bean) {
+        bean = R.dispense("setting")
+        bean.key = key;
+    }
+    bean.value = value;
+    await R.store(bean)
+}
+
 exports.getSettings = async function (type) {
     let list = await R.getAll("SELECT * FROM setting WHERE `type` = ? ", [
         type

From 1e42343aee3eae467bae008641d860f2f5cef4ee Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Thu, 22 Jul 2021 10:45:22 +0800
Subject: [PATCH 14/17] Update patch1.sql

minor
---
 db/patch1.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/patch1.sql b/db/patch1.sql
index 1ab6cc0cf..6a31fa2f6 100644
--- a/db/patch1.sql
+++ b/db/patch1.sql
@@ -1,4 +1,4 @@
--- You should not modify if this have pushed to Github, unless it do serious wrong with the db.
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 -- Change Monitor.created_date from "TIMESTAMP" to "DATETIME"
 -- SQL Generated by Intellij Idea
 PRAGMA foreign_keys=off;

From a64ce814576f3597dbe13073bd16bd100f9da018 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Thu, 22 Jul 2021 10:55:55 +0800
Subject: [PATCH 15/17] update package-lock.json

---
 package-lock.json | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 92c91a935..99dd01b6b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uptime-kuma",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -392,6 +392,11 @@
         "follow-redirects": "^1.10.0"
       }
     },
+    "babel-plugin-add-module-exports": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
+      "integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU="
+    },
     "backo2": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
@@ -2093,6 +2098,11 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
+    "merge": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
+    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -3698,6 +3708,16 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "optional": true
     },
+    "v-pagination-3": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/v-pagination-3/-/v-pagination-3-0.1.6.tgz",
+      "integrity": "sha512-82J8HnEIYtZijn6F3xhyP/ildI5K7Rv4Yu74VNfQWQsiPWTKntgVvZgBH8UPh/lFEjgWxty/M4N+YHvS+YbGzg==",
+      "requires": {
+        "babel-plugin-add-module-exports": "^0.2.1",
+        "merge": "^2.1.1",
+        "vue": ">=3.0.0"
+      }
+    },
     "v8flags": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",

From 7e4a1ad279117db51dd10d3cb7d6868b507feb42 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:15:53 +0800
Subject: [PATCH 16/17] remove used vars

---
 server/notification.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/notification.js b/server/notification.js
index 781f7dfde..3c0e9f2a4 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -72,7 +72,7 @@ class Notification {
                     finalData = data;
                 }
 
-                let res = await axios.post(notification.webhookURL, finalData, config)
+                await axios.post(notification.webhookURL, finalData, config)
                 return okMsg;
 
             } catch (error) {
@@ -90,7 +90,7 @@ class Notification {
                   username: 'Uptime-Kuma',
                   content: msg
                 }
-                let res = await axios.post(notification.discordWebhookUrl, data)
+                await axios.post(notification.discordWebhookUrl, data)
                 return okMsg;
               }
               // If heartbeatJSON is not null, we go into the normal alerting loop.
@@ -116,7 +116,7 @@ class Notification {
                   ]
                 }]
               }
-              let res = await axios.post(notification.discordWebhookUrl, data)
+              await axios.post(notification.discordWebhookUrl, data)
               return okMsg;
             } catch(error) {
               throwGeneralAxiosError(error)
@@ -131,7 +131,7 @@ class Notification {
             };
             let config = {};
 
-            let res = await axios.post(notification.signalURL, data, config)
+            await axios.post(notification.signalURL, data, config)
             return okMsg;
         } catch (error) {
               throwGeneralAxiosError(error)
@@ -141,7 +141,7 @@ class Notification {
             try {
                 if (heartbeatJSON == null) {
                     let data = {'text': "Uptime Kuma Slack testing successful.", 'channel': notification.slackchannel, 'username': notification.slackusername, 'icon_emoji': notification.slackiconemo}
-                    let res = await axios.post(notification.slackwebhookURL, data)
+                    await axios.post(notification.slackwebhookURL, data)
                     return okMsg;
                 }
 
@@ -186,7 +186,7 @@ class Notification {
                             }
                         ]
                     }
-                let res = await axios.post(notification.slackwebhookURL, data)
+                await axios.post(notification.slackwebhookURL, data)
                 return okMsg;
             } catch (error) {
                 throwGeneralAxiosError(error)
@@ -199,7 +199,7 @@ class Notification {
                     let data = {'message': "<b>Uptime Kuma Pushover testing successful.</b>",
                     'user': notification.pushoveruserkey, 'token': notification.pushoverapptoken, 'sound':notification.pushoversounds,
                     'priority': notification.pushoverpriority, 'title':notification.pushovertitle, 'retry': "30", 'expire':"3600", 'html': 1}
-                    let res = await axios.post(pushoverlink, data)
+                    await axios.post(pushoverlink, data)
                     return okMsg;
                 }
 
@@ -214,7 +214,7 @@ class Notification {
                     "expire": "3600",
                     "html": 1
                     }
-                let res = await axios.post(pushoverlink, data)
+                await axios.post(pushoverlink, data)
                 return okMsg;
             } catch (error) {
                 throwGeneralAxiosError(error)

From 03b3bb5b30a80e4970ebffee92225e71c7f6990e Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Thu, 22 Jul 2021 12:28:47 +0800
Subject: [PATCH 17/17] fix if notification throw exception, the heartbeat is
 not stored in to the db.

---
 server/model/monitor.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index f81f6e00e..04feea6b0 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -121,8 +121,6 @@ class Monitor extends BeanModel {
                         this.id
                     ])
 
-                    let promiseList = [];
-
                     let text;
                     if (bean.status === 1) {
                         text = "✅ Up"
@@ -133,10 +131,12 @@ class Monitor extends BeanModel {
                     let msg = `[${this.name}] [${text}] ${bean.msg}`;
 
                     for(let notification of notificationList) {
-                        promiseList.push(Notification.send(JSON.parse(notification.config), msg, await this.toJSON(), bean.toJSON()));
+                        try {
+                            await Notification.send(JSON.parse(notification.config), msg, await this.toJSON(), bean.toJSON())
+                        } catch (e) {
+                            console.error("Cannot send notification to " + notification.name)
+                        }
                     }
-
-                    await Promise.all(promiseList);
                 }
 
             } else {