Merge branch 'master' into tls-monitor-type

This commit is contained in:
MkDev11 2026-01-06 10:39:01 -08:00 committed by GitHub
commit dda9bb132d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -41,14 +41,18 @@ module.exports.cloudflaredSocketHandler = (socket) => {
io.to(socket.userID).emit(prefix + "installed", cloudflared.checkInstalled());
io.to(socket.userID).emit(prefix + "running", cloudflared.running);
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 () => {
try {
checkLogin(socket);
socket.leave("cloudflared");
} catch (error) { }
} catch (error) {
log.error("cloudflared", "Error in leave handler: " + error.message);
}
});
socket.on(prefix + "start", async (token) => {
@ -61,7 +65,9 @@ module.exports.cloudflaredSocketHandler = (socket) => {
cloudflared.token = null;
}
cloudflared.start();
} catch (error) { }
} catch (error) {
log.error("cloudflared", "Error in start handler: " + error.message);
}
});
socket.on(prefix + "stop", async (currentPassword, callback) => {
@ -84,7 +90,9 @@ module.exports.cloudflaredSocketHandler = (socket) => {
try {
checkLogin(socket);
await setSetting("cloudflaredTunnelToken", "");
} catch (error) { }
} catch (error) {
log.error("cloudflared", "Error in removeToken handler: " + error.message);
}
});
};