From 23da9064ceffc8a9dda79262234be674ec3bd7eb Mon Sep 17 00:00:00 2001
From: Benjamin Kyd <benjaminkyd@gmail.com>
Date: Thu, 4 Mar 2021 01:15:31 +0000
Subject: [PATCH] changed how id's work

---
 client/public/game/index.html |  3 +++
 server/index.js               |  1 +
 server/src/game-registrar.js  |  4 ++--
 server/src/lobbies.js         | 19 +++++++++++++++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/client/public/game/index.html b/client/public/game/index.html
index 6874ec1..4486eb9 100644
--- a/client/public/game/index.html
+++ b/client/public/game/index.html
@@ -14,6 +14,7 @@
 
         <div id="connection-state"></div>
         <p>
+            
 
         <div id="lobbies" style="display:none">
             <input type="button" value="Create Lobby" onclick="createLobby()">
@@ -25,6 +26,7 @@
 
         </div>
 
+
         <div id="lobby-create" style="display:none">
             <h3>Create a Lobby</h3>
             <input type="text" id="" placeholder="name">
@@ -37,6 +39,7 @@
             <input type="button" value="back" onclick="back()">
         </div>
 
+
         <div id="lobby-join" style="display:none">
             <h3>Join a Lobby</h3>
             <input type="text" id="" placeholder="lobby code">
diff --git a/server/index.js b/server/index.js
index 4b04fc0..ad13f80 100644
--- a/server/index.js
+++ b/server/index.js
@@ -4,6 +4,7 @@ const Router = require('./src/router.js');
 const Socket = require('./src/socketserver.js');
 
 require('dotenv').config()
+const Crypto = require("crypto");
 
 async function main()
 {
diff --git a/server/src/game-registrar.js b/server/src/game-registrar.js
index 5d5e153..6095c0a 100644
--- a/server/src/game-registrar.js
+++ b/server/src/game-registrar.js
@@ -80,7 +80,7 @@ function GetUserByUsername(username)
 function RegisterUser(username, ip)
 {
     // TODO: Don't assume this is unique, even with Crypto, UUIDv4?
-    const uid = Crypto.randomBytes(32).toString("hex");
+    const uid = Crypto.randomBytes(8).toString("hex");
 
     // Free up disconnected users with likewise usernames
     for (const user in OnlineUsers)
@@ -90,7 +90,7 @@ function RegisterUser(username, ip)
             DeRegisterUser(user);
         } else
         {
-            return;
+            return false;
         }
     }
 
diff --git a/server/src/lobbies.js b/server/src/lobbies.js
index 5673074..aaf990e 100644
--- a/server/src/lobbies.js
+++ b/server/src/lobbies.js
@@ -9,16 +9,28 @@ LOBBY OBJECT
     // PUBLIC, PRIVATE
     visibility: 'PUBLIC',
     allowspectators: bool,
-    
 }
 NOTES
-
+    - Users can only own one lobby
+    - Lobby UID is "join code", will be much shorter than userid
+    - When inactive will be deleted, unlike users
 */
 let Lobbies = [];
 
 
+function CheckUserAvailability(ownerid)
+{
+    for (const lobby in Lobbies)
+        if (Lobbies[lobby].ownerid == ownerid) return false;
+    return true;
+}
+
+
 function RegisterLobby(ownerid, name, private, spectators)
 {
+    if (!CheckUserAvailability(ownerid)) return false;
+
+    const uid = Math.random().toString(36).substring(7).toUpperCase();
 
 }
 
@@ -29,5 +41,8 @@ function DeRegisterLobby(lobbyid)
 
 
 module.exports = {
+    CheckUserAvailability: CheckUserAvailability,
 
+    RegisterLobby: RegisterLobby,
+    DeRegisterLobby: DeRegisterLobby
 }