💾 Feat(Workflow, PluginServer): To ensure the workflow and the plugin server can receive the response of the plugin(functions).

Author: StardustSeemsInk

KitX Clients/KitX Core/KitX.Core/Device/PluginsServer.cs

@@ -85,10 +85,17 @@ public class PluginsServer : IPluginServer
     /// </summary>
     public event EventHandler<PluginUnregisteredEventArgs>? PluginUnregistered;
 
+    /// <summary>
+    /// Event raised when a plugin sends a response (has RequestId)
+    /// </summary>
+    public event EventHandler<PluginResponseEventArgs>? PluginResponse;
+
     /// <summary>
     /// Private constructor
     /// </summary>
-    private PluginsServer() { }
+    private PluginsServer()
+    {
+    }
 
     /// <summary>
     /// Initializes the server
@@ -116,6 +123,17 @@ public IPluginServer Run()
 
         _status = ServerStatus.Starting;
 
+        // Initialize RealPluginManager when server starts, so it can receive plugin messages
+        try
+        {
+            _ = new KitX.Core.Workflow.RealPluginManager(this);
+            Log.Information("[PluginsServer] RealPluginManager initialized for message handling");
+        }
+        catch (Exception ex)
+        {
+            Log.Warning(ex, "[PluginsServer] Failed to initialize RealPluginManager");
+        }
+
         const int maxRetries = 5;
         const int startPort = 7777;
         int currentPort = startPort;
@@ -224,13 +242,21 @@ public IPluginServer Run()
                             Log.Warning(ex, "Error handling plugin message");
                         }
 
+                        Log.Information($"[PluginsServer] Invoking PluginMessageReceived event for connection {connectionId}");
                         PluginMessageReceived?.Invoke(this, new PluginMessageReceivedEventArgs
                         {
                             ConnectionId = connectionId,
                             Message = message
                         });
                     };
 
