IntenseWebs/uptime-kuma
3
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-24 16:10:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

formatting socket.js + deal with broken windows ports - default :50013

Browse Source
This commit is contained in:
Philipp Dormann 2021-07-12 21:49:18 +02:00
parent 5515437eab
commit 789094a2ee
No known key found for this signature in database
GPG Key ID: 3BB9ADD52DCA4314
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/server.js
View File

@ -18,7 +18,7 @@ console.log("args:")
console.log(args) console.log(args)
const hostname = args.host || "0.0.0.0" const hostname = args.host || "0.0.0.0"
const port = args.port || 3001 const port = args.port || 50013
app.use(express.json()) app.use(express.json())

33
src/mixins/socket.js
View File

@ -1,4 +1,4 @@
import {io} from "socket.io-client"; import { io } from "socket.io-client";
import { useToast } from 'vue-toastification' import { useToast } from 'vue-toastification'
import dayjs from "dayjs"; import dayjs from "dayjs";
const toast = useToast() const toast = useToast()
@ -19,11 +19,11 @@ export default {
userTimezone: localStorage.timezone || "auto", userTimezone: localStorage.timezone || "auto",
allowLoginDialog: false, // Allowed to show login dialog, but "loggedIn" have to be true too. This exists because prevent the login dialog show 0.1s in first before the socket server auth-ed. allowLoginDialog: false, // Allowed to show login dialog, but "loggedIn" have to be true too. This exists because prevent the login dialog show 0.1s in first before the socket server auth-ed.
loggedIn: false, loggedIn: false,
monitorList: { }, monitorList: {},
heartbeatList: { }, heartbeatList: {},
importantHeartbeatList: { }, importantHeartbeatList: {},
avgPingList: { }, avgPingList: {},
uptimeList: { }, uptimeList: {},
notificationList: [], notificationList: [],
windowWidth: window.innerWidth, windowWidth: window.innerWidth,
showListMobile: false, showListMobile: false,
@ -33,12 +33,7 @@ export default {
created() { created() {
window.addEventListener('resize', this.onResize); window.addEventListener('resize', this.onResize);
let wsHost; const wsHost = ":50013"
if (localStorage.dev === "dev") {
wsHost = ":3001"
} else {
wsHost = ""
}
socket = io(wsHost, { socket = io(wsHost, {
transports: ['websocket'] transports: ['websocket']
@ -57,7 +52,7 @@ export default {
}); });
socket.on('heartbeat', (data) => { socket.on('heartbeat', (data) => {
if (! (data.monitorID in this.heartbeatList)) { if (!(data.monitorID in this.heartbeatList)) {
this.heartbeatList[data.monitorID] = []; this.heartbeatList[data.monitorID] = [];
} }
@ -80,7 +75,7 @@ export default {
} }
if (! (data.monitorID in this.importantHeartbeatList)) { if (!(data.monitorID in this.importantHeartbeatList)) {
this.importantHeartbeatList[data.monitorID] = []; this.importantHeartbeatList[data.monitorID] = [];
} }
@ -89,7 +84,7 @@ export default {
}); });
socket.on('heartbeatList', (monitorID, data) => { socket.on('heartbeatList', (monitorID, data) => {
if (! (monitorID in this.heartbeatList)) { if (!(monitorID in this.heartbeatList)) {
this.heartbeatList[monitorID] = data; this.heartbeatList[monitorID] = data;
} else { } else {
this.heartbeatList[monitorID] = data.concat(this.heartbeatList[monitorID]) this.heartbeatList[monitorID] = data.concat(this.heartbeatList[monitorID])
@ -105,7 +100,7 @@ export default {
}); });
socket.on('importantHeartbeatList', (monitorID, data) => { socket.on('importantHeartbeatList', (monitorID, data) => {
if (! (monitorID in this.importantHeartbeatList)) { if (!(monitorID in this.importantHeartbeatList)) {
this.importantHeartbeatList[monitorID] = data; this.importantHeartbeatList[monitorID] = data;
} else { } else {
this.importantHeartbeatList[monitorID] = data.concat(this.importantHeartbeatList[monitorID]) this.importantHeartbeatList[monitorID] = data.concat(this.importantHeartbeatList[monitorID])
@ -153,7 +148,7 @@ export default {
}, },
getSocket() { getSocket() {
return socket; return socket;
}, },
toastRes(res) { toastRes(res) {
@ -187,7 +182,7 @@ export default {
socket.emit("loginByToken", token, (res) => { socket.emit("loginByToken", token, (res) => {
this.allowLoginDialog = true; this.allowLoginDialog = true;
if (! res.ok) { if (!res.ok) {
this.logout() this.logout()
} else { } else {
this.loggedIn = true; this.loggedIn = true;
@ -257,7 +252,7 @@ export default {
for (let monitorID in this.lastHeartbeatList) { for (let monitorID in this.lastHeartbeatList) {
let lastHeartBeat = this.lastHeartbeatList[monitorID] let lastHeartBeat = this.lastHeartbeatList[monitorID]
if (! lastHeartBeat) { if (!lastHeartBeat) {
result[monitorID] = unknown; result[monitorID] = unknown;
} else if (lastHeartBeat.status === 1) { } else if (lastHeartBeat.status === 1) {
result[monitorID] = { result[monitorID] = {