From bbf86934d43acec2276a9f4b86d030f1c3c702ee Mon Sep 17 00:00:00 2001 From: Mate Date: Fri, 1 Oct 2021 09:26:15 -0700 Subject: [PATCH 1/7] Added feature to generate numerical room ID --- .../LRM/RelayHandler/RelayHandler.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs index dd916584..f0c18a26 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs @@ -21,15 +21,27 @@ public RelayHandler(int maxPacketSize) private bool DoesServerIdExist(string id) => _cachedRooms.ContainsKey(id); private string GenerateRoomID() + { + return GenerateRoomID(false); + } + + private string GenerateRoomID(bool generateNumerical) { const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; var randomID = ""; var random = _cachedRandom; + var length = Program.conf.RandomlyGeneratedIDLength; do { - randomID = new string(Enumerable.Repeat(chars, Program.conf.RandomlyGeneratedIDLength) - .Select(s => s[random.Next(s.Length)]).ToArray()); + if (generateNumerical) + { + randomID = random.Next(0, (int) Math.Pow(10, (double) length)).ToString("D" + length); + } + else + { + randomID = new string(Enumerable.Repeat(chars, length).Select(s => s[random.Next(s.Length)]).ToArray()); + } } while (DoesServerIdExist(randomID)); From b9dadf093e9d9c8df8b6ccb0c0ba1cea3492623a Mon Sep 17 00:00:00 2001 From: Mate Date: Fri, 1 Oct 2021 12:08:41 -0700 Subject: [PATCH 2/7] Removed additional functionality, and left a optional string argument --- .../LRM/RelayHandler/RelayHandler.cs | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs index f0c18a26..b714f0b5 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs @@ -19,29 +19,16 @@ public RelayHandler(int maxPacketSize) /// The ID to check for /// private bool DoesServerIdExist(string id) => _cachedRooms.ContainsKey(id); - - private string GenerateRoomID() + + private string GenerateRoomID(string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ") { - return GenerateRoomID(false); - } - - private string GenerateRoomID(bool generateNumerical) - { - const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; var randomID = ""; var random = _cachedRandom; var length = Program.conf.RandomlyGeneratedIDLength; do { - if (generateNumerical) - { - randomID = random.Next(0, (int) Math.Pow(10, (double) length)).ToString("D" + length); - } - else - { - randomID = new string(Enumerable.Repeat(chars, length).Select(s => s[random.Next(s.Length)]).ToArray()); - } + randomID = new string(Enumerable.Repeat(chars, length).Select(s => s[random.Next(s.Length)]).ToArray()); } while (DoesServerIdExist(randomID)); From 03585ac32bc0de1b70bdf84d4a9234d59af48636 Mon Sep 17 00:00:00 2001 From: Mate Date: Thu, 7 Oct 2021 15:57:41 -0700 Subject: [PATCH 3/7] Updated ServerID generation inside a load balancer ( made it more flexible ) --- .../LRM_LoadBalancer/Program/ProgramExtra.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs index 02adf217..e1cefc4f 100644 --- a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs +++ b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs @@ -25,17 +25,17 @@ public long GetTotalServers() return temp; } - - public string GenerateServerID() + + + public string GenerateServerID(string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ") { - const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; var randomID = ""; var random = _cachedRandom; + var length = Program.conf.RandomlyGeneratedIDLength; do { - randomID = new string(Enumerable.Repeat(chars, conf.RandomlyGeneratedIDLength) - .Select(s => s[random.Next(s.Length)]).ToArray()); + randomID = new string(Enumerable.Repeat(chars, length).Select(s => s[random.Next(s.Length)]).ToArray()); } while (cachedRooms.ContainsKey(randomID)); From 623954791fb2e29e04e0a671c1557a5e3dde209c Mon Sep 17 00:00:00 2001 From: Mate Date: Thu, 7 Oct 2021 16:02:38 -0700 Subject: [PATCH 4/7] Update ProgramExtra.cs --- .../LRM_LoadBalancer/Program/ProgramExtra.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs index e1cefc4f..540915d4 100644 --- a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs +++ b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs @@ -35,7 +35,9 @@ public string GenerateServerID(string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ") do { - randomID = new string(Enumerable.Repeat(chars, length).Select(s => s[random.Next(s.Length)]).ToArray()); + randomID = new string(Enumerable.Repeat(chars, length) + .Select(s => s[random.Next(s.Length)]) + .ToArray()); } while (cachedRooms.ContainsKey(randomID)); From f418f640969bc0e5e8e6bc396abbcfbc2b8557fd Mon Sep 17 00:00:00 2001 From: Mate Date: Thu, 7 Oct 2021 16:04:38 -0700 Subject: [PATCH 5/7] Update ProgramExtra.cs --- .../LRM_LoadBalancer/Program/ProgramExtra.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs index 540915d4..fc701215 100644 --- a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs +++ b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs @@ -31,11 +31,10 @@ public string GenerateServerID(string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ") { var randomID = ""; var random = _cachedRandom; - var length = Program.conf.RandomlyGeneratedIDLength; do { - randomID = new string(Enumerable.Repeat(chars, length) + randomID = new string(Enumerable.Repeat(chars, conf.RandomlyGeneratedIDLength) .Select(s => s[random.Next(s.Length)]) .ToArray()); } From d68d37e338227645dd11ec7c9f7e2ec523bc621b Mon Sep 17 00:00:00 2001 From: Mate Date: Sat, 16 Oct 2021 19:14:58 -0700 Subject: [PATCH 6/7] Created "Numerical" generation option for games ID in configs --- .../LRM_LoadBalancer/Config.cs | 1 + .../LRM_LoadBalancer/Program/ProgramExtra.cs | 5 +++++ ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Config.cs | 1 + .../LRM/RelayHandler/RelayHandler.cs | 5 +++++ 4 files changed, 12 insertions(+) diff --git a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Config.cs b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Config.cs index 683e3f95..3c4705d5 100644 --- a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Config.cs +++ b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Config.cs @@ -13,5 +13,6 @@ class Config public ushort EndpointPort = 7070; public bool ShowDebugLogs = false; public int RandomlyGeneratedIDLength = 5; + public bool RandomlyGeneratedIDNumerical = false; } } diff --git a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs index fc701215..ca9befb0 100644 --- a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs +++ b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs @@ -32,6 +32,11 @@ public string GenerateServerID(string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ") var randomID = ""; var random = _cachedRandom; + if (conf.RandomlyGeneratedIDNumerical) + { + chars = "0123456789"; + } + do { randomID = new string(Enumerable.Repeat(chars, conf.RandomlyGeneratedIDLength) diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Config.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Config.cs index 7578ffd7..7bdc20c4 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Config.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Config.cs @@ -20,6 +20,7 @@ public class Config // this wont be used if you are using load balancer // load balancer will generate instead. public int RandomlyGeneratedIDLength = 5; + public bool RandomlyGeneratedIDNumerical = false; //======================== // Endpoint REST API Settings diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs index b714f0b5..7d009cff 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs @@ -22,6 +22,11 @@ public RelayHandler(int maxPacketSize) private string GenerateRoomID(string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ") { + if (Program.conf.RandomlyGeneratedIDNumerical) + { + chars = "0123456789"; + } + var randomID = ""; var random = _cachedRandom; var length = Program.conf.RandomlyGeneratedIDLength; From b725d54de21988ef237bc90a95d625035bf3e5e5 Mon Sep 17 00:00:00 2001 From: Mate Date: Sat, 16 Oct 2021 19:22:26 -0700 Subject: [PATCH 7/7] Updated numerical check to ternary --- .../LRM_LoadBalancer/Program/ProgramExtra.cs | 6 +----- .../LRM/RelayHandler/RelayHandler.cs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs index ca9befb0..4719a604 100644 --- a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs +++ b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program/ProgramExtra.cs @@ -29,14 +29,10 @@ public long GetTotalServers() public string GenerateServerID(string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ") { + chars = conf.RandomlyGeneratedIDNumerical ? "0123456789" : chars; var randomID = ""; var random = _cachedRandom; - if (conf.RandomlyGeneratedIDNumerical) - { - chars = "0123456789"; - } - do { randomID = new string(Enumerable.Repeat(chars, conf.RandomlyGeneratedIDLength) diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs index 7d009cff..90b8e56c 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs @@ -22,11 +22,7 @@ public RelayHandler(int maxPacketSize) private string GenerateRoomID(string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ") { - if (Program.conf.RandomlyGeneratedIDNumerical) - { - chars = "0123456789"; - } - + chars = Program.conf.RandomlyGeneratedIDNumerical ? "0123456789" : chars; var randomID = ""; var random = _cachedRandom; var length = Program.conf.RandomlyGeneratedIDLength;