Fixed connection via domain name (SubnauticaNitrox#1272)

* Updated regex to remove domain validation

* Added port to server save file and added input field

* Changed logic for domain and ip validation

* Moved ingamelogger to stop error if connection isnt valid

* Added backwards compatibility for older servers

* Seperated out the splitting of ip/port

* Moved ingamelogger setup to main patcher and fixed server ip display

Author: Coding-Hen

NitroxClient/MonoBehaviours/DiscordRP/DiscordRPController.cs

@@ -38,7 +38,10 @@ public void JoinCallback(string secret)
             Log.Info("[Discord] Joining Server");
             if (SceneManager.GetActiveScene().name == "StartScreen" && MainMenuMultiplayerPanel.Main != null)
             {
-                MainMenuMultiplayerPanel.Main.OpenJoinServerMenu(secret);
+                string[] splitSecret = secret.Split(':');
+                string ip = splitSecret[0];
+                string port = splitSecret[1];
+                MainMenuMultiplayerPanel.Main.OpenJoinServerMenu(ip,port);
             }
             else
             {

NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuMultiplayerPanel.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
@@ -25,6 +26,7 @@ public class MainMenuMultiplayerPanel : MonoBehaviour
         public string SERVER_LIST_PATH = Path.Combine(".", "servers");
         private string serverHostInput;
         private string serverNameInput;
+        private string serverPortInput;
 
         private bool shouldFocus;
         private bool showingAddServer;
@@ -41,7 +43,7 @@ public void Awake()
 
             if (!File.Exists(SERVER_LIST_PATH))
             {
-                AddServer("local server", "127.0.0.1");
+                AddServer("local server", "127.0.0.1", "11000");
             }
 
             CreateButton("Add server IP", ShowAddServerWindow);
@@ -60,7 +62,7 @@ public void CreateButton(string text, UnityAction clickEvent)
             multiplayerButtonInst.transform.SetParent(savedGameAreaContent, false);
         }
 
-        public void CreateServerButton(string text, string joinIp)
+        public void CreateServerButton(string text, string joinIp, string joinPort)
         {
             GameObject multiplayerButtonInst = Instantiate(multiplayerButton, savedGameAreaContent, false);
             multiplayerButtonInst.name = (savedGameAreaContent.childCount - 1).ToString();
@@ -73,7 +75,7 @@ public void CreateServerButton(string text, string joinIp)
             multiplayerButtonButton.onClick.AddListener(() =>
             {
                 txt.GetComponent<Text>().color = prevTextColor; // Visual fix for black text after click (hover state still active)
-                OpenJoinServerMenu(joinIp);
+                OpenJoinServerMenu(joinIp, joinPort);
             });
 
             GameObject delete = Instantiate(SavedGamesRef.GetComponent<MainMenuLoadPanel>().saveInstance.GetComponent<MainMenuLoadButton>().deleteButton);
@@ -87,11 +89,11 @@ public void CreateServerButton(string text, string joinIp)
             delete.transform.SetParent(multiplayerButtonInst.transform, false);
         }
 
-        public void AddServer(string name, string ip)
+        public void AddServer(string name, string ip, string port)
         {
             using (StreamWriter sw = new StreamWriter(SERVER_LIST_PATH, true))
             {
-                sw.WriteLine($"{name}|{ip}");
+                sw.WriteLine($"{name}|{ip}|{port}");
             }
         }
 
@@ -102,12 +104,12 @@ public void RemoveServer(int index)
             File.WriteAllLines(SERVER_LIST_PATH, serverLines.ToArray());
         }
 
-        public void OpenJoinServerMenu(string serverIp)
+        public void OpenJoinServerMenu(string serverIp, string serverPort)
         {
-            IPEndPoint endpoint = ResolveIp(serverIp) ?? ResolveHostName(serverIp);
+            IPEndPoint endpoint = ResolveIPEndPoint(serverIp, serverPort);
             if (endpoint == null)
             {
-                Log.InGame($"Unable to resolve remote address: {serverIp}");
+                Log.InGame($"Unable to resolve remote address: {serverIp}:{serverPort}");
                 return;
             }
 
@@ -128,6 +130,7 @@ public void ShowAddServerWindow()
         {
             serverNameInput = "local";
             serverHostInput = "127.0.0.1";
+            serverPortInput = "11000";
             showingAddServer = true;
             shouldFocus = true;
         }
@@ -158,41 +161,56 @@ private void LoadSavedServers()
                     string[] lineData = line.Split('|');
                     string serverName = lineData[0];
                     string serverIp = lineData[1];
-                    CreateServerButton($"Connect to <b>{serverName}</b>\n{serverIp}", serverIp);
+                    string serverPort;
+                    if (lineData.Length == 3)
+                    {
+                        serverPort = lineData[2];
+                    }
+                    else
+                    {
+                        Match match = Regex.Match(serverIp, @"^(.*?)(?::(\d{3,5}))?$");
+                        serverIp = match.Groups[1].Value;
+                        serverPort = match.Groups[2].Success ? match.Groups[2].Value : "11000";
+                    }
+                    CreateServerButton($"Connect to <b>{serverName}</b>\n{serverIp}:{serverPort}", serverIp, serverPort);
                 }
             }
         }
 
