web secure socket & fix player already in server kicking

Author: michaljaz

src/client/scripts/Setup.js

@@ -43,10 +43,15 @@ async function Setup(game) {
         game.distanceBasedFog = new DistanceBasedFog(game);
         UrlParams(game, (password) => {
             console.warn(gpuInfo());
-
+            var prefix;
+            if (document.location.protocol === "https:") {
+                prefix = "wss";
+            } else {
+                prefix = "ws";
+            }
             game.socket = new Socket(
                 game,
-                `ws://${document.location.host}?nick=${game.nick}&server=${game.server}&port=${game.serverPort}&password=${password}&premium=${game.premium}`
+                `${prefix}://${document.location.host}?nick=${game.nick}&server=${game.server}&port=${game.serverPort}&password=${password}&premium=${game.premium}`
             );
 
             game.pii = new PlayerInInventory(game);

src/client/scripts/index.js

@@ -39,6 +39,16 @@ class Game {
     async init() {
         await this.al.init();
         await Setup(this);
+        this.socket.on("alreadyPlaying", () => {
+            swal({
+                title: "Player already is in server",
+                text: "Try later...",
+                icon: "error",
+                button: "Rejoin",
+            }).then(function () {
+                document.location.reload();
+            });
+        });
         this.socket.on("connect", () => {
             console.log("Connected to server!");
             $(".loadingText").text(`Connecting to ${this.server}`);

src/index.js

@@ -44,15 +44,18 @@ server.listen(port, function () {
     return console.log(`Server is running on \x1b[34m*:${port}\x1b[0m`);
 });
 
-var botByNick = {};
+var botByNick = new Map();
 
 wss.on("connection", (socket, req) => {
     const emit = (type, ...data) => {
         socket.send(encode([type, ...data]));
     };
-
     const query = qs.parse(req.url.substr(1), { ignoreQueryPrefix: true });
 
+    if (botByNick.get(query.nick) !== undefined) {
+        emit("alreadyPlaying");
+        return;
+    }
     console.log(`[\x1b[32m+\x1b[0m] ${query.nick}`);
     var heldItem = null;
     var bot = mineflayer.createBot({
@@ -62,7 +65,7 @@ wss.on("connection", (socket, req) => {
         version: version,
         password: query.premium === "true" ? query.password : undefined,
     });
-    botByNick[query.nick] = bot;
+    botByNick.set(query.nick, bot);
     bot._client.on("map_chunk", function (packet) {
         var cell = new Chunk();
         cell.load(packet.chunkData, packet.bitMap, true, true);
@@ -220,6 +223,7 @@ wss.on("connection", (socket, req) => {
             try {
                 clearInterval(interval);
                 console.log(`[\x1b[31m-\x1b[0m] ${query.nick}`);
+                botByNick.delete(query.nick);
                 bot.end();
             } catch (error) {}
         });