Add Notice handler feature.

aaasoft · aaasoft · commit 7b2f00cea4fb · 2022-04-08T09:32:44.000+08:00
diff --git a/Quick.Protocol/CommandExecuterManager.cs b/Quick.Protocol/CommandExecuterManager.cs
@@ -10,11 +10,6 @@ public class CommandExecuterManager
     {
         private Dictionary<string, Delegate> commandExecuterDict = new Dictionary<string, Delegate>();
 
-        public CommandExecuterManager()
-        {
-
-        }
-
         /// <summary>
         /// 获取全部注册的命令请求类型名称
         /// </summary>
diff --git a/Quick.Protocol/NoticeHandlerManager.cs b/Quick.Protocol/NoticeHandlerManager.cs
@@ -0,0 +1,55 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Quick.Protocol
+{
+    public class NoticeHandlerManager
+    {
+        private Dictionary<string, Delegate> noticeHandlerDict = new Dictionary<string, Delegate>();
+
+        /// <summary>
+        /// 获取全部注册的通知类型名称
+        /// </summary>
+        public string[] GetRegisterNoticeTypeNames() => noticeHandlerDict.Keys.ToArray();
+
+        public void Register(string noticeTypeName, Delegate noticeHandler)
+        {
+            noticeHandlerDict[noticeTypeName] = noticeHandler;
+        }
+
+        public void Register<TNotice>(Action<QpChannel, TNotice> noticeHandler)
+            where TNotice : class, new()
+        {
+            var noticeTypeName = typeof(TNotice).FullName;
+            Register(noticeTypeName, noticeHandler);
+        }
+
+
+        /// <summary>
+        /// 处理通知
+        /// </summary>
+        /// <param name="handler"></param>
+        /// <param name="noticeTypeName"></param>
+        /// <param name="noticeModel"></param>
+        /// <returns></returns>
+        public virtual void HandleNotice(QpChannel handler, string noticeTypeName, object noticeModel)
+        {
+            if (!CanHandleNoticed(noticeTypeName))
+                return;
+            Delegate noticeHandler = noticeHandlerDict[noticeTypeName];
+            noticeHandler.DynamicInvoke(new object[] { handler, noticeModel });
+        }
+
+        /// <summary>
+        /// 能否处理指定类型的通知
+        /// </summary>
+        /// <param name="noticeTypeName"></param>
+        /// <returns></returns>
+        public virtual bool CanHandleNoticed(string noticeTypeName)
+        {
+            return noticeHandlerDict.ContainsKey(noticeTypeName);
+        }
+    }
+}
diff --git a/Quick.Protocol/QpChannel.cs b/Quick.Protocol/QpChannel.cs
@@ -707,18 +707,32 @@ protected void OnRawNoticePackageReceived(string typeName, string content)
                 TypeName = typeName,
                 Content = content
             });
+            //如果在字典中未找到此类型名称，则直接返回
+            if (!noticeTypeDict.ContainsKey(typeName))
+                return;
+            var contentModel = JsonConvert.DeserializeObject(content, noticeTypeDict[typeName]);
+
+            //处理通知
+            var hasNoticeHandler = false;
+            if (options.NoticeHandlerManagerList != null)
+                foreach (var noticeHandlerManager in options.NoticeHandlerManagerList)
+                {
+                    if (noticeHandlerManager.CanHandleNoticed(typeName))
+                    {
+                        hasNoticeHandler = true;
+                        noticeHandlerManager.HandleNotice(this, typeName, contentModel);
+                        break;
+                    }
+                }
 
             //如果配置了触发NoticePackageReceived事件
             if (options.RaiseNoticePackageReceivedEvent)
-            {
-                //如果在字典中未找到此类型名称，则直接返回
-                if (!noticeTypeDict.ContainsKey(typeName))
-                    return;
-                var contentModel = JsonConvert.DeserializeObject(content, noticeTypeDict[typeName]);
+            {                
                 NoticePackageReceived?.Invoke(this, new NoticePackageReceivedEventArgs()
                 {
                     TypeName = typeName,
-                    ContentModel = contentModel
+                    ContentModel = contentModel,
+                    Handled = hasNoticeHandler
                 });
             }
         }
diff --git a/Quick.Protocol/QpChannelOptions.cs b/Quick.Protocol/QpChannelOptions.cs
@@ -85,6 +85,12 @@ public virtual void Check()
         [Browsable(false)]
         [JsonIgnore]
         public List<CommandExecuterManager> CommandExecuterManagerList { get; set; } = new List<CommandExecuterManager>();
+        /// <summary>
+        /// 通知处理器管理器列表
+        /// </summary>
+        [Browsable(false)]
+        [JsonIgnore]
+        public List<NoticeHandlerManager> NoticeHandlerManagerList { get; set; } = new List<NoticeHandlerManager>();
 
         // <summary>
         // 注册指令执行器管理器
