From b9dfcd1291d27674d39cf9f71ad6f46a55c16f86 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 12 Mar 2022 15:10:45 +0800 Subject: [PATCH] [Favicon] Code refactoring --- package-lock.json | 15 ++++++++-- src/mixins/socket.js | 55 +++++++++++++++++++++++++++---------- src/pages/DashboardHome.vue | 39 +++----------------------- 3 files changed, 57 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index eefd9d5ac..5b961b90f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "uptime-kuma", - "version": "1.11.4", + "version": "1.12.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "uptime-kuma", - "version": "1.11.4", + "version": "1.12.1", "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "~1.2.36", @@ -29,6 +29,7 @@ "dayjs": "~1.10.7", "express": "~4.17.1", "express-basic-auth": "~1.2.0", + "favico.js": "^0.3.10", "form-data": "~4.0.0", "http-graceful-shutdown": "~3.1.5", "iconv-lite": "^0.6.3", @@ -6140,6 +6141,11 @@ "reusify": "^1.0.4" } }, + "node_modules/favico.js": { + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz", + "integrity": "sha1-gFhuJ6EX8kqNUcGKmb3HFNQzkwE=" + }, "node_modules/fb-watchman": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", @@ -18240,6 +18246,11 @@ "reusify": "^1.0.4" } }, + "favico.js": { + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz", + "integrity": "sha1-gFhuJ6EX8kqNUcGKmb3HFNQzkwE=" + }, "fb-watchman": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", diff --git a/src/mixins/socket.js b/src/mixins/socket.js index f207aaaf3..14a805fd9 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -16,8 +16,6 @@ const favicon = new Favico({ animation: "none" }); -let downMonitors = []; - export default { data() { @@ -126,14 +124,10 @@ export default { if (data.important) { if (data.status === 0) { - downMonitors.push(data.monitorID); - favicon.badge(downMonitors.length); toast.error(`[${this.monitorList[data.monitorID].name}] [DOWN] ${data.msg}`, { timeout: false, }); } else if (data.status === 1) { - downMonitors = downMonitors.filter(monitor => monitor !== data.monitorID); - favicon.badge(downMonitors.length); toast.success(`[${this.monitorList[data.monitorID].name}] [Up] ${data.msg}`, { timeout: 20000, }); @@ -150,11 +144,6 @@ export default { }); socket.on("heartbeatList", (monitorID, data, overwrite = false) => { - const lastElement = data.at(-1); - if (lastElement.status === 0) { - downMonitors.push(monitorID); - favicon.badge(downMonitors.length); - } if (! (monitorID in this.heartbeatList) || overwrite) { this.heartbeatList[monitorID] = data; } else { @@ -330,15 +319,11 @@ export default { }, deleteMonitor(monitorID, callback) { - downMonitors = downMonitors.filter(monitor => monitor !== monitorID); - favicon.badge(downMonitors.length); socket.emit("deleteMonitor", monitorID, callback); }, clearData() { console.log("reset heartbeat list"); - downMonitors = []; - favicon.badge(0); this.heartbeatList = {}; this.importantHeartbeatList = {}; }, @@ -412,10 +397,50 @@ export default { return result; }, + + stats() { + let result = { + up: 0, + down: 0, + unknown: 0, + pause: 0, + }; + + for (let monitorID in this.$root.monitorList) { + let beat = this.$root.lastHeartbeatList[monitorID]; + let monitor = this.$root.monitorList[monitorID]; + + if (monitor && ! monitor.active) { + result.pause++; + } else if (beat) { + if (beat.status === 1) { + result.up++; + } else if (beat.status === 0) { + result.down++; + } else if (beat.status === 2) { + result.up++; + } else { + result.unknown++; + } + } else { + result.unknown++; + } + } + + return result; + }, }, watch: { + // Update Badge + "stats.down"(to, from) { + if (to !== from) { + favicon.badge(to); + console.log(to); + } + }, + // Reload the SPA if the server version is changed. "info.version"(to, from) { if (from && from !== to) { diff --git a/src/pages/DashboardHome.vue b/src/pages/DashboardHome.vue index 16d07983b..6e8a5bbcd 100644 --- a/src/pages/DashboardHome.vue +++ b/src/pages/DashboardHome.vue @@ -9,19 +9,19 @@

{{ $t("Up") }}

- {{ stats.up }} + {{ $root.stats.up }}

{{ $t("Down") }}

- {{ stats.down }} + {{ $root.stats.down }}

{{ $t("Unknown") }}

- {{ stats.unknown }} + {{ $root.stats.unknown }}

{{ $t("pauseDashboardHome") }}

- {{ stats.pause }} + {{ $root.stats.pause }}
@@ -89,37 +89,6 @@ export default { }; }, computed: { - stats() { - let result = { - up: 0, - down: 0, - unknown: 0, - pause: 0, - }; - - for (let monitorID in this.$root.monitorList) { - let beat = this.$root.lastHeartbeatList[monitorID]; - let monitor = this.$root.monitorList[monitorID]; - - if (monitor && ! monitor.active) { - result.pause++; - } else if (beat) { - if (beat.status === 1) { - result.up++; - } else if (beat.status === 0) { - result.down++; - } else if (beat.status === 2) { - result.up++; - } else { - result.unknown++; - } - } else { - result.unknown++; - } - } - - return result; - }, importantHeartBeatList() { let result = [];