Remove reflection invoke.

aaasoft · aaasoft · commit ace601bdbfca · 2023-12-04T15:36:26.000+08:00
diff --git a/Quick.Protocol.Pipeline/QpPipelineClient.cs b/Quick.Protocol.Pipeline/QpPipelineClient.cs
@@ -12,7 +12,7 @@ namespace Quick.Protocol.Pipeline
     [DisplayName("命名管道")]
     public class QpPipelineClient : QpClient
     {
-        private QpPipelineClientOptions options;
+        private readonly QpPipelineClientOptions options;
         private NamedPipeClientStream pipeClientStream;
         public QpPipelineClient(QpPipelineClientOptions options) : base(options)
         {
diff --git a/Quick.Protocol.SerialPort/QpSerialPortClientOptions.cs b/Quick.Protocol.SerialPort/QpSerialPortClientOptions.cs
@@ -57,6 +57,28 @@ public override QpClient CreateClient()
             return new QpSerialPortClient(this);
         }
 
+        protected override void LoadFromQueryString(string key, string value)
+        {
+            switch (key)
+            {
+                case nameof(BaudRate):
+                    BaudRate = int.Parse(value);
+                    break;
+                case nameof(Parity):
+                    Parity = Enum.Parse<Parity>(value);
+                    break;
+                case nameof(DataBits):
+                    DataBits = int.Parse(value);
+                    break;
+                case nameof(StopBits):
+                    StopBits = Enum.Parse<StopBits>(value);
+                    break;
+                default:
+                    base.LoadFromQueryString(key, value);
+                    break;
+            }
+        }
+
         protected override void LoadFromUri(Uri uri)
         {
             PortName = uri.Host;
diff --git a/Quick.Protocol.Tcp/QpTcpClient.cs b/Quick.Protocol.Tcp/QpTcpClient.cs
@@ -15,7 +15,7 @@ namespace Quick.Protocol.Tcp
     public class QpTcpClient : QpClient
     {
         private TcpClient tcpClient;
-        private QpTcpClientOptions options;
+        private readonly QpTcpClientOptions options;
 
         public QpTcpClient(QpTcpClientOptions options) : base(options)
         {
@@ -27,10 +27,10 @@ protected override async Task<Stream> InnerConnectAsync()
             if (tcpClient != null)
                 Close();
             //开始连接
-            if (string.IsNullOrEmpty(options.LocalHost))
-                tcpClient = new TcpClient();
+            if (!string.IsNullOrEmpty(options.LocalHost) && options.LocalPort != null)
+                tcpClient = new TcpClient(new IPEndPoint(IPAddress.Parse(options.LocalHost), options.LocalPort.Value));
             else
-                tcpClient = new TcpClient(new IPEndPoint(IPAddress.Parse(options.LocalHost), options.LocalPort));
+                tcpClient = new TcpClient();
 
             CancellationTokenSource cts = new CancellationTokenSource();
             var connectTask = tcpClient.ConnectAsync(Dns.GetHostAddresses(options.Host), options.Port, cts.Token).AsTask();
diff --git a/Quick.Protocol.Tcp/QpTcpClientOptions.cs b/Quick.Protocol.Tcp/QpTcpClientOptions.cs
@@ -37,7 +37,7 @@ public class QpTcpClientOptions : QpClientOptions
         /// </summary>
         [DisplayName("本地端口")]
         [Category("高级")]
-        public int LocalPort { get; set; } = 0;
+        public int? LocalPort { get; set; }
 
         public override void Check()
         {
@@ -53,6 +53,22 @@ public override QpClient CreateClient()
             return new QpTcpClient(this);
         }
 
+        protected override void LoadFromQueryString(string key, string value)
+        {
+            switch (key)
+            {
+                case nameof(LocalHost):
+                    LocalHost = value;
+                    break;
+                case nameof(LocalPort):
+                    LocalPort = int.Parse(value);
+                    break;
+                default:
+                    base.LoadFromQueryString(key, value);
+                    break;
+            }
+        }
+
         protected override void LoadFromUri(Uri uri)
         {
             Host = uri.Host;
diff --git a/Quick.Protocol/QpChannel.cs b/Quick.Protocol/QpChannel.cs
@@ -12,6 +12,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Text.Json.Serialization;
+using System.Collections.ObjectModel;
 
 namespace Quick.Protocol
 {
@@ -33,8 +34,8 @@ public abstract class QpChannel
         /// <summary>
         /// 心跳包
         /// </summary>
-        private static byte[] HEARTBEAT_PACKAGHE = new byte[] { 0, 0, 0, 5, 0 };
-        private static ArraySegment<byte> nullArraySegment = new ArraySegment<byte>();
+        private static readonly byte[] HEARTBEAT_PACKAGHE = new byte[] { 0, 0, 0, 5, 0 };
+        private static readonly ArraySegment<byte> nullArraySegment = new ArraySegment<byte>();
         //接收缓存
         private byte[] recvBuffer;
         private byte[] recvBuffer2;
@@ -43,26 +44,26 @@ public abstract class QpChannel
         private byte[] sendBuffer2;
 
         private Stream QpPackageHandler_Stream;
-        private QpChannelOptions options;
+        private readonly QpChannelOptions options;
         private DateTime lastSendPackageTime = DateTime.MinValue;
 
-        private byte[] passwordMd5Buffer;
-        private ICryptoTransform enc;
-        private ICryptoTransform dec;
-        private Encoding encoding = Encoding.UTF8;
+        private readonly byte[] passwordMd5Buffer;
+        private readonly ICryptoTransform enc;
+        private readonly ICryptoTransform dec;
+        private readonly Encoding encoding = Encoding.UTF8;
 
         private Task sendPackageTask = Task.CompletedTask;
         //发送包锁对象
-        private object SEND_PACKAGE_LOCK_OBJ = new object();
+        private readonly object SEND_PACKAGE_LOCK_OBJ = new object();
         //断开连接锁对象
-        private object DISCONNECT_LOCK_OBJ = new object();
+        private readonly object DISCONNECT_LOCK_OBJ = new object();
 
-        private Dictionary<Type, JsonSerializerContext> typeSerializerContextDict = new Dictionary<Type, JsonSerializerContext>();
-        private Dictionary<string, Type> commandRequestTypeDict = new Dictionary<string, Type>();
-        private Dictionary<string, Type> commandResponseTypeDict = new Dictionary<string, Type>();
-        private Dictionary<Type, Type> commandRequestTypeResponseTypeDict = new Dictionary<Type, Type>();
+        private readonly Dictionary<Type, JsonSerializerContext> typeSerializerContextDict = new Dictionary<Type, JsonSerializerContext>();
+        private readonly Dictionary<string, Type> commandRequestTypeDict = new Dictionary<string, Type>();
+        private readonly Dictionary<string, Type> commandResponseTypeDict = new Dictionary<string, Type>();
+        private readonly Dictionary<Type, Type> commandRequestTypeResponseTypeDict = new Dictionary<Type, Type>();
 
-        private ConcurrentDictionary<string, CommandContext> commandDict = new ConcurrentDictionary<string, CommandContext>();
+        private readonly ConcurrentDictionary<string, CommandContext> commandDict = new ConcurrentDictionary<string, CommandContext>();
 
         private bool _IsConnected = false;
         /// <summary>
@@ -94,7 +95,7 @@ protected set
         public string AuthenticateQuestion { get; protected set; }
 
         //长整型数字的一半，统计大于这个数时，统计计数归零，防止溢出
-        private long LONG_HALF_MAX_VALUE = long.MaxValue / 2;
+        private readonly long LONG_HALF_MAX_VALUE = long.MaxValue / 2;
         /// <summary>
         /// 总共接收到的字节数量
         /// </summary>
@@ -217,7 +218,7 @@ private JsonSerializerContext getTypeSerializerContext(Type type)
         /// </summary>
         public object Tag { get; set; }
 
-        private Dictionary<string, Type> noticeTypeDict = new Dictionary<string, Type>();
+        private readonly Dictionary<string, Type> noticeTypeDict = new Dictionary<string, Type>();
 
         public QpChannel(QpChannelOptions options)
         {
@@ -295,7 +296,7 @@ protected virtual void OnReadError(Exception exception)
         }
 
         //获取空闲的缓存
-        private byte[] getFreeBuffer(byte[] usingBuffer, params byte[][] bufferArray)
+        private static byte[] getFreeBuffer(byte[] usingBuffer, params byte[][] bufferArray)
         {
             foreach (var buffer in bufferArray)
             {
@@ -374,7 +375,7 @@ await writeTask
             await stream.FlushAsync().ConfigureAwait(false);
         }
 
-        private void writePackageTotalLengthToBuffer(byte[] buffer, int offset, int packageTotalLength)
+        private static void writePackageTotalLengthToBuffer(byte[] buffer, int offset, int packageTotalLength)
         {
             //构造包头
             var ret = BitConverter.GetBytes(packageTotalLength);
diff --git a/Quick.Protocol/QpClientOptions.cs b/Quick.Protocol/QpClientOptions.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Reflection;
 using System.Text;
@@ -67,47 +68,46 @@ public virtual QpClient CreateClient()
             throw new NotImplementedException();
         }
 
+        protected virtual void LoadFromQueryString(string key, string value)
+        {
+            switch (key)
+            {
+                case nameof(ConnectionTimeout):
+                    ConnectionTimeout = int.Parse(value);
+                    break;
+                case nameof(EnableCompress):
+                    EnableCompress = bool.Parse(value);
+                    break;
+                case nameof(EnableEncrypt):
+                    EnableEncrypt = bool.Parse(value);
+                    break;
+                case nameof(EnableNetstat):
+                    EnableNetstat = bool.Parse(value);
+                    break;
+                case nameof(MaxPackageSize):
+                    MaxPackageSize = int.Parse(value);
+                    break;
+                case nameof(Password):
+                    Password = value;
+                    break;
+                case nameof(RaiseNoticePackageReceivedEvent):
+                    RaiseNoticePackageReceivedEvent = bool.Parse(value);
+                    break;
+                case nameof(TransportTimeout):
+                    TransportTimeout = int.Parse(value);
+                    break;
+            }
+        }
+
         protected virtual void LoadFromUri(Uri uri)
         {
             if (string.IsNullOrEmpty(uri.Query))
                 return;
             var queryString = System.Web.HttpUtility.ParseQueryString(uri.Query);
-            var type = this.GetType();
             foreach (var key in queryString.AllKeys)
             {
-                var pi = type.GetProperty(key);
-                if (pi == null)
-                    continue;
-                var propertyType = pi.PropertyType;
-                var stringValue = queryString[key];
-                object propertyValue = stringValue;
-                if (propertyType == typeof(bool))
-                    propertyValue = Convert.ToBoolean(stringValue);
-                else if (propertyType == typeof(byte))
-                    propertyValue = Convert.ToByte(stringValue);
-                else if (propertyType == typeof(sbyte))
-                    propertyValue = Convert.ToSByte(stringValue);
-                else if (propertyType == typeof(short))
-                    propertyValue = Convert.ToInt16(stringValue);
-                else if (propertyType == typeof(ushort))
-                    propertyValue = Convert.ToUInt16(stringValue);
-                else if (propertyType == typeof(int))
-                    propertyValue = Convert.ToInt32(stringValue);
-                else if (propertyType == typeof(uint))
-                    propertyValue = Convert.ToUInt32(stringValue);
-                else if (propertyType == typeof(long))
-                    propertyValue = Convert.ToInt64(stringValue);
-                else if (propertyType == typeof(ulong))
-                    propertyValue = Convert.ToUInt64(stringValue);
-                else if (propertyType == typeof(float))
-                    propertyValue = Convert.ToSingle(stringValue);
-                else if (propertyType == typeof(double))
-                    propertyValue = Convert.ToDouble(stringValue);
-                else if (propertyType == typeof(decimal))
-                    propertyValue = Convert.ToDecimal(stringValue);
-                else if (propertyType == typeof(DateTime))
-                    propertyValue = Convert.ToDateTime(stringValue);
-                pi.SetValue(this, propertyValue);
+                var value = queryString[key];
+                LoadFromQueryString(key, value);
             }
         }
 
@@ -118,14 +118,13 @@ public Uri ToUri(bool includePassword = false, bool includeOtherProperty = false
             HashSet<string> ignorePropertyNames = new HashSet<string>();
             ignorePropertyNames.Add(nameof(HeartBeatInterval));
             if (!includePassword)
-                ignorePropertyNames.Add(nameof(Password));
-
+                ignorePropertyNames.Add(nameof(Password));            
             string baseUrl = ToUriBasic(ignorePropertyNames);
             if (includePassword || includeOtherProperty)
             {
                 StringBuilder sb = new StringBuilder(baseUrl);
                 int currentIndex = 0;
-                var jObj = JsonNode.Parse(JsonSerializer.Serialize(this,this.GetType(), GetJsonSerializerContext())).AsObject();
+                var jObj = JsonNode.Parse(JsonSerializer.Serialize(this, GetType(), GetJsonSerializerContext())).AsObject();
                 foreach (var property in jObj)
                 {
                     var key = property.Key;
@@ -134,12 +133,14 @@ public Uri ToUri(bool includePassword = false, bool includeOtherProperty = false
                     if (!includeOtherProperty && key != nameof(Password))
                         continue;
                     if (currentIndex == 0)
-                        sb.Append("?");
+                        sb.Append('?');
                     if (currentIndex > 0)
-                        sb.Append("&");
+                        sb.Append('&');
                     currentIndex++;
 
-                    var value = property.Value.ToString();
+                    var value = property.Value?.ToString();
+                    if (string.IsNullOrEmpty(value))
+                        continue;
                     value = System.Web.HttpUtility.UrlEncode(value);
                     sb.Append($"{key}={value}");
                 }
@@ -151,7 +152,7 @@ public Uri ToUri(bool includePassword = false, bool includeOtherProperty = false
 
         public override string ToString() => ToUri().ToString();
 
-        private static Dictionary<string, Func<QpClientOptions>> schemaQpClientOptionsFactoryDict = new Dictionary<string, Func<QpClientOptions>>();
+        private static readonly Dictionary<string, Func<QpClientOptions>> schemaQpClientOptionsFactoryDict = new Dictionary<string, Func<QpClientOptions>>();
 
         public static void RegisterUriSchema(string schema, Func<QpClientOptions> optionsFactory)
         {
diff --git a/Quick.Protocol/QpCommandInfo.cs b/Quick.Protocol/QpCommandInfo.cs
@@ -48,12 +48,12 @@ public class QpCommandInfo
         [DisplayName("响应示例")]
         [ReadOnly(true)]
         public string ResponseTypeSchemaSample { get; set; }
-        private JsonSerializerContext jsonSerializerContext;
+        private readonly JsonSerializerContext jsonSerializerContext;
         public JsonSerializerContext GetJsonSerializerContext() => jsonSerializerContext;
 
-        private Type requestType;
+        private readonly Type requestType;
 
-        private Type responseType;
+        private readonly Type responseType;
 
         public QpCommandInfo() { }
         public QpCommandInfo(string name, string description,
diff --git a/Quick.Protocol/QpNoticeInfo.cs b/Quick.Protocol/QpNoticeInfo.cs
@@ -14,7 +14,7 @@ namespace Quick.Protocol
     /// </summary>
     public class QpNoticeInfo
     {
-        private Type noticeType;
+        private readonly Type noticeType;
 
         /// <summary>
         /// 名称
@@ -35,7 +35,7 @@ public class QpNoticeInfo
         [ReadOnly(true)]
         public string NoticeTypeName { get; set; }
 
-        private JsonSerializerContext jsonSerializerContext;
+        private readonly JsonSerializerContext jsonSerializerContext;
         public JsonSerializerContext GetJsonSerializerContext() => jsonSerializerContext;
         
         public QpNoticeInfo() { }
diff --git a/Quick.Protocol/QpServerChannel.cs b/Quick.Protocol/QpServerChannel.cs
@@ -11,14 +11,14 @@ namespace Quick.Protocol
 {
     public class QpServerChannel : QpChannel
     {
-        private Stream stream;
-        private CancellationTokenSource cts;
-        private QpServerOptions options;
-        private string channelName;
+        private readonly Stream stream;
+        private readonly CancellationTokenSource cts;
+        private readonly QpServerOptions options;
+        private readonly string channelName;
         //通过认证后，才允许使用的命令执行管理器列表
-        private List<CommandExecuterManager> authedCommandExecuterManagerList = null;
+        private readonly List<CommandExecuterManager> authedCommandExecuterManagerList = null;
         //通过认证后，才允许使用的通知处理器管理器列表
-        private List<NoticeHandlerManager> authedNoticeHandlerManagerList = null;
+        private readonly List<NoticeHandlerManager> authedNoticeHandlerManagerList = null;
 
         public override string ChannelName => channelName;
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Quick.Protocol.Pipeline`
`12`	`12`	`[DisplayName("命名管道")]`
`13`	`13`	`public class QpPipelineClient : QpClient`
`14`	`14`	`{`
`15`		`- private QpPipelineClientOptions options;`
	`15`	`+ private readonly QpPipelineClientOptions options;`
`16`	`16`	`private NamedPipeClientStream pipeClientStream;`
`17`	`17`	`public QpPipelineClient(QpPipelineClientOptions options) : base(options)`
`18`	`18`	`{`