Enhance AIImages mod by adding cancellation support for image generation, improving user experience with localized strings for cancellation actions in English and Russian. Refactor service integration for better dependency management and update AIImages.dll to reflect these changes.

2025-10-26 19:10:45 +03:00
parent 3434927342
commit 02b0143186
11 changed files with 974 additions and 174 deletions
--- a/Source/AIImages/Helpers/AsyncHelper.cs
+++ b/Source/AIImages/Helpers/AsyncHelper.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Threading.Tasks;
+using RimWorld;
+using Verse;
+
+namespace AIImages.Helpers
+{
+    /// <summary>
+    /// Вспомогательный класс для правильной обработки асинхронных операций в RimWorld
+    /// Предотвращает fire-and-forget паттерн и обеспечивает централизованную обработку ошибок
+    /// </summary>
+    public static class AsyncHelper
+    {
+        /// <summary>
+        /// Выполняет асинхронную задачу с обработкой ошибок
+        /// </summary>
+        public static async Task RunAsync(Func<Task> taskFunc, string operationName = "Operation")
+        {
+            try
+            {
+                await taskFunc();
+            }
+            catch (OperationCanceledException)
+            {
+                Log.Message($"[AI Images] {operationName} was cancelled");
+                Messages.Message($"{operationName} was cancelled", MessageTypeDefOf.RejectInput);
+            }
+            catch (Exception ex)
+            {
+                Log.Error($"[AI Images] Error in {operationName}: {ex.Message}\n{ex.StackTrace}");
+                Messages.Message(
+                    $"Error in {operationName}: {ex.Message}",
+                    MessageTypeDefOf.RejectInput
+                );
+            }
+        }
+
+        /// <summary>
+        /// Выполняет асинхронную задачу с обработкой ошибок и callback при успехе
+        /// </summary>
+        public static async Task RunAsync<T>(
+            Func<Task<T>> taskFunc,
+            Action<T> onSuccess,
+            string operationName = "Operation"
+        )
+        {
+            try
+            {
+                T result = await taskFunc();
+                onSuccess?.Invoke(result);
+            }
+            catch (OperationCanceledException)
+            {
+                Log.Message($"[AI Images] {operationName} was cancelled");
+                Messages.Message($"{operationName} was cancelled", MessageTypeDefOf.RejectInput);
+            }
+            catch (Exception ex)
+            {
+                Log.Error($"[AI Images] Error in {operationName}: {ex.Message}\n{ex.StackTrace}");
+                Messages.Message(
+                    $"Error in {operationName}: {ex.Message}",
+                    MessageTypeDefOf.RejectInput
+                );
+            }
+        }
+
+        /// <summary>
+        /// Выполняет асинхронную задачу с полным контролем: onSuccess, onError, onCancel
+        /// </summary>
+        public static async Task RunAsync<T>(
+            Func<Task<T>> taskFunc,
+            Action<T> onSuccess,
+            Action<Exception> onError = null,
+            Action onCancel = null,
+            string operationName = "Operation"
+        )
+        {
+            try
+            {
+                T result = await taskFunc();
+                onSuccess?.Invoke(result);
+            }
+            catch (OperationCanceledException)
+            {
+                Log.Message($"[AI Images] {operationName} was cancelled");
+
+                if (onCancel != null)
+                {
+                    onCancel();
+                }
+                else
+                {
+                    Messages.Message(
+                        $"{operationName} was cancelled",
+                        MessageTypeDefOf.RejectInput
+                    );
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error($"[AI Images] Error in {operationName}: {ex.Message}\n{ex.StackTrace}");
+
+                if (onError != null)
+                {
+                    onError(ex);
+                }
+                else
+                {
+                    Messages.Message(
+                        $"Error in {operationName}: {ex.Message}",
+                        MessageTypeDefOf.RejectInput
+                    );
+                }
+            }
+        }
+
+        /// <summary>
+        /// Безопасно выполняет Task без ожидания результата, с логированием ошибок
+        /// Используется когда нужен fire-and-forget, но с обработкой ошибок
+        /// </summary>
+        public static void FireAndForget(Task task, string operationName = "Background operation")
+        {
+            if (task == null)
+                return;
+
+            task.ContinueWith(
+                t =>
+                {
+                    if (t.IsFaulted && t.Exception != null)
+                    {
+                        var ex = t.Exception.GetBaseException();
+                        Log.Error(
+                            $"[AI Images] Error in {operationName}: {ex.Message}\n{ex.StackTrace}"
+                        );
+                    }
+                    else if (t.IsCanceled)
+                    {
+                        Log.Message($"[AI Images] {operationName} was cancelled");
+                    }
+                },
+                TaskScheduler.Default
+            );
+        }
+    }
+}