@@ -93,5 +99,14 @@ public void RegisterCommandExecuterManager(CommandExecuterManager commandExecute
         {
             CommandExecuterManagerList.Add(commandExecuterManager);
         }
+
+        /// <summary>
+        /// 注册通知处理器管理器
+        /// </summary>
+        /// <param name="noticeHandlerManager"></param>
+        public void RegisterNoticeHandlerManager(NoticeHandlerManager noticeHandlerManager)
+        {
+            NoticeHandlerManagerList.Add(noticeHandlerManager);
+        }
     }
 }
diff --git a/Quick.Protocol/QpEventArgs.cs b/Quick.Protocol/QpEventArgs.cs
@@ -36,6 +36,10 @@ public class NoticePackageReceivedEventArgs : QpEventArgs
         /// 内容模型
         /// </summary>
         public object ContentModel { get; set; }
+        /// <summary>
+        /// 是否已处理
+        /// </summary>
+        public bool Handled { get; set; }
     }
 
     /// <summary>
diff --git a/Quick.Protocol/QpServerChannel.cs b/Quick.Protocol/QpServerChannel.cs
@@ -19,7 +19,8 @@ public class QpServerChannel : QpChannel
         private string question;
         //通过认证后，才允许使用的命令执行管理器列表
         private List<CommandExecuterManager> authedCommandExecuterManagerList = null;
-
+        //通过认证后，才允许使用的通知处理器管理器列表
+        private List<NoticeHandlerManager> authedNoticeHandlerManagerList = null;
         public string ChannelName { get; private set; }
 
         /// <summary>
@@ -38,6 +39,8 @@ public QpServerChannel(QpServer server, Stream stream, string channelName, Cance
             this.ChannelName = channelName;
             this.options = options;
             this.authedCommandExecuterManagerList = options.CommandExecuterManagerList;
+            this.authedNoticeHandlerManagerList = options.NoticeHandlerManagerList;
+
             cts = new CancellationTokenSource();
             cancellationToken.Register(() => Stop());
             //修改缓存大小
@@ -50,6 +53,7 @@ public QpServerChannel(QpServer server, Stream stream, string channelName, Cance
             connectAndAuthCommandExecuterManager.Register(new Commands.HandShake.Request(), handShake);
             connectAndAuthCommandExecuterManager.Register(new Commands.GetQpInstructions.Request(), getQpInstructions);
             options.CommandExecuterManagerList = new List<CommandExecuterManager>() { connectAndAuthCommandExecuterManager };
+            options.NoticeHandlerManagerList = null;
 
             InitQpPackageHandler_Stream(stream);
             //开始读取其他数据包
@@ -117,6 +121,7 @@ private Commands.Authenticate.Response authenticate(QpChannel handler, Commands.
         private Commands.HandShake.Response handShake(QpChannel handler, Commands.HandShake.Request request)
         {
             options.CommandExecuterManagerList.AddRange(authedCommandExecuterManagerList);
+            options.NoticeHandlerManagerList = authedNoticeHandlerManagerList;
             options.InternalCompress = request.EnableCompress;
             options.InternalEncrypt = request.EnableEncrypt;
             options.InternalTransportTimeout = request.TransportTimeout;
diff --git a/Quick.Protocol/QpServerOptions.cs b/Quick.Protocol/QpServerOptions.cs
@@ -32,6 +32,7 @@ public virtual QpServerOptions Clone()
             var ret = JsonConvert.DeserializeObject<QpServerOptions>(JsonConvert.SerializeObject(this));
             ret.InstructionSet = InstructionSet;
             ret.CommandExecuterManagerList = CommandExecuterManagerList;
+            ret.NoticeHandlerManagerList = NoticeHandlerManagerList;
             ret.ProtocolErrorHandler = ProtocolErrorHandler;
             return ret;
         }
diff --git a/Test/Tcp/TcpServer/Program.cs b/Test/Tcp/TcpServer/Program.cs
@@ -34,7 +34,7 @@ static void Main(string[] args)
     </head>
     <body>
         <p>Welcome to use <b>Quick.Protocol</b>.</p>
-        <p>Source Code:<a href=""http://github.com/aaasoft/Quick.Protocol"">http://github.com/aaasoft/Quick.Protocol</a></p>
+        <p>Source Code:<a href=""https://github.com/QuickProtocol"">https://github.com/QuickProtocol</a></p>
         <p>Time:{DateTime.Now}</p>
     </body>
 </html>";

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public virtual QpServerOptions Clone()`
`32`	`32`	`var ret = JsonConvert.DeserializeObject<QpServerOptions>(JsonConvert.SerializeObject(this));`
`33`	`33`	`ret.InstructionSet = InstructionSet;`
`34`	`34`	`ret.CommandExecuterManagerList = CommandExecuterManagerList;`
	`35`	`+ ret.NoticeHandlerManagerList = NoticeHandlerManagerList;`
`35`	`36`	`ret.ProtocolErrorHandler = ProtocolErrorHandler;`
`36`	`37`	`return ret;`
`37`	`38`	`}`