7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-09-17 17:06:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.23.X' into version-merge

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	server/server.js
#	server/uptime-kuma-server.js
This commit is contained in:
Louis Lam
2023-12-13 01:54:08 +08:00
parent 99adac3eb9 4185ec20b0
commit 1a47563eb8
5 changed files with 69 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mixins/socket.js
View File

@@ -99,21 +99,20 @@ export default {
this.socket.initedSocketIO = true;
let protocol = (location.protocol === "https:") ? "wss://" : "ws://";
let protocol = location.protocol + "//";
let wsHost;
let url;
const env = process.env.NODE_ENV || "production";
if (env === "development" && isDevContainer()) {
wsHost = protocol + getDevContainerServerHostname();
url = protocol + getDevContainerServerHostname();
} else if (env === "development" || localStorage.dev === "dev") {
wsHost = protocol + location.hostname + ":3001";
url = protocol + location.hostname + ":3001";
} else {
wsHost = protocol + location.host;
// Connect to the current url
url = undefined;
}
socket = io(wsHost, {
transports: [ "websocket" ],
});
socket = io(url);
socket.on("info", (info) => {
this.info = info;