From fa5216c8d4d848c32a18cb2247c702262c4e7c9a Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Tue, 19 Jul 2022 11:19:05 +0200 Subject: [PATCH] add secure protocol Signed-off-by: Christian Richter --- assets/index.html | 2 +- config/config.json.example | 1 + weirdradio.js | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/assets/index.html b/assets/index.html index 52c9987..2f8e090 100644 --- a/assets/index.html +++ b/assets/index.html @@ -112,7 +112,7 @@ } console.log("Connecting to socket"); socketSemaphore = true; - let socket = new WebSocket("ws://" + wsBaseUrl); + let socket = new WebSocket(wsBaseUrl); socket.onopen = function (e) { clearInterval(socketConnector); socketConnector = null; diff --git a/config/config.json.example b/config/config.json.example index fb951f8..75218b2 100644 --- a/config/config.json.example +++ b/config/config.json.example @@ -3,6 +3,7 @@ "accessToken": "youraccesstokencanbeobtainedthroughriot", "domain": "yourdomain.tld", "webSocketDomain": "ws.yourdomain.tld", + "secure":true, "storage": "config/bot.json", "assetDir": "assets/", "webServerPort": "8080", diff --git a/weirdradio.js b/weirdradio.js index db78082..1a655c2 100644 --- a/weirdradio.js +++ b/weirdradio.js @@ -21,9 +21,14 @@ const client = new MatrixClient( ); // write javascript for baseurl +if (config.secure) { + urlConfigData = `var baseUrl = "https://${config.domain}";\nvar wsBaseUrl = "wss://${config.webSocketDomain}";\n`; +} else { + urlConfigData = `var baseUrl = "http://${config.domain}";\nvar wsBaseUrl = "ws://${config.webSocketDomain}";\n`; +} fs.writeFileSync( config.assetDir + "/baseurl.js", - `var baseUrl = "${config.domain}";\nvar wsBaseUrl = "${config.webSocketDomain}";\n`, + urlConfigData, function (err) { if (err) return console.log(err); } -- 2.49.1