Implement server types and P2P connection helper

Source/Configuration/PluginConfigSettings.cs

@@ -1,5 +1,6 @@
 using BepInEx.Configuration;
 using BepInEx.Logging;
+using StayInTarkov.Networking;
 using System;
 using System.Net;
 
@@ -9,6 +10,7 @@ namespace StayInTarkov.Configuration
     /// Created by: Paulov
     /// Description: Stores and Loads all of the Plugin config settings
     /// </summary>
+
     public class PluginConfigSettings
     {
         public ConfigFile Config { get; }
@@ -60,7 +62,7 @@ public void GetSettings()
                 ("Advanced", "UseSITGarbageCollector", true, new ConfigDescription("Whether to use the Garbage Collector developed in to SIT OR leave it to BSG/Unity")).Value;
 
                 SITGCMemoryThreshold = StayInTarkovPlugin.Instance.Config.Bind
-                ("Advanced", "SITGarbageCollectorMemoryThreshold", 512, new ConfigDescription("The SIT Garbage Collector memory threshold (in megabytes) between ticks before forcing a garbage collection")).Value;
+                ("Advanced", "SITGarbageCollectorMemoryThreshold", 768, new ConfigDescription("The SIT Garbage Collector memory threshold (in megabytes) between ticks before forcing a garbage collection")).Value;
 
                 SITGCClearAssets = StayInTarkovPlugin.Instance.Config.Bind
                 ("Advanced", "SITGarbageCollectorClearAssets", false, new ConfigDescription("Set SIT Garbage Collector to clear Unity assets. Reduces RAM usage but can be unstable!")).Value;
@@ -103,9 +105,11 @@ public bool SETTING_DEBUGShowPlayerList
             public bool SETTING_ShowFeed { get; set; } = true;
             public bool SETTING_ShowSITStatistics { get; set; } = true;
             public bool ShowPing { get; set; } = true;
-            public HostProtocol SITHostProtocol { get; private set; }
             public int SITWebSocketPort { get; set; } = 6970;
-            public int SITUDPPort { get; set; } = 6971;
+            public int SITNatHelperPort { get; set; } = 6971;
+            public int SITUdpPort { get; set; } = 6972;
+            //public ServerType SITServerType { get; set; } = ServerType.Relay;
+            public NatTraversalMethod SITNatTraversalMethod { get; set; } = NatTraversalMethod.Upnp;
 
             public bool AllPlayersSpawnTogether { get; set; } = true;
             public bool ArenaMode { get; set; } = false;
@@ -123,9 +127,6 @@ public int BlackScreenOnDeathTime
                 }
             }
 
-            public string SITUDPHostIPV4 { get; set; }
-            public string SITUDPHostIPV6 { get; set; }
-
             public void GetSettings()
             {
                 SETTING_DEBUGSpawnDronesOnServer = StayInTarkovPlugin.Instance.Config.Bind
@@ -171,13 +172,10 @@ public void GetSettings()
                 Logger.LogDebug($"ArenaMode: {ArenaMode}");
                 Logger.LogDebug($"ForceHighPingMode: {ForceHighPingMode}");
 
-                SITHostProtocol = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITHostProtocol", HostProtocol.TCP, new ConfigDescription("SIT Host Protocol.")).Value;
-                SITWebSocketPort = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITPort", 6970, new ConfigDescription("SIT TCP/Websocket Port DEFAULT = 6970")).Value;
-                SITUDPPort = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITUDPPort", 6971, new ConfigDescription("SIT UDP Port DEFAULT = 6971")).Value;
-                SITUDPHostIPV4 = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITUDPHostIPV4", "127.0.0.1", new ConfigDescription("The IPv4 to use when hosting a UDP Coop Session")).Value;
-                SITUDPHostIPV6 = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITUDPHostIPV6", "2001:0db8:85a3:0000:0000:8a2e:0370:7334", new ConfigDescription("The IPv6 to use when hosting a UDP Coop Session")).Value;
-
-                Logger.LogDebug($"SITWebSocketPort: {SITWebSocketPort}");
+                SITWebSocketPort = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITPort", 6970, new ConfigDescription("SIT TCP/Websocket Port")).Value;
+                SITNatHelperPort = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITNatHelperPort", 6971, new ConfigDescription("SIT Nat Helper Port")).Value;
+                //SITUdpPort = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITUdpPort", 6972, new ConfigDescription("SIT UDP port for P2P connection.")).Value;
+                //SITServerType = StayInTarkovPlugin.Instance.Config.Bind("Coop", "SITServerType", ServerType.Relay, new ConfigDescription("SIT Server Type (when hosting a match). Possible values: Relay, P2P")).Value;
 
                 if (ArenaMode)
                 {
@@ -186,14 +184,6 @@ public void GetSettings()
                     EnableAISpawnWaveSystem = false;
                 }
             }
-
-            public enum HostProtocol
-            {
-                TCP,
-                UDP, 
-                //Both
-            }
         }
-
     }
 }

Source/Coop/Airdrops/SITAirdropsManager.cs

@@ -61,7 +61,7 @@ public async void Start()
             }
 
             // If this is not the server, then this manager will have to wait for the packet to initialize stuff.
