v1.1.22

- Actualizar ALM

- Corregir la apariencia de la imagen de Stream TradeBlock para SV

- Correcciones de fugas de memoria

- Envolver EnterLinkTradeAndCode en try/finally para una limpieza adecuada

Author: Daiivr

SysBot.Pokemon.WinForms/Main.cs

@@ -60,6 +60,7 @@ private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter,
 
         private SearchManager _searchManager = null!;
         private LogViewerForwarder _logViewerForwarder = null!;
+        private TextBoxForwarder _textBoxForwarder = null!;
 
         internal bool hasUpdate = false;
         private bool _isRestoringFromTray = false;
@@ -457,7 +458,8 @@ private void LoadControls()
             // Apply enhanced styling to the game selector
             ConfigureGameSelector();
 
-            LogUtil.Forwarders.Add(new TextBoxForwarder(RTB_Logs));
+            _textBoxForwarder = new TextBoxForwarder(RTB_Logs);
+            LogUtil.Forwarders.Add(_textBoxForwarder);
             LogUtil.Forwarders.Add(_logViewerForwarder);
         }
 
@@ -474,7 +476,11 @@ private ProgramConfig GetCurrentConfiguration()
         private void Main_FormClosing(object sender, FormClosingEventArgs e)
         {
             if (IsUpdating) return;
-            
+
+            // Remove log forwarders to prevent memory leaks
+            LogUtil.Forwarders.Remove(_textBoxForwarder);
+            LogUtil.Forwarders.Remove(_logViewerForwarder);
+
             // Let the form close normally when X button is clicked
             // No longer minimizing to tray on close
             this.StopWebServer();

SysBot.Pokemon.WinForms/WebApi/WebApiExtensions.cs

@@ -33,6 +33,8 @@ public static void InitWebServer(this Main mainForm)
     {
         _main = mainForm;
 
+        _cts = new CancellationTokenSource(); // Initialize early for background tasks
+
         // Get the configured port from settings
         if (mainForm.Config?.Hub?.WebServer != null)
         {
@@ -120,10 +122,17 @@ public static void InitWebServer(this Main mainForm)
             // Periodically clean up completed update sessions
             _ = Task.Run(async () =>
             {
-                while (true)
+                while (_cts != null && !_cts.Token.IsCancellationRequested)
                 {
-                    await Task.Delay(TimeSpan.FromMinutes(30));
-                    UpdateManager.ClearState();
+                    try
+                    {
+                        await Task.Delay(TimeSpan.FromMinutes(30), _cts.Token);
+                        UpdateManager.ClearState();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        break; // Exit gracefully when cancelled
+                    }
                 }
             });
         }
@@ -320,7 +329,7 @@ private static void StartFullServer()
 
     private static void StartTcp()
     {
-        _cts = new CancellationTokenSource();
+        _cts ??= new CancellationTokenSource(); // Only create if not already created
         Task.Run(() => StartTcpListenerAsync(_cts.Token));
     }
 

SysBot.Pokemon/Helpers/PokeNexo.cs

@@ -2,10 +2,10 @@ namespace SysBot.Pokemon.Helpers
 {
     public static class PokeNexo
     {
-        public const string Attribution = "https://github.com/hexbyt3/PokeBot";
+        public const string Attribution = "https://github.com/Daiivr/PokeNexo";
 
         public const string ConfigPath = "config.json";
 
-        public const string Version = "v1.1.21";
+        public const string Version = "v1.1.22";
     }
 }

SysBot.Pokemon/SV/BotTrade/PokeTradeBotSV.cs

@@ -957,8 +957,6 @@ void SendCollectedPokemonAndCleanup()
                     return PokeTradeResult.NoTrainerFound;
                 }
 
-                Hub.Config.Stream.EndEnterCode(this);
-
                 var cnt = 0;
                 while (!await IsInBox(PortalOffset, token).ConfigureAwait(false))
                 {
@@ -1214,7 +1212,6 @@ private async Task<PokeTradeResult> PerformLinkCodeTrade(SAV9SV sav, PokeTradeDe
         // Update Barrier Settings
         UpdateBarrier(poke.IsSynchronized);
         poke.TradeInitialize(this);
-        Hub.Config.Stream.EndEnterCode(this);
 
         // Handle connection and portal entry
         if (!await EnsureConnectedAndInPortal(token).ConfigureAwait(false))
@@ -1223,7 +1220,7 @@ private async Task<PokeTradeResult> PerformLinkCodeTrade(SAV9SV sav, PokeTradeDe
         }
 
         // Enter Link Trade and code
-        if (!await EnterLinkTradeAndCode(poke.Code, token).ConfigureAwait(false))
+        if (!await EnterLinkTradeAndCode(poke, poke.Code, token).ConfigureAwait(false))
         {
             return PokeTradeResult.RecoverStart;
         }
@@ -1260,7 +1257,7 @@ private async Task<bool> EnsureConnectedAndInPortal(CancellationToken token)
         return true;
     }
 
-    private async Task<bool> EnterLinkTradeAndCode(int code, CancellationToken token)
+    private async Task<bool> EnterLinkTradeAndCode(PokeTradeDetail<PK9> poke, int code, CancellationToken token)
     {
         // Assumes we're freshly in the Portal and the cursor is over Link Trade.
         Log("Seleccionando Link Trade.");
@@ -1269,13 +1266,29 @@ private async Task<bool> EnterLinkTradeAndCode(int code, CancellationToken token
         // Always clear Link Codes and enter a new one based on the current trade type
         await Click(X, 1_000, token).ConfigureAwait(false);
         await Click(PLUS, 1_000, token).ConfigureAwait(false);
-        await Task.Delay(Hub.Config.Timings.MiscellaneousSettings.ExtraTimeOpenCodeEntry, token).ConfigureAwait(false);
 
-        Log($"Ingresando el código de Link Trade: {code:0000 0000}...");
-        await EnterLinkCode(code, Hub.Config, token).ConfigureAwait(false);
-        await Click(PLUS, 3_000, token).ConfigureAwait(false);
+        // Loading code entry
+        bool startedEnterCode = false;
+        try
+        {
+            if (poke.Type != PokeTradeType.Random)
+            {
+                Hub.Config.Stream.StartEnterCode(this);
+                startedEnterCode = true;
+            }
+            await Task.Delay(Hub.Config.Timings.MiscellaneousSettings.ExtraTimeOpenCodeEntry, token).ConfigureAwait(false);
 
-        return true;
+            Log($"Ingresando el código de Link Trade: {code:0000 0000}...");
+            await EnterLinkCode(code, Hub.Config, token).ConfigureAwait(false);
+            await Click(PLUS, 3_000, token).ConfigureAwait(false);
+
+            return true;
+        }
+        finally
+        {
+            if (startedEnterCode)
+                Hub.Config.Stream.EndEnterCode(this);
+        }
     }
 
     private async Task<PokeTradeResult> PerformNonBatchTrade(SAV9SV sav, PokeTradeDetail<PK9> poke, CancellationToken token)
@@ -1320,8 +1333,6 @@ private async Task<PokeTradeResult> PerformNonBatchTrade(SAV9SV sav, PokeTradeDe
             return PokeTradeResult.NoTrainerFound;
         }
 
-        Hub.Config.Stream.EndEnterCode(this);
-
         // Wait until we get into the box.
         var cnt = 0;
         while (!await IsInBox(PortalOffset, token).ConfigureAwait(false))