+                    // Forward PluginResponse events from PluginConnection to PluginsServer.PluginResponse
+                    connection.PluginResponse += (sender, args) =>
+                    {
+                        Log.Information($"[PluginsServer] Forwarding PluginResponse event, RequestId: {args.RequestId}");
+                        PluginResponse?.Invoke(this, args);
+                    };
+
                     connection.Initialize();
 
                     PluginConnected?.Invoke(this, new PluginConnectedEventArgs

KitX Clients/KitX Core/KitX.Core/Workflow/RealPluginManager.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Kscript.CSharp.Parser.Core;
 using Kscript.CSharp.Parser.Models;
+using KitX.Core.Contract.Plugin;
 using KitX.Core.Device;
 using KitX.Shared.CSharp.Plugin;
 using KitX.Shared.CSharp.WebCommand;
@@ -49,6 +50,38 @@ public RealPluginManager(PluginsServer pluginsServer)
 
         // 订阅插件消息接收事件以处理响应
         _pluginsServer.PluginMessageReceived += OnPluginMessageReceived;
+
+        // 订阅插件响应事件（当插件返回带RequestId的响应时触发）
+        _pluginsServer.PluginResponse += OnPluginResponse;
+    }
+
+    /// <summary>
+    /// 处理插件响应事件
+    /// </summary>
+    private void OnPluginResponse(object? sender, PluginResponseEventArgs e)
+    {
+        try
+        {
+            Log.Information($"[RealPluginManager] OnPluginResponse called with RequestId: {e.RequestId}");
+
+            if (_pendingResponses.TryRemove(e.RequestId, out var tcs))
+            {
+                var command = JsonSerializer.Deserialize<Command>(e.Content, _serializerOptions);
+                var responseBody = command.BodyLength > 0
+                    ? Encoding.UTF8.GetString(command.Body.AsSpan(0, command.BodyLength))
+                    : string.Empty;
+                Log.Information($"[RealPluginManager] Setting result from PluginResponse: {responseBody}");
+                tcs.SetResult(responseBody);
+            }
+            else
+            {
+                Log.Warning($"[RealPluginManager] RequestId {e.RequestId} not found in pending responses");
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Warning(ex, "[RealPluginManager] Error handling plugin response");
+        }
     }
 
     /// <summary>
@@ -58,22 +91,36 @@ private void OnPluginMessageReceived(object? sender, PluginMessageReceivedEventA
     {
         try
         {
+            Log.Information($"[RealPluginManager] OnPluginMessageReceived called with message: {e.Message?.Substring(0, Math.Min(200, e.Message?.Length ?? 0))}...");
+
             var kwc = JsonSerializer.Deserialize<Request>(e.Message, _serializerOptions);
-            if (kwc?.Content is null) return;
+            if (kwc?.Content is null)
+            {
+                Log.Information($"[RealPluginManager] kwc or kwc.Content is null");
+                return;
+            }
+
+            Log.Information($"[RealPluginManager] kwc.Content: {kwc.Content.Substring(0, Math.Min(100, kwc.Content.Length))}...");
 
             var command = JsonSerializer.Deserialize<Command>(kwc.Content, _serializerOptions);
             if (command.Request is null) return; // Command is a struct, check if Request is empty
 
             // 检查是否是响应消息
             if (command.Tags != null && command.Tags.TryGetValue("RequestId", out var requestId))
             {
+                Log.Information($"[RealPluginManager] Found RequestId: {requestId}");
                 if (_pendingResponses.TryRemove(requestId, out var tcs))
                 {
                     var responseBody = command.BodyLength > 0
                         ? Encoding.UTF8.GetString(command.Body.AsSpan(0, command.BodyLength))
                         : string.Empty;
+                    Log.Information($"[RealPluginManager] Setting result: {responseBody}");
                     tcs.SetResult(responseBody);
                 }
+                else
+                {
+                    Log.Warning($"[RealPluginManager] RequestId {requestId} not found in pending responses");
+                }
             }
         }
         catch (Exception ex)
@@ -178,10 +225,24 @@ private async Task<string> CallAsync(PluginCallInfo callInfo)
 
             Log.Information($"[RealPluginManager] Sent request to {callInfo.PluginName}.{callInfo.MethodName}, RequestId: {requestId}");
 
-            // 注意: Loader 在处理 ReceiveCommand 后不会返回响应
-            // 对于 void 方法，我们直接返回空结果
-            // 对于有返回值的方法，需要插件支持返回响应（当前不支持）
-            return string.Empty;
+            // 等待插件响应，设置超时
+            using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30));
+            try
+            {
+                return await tcs.Task.WaitAsync(cts.Token);
+            }
+            catch (TimeoutException)
+            {
+                Log.Warning($"[RealPluginManager] Request {requestId} timed out");
+                _pendingResponses.TryRemove(requestId, out _);
+                throw new TimeoutException($"Plugin call timed out: {callInfo.PluginName}.{callInfo.MethodName}");
+            }
+            catch (OperationCanceledException)
+            {
+                Log.Warning($"[RealPluginManager] Request {requestId} was cancelled");
+                _pendingResponses.TryRemove(requestId, out _);
+                throw;
+            }
         }
         catch (Exception ex)
         {

KitX Clients/KitX Core/KitX.Core/Workflow/WorkflowScriptService.cs

@@ -49,9 +49,25 @@ public class WorkflowScriptService : IWorkflowService
     private List<PluginInfo> _availablePlugins { get; set; } = new();
 
     /// <summary>
-    /// Private constructor
+    /// Private constructor - initializes RealPluginManager immediately
     /// </summary>
-    private WorkflowScriptService() { }
+    private WorkflowScriptService()
+    {
+        // Pre-initialize RealPluginManager to ensure it subscribes to plugin events
+        // This must be done at startup, not when first script is executed
+        try
+        {
+            var pluginsServer = PluginsServer.Instance;
+            var realPluginManager = new RealPluginManager(pluginsServer);
+            Parser.SetPluginManager(realPluginManager);
+            _isParserInitialized = true;
+            Log.Information("[WorkflowScriptService] Real plugin manager pre-initialized at startup");
+        }
+        catch (Exception ex)
+        {
+            Log.Warning(ex, "[WorkflowScriptService] Failed to pre-initialize RealPluginManager, will retry on first script execution");
+        }
+    }
 
     /// <summary>
     /// Gets the script engine, creating it if necessary