-            if (MatchmakerAcceptPatches.IsClient)
+            if (SITMatchmaking.IsClient)
                 return;
 
             // The server will generate stuff ready for the packet
@@ -102,7 +102,7 @@ public async void Start()
 
         public IEnumerator SendParamsToClients()
         {
-            if (!MatchmakerAcceptPatches.IsServer)
+            if (!SITMatchmaking.IsServer)
                 yield break;
 
             yield return new WaitForSeconds(AirdropParameters.TimeToStart);
@@ -123,11 +123,11 @@ public async void FixedUpdate()
                 return;
 
             // If we are a client. Wait until the server has sent all the data.
-            if (MatchmakerAcceptPatches.IsClient && (ClientAirdropLootResultModel == null || ClientAirdropConfigModel == null))
+            if (SITMatchmaking.IsClient && (ClientAirdropLootResultModel == null || ClientAirdropConfigModel == null))
                 return;
 
             // If we have all the parameters sent from the Server. Lets build the plane, box, container and loot
-            if (MatchmakerAcceptPatches.IsClient && !ClientLootBuilt)
+            if (SITMatchmaking.IsClient && !ClientLootBuilt)
             {
                 ClientLootBuilt = true;
                 Logger.LogInfo("Client::Building Plane, Box, Factory and Loot.");
@@ -150,7 +150,7 @@ public async void FixedUpdate()
             if (airdropPlane == null || AirdropBox == null || factory == null)
                 return;
 
-            if (MatchmakerAcceptPatches.IsServer || MatchmakerAcceptPatches.IsSinglePlayer)
+            if (SITMatchmaking.IsServer || SITMatchmaking.IsSinglePlayer)
             {
                 AirdropParameters.Timer += 0.02f;
 
@@ -217,13 +217,13 @@ private void StartBox()
 
         private void BuildLootContainer(AirdropConfigModel config)
         {
-            if (MatchmakerAcceptPatches.IsClient)
+            if (SITMatchmaking.IsClient)
                 return;
 
             var lootData = factory.GetLoot();
 
             // Get the lootData. Sent to Clients.
-            if (MatchmakerAcceptPatches.IsServer)
+            if (SITMatchmaking.IsServer)
             {
                 var packet = new Dictionary<string, object>();
                 packet.Add("serverId", CoopGameComponent.GetServerId());

Source/Coop/Components/ActionPacketHandlerComponent.cs

@@ -409,7 +409,7 @@ void ReplicateRaidTimer(Dictionary<string, object> packet)
             if (coopGameComponent == null)
                 return;
 
-            if (MatchmakerAcceptPatches.IsClient)
+            if (SITMatchmaking.IsClient)
             {
                 var sessionTime = new TimeSpan(long.Parse(packet["sessionTime"].ToString()));
                 Logger.LogInfo($"RaidTimer: Remaining session time {sessionTime.TraderFormat()}");
@@ -450,7 +450,7 @@ void ReplicateTimeAndWeather(Dictionary<string, object> packet)
             if (coopGameComponent == null)
                 return;
 
-            if (MatchmakerAcceptPatches.IsClient)
+            if (SITMatchmaking.IsClient)
             {
                 Logger.LogDebug(packet.ToJson());
 
@@ -548,7 +548,7 @@ void ReplicateArmoredTrainTime(Dictionary<string, object> packet)
             if (coopGameComponent == null)
                 return;
 
-            if (MatchmakerAcceptPatches.IsClient)
+            if (SITMatchmaking.IsClient)
             {
                 DateTime utcTime = new(long.Parse(packet["utcTime"].ToString()));
 

Source/Coop/Components/CoopGameComponents/CoopGameComponent.cs

@@ -80,7 +80,7 @@
             {
                 if (LocalGameInstance is CoopGame coopGame)
                 {
-                    if (MatchmakerAcceptPatches.IsClient || coopGame.Bots.Count == 0)
+                    if (SITMatchmaking.IsClient || coopGame.Bots.Count == 0)
                         return Players
                             .Values
                             .Where(x => ProfileIdsAI.Contains(x.ProfileId) && x.ActiveHealthController.IsAlive)
@@ -233,7 +233,7 @@
             StartCoroutine(SendPlayerStatePacket());
 
             // Start the SIT Garbage Collector
-            //StartCoroutine(PeriodicEnableDisableGC());
+            StartCoroutine(PeriodicEnableDisableGC());
             GCHelpers.ClearGarbage(true, PluginConfigSettings.Instance.AdvancedSettings.SITGCClearAssets);
 
             // Get a List of Interactive Objects (this is a slow method), so run once here to maintain a reference
@@ -550,9 +550,9 @@
                 }
                 else if (!world.MainPlayer.HealthController.IsAlive)
                 {
-                    if (MatchmakerAcceptPatches.IsClient)
+                    if (SITMatchmaking.IsClient)
                         quitState = EQuitState.YouAreDeadAsClient;
-                    else if (MatchmakerAcceptPatches.IsServer)
+                    else if (SITMatchmaking.IsServer)
                         quitState = EQuitState.YouAreDeadAsHost;
                 }
             }
@@ -565,9 +565,9 @@
             // Extractions
             if (coopGame.ExtractedPlayers.Contains(world.MainPlayer.ProfileId))
             {
-                if (MatchmakerAcceptPatches.IsClient)
+                if (SITMatchmaking.IsClient)
                     quitState = EQuitState.YouHaveExtractedOnlyAsClient;
-                else if (MatchmakerAcceptPatches.IsServer)
+                else if (SITMatchmaking.IsServer)
                     quitState = EQuitState.YouHaveExtractedOnlyAsHost;
             }
 
@@ -597,7 +597,7 @@
                 RequestQuitGame = true;
 
                 // If you are the server / host
-                if (MatchmakerAcceptPatches.IsServer)
+                if (SITMatchmaking.IsServer)
                 {
                     // A host needs to wait for the team to extract or die!
                     if (PlayerUsers.Count() > 1 && (quitState == EQuitState.YouAreDeadAsHost || quitState == EQuitState.YouHaveExtractedOnlyAsHost))
@@ -1138,7 +1138,7 @@
             var prc = otherPlayer.GetOrAddComponent<PlayerReplicatedComponent>();
             prc.IsClientDrone = true;
 
-            if (!MatchmakerAcceptPatches.IsClient)
+            if (!SITMatchmaking.IsClient)
             {
                 if (otherPlayer.ProfileId.StartsWith("pmc"))
                 {
@@ -1326,8 +1326,8 @@
 
         public BaseLocalGame<GamePlayerOwner> LocalGameInstance { get; internal set; }
 
         int GuiX = 10;
         int GuiWidth = 400;
 
         //public const int PING_LIMIT_HIGH = 125;
         //public const int PING_LIMIT_MID = 100;
@@ -1339,9 +1339,9 @@
         public bool ServerHasStopped { get; set; }
         private bool ServerHasStoppedActioned { get; set; }
 
         GUIStyle middleLabelStyle;
         GUIStyle middleLargeLabelStyle;
         GUIStyle normalLabelStyle;
 
         //void OnGUI()
         //{
@@ -1442,7 +1442,7 @@
                 return rect;
 
             rect.y = 5;
-            GUI.Label(rect, $"SIT Coop: " + (MatchmakerAcceptPatches.IsClient ? "CLIENT" : "SERVER"));
+            GUI.Label(rect, $"SIT Coop: " + (SITMatchmaking.IsClient ? "CLIENT" : "SERVER"));
             rect.y += 15;
 
             // PING ------

Source/Coop/Components/CoopGameComponents/CoopGameGUIComponent.cs

@@ -110,30 +110,30 @@ void OnGUI()
             switch (quitState)
             {
                 case EQuitState.YourTeamIsDead:
-                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_TEAM_DEAD"], middleLargeLabelStyle);
+                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_TEAM_DEAD"].ToString(), middleLargeLabelStyle);
                     break;
                 case EQuitState.YouAreDead:
-                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_DEAD_SOLO"], middleLargeLabelStyle);
+                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_DEAD_SOLO"].ToString(), middleLargeLabelStyle);
                     break;
                 case EQuitState.YouAreDeadAsHost:
-                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_DEAD_HOST"], middleLargeLabelStyle);
+                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_DEAD_HOST"].ToString(), middleLargeLabelStyle);
                     break;
                 case EQuitState.YouAreDeadAsClient:
-                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_DEAD_CLIENT"], middleLargeLabelStyle);
+                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_DEAD_CLIENT"].ToString(), middleLargeLabelStyle);
                     break;
                 case EQuitState.YourTeamHasExtracted:
-                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_TEAM_EXTRACTED"], middleLargeLabelStyle);
+                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_TEAM_EXTRACTED"].ToString(), middleLargeLabelStyle);
                     break;
                 case EQuitState.YouHaveExtractedOnlyAsHost:
-                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_EXTRACTED_HOST"], middleLargeLabelStyle);
+                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_EXTRACTED_HOST"].ToString(), middleLargeLabelStyle);
                     break;
                 case EQuitState.YouHaveExtractedOnlyAsClient:
-                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_EXTRACTED_CLIENT"], middleLargeLabelStyle);
+                    GUI.Label(rectEndOfGameMessage, StayInTarkovPlugin.LanguageDictionary["RAID_PLAYER_EXTRACTED_CLIENT"].ToString(), middleLargeLabelStyle);
                     break;
             }
 
             //OnGUI_DrawPlayerList(rect);
-            OnGUI_DrawPlayerFriendlyTags(rect);
+            //OnGUI_DrawPlayerFriendlyTags(rect);
             //OnGUI_DrawPlayerEnemyTags(rect);
 
         }
@@ -144,7 +144,7 @@ private Rect DrawPing(Rect rect)
                 return rect;
 
             rect.y = 5;
-            GUI.Label(rect, $"SIT Coop: " + (MatchmakerAcceptPatches.IsClient ? "CLIENT" : "SERVER"));
+            GUI.Label(rect, $"SIT Coop: " + (SITMatchmaking.IsClient ? "CLIENT" : "SERVER"));
             rect.y += 15;
 
             // PING ------