-        private IPEndPoint ResolveIp(string serverIp)
+        private IPEndPoint ResolveIPEndPoint(string serverIp, string serverPort)
         {
-            Match match = Regex.Match(serverIp, @"^((?:(?:[\da-f]+:??){8}|[\d\.]+|[^:\s]+)):?(\d+)?$"); // Pattern test url: https://regex101.com/r/WY4FWp/10
-            if (!match.Success)
+            UriHostNameType hostType = Uri.CheckHostName(serverIp);
+            IPAddress address;
+            switch (hostType)
             {
-                return null;
+                case UriHostNameType.IPv4:
+                case UriHostNameType.IPv6:
+                    IPAddress.TryParse(serverIp, out address);
+                    break;
+                case UriHostNameType.Dns:
+                    address = ResolveHostName(serverIp, serverPort);
+                    break;
+                default:
+                    return null;
             }
 
-            IPAddress ip = IPAddress.Parse(match.Groups[1].Value);
-            int port = match.Groups[2].Success ? int.Parse(match.Groups[2].Value) : 11000;
-            return new IPEndPoint(ip, port);
-        }
-
-        private IPEndPoint ResolveHostName(string hostname)
-        {
-            Match match = Regex.Match(hostname, @"^\s*([a-zA-Z\.]*)\:?(\d{2,5})?\s*$");
-            if (!match.Success)
+            if (address == null)
             {
-                Log.ErrorSensitive("Hostname {hostname} has an invalid format", hostname);
                 return null;
             }
+            return new IPEndPoint(address, int.Parse(serverPort));
+        }
 
+        private IPAddress ResolveHostName(string hostname, string serverPort)
+        {
             try
             {
-                IPHostEntry hostEntry = Dns.GetHostEntry(match.Groups[1].Value);
-                return new IPEndPoint(hostEntry.AddressList[0], match.Groups[2].Success ? int.Parse(match.Groups[2].Value) : 11000);
+                IPHostEntry hostEntry = Dns.GetHostEntry(hostname);
+                return hostEntry.AddressList[0];
             }
             catch (SocketException ex)
             {
-                Log.ErrorSensitive(ex, "Unable to resolve the address {hostname}", hostname);
+                Log.ErrorSensitive(ex, "Unable to resolve the address {hostname}:{serverPort}", hostname, serverPort);
                 return null;
             }
         }
@@ -201,8 +219,9 @@ private void OnAddServerButtonClicked()
         {
             serverNameInput = serverNameInput.Trim();
             serverHostInput = serverHostInput.Trim();
-            AddServer(serverNameInput, serverHostInput);
-            CreateServerButton($"Connect to <b>{serverNameInput}</b>\n{serverHostInput}", serverHostInput);
+            serverPortInput = serverPortInput.Trim();
+            AddServer(serverNameInput, serverHostInput, serverPortInput);
+            CreateServerButton($"Connect to <b>{serverNameInput}</b>\n{serverHostInput}:{serverPortInput}", serverHostInput, serverPortInput);
             HideAddServerWindow();
         }
 
@@ -270,6 +289,13 @@ private void DoAddServerWindow(int windowId)
                             serverHostInput = GUILayout.TextField(serverHostInput, 120);
                         }
 
+                        using (new GUILayout.HorizontalScope())
+                        {
+                            GUILayout.Label("Port:");
+                            GUI.SetNextControlName("serverPortField");
+                            serverPortInput = GUILayout.TextField(serverPortInput);
+                        }
+
                         if (GUILayout.Button("Add server"))
                         {
                             OnAddServerButtonClicked();

NitroxClient/MonoBehaviours/Multiplayer.cs

@@ -19,7 +19,6 @@
 using NitroxModel.Packets;
 using NitroxModel.Packets.Processors.Abstract;
 using NitroxModel_Subnautica.Helper;
-using NitroxModel_Subnautica.Logger;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -77,7 +76,6 @@ public static IEnumerator LoadAsync()
 
         public void Awake()
         {
-            Log.InGameLogger = new SubnauticaInGameLogger();
             Log.InGame("Multiplayer Client Loaded...");
 
             multiplayerSession = NitroxServiceLocator.LocateService<IMultiplayerSession>();

NitroxPatcher/Main.cs

@@ -11,6 +11,7 @@
 using NitroxModel.DataStructures.Util;
 using NitroxModel.Helper;
 using NitroxModel.Logger;
+using NitroxModel_Subnautica.Logger;
 using NitroxPatcher.Modules;
 using NitroxPatcher.Patches;
 using UnityEngine;
@@ -30,6 +31,7 @@ public static class Main
         public static void Execute()
         {
             Log.Setup(true);
+            Log.InGameLogger = new SubnauticaInGameLogger();
             Log.Info($"Using Nitrox version {Assembly.GetExecutingAssembly().GetName().Version} built on {File.GetCreationTimeUtc(Assembly.GetExecutingAssembly().Location)}");
             try
             {