diff --git a/Library/Api/IFlowEnvironment.cs b/Library/Api/IFlowEnvironment.cs index 1d83946..c98293f 100644 --- a/Library/Api/IFlowEnvironment.cs +++ b/Library/Api/IFlowEnvironment.cs @@ -45,7 +45,7 @@ namespace Serein.Library.Api /// 环境中流程起始节点发生了改变 /// /// - public delegate void StartNodeChangeHandler(StartNodeChangeEventArgs eventArgs); + public delegate void StartNodeChangeHandler(StartNodeChangeEventArgs eventArgs); #endregion #region 环境事件签名 @@ -211,19 +211,134 @@ namespace Serein.Library.Api } #endregion + + /// + /// 被监视的对象改变事件 + /// + /// + public delegate void MonitorObjectChangeHandler(MonitorObjectEventArgs eventArgs); + /// + /// 节点中断状态改变事件（开启了中断/取消了中断） + /// + /// + public delegate void NodeInterruptStateChangeHandler(NodeInterruptStateChangeEventArgs eventArgs); + /// + /// 节点触发中断事件 + /// + /// + public delegate void NodeInterruptTriggerHandler(NodeInterruptTriggerEventArgs eventArgs); + + /// + /// 监视的节点数据发生变化 + /// + public class MonitorObjectEventArgs : FlowEventArgs + { + public MonitorObjectEventArgs(string nodeGuid,object newData) + { + NodeGuid = nodeGuid; + NewData = newData; + } + + /// + /// 中断的节点Guid + /// + public string NodeGuid { get; protected set; } + + /// + /// 新的数据 + /// + public object NewData { get; protected set; } + } + + /// + /// 节点中断状态改变事件参数 + /// + public class NodeInterruptStateChangeEventArgs : FlowEventArgs + { + public NodeInterruptStateChangeEventArgs(string nodeGuid,InterruptClass @class) + { + NodeGuid = nodeGuid; + Class = @class; + } + + /// + /// 中断的节点Guid + /// + public string NodeGuid { get; protected set; } + public InterruptClass Class { get; protected set; } + } + /// + /// 节点触发了中断事件参数 + /// + public class NodeInterruptTriggerEventArgs : FlowEventArgs + { + public NodeInterruptTriggerEventArgs(string nodeGuid) + { + NodeGuid = nodeGuid; + } + + /// + /// 中断的节点Guid + /// + public string NodeGuid { get; protected set; } + } + public interface IFlowEnvironment { ChannelFlowInterrupt ChannelFlowInterrupt { get; set; } - event FlowRunCompleteHandler OnFlowRunComplete; - event ProjectLoadedHandler OnProjectLoaded; + /// + /// 加载Dll + /// event LoadDLLHandler OnDllLoad; + + /// + /// 项目加载完成 + /// + event ProjectLoadedHandler OnProjectLoaded; + + /// + /// 节点连接属性改变事件 + /// event NodeConnectChangeHandler OnNodeConnectChange; + + /// + /// 节点创建事件 + /// event NodeCreateHandler OnNodeCreate; + + /// + /// 移除节点事件 + /// event NodeRemoteHandler OnNodeRemote; + + /// + /// 起始节点变化事件 + /// event StartNodeChangeHandler OnStartNodeChange; + /// + /// 流程运行完成事件 + /// + event FlowRunCompleteHandler OnFlowRunComplete; + + /// + /// 被监视的对象改变事件 + /// + event MonitorObjectChangeHandler OnMonitorObjectChange; + + /// + /// 节点中断状态变化事件 + /// + event NodeInterruptStateChangeHandler OnNodeInterruptStateChange; + + /// + /// 节点触发中断 + /// + event NodeInterruptTriggerHandler OnNodeInterruptTrigger; + + /// /// 保存当前项目 /// @@ -252,6 +367,7 @@ namespace Serein.Library.Api /// bool TryGetMethodDetails(string methodName,out MethodDetails md); + /// /// 开始运行 /// @@ -261,6 +377,8 @@ namespace Serein.Library.Api /// void Exit(); + + /// /// 设置流程起点节点 /// @@ -293,6 +411,27 @@ namespace Serein.Library.Api void RemoteNode(string nodeGuid); - } + /// + /// 设置节点中断级别 + /// + /// 被中断的节点Guid + /// 新的中断级别 + /// + bool NodeInterruptChange(string nodeGuid,InterruptClass interruptClass); + /// + /// /// + /// 设置节点数据监视状态 + /// + /// 需要监视的节点Guid + /// 是否监视 + void SetNodeFLowDataMonitorState(string nodeGuid, bool isMonitor); + + /// + /// 节点数据更新通知 + /// + /// + void FlowDataUpdateNotification(string nodeGuid, object flowData); + + } } diff --git a/Library/Api/ISereinIoc.cs b/Library/Api/ISereinIoc.cs index 83c3f9d..f58169c 100644 --- a/Library/Api/ISereinIoc.cs +++ b/Library/Api/ISereinIoc.cs @@ -32,6 +32,9 @@ namespace Serein.Library.Api object Get(string name); void CustomRegisterInstance(string name, object instance, bool needInjectProperty = true); + ISereinIOC Run(string name, Action action); + + /// /// 创建目标类型的对象， 并注入依赖项 /// diff --git a/Library/Entity/NodeDebugSetting.cs b/Library/Entity/NodeDebugSetting.cs index c605267..9008fb7 100644 --- a/Library/Entity/NodeDebugSetting.cs +++ b/Library/Entity/NodeDebugSetting.cs @@ -12,14 +12,17 @@ namespace Serein.Library.Entity public bool IsEnable { get; set; } = true; /// - /// 是否中断（调试中断功能） + /// 是否监视数据改变 /// - public bool IsInterrupt { get; set; } = false; + public bool IsMonitorFlowData { get; set; } = false; /// /// 中断级别，暂时停止继续执行后继分支。 /// public InterruptClass InterruptClass { get; set; } = InterruptClass.None; + + + public List InterruptExpression { get; } = new List(); } /// @@ -32,15 +35,15 @@ namespace Serein.Library.Entity /// None, /// - /// 分支中断，当前节点。 + /// 分支中断，中断进入当前节点的分支。 /// Branch, /// - /// 分组中断，相同中断分组的节点。 + /// 分组中断，中断进入指定节点分组的分支。（暂未实现相关） /// Group, /// - /// 全局中断，其它所有节点。 + /// 全局中断，中断全局所有节点的运行。（暂未实现相关） /// Global, } diff --git a/Library/Utils/SereinIoc.cs b/Library/Utils/SereinIoc.cs index 03c238a..21c1479 100644 --- a/Library/Utils/SereinIoc.cs +++ b/Library/Utils/SereinIoc.cs @@ -366,6 +366,27 @@ namespace Serein.Library.Utils #endregion #region run() + public ISereinIOC Run(string name, Action action) + { + var obj = Get(name); + if (obj != null) + { + if(obj is T service) + { + try + { + action(service); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + } + } + return this; + } + + public ISereinIOC Run(Action action) { var service = GetOrRegisterInstantiate(); diff --git a/Library/Web/WebServer.cs b/Library/Web/WebServer.cs index 436461e..fa34465 100644 --- a/Library/Web/WebServer.cs +++ b/Library/Web/WebServer.cs @@ -123,8 +123,16 @@ namespace Serein.Library.Web // 停止服务器 public void Stop() { - listener?.Stop(); // 停止监听 - listener?.Close(); // 关闭监听器 + + try + { + listener?.Stop(); // 停止监听 + listener?.Close(); // 关闭监听器 + } + catch (Exception EX) + { + Console.WriteLine(EX); + } } } diff --git a/NodeFlow/Base/NodeModelBaseData.cs b/NodeFlow/Base/NodeModelBaseData.cs index 4623382..06ef4ad 100644 --- a/NodeFlow/Base/NodeModelBaseData.cs +++ b/NodeFlow/Base/NodeModelBaseData.cs @@ -81,7 +81,7 @@ namespace Serein.NodeFlow.Base /// /// 当前传递数据（执行了节点对应的方法，才会存在值） /// - public object? FlowData { get; set; } = null; + protected object? FlowData { get; set; } = null; } diff --git a/NodeFlow/Base/NodeModelBaseFunc.cs b/NodeFlow/Base/NodeModelBaseFunc.cs index 208e698..06f4035 100644 --- a/NodeFlow/Base/NodeModelBaseFunc.cs +++ b/NodeFlow/Base/NodeModelBaseFunc.cs @@ -8,6 +8,7 @@ using Serein.NodeFlow.Tool.SereinExpression; using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; @@ -34,7 +35,6 @@ namespace Serein.NodeFlow.Base public void Interrupt() { this.DebugSetting.InterruptClass = InterruptClass.Branch; - this.DebugSetting.IsInterrupt = true; } /// @@ -43,7 +43,6 @@ namespace Serein.NodeFlow.Base public void CancelInterrupt() { this.DebugSetting.InterruptClass = InterruptClass.None; - this.DebugSetting.IsInterrupt = false; CancelInterruptCallback?.Invoke(); CancelInterruptCallback = null; } @@ -106,93 +105,64 @@ namespace Serein.NodeFlow.Base /// public async Task StartExecute(IDynamicContext context) { - CancellationTokenSource cts = null; - try + Stack stack = new Stack(); + stack.Push(this); + var cts = context.SereinIoc.Get(FlowStarter.FlipFlopCtsName); + while (stack.Count > 0 && !cts.IsCancellationRequested) // 循环中直到栈为空才会退出循环 { - cts = context.SereinIoc.Get(FlowStarter.FlipFlopCtsName); + // 从栈中弹出一个节点作为当前节点进行处理 + var currentNode = stack.Pop(); - - Stack stack = new Stack(); - stack.Push(this); - while (stack.Count > 0 && !cts.IsCancellationRequested) // 循环中直到栈为空才会退出循环 + // 设置方法执行的对象 + if (currentNode.MethodDetails?.ActingInstance == null && currentNode.MethodDetails?.ActingInstanceType is not null) { - // 从栈中弹出一个节点作为当前节点进行处理 - var currentNode = stack.Pop(); - - // 设置方法执行的对象 - if (currentNode.MethodDetails?.ActingInstance == null && currentNode.MethodDetails?.ActingInstanceType is not null) - { - currentNode.MethodDetails.ActingInstance ??= context.SereinIoc.GetOrRegisterInstantiate(currentNode.MethodDetails.ActingInstanceType); - } - - #region 执行相关 - // 首先执行上游分支 -#if false - var upstreamNodes = currentNode.SuccessorNodes[ConnectionType.Upstream]; - for (int i = upstreamNodes.Count - 1; i >= 0; i--) - { - if (upstreamNodes[i].DebugSetting.IsEnable) // 排除未启用的上游节点 - { - upstreamNodes[i].PreviousNode = currentNode; - await upstreamNodes[i].StartExecute(context); // 执行流程节点的上游分支 - } - } -#endif - - currentNode.FlowData = await currentNode.ExecutingAsync(context); // 流程中正常执行 - #endregion - - #region 执行完成 - if (currentNode.NextOrientation == ConnectionType.None) break; // 不再执行 - - - // 选择后继分支 - var nextNodes = currentNode.SuccessorNodes[currentNode.NextOrientation]; - - // 将下一个节点集合中的所有节点逆序推入栈中 - for (int i = nextNodes.Count - 1; i >= 0; i--) - { - // 排除未启用的节点 - if (nextNodes[i].DebugSetting.IsEnable) - { - nextNodes[i].PreviousNode = currentNode; - stack.Push(nextNodes[i]); - } - } - #endregion + currentNode.MethodDetails.ActingInstance ??= context.SereinIoc.GetOrRegisterInstantiate(currentNode.MethodDetails.ActingInstanceType); } - } - finally - { - cts?.Dispose(); - } - } - public static bool TryCreateInterruptTask(IDynamicContext context, NodeModelBase currentNode, out Task? task) - { - bool haveTask; - Console.WriteLine($"[{currentNode.MethodDetails.MethodName}]在当前分支中断"); + #region 执行相关 - if (currentNode.DebugSetting.InterruptClass == InterruptClass.None) - { - haveTask = false; - task = null; - currentNode.DebugSetting.IsInterrupt = false; // 纠正设置 - } - else if (currentNode.DebugSetting.InterruptClass == InterruptClass.Branch) // 中断当前分支 - { - currentNode.DebugSetting.IsInterrupt = true; - haveTask = true; - task = context.FlowEnvironment.ChannelFlowInterrupt.CreateChannelWithTimeoutAsync(currentNode.Guid, TimeSpan.FromSeconds(60 * 30)); // 中断30分钟 - } - else - { - haveTask = false; - task = null; - } + // 首先执行上游分支 + var upstreamNodes = currentNode.SuccessorNodes[ConnectionType.Upstream]; + for (int i = upstreamNodes.Count - 1; i >= 0; i--) + { + if (upstreamNodes[i].DebugSetting.IsEnable) // 排除未启用的上游节点 + { + upstreamNodes[i].PreviousNode = currentNode; + var upNewFlowData = await upstreamNodes[i].ExecutingAsync(context); // 执行流程节点的上游分支 + await FlowRefreshDataOrInterrupt(context, upstreamNodes[i], upNewFlowData); // 执行上游分支后刷新上游节点数据 + } + } - return haveTask; + // 执行当前节点 + var newFlowData = await currentNode.ExecutingAsync(context); + await FlowRefreshDataOrInterrupt(context, currentNode, newFlowData); // 执行当前节点后刷新数据 + #endregion + + + #region 执行完成 + if (cts == null || cts.IsCancellationRequested || currentNode.NextOrientation == ConnectionType.None) + { + // 不再执行 + break; + } + + + // 选择后继分支 + var nextNodes = currentNode.SuccessorNodes[currentNode.NextOrientation]; + + // 将下一个节点集合中的所有节点逆序推入栈中 + for (int i = nextNodes.Count - 1; i >= 0; i--) + { + // 排除未启用的节点 + if (nextNodes[i].DebugSetting.IsEnable) + { + nextNodes[i].PreviousNode = currentNode; + stack.Push(nextNodes[i]); + } + } + #endregion + } } /// @@ -203,12 +173,11 @@ namespace Serein.NodeFlow.Base public virtual async Task ExecutingAsync(IDynamicContext context) { #region 调试中断 - if (DebugSetting.IsInterrupt && TryCreateInterruptTask(context, this, out Task? task)) // 执行节点前检查中断 + if (DebugSetting.InterruptClass != InterruptClass.None && TryCreateInterruptTask(context, this, out Task? task)) // 执行节点前检查中断 { string guid = this.Guid.ToString(); this.CancelInterruptCallback ??= () => context.FlowEnvironment.ChannelFlowInterrupt.TriggerSignal(guid); var cancelType = await task!; - task?.ToString(); await Console.Out.WriteLineAsync($"[{this.MethodDetails.MethodName}]中断已{(cancelType == CancelType.Manual ? "手动取消" : "自动取消")}，开始执行后继分支"); } @@ -223,7 +192,7 @@ namespace Serein.NodeFlow.Base try { // Action/Func([方法作用的实例],[可能的参数值],[可能的返回值]) - object?[]? parameters = GetParameters(context, md); + object?[]? parameters = GetParameters(context,this, md); object? result = (haveParameter, haveResult) switch { (false, false) => Execution((Action)del, instance), // 调用节点方法，返回null @@ -232,33 +201,6 @@ namespace Serein.NodeFlow.Base (true, true) => Execution((Func)del, instance, parameters), // 调用节点方法，获取入参参数，返回方法忏悔类型 }; - //object?[]? parameters; - //object? result = null; - //if ( haveParameter ) - //{ - // var data = GetParameters(context, md); - - // if (data[0] is Int32 count && count > 1) - // { - // } - // parameters = [instance, data]; - //} - //else - //{ - // parameters = [instance]; - //} - - //if (haveResult) - //{ - // result = del.DynamicInvoke(parameters); - //} - //else - //{ - // del.DynamicInvoke(parameters); - //} - - - NextOrientation = ConnectionType.IsSucceed; return result; } @@ -270,13 +212,6 @@ namespace Serein.NodeFlow.Base } } - /// - /// 执行等待触发器的方法 - /// - /// - /// 节点传回数据对象 - /// - #region 节点转换的委托类型 @@ -304,7 +239,7 @@ namespace Serein.NodeFlow.Base /// /// 获取对应的参数数组 /// - public object?[]? GetParameters(IDynamicContext context, MethodDetails md) + public static object?[]? GetParameters(IDynamicContext context, NodeModelBase nodeModel, MethodDetails md) { // 用正确的大小初始化参数数组 if (md.ExplicitDatas.Length == 0) @@ -313,7 +248,7 @@ namespace Serein.NodeFlow.Base } object?[]? parameters = new object[md.ExplicitDatas.Length]; - var flowData = PreviousNode?.FlowData; // 当前传递的数据 + var flowData = nodeModel.PreviousNode?.FlowData; // 当前传递的数据 var previousDataType = flowData?.GetType(); for (int i = 0; i < parameters.Length; i++) @@ -349,7 +284,7 @@ namespace Serein.NodeFlow.Base //Type t when t == previousDataType => inputParameter, // 上下文 Type t when t == typeof(IDynamicContext) => context, // 上下文 Type t when t == typeof(MethodDetails) => md, // 节点方法描述 - Type t when t == typeof(NodeModelBase) => this, // 节点实体类 + Type t when t == typeof(NodeModelBase) => nodeModel, // 节点实体类 Type t when t == typeof(Guid) => new Guid(inputParameter?.ToString()), Type t when t == typeof(DateTime) => DateTime.Parse(inputParameter?.ToString()), Type t when t == typeof(string) => inputParameter?.ToString(), @@ -387,6 +322,88 @@ namespace Serein.NodeFlow.Base return parameters; } + /// + /// 更新节点数据，并检查监视表达式 + /// + /// + public static async Task FlowRefreshDataOrInterrupt(IDynamicContext context , NodeModelBase nodeModel, object? newData = null) + { + string guid = nodeModel.Guid; + if (newData is not null) + { + // 判断是否存在表达式 + bool isInterrupt = false; + // 判断监视表达式 + for (int i = 0; i < nodeModel.DebugSetting.InterruptExpression.Count && !isInterrupt; i++) + { + string? exp = nodeModel.DebugSetting.InterruptExpression[i]; + isInterrupt = SereinConditionParser.To(newData, exp); + } + if (isInterrupt) // 触发中断 + { + nodeModel.Interrupt(); + if(TryCreateInterruptTask(context, nodeModel, out Task? task)) + { + + nodeModel.CancelInterruptCallback ??= () => context.FlowEnvironment.ChannelFlowInterrupt.TriggerSignal(guid); + var cancelType = await task!; + await Console.Out.WriteLineAsync($"[{nodeModel.MethodDetails.MethodName}]中断已{(cancelType == CancelType.Manual ? "手动取消" : "自动取消")}，开始执行后继分支"); + } + } + } + nodeModel.FlowData = newData; + // 节点是否监视了数据，如果是，调用环境接口触发其相关事件。 + if (nodeModel.DebugSetting.IsMonitorFlowData) + { + context.FlowEnvironment.FlowDataUpdateNotification(guid, newData); + } + } + + public static bool TryCreateInterruptTask(IDynamicContext context, NodeModelBase currentNode, out Task? task) + { + bool haveTask; + Console.WriteLine($"[{currentNode.MethodDetails.MethodName}]在当前分支中断"); + + if (currentNode.DebugSetting.InterruptClass == InterruptClass.None) + { + haveTask = false; + task = null; + } + else if (currentNode.DebugSetting.InterruptClass == InterruptClass.Branch) // 中断当前分支 + { + haveTask = true; + task = context.FlowEnvironment.ChannelFlowInterrupt.CreateChannelWithTimeoutAsync(currentNode.Guid, TimeSpan.FromSeconds(60 * 30)); // 中断30分钟 + } + else + { + haveTask = false; + task = null; + } + + return haveTask; + } + + + /// + /// 释放对象 + /// + public void ReleaseFlowData() + { + if (typeof(IDisposable).IsAssignableFrom(FlowData?.GetType()) && FlowData is IDisposable disposable) + { + disposable?.Dispose(); + } + this.FlowData = null; + } + + /// + /// 获取节点数据 + /// + /// + public object? GetFlowData() + { + return this.FlowData ; + } #endregion } diff --git a/NodeFlow/FlowEnvironment.cs b/NodeFlow/FlowEnvironment.cs index 0943fe0..5871b63 100644 --- a/NodeFlow/FlowEnvironment.cs +++ b/NodeFlow/FlowEnvironment.cs @@ -1,4 +1,5 @@  +using Newtonsoft.Json.Linq; using Serein.Library.Api; using Serein.Library.Attributes; using Serein.Library.Entity; @@ -90,10 +91,25 @@ namespace Serein.NodeFlow public event StartNodeChangeHandler OnStartNodeChange; /// - /// 流程运行完成时间 + /// 流程运行完成事件 /// public event FlowRunCompleteHandler OnFlowRunComplete; + /// + /// 被监视的对象改变事件 + /// + public event MonitorObjectChangeHandler OnMonitorObjectChange; + + /// + /// 节点中断状态改变事件 + /// + public event NodeInterruptStateChangeHandler OnNodeInterruptStateChange; + + /// + /// 节点触发了中断 + /// + public event NodeInterruptTriggerHandler OnNodeInterruptTrigger; + #endregion @@ -171,23 +187,25 @@ namespace Serein.NodeFlow { ChannelFlowInterrupt?.CancelAllTasks(); flowStarter = new FlowStarter(); - List flipflopNodes = Nodes.Values.Where(it => it.MethodDetails?.MethodDynamicType == NodeType.Flipflop && it.IsStart == false) - .Select(it => (SingleFlipflopNode)it) - .Where(node => node is SingleFlipflopNode flipflopNode && flipflopNode.NotExitPreviousNode()) - .ToList();// 获取需要再运行开始之前启动的触发器节点 - var runMethodDetailess = Nodes.Values.Select(item => item.MethodDetails).ToList(); // 获取环境中所有节点的方法信息 - var initMethods = MethodDetailss.Where(it => it.MethodDynamicType == NodeType.Init).ToList(); - var loadingMethods = MethodDetailss.Where(it => it.MethodDynamicType == NodeType.Loading).ToList(); - var exitMethods = MethodDetailss.Where(it => it.MethodDynamicType == NodeType.Exit).ToList(); + var nodes = Nodes.Values.ToList(); + + List initMethods; + List loadingMethods; + List exitMethods; + initMethods = MethodDetailss.Where(it => it.MethodDynamicType == NodeType.Init).ToList(); + loadingMethods = MethodDetailss.Where(it => it.MethodDynamicType == NodeType.Loading).ToList(); + exitMethods = MethodDetailss.Where(it => it.MethodDynamicType == NodeType.Exit).ToList(); + + await flowStarter.RunAsync(this, nodes, initMethods, loadingMethods, exitMethods); - await flowStarter.RunAsync(StartNode, - this, - runMethodDetailess, - initMethods, - loadingMethods, - exitMethods, - flipflopNodes); + //await flowStarter.RunAsync(StartNode, + // this, + // runMethodDetailess, + // initMethods, + // loadingMethods, + // exitMethods, + // flipflopNodes); if(flowStarter?.FlipFlopState == RunState.NoStart) { @@ -195,19 +213,24 @@ namespace Serein.NodeFlow } flowStarter = null; } + + /// + /// 退出 + /// public void Exit() { - foreach (var node in Nodes.Values) - { - if (typeof(IDisposable).IsAssignableFrom(node?.FlowData?.GetType()) && node.FlowData is IDisposable disposable) - { - disposable?.Dispose(); - } - node!.FlowData = null; - } - ChannelFlowInterrupt?.CancelAllTasks(); flowStarter?.Exit(); + + foreach (var node in Nodes.Values) + { + if(node is not null) + { + node.ReleaseFlowData(); // 退出时释放对象计数 + } + } + + OnFlowRunComplete?.Invoke(new FlowEventArgs()); GC.Collect(); @@ -443,20 +466,12 @@ namespace Serein.NodeFlow /// public void RemoteNode(string nodeGuid) { - if (!Nodes.TryGetValue(nodeGuid, out NodeModelBase? remoteNode)) - { - return; - } - if (remoteNode is null) - { - return; - } + NodeModelBase remoteNode = GuidToModel(nodeGuid); if (remoteNode.IsStart) { return; } - // 遍历所有父节点，从那些父节点中的子节点集合移除该节点 foreach (var pnc in remoteNode.PreviousNodes) { @@ -507,14 +522,8 @@ namespace Serein.NodeFlow public void ConnectNode(string fromNodeGuid, string toNodeGuid, ConnectionType connectionType) { // 获取起始节点与目标节点 - if (!Nodes.TryGetValue(fromNodeGuid, out NodeModelBase? fromNode) || !Nodes.TryGetValue(toNodeGuid, out NodeModelBase? toNode)) - { - return; - } - if (fromNode is null || toNode is null) - { - return; - } + NodeModelBase fromNode = GuidToModel(fromNodeGuid); + NodeModelBase toNode = GuidToModel(toNodeGuid); // 开始连接 ConnectNode(fromNode, toNode, connectionType); // 外部调用连接方法 @@ -530,14 +539,8 @@ namespace Serein.NodeFlow public void RemoteConnect(string fromNodeGuid, string toNodeGuid, ConnectionType connectionType) { // 获取起始节点与目标节点 - if (!Nodes.TryGetValue(fromNodeGuid, out NodeModelBase? fromNode) || !Nodes.TryGetValue(toNodeGuid, out NodeModelBase? toNode)) - { - return; - } - if (fromNode is null || toNode is null) - { - return; - } + NodeModelBase fromNode = GuidToModel(fromNodeGuid); + NodeModelBase toNode = GuidToModel(toNodeGuid); RemoteConnect(fromNode, toNode, connectionType); //fromNode.SuccessorNodes[connectionType].Remove(toNode); @@ -603,28 +606,83 @@ namespace Serein.NodeFlow /// public void SetStartNode(string newNodeGuid) { - if (string.IsNullOrEmpty(newNodeGuid)) - { - return; - } - if (Nodes.TryGetValue(newNodeGuid, out NodeModelBase? newStartNodeModel)) - { - if (newStartNodeModel != null) - { - SetStartNode(newStartNodeModel); - //var oldNodeGuid = ""; - //if(StartNode != null) - //{ - // oldNodeGuid = StartNode.Guid; - // StartNode.IsStart = false; - //} - //newStartNodeModel.IsStart = true; - //StartNode = newStartNodeModel; - //OnStartNodeChange?.Invoke(new StartNodeChangeEventArgs(oldNodeGuid, newNodeGuid)); - } - } + NodeModelBase newStartNodeModel = GuidToModel(newNodeGuid); + SetStartNode(newStartNodeModel); + + //if (string.IsNullOrEmpty(newNodeGuid)) + //{ + // return; + //} + //if (Nodes.TryGetValue(newNodeGuid, out NodeModelBase? newStartNodeModel)) + //{ + // if (newStartNodeModel != null) + // { + // SetStartNode(newStartNodeModel); + // //var oldNodeGuid = ""; + // //if(StartNode != null) + // //{ + // // oldNodeGuid = StartNode.Guid; + // // StartNode.IsStart = false; + // //} + // //newStartNodeModel.IsStart = true; + // //StartNode = newStartNodeModel; + // //OnStartNodeChange?.Invoke(new StartNodeChangeEventArgs(oldNodeGuid, newNodeGuid)); + // } + //} } + /// + /// 中断指定节点，并指定中断等级。 + /// + /// 被中断的目标节点Guid + /// 中断级别 + /// 操作是否成功 + public bool NodeInterruptChange(string nodeGuid, InterruptClass interruptClass) + { + NodeModelBase nodeModel = GuidToModel(nodeGuid); + nodeModel.DebugSetting.InterruptClass = interruptClass; + OnNodeInterruptStateChange.Invoke(new NodeInterruptStateChangeEventArgs(nodeGuid, interruptClass)); + return true; + + } + + /// + /// 监视节点的数据 + /// + /// 需要监视的节点Guid + public void SetNodeFLowDataMonitorState(string nodeGuid, bool isMonitor) + { + NodeModelBase nodeModel = GuidToModel(nodeGuid); + nodeModel.DebugSetting.IsMonitorFlowData = isMonitor; + } + + /// + /// 节点数据更新通知 + /// + /// + public void FlowDataUpdateNotification(string nodeGuid, object flowData) + { + OnMonitorObjectChange?.Invoke(new MonitorObjectEventArgs(nodeGuid, flowData)); + } + + /// + /// Guid 转 NodeModel + /// + /// 节点Guid + /// 节点Model + /// 无法获取节点、Guid/节点为null时报错 + private NodeModelBase GuidToModel(string nodeGuid) + { + if (string.IsNullOrEmpty(nodeGuid)) + { + throw new ArgumentNullException("not contains - Guid没有对应节点:" + (nodeGuid)); + } + if (!Nodes.TryGetValue(nodeGuid, out NodeModelBase? nodeModel) || nodeModel is null) + { + throw new ArgumentNullException("null - Guid存在对应节点,但节点为null:" + (nodeGuid)); + } + return nodeModel; + } #endregion #region 私有方法 diff --git a/NodeFlow/FlowStarter.cs b/NodeFlow/FlowStarter.cs index 7155807..9737f0a 100644 --- a/NodeFlow/FlowStarter.cs +++ b/NodeFlow/FlowStarter.cs @@ -8,6 +8,7 @@ using Serein.NodeFlow.Base; using Serein.NodeFlow.Model; using System.ComponentModel.Design; using System.Runtime.CompilerServices; +using System.Xml.Linq; using static Serein.Library.Utils.ChannelFlowInterrupt; namespace Serein.NodeFlow @@ -46,7 +47,7 @@ namespace Serein.NodeFlow /// /// 控制触发器 /// - + private CancellationTokenSource _flipFlopCts = null; public const string FlipFlopCtsName = "<>.FlowFlipFlopCts"; public bool IsStopStart = false; @@ -55,22 +56,18 @@ namespace Serein.NodeFlow /// public RunState FlowState { get; private set; } = RunState.NoStart; public RunState FlipFlopState { get; private set; } = RunState.NoStart; - /// /// 运行时的IOC容器 /// private ISereinIOC SereinIOC { get; } = null; - /// /// 结束运行时需要执行的方法 /// private Action ExitAction { get; set; } = null; - /// /// 运行的上下文 /// private IDynamicContext Context { get; set; } = null; - private void CheckStartState() { if (IsStopStart) @@ -81,30 +78,52 @@ namespace Serein.NodeFlow } + // + // 开始运行 + // + // 起始节点 + // 运行环境 + // 环境中已加载的所有节点方法 + // 触发器节点 + // + /// /// 开始运行 /// - /// 起始节点 /// 运行环境 - /// 环境中已加载的所有节点方法 - /// 触发器节点 + /// 环境中已加载的所有节点 + /// 初始化方法 + /// 加载时方法 + /// 结束时方法 /// - public async Task RunAsync(NodeModelBase startNode, - IFlowEnvironment env, - List runNodeMd, + public async Task RunAsync(IFlowEnvironment env, + List nodes, List initMethods, List loadingMethods, - List exitMethods, - List flipflopNodes) + List exitMethods) { FlowState = RunState.Running; // 开始运行 - - if (startNode == null) { + NodeModelBase? startNode = nodes.FirstOrDefault(node => node.IsStart); + if (startNode is null) { FlowState = RunState.Completion; // 不存在起点，退出流程 return; } + #region 获取所有触发器，以及已加载节点的方法信息 + List runNodeMd; + List flipflopNodes; + + flipflopNodes = nodes.Where(it => it.MethodDetails?.MethodDynamicType == NodeType.Flipflop && it.IsStart == false) + .Select(it => (SingleFlipflopNode)it) + .Where(node => node is SingleFlipflopNode flipflopNode && flipflopNode.NotExitPreviousNode()) + .ToList();// 获取需要再运行开始之前启动的触发器节点 + runNodeMd = nodes.Select(item => item.MethodDetails).ToList(); // 获取环境中所有节点的方法信息 + + + #endregion + + #region 选择运行环境的上下文 // 判断使用哪一种流程上下文 @@ -146,7 +165,7 @@ namespace Serein.NodeFlow IsStopStart = true; } } - CheckStartState(); + CheckStartState(); // 初始化IOC后检查状态 SereinIOC.Build(); // 流程启动前的初始化 @@ -161,12 +180,8 @@ namespace Serein.NodeFlow } } - CheckStartState(); + CheckStartState();// 调用节点初始化后检查状态 - //foreach (var md in flipflopNodes.Select(it => it.MethodDetails).ToArray()) - //{ - // md.ActingInstance = SereinIoc.GetOrCreateServiceInstance(md.ActingInstanceType); - //} #endregion #region 检查并修正初始化、加载时、退出时方法作用的对象，保证后续不会报错（已注释） @@ -204,7 +219,6 @@ namespace Serein.NodeFlow #region 设置流程退出时的回调函数 ExitAction = () => { - SereinIOC.Run(web => { web?.Stop(); }); @@ -214,23 +228,18 @@ namespace Serein.NodeFlow ((Action)md.MethodDelegate).Invoke(md.ActingInstance, [Context]); } - //if (Context != null && Context.NodeRunCts != null && !Context.NodeRunCts.IsCancellationRequested) - //{ - // Context.NodeRunCts.Cancel(); - //} - - //if (FlipFlopCts != null && !FlipFlopCts.IsCancellationRequested) - //{ - // FlipFlopCts?.Cancel(); - // FlipFlopCts?.Dispose(); - //} + if (_flipFlopCts != null && !_flipFlopCts.IsCancellationRequested) + { + _flipFlopCts?.Cancel(); + _flipFlopCts?.Dispose(); + } FlowState = RunState.Completion; FlipFlopState = RunState.Completion; }; #endregion #region 开始启动流程 - CancellationTokenSource FlipFlopCts = null; + try { @@ -238,8 +247,8 @@ namespace Serein.NodeFlow { FlipFlopState = RunState.Running; // 如果存在需要启动的触发器，则开始启动 - FlipFlopCts = new CancellationTokenSource(); - SereinIOC.CustomRegisterInstance(FlipFlopCtsName, FlipFlopCts,false); + _flipFlopCts = new CancellationTokenSource(); + SereinIOC.CustomRegisterInstance(FlipFlopCtsName, _flipFlopCts,false); // 使用 TaskCompletionSource 创建未启动的触发器任务 var tasks = flipflopNodes.Select(async node => @@ -250,15 +259,13 @@ namespace Serein.NodeFlow } await startNode.StartExecute(Context); // 开始运行时从起始节点开始运行 // 等待结束 - if(FlipFlopState == RunState.Running && FlipFlopCts is not null) + if(FlipFlopState == RunState.Running && _flipFlopCts is not null) { - while (!FlipFlopCts.IsCancellationRequested) + while (!_flipFlopCts.IsCancellationRequested) { await Task.Delay(100); } } - - //FlipFlopCts?.Dispose(); } catch (Exception ex) { @@ -266,7 +273,6 @@ namespace Serein.NodeFlow } finally { - FlipFlopCts?.Dispose(); FlowState = RunState.Completion; } #endregion @@ -290,72 +296,72 @@ namespace Serein.NodeFlow /// private async Task FlipflopExecute(IFlowEnvironment flowEnvironment,SingleFlipflopNode singleFlipFlopNode) { - CancellationTokenSource cts = null; var context = new DynamicContext(SereinIOC, flowEnvironment); // 启动全局触发器时新建上下文 - - MethodDetails md = singleFlipFlopNode.MethodDetails; - var del = md.MethodDelegate; - object?[]? parameters = singleFlipFlopNode.GetParameters(context, singleFlipFlopNode.MethodDetails); // 启动全局触发器时获取入参参数 - // 设置委托对象 - var func = md.ExplicitDatas.Length == 0 ? - (Func>)del : - (Func>)del; - - bool t = md.ExplicitDatas.Length == 0; try { - - - cts = Context.SereinIoc.Get(FlipFlopCtsName); - - while (!cts.IsCancellationRequested) + + while (!_flipFlopCts.IsCancellationRequested) { - - singleFlipFlopNode.FlowData = await singleFlipFlopNode.ExecutingAsync(context); + var newFlowData = await singleFlipFlopNode.ExecutingAsync(context); + await NodeModelBase.FlowRefreshDataOrInterrupt(context, singleFlipFlopNode, newFlowData); // 全局触发器触发后刷新该触发器的节点数据 if (singleFlipFlopNode.NextOrientation != ConnectionType.None) { var nextNodes = singleFlipFlopNode.SuccessorNodes[singleFlipFlopNode.NextOrientation]; - for (int i = nextNodes.Count - 1; i >= 0; i--) + for (int i = nextNodes.Count - 1; i >= 0 && !_flipFlopCts.IsCancellationRequested; i--) { if (nextNodes[i].DebugSetting.IsEnable) // 排除未启用的后继节点 { nextNodes[i].PreviousNode = singleFlipFlopNode; - await nextNodes[i].StartExecute(context); // 执行流程节点的后继分支 + await nextNodes[i].StartExecute(context); // 启动执行触发器后继分支的节点 } } } - //if(t) - //{ - // IFlipflopContext flipflopContext = await ((Func>)del.Clone()).Invoke(md.ActingInstance);// 开始等待全局触发器的触发 - // var connectionType = flipflopContext.State.ToContentType(); - // if (connectionType != ConnectionType.None) - // { - // await GlobalFlipflopExecute(context, singleFlipFlopNode, connectionType, cts); - // } - //} - //else - //{ - // IFlipflopContext flipflopContext = await ((Func>)del.Clone()).Invoke(md.ActingInstance, parameters);// 开始等待全局触发器的触发 - // var connectionType = flipflopContext.State.ToContentType(); - // if (connectionType != ConnectionType.None) - // { - // await GlobalFlipflopExecute(context, singleFlipFlopNode, connectionType, cts); - // } - //} - } } catch (Exception ex) { await Console.Out.WriteLineAsync(ex.ToString()); } - finally - { - cts?.Cancel(); - } + + + //MethodDetails md = singleFlipFlopNode.MethodDetails; + //var del = md.MethodDelegate; + //object?[]? parameters = singleFlipFlopNode.GetParameters(context, singleFlipFlopNode.MethodDetails); // 启动全局触发器时获取入参参数 + //// 设置委托对象 + //var func = md.ExplicitDatas.Length == 0 ? + // (Func>)del : + // (Func>)del; + + //if(t) + //{ + // IFlipflopContext flipflopContext = await ((Func>)del.Clone()).Invoke(md.ActingInstance);// 开始等待全局触发器的触发 + // var connectionType = flipflopContext.State.ToContentType(); + // if (connectionType != ConnectionType.None) + // { + // await GlobalFlipflopExecute(context, singleFlipFlopNode, connectionType, cts); + // } + //} + //else + //{ + // IFlipflopContext flipflopContext = await ((Func>)del.Clone()).Invoke(md.ActingInstance, parameters);// 开始等待全局触发器的触发 + // var connectionType = flipflopContext.State.ToContentType(); + // if (connectionType != ConnectionType.None) + // { + // await GlobalFlipflopExecute(context, singleFlipFlopNode, connectionType, cts); + // } + //} } + + public void Exit() + { + ExitAction?.Invoke(); + } + + +#if false + /// /// 全局触发器开始执行相关分支 /// @@ -364,9 +370,10 @@ namespace Serein.NodeFlow /// 分支类型 /// public async Task GlobalFlipflopExecute(IDynamicContext context, SingleFlipflopNode singleFlipFlopNode, - ConnectionType connectionType, CancellationTokenSource cts) + + ConnectionType connectionType, CancellationTokenSource cts) { - + bool skip = true; Stack stack = new Stack(); @@ -400,9 +407,9 @@ namespace Serein.NodeFlow else { currentNode.FlowData = await currentNode.ExecutingAsync(context); - - if (currentNode.NextOrientation == ConnectionType.None) + + if (currentNode.NextOrientation == ConnectionType.None) { break; // 不再执行 } @@ -418,13 +425,13 @@ namespace Serein.NodeFlow nextNodes[i].PreviousNode = currentNode; stack.Push(nextNodes[i]); } - } - } + }} +#endif - public void Exit() - { - ExitAction?.Invoke(); - } } } + + + + diff --git a/NodeFlow/Model/CompositeConditionNode.cs b/NodeFlow/Model/CompositeConditionNode.cs index 2aee3e8..4e02700 100644 --- a/NodeFlow/Model/CompositeConditionNode.cs +++ b/NodeFlow/Model/CompositeConditionNode.cs @@ -38,7 +38,7 @@ namespace Serein.NodeFlow.Model break; } } - return Task.FromResult( PreviousNode?.FlowData); + return Task.FromResult( PreviousNode?.GetFlowData()); } diff --git a/NodeFlow/Model/SingleConditionNode.cs b/NodeFlow/Model/SingleConditionNode.cs index 8f82ffe..ad258eb 100644 --- a/NodeFlow/Model/SingleConditionNode.cs +++ b/NodeFlow/Model/SingleConditionNode.cs @@ -39,7 +39,7 @@ namespace Serein.NodeFlow.Model } else { - result = PreviousNode?.FlowData; + result = PreviousNode?.GetFlowData(); } try { diff --git a/NodeFlow/Model/SingleExpOpNode.cs b/NodeFlow/Model/SingleExpOpNode.cs index 3faaaf5..048360b 100644 --- a/NodeFlow/Model/SingleExpOpNode.cs +++ b/NodeFlow/Model/SingleExpOpNode.cs @@ -21,7 +21,7 @@ namespace Serein.NodeFlow.Model //public override async Task Executing(IDynamicContext context) public override Task ExecutingAsync(IDynamicContext context) { - var data = PreviousNode?.FlowData; + var data = PreviousNode?.GetFlowData(); try { @@ -34,7 +34,7 @@ namespace Serein.NodeFlow.Model } else { - result = PreviousNode?.FlowData; + result = data; } NextOrientation = ConnectionType.IsSucceed; @@ -44,7 +44,7 @@ namespace Serein.NodeFlow.Model { NextOrientation = ConnectionType.IsError; RuningException = ex; - return Task.FromResult(PreviousNode?.FlowData); + return Task.FromResult(data); } } diff --git a/NodeFlow/Model/SingleFlipflopNode.cs b/NodeFlow/Model/SingleFlipflopNode.cs index 7ec4903..983905e 100644 --- a/NodeFlow/Model/SingleFlipflopNode.cs +++ b/NodeFlow/Model/SingleFlipflopNode.cs @@ -22,12 +22,11 @@ namespace Serein.NodeFlow.Model public override async Task ExecutingAsync(IDynamicContext context) { #region 执行前中断 - if (DebugSetting.IsInterrupt && TryCreateInterruptTask(context, this, out Task? task)) // 执行触发前 + if (DebugSetting.InterruptClass != InterruptClass.None && TryCreateInterruptTask(context, this, out Task? task)) // 执行触发前 { string guid = this.Guid.ToString(); this.CancelInterruptCallback ??= () => context.FlowEnvironment.ChannelFlowInterrupt.TriggerSignal(guid); var cancelType = await task!; - task?.ToString(); await Console.Out.WriteLineAsync($"[{this.MethodDetails.MethodName}]中断已{(cancelType == CancelType.Manual ? "手动取消" : "自动取消")}，开始执行后继分支"); } #endregion @@ -42,24 +41,9 @@ namespace Serein.NodeFlow.Model Task flipflopTask = md.ExplicitDatas.Length switch { 0 => ((Func>)del).Invoke(md.ActingInstance), - _ => ((Func>)del).Invoke(md.ActingInstance, GetParameters(context, md)), // 执行流程中的触发器方法时获取入参参数 + _ => ((Func>)del).Invoke(md.ActingInstance, GetParameters(context, this, md)), // 执行流程中的触发器方法时获取入参参数 }; - //object?[]? parameters; - //object? result = null; - //if (haveParameter) - //{ - // var data = GetParameters(context, md); - // parameters = [instance, data]; - //} - //else - //{ - // parameters = [instance]; - //} - //flipflopTask = del.DynamicInvoke(parameters) as Task; - //if (flipflopTask == null) - //{ - // throw new FlipflopException(base.MethodDetails.MethodName + "触发器返回值非 Task 类型"); - //} + IFlipflopContext flipflopContext = (await flipflopTask) ?? throw new FlipflopException("没有返回上下文"); NextOrientation = flipflopContext.State.ToContentType(); if(flipflopContext.TriggerData is null || flipflopContext.TriggerData.Type == Library.NodeFlow.Tool.TriggerType.Overtime) @@ -72,7 +56,7 @@ namespace Serein.NodeFlow.Model { NextOrientation = ConnectionType.None; RuningException = ex; - throw; + return null; } catch (Exception ex) { diff --git a/WorkBench/MainWindow.xaml b/WorkBench/MainWindow.xaml index 22992b3..89b2b62 100644 --- a/WorkBench/MainWindow.xaml +++ b/WorkBench/MainWindow.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Serein.WorkBench" xmlns:custom="clr-namespace:Serein.WorkBench.Node.View" + xmlns:themes="clr-namespace:Serein.WorkBench.Themes" Title="Dynamic Node Flow" Height="700" Width="1200" AllowDrop="True" Drop="Window_Drop" DragOver="Window_DragOver" Loaded="Window_Loaded" @@ -38,37 +39,26 @@ - - - +