Merge branch 'master' into tls-monitor-type
This commit is contained in:
commit
dda9bb132d
@ -41,14 +41,18 @@ module.exports.cloudflaredSocketHandler = (socket) => {
|
|||||||
io.to(socket.userID).emit(prefix + "installed", cloudflared.checkInstalled());
|
io.to(socket.userID).emit(prefix + "installed", cloudflared.checkInstalled());
|
||||||
io.to(socket.userID).emit(prefix + "running", cloudflared.running);
|
io.to(socket.userID).emit(prefix + "running", cloudflared.running);
|
||||||
io.to(socket.userID).emit(prefix + "token", await setting("cloudflaredTunnelToken"));
|
io.to(socket.userID).emit(prefix + "token", await setting("cloudflaredTunnelToken"));
|
||||||
} catch (error) { }
|
} catch (error) {
|
||||||
|
log.error("cloudflared", "Error in join handler: " + error.message);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on(prefix + "leave", async () => {
|
socket.on(prefix + "leave", async () => {
|
||||||
try {
|
try {
|
||||||
checkLogin(socket);
|
checkLogin(socket);
|
||||||
socket.leave("cloudflared");
|
socket.leave("cloudflared");
|
||||||
} catch (error) { }
|
} catch (error) {
|
||||||
|
log.error("cloudflared", "Error in leave handler: " + error.message);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on(prefix + "start", async (token) => {
|
socket.on(prefix + "start", async (token) => {
|
||||||
@ -61,7 +65,9 @@ module.exports.cloudflaredSocketHandler = (socket) => {
|
|||||||
cloudflared.token = null;
|
cloudflared.token = null;
|
||||||
}
|
}
|
||||||
cloudflared.start();
|
cloudflared.start();
|
||||||
} catch (error) { }
|
} catch (error) {
|
||||||
|
log.error("cloudflared", "Error in start handler: " + error.message);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on(prefix + "stop", async (currentPassword, callback) => {
|
socket.on(prefix + "stop", async (currentPassword, callback) => {
|
||||||
@ -84,7 +90,9 @@ module.exports.cloudflaredSocketHandler = (socket) => {
|
|||||||
try {
|
try {
|
||||||
checkLogin(socket);
|
checkLogin(socket);
|
||||||
await setSetting("cloudflaredTunnelToken", "");
|
await setSetting("cloudflaredTunnelToken", "");
|
||||||
} catch (error) { }
|
} catch (error) {
|
||||||
|
log.error("cloudflared", "Error in removeToken handler: " + error.message);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user