Class QpServerOptions add virtual method 'CreateServer'.

aaasoft · aaasoft · commit 23528c955079 · 2023-03-04T11:35:43.000+08:00
diff --git a/QpTestClient/QuickConnectForm.cs b/QpTestClient/QuickConnectForm.cs
@@ -59,7 +59,7 @@ private void btnOk_Click(object sender, EventArgs e)
             ConnectionInfo = new TestConnectionInfo()
             {
                 Name = name,
-                QpClientTypeName = options.GetQpClientType().FullName,
+                QpClientTypeName = options.CreateClient().GetType().FullName,
                 QpClientOptions = options
             };
             DialogResult = DialogResult.OK;
diff --git a/Quick.Protocol.Pipeline/QpPipelineClientOptions.cs b/Quick.Protocol.Pipeline/QpPipelineClientOptions.cs
@@ -24,8 +24,11 @@ public override void Check()
                 throw new ArgumentNullException(nameof(PipeName));
         }
 
-        public override Type GetQpClientType() => typeof(QpPipelineClient);
-        
+        public override QpClient CreateClient()
+        {
+            return new QpPipelineClient(this);
+        }
+
         protected override void LoadFromUri(Uri uri)
         {
             ServerName =uri.Host;
diff --git a/Quick.Protocol.Pipeline/QpPipelineServerOptions.cs b/Quick.Protocol.Pipeline/QpPipelineServerOptions.cs
@@ -14,5 +14,10 @@ public override void Check()
             if (string.IsNullOrEmpty(PipeName))
                 throw new ArgumentNullException(nameof(PipeName));
         }
+
+        public override QpServer CreateServer()
+        {
+            return new QpPipelineServer(this);
+        }
     }
 }
diff --git a/Quick.Protocol.SerialPort/QpSerialPortClientOptions.cs b/Quick.Protocol.SerialPort/QpSerialPortClientOptions.cs
@@ -47,8 +47,11 @@ public override void Check()
                 throw new ArgumentNullException(nameof(PortName));
         }
 
-        public override Type GetQpClientType() => typeof(QpSerialPortClient);
-        
+        public override QpClient CreateClient()
+        {
+            return new QpSerialPortClient(this);
+        }
+
         protected override void LoadFromUri(Uri uri)
         {
             PortName = uri.Host;
diff --git a/Quick.Protocol.SerialPort/QpSerialPortServerOptions.cs b/Quick.Protocol.SerialPort/QpSerialPortServerOptions.cs
@@ -5,7 +5,7 @@
 
 namespace Quick.Protocol.SerialPort
 {
-    public class QpSerialPortServerOptions: QpServerOptions
+    public class QpSerialPortServerOptions : QpServerOptions
     {
         /// <summary>
         /// 端口名称
@@ -34,5 +34,10 @@ public override void Check()
             if (string.IsNullOrEmpty(PortName))
                 throw new ArgumentNullException(nameof(PortName));
         }
+
+        public override QpServer CreateServer()
+        {
+            return new QpSerialPortServer(this);
+        }
     }
 }
diff --git a/Quick.Protocol.Tcp/QpTcpClientOptions.cs b/Quick.Protocol.Tcp/QpTcpClientOptions.cs
@@ -42,7 +42,10 @@ public override void Check()
                 throw new ArgumentException("Port must between 0 and 65535", nameof(Port));
         }
 
-        public override Type GetQpClientType() => typeof(QpTcpClient);
+        public override QpClient CreateClient()
+        {
+            return new QpTcpClient(this);
+        }
 
         protected override void LoadFromUri(Uri uri)
         {
diff --git a/Quick.Protocol.Tcp/QpTcpServerOptions.cs b/Quick.Protocol.Tcp/QpTcpServerOptions.cs
@@ -26,5 +26,10 @@ public override void Check()
             if (Port < 0 || Port > 65535)
                 throw new ArgumentException("Port must between 0 and 65535", nameof(Port));
         }
+
+        public override QpServer CreateServer()
+        {
+            return new QpTcpServer(this);
+        }
     }
 }
diff --git a/Quick.Protocol.Udp/QpUdpClientOptions.cs b/Quick.Protocol.Udp/QpUdpClientOptions.cs
@@ -42,7 +42,10 @@ public override void Check()
                 throw new ArgumentException("Port must between 0 and 65535", nameof(Port));
         }
 
-        public override Type GetQpClientType() => typeof(QpUdpClient);
+        public override QpClient CreateClient()
+        {
+            return new QpUdpClient(this);
+        }
 
         protected override void LoadFromUri(Uri uri)
         {
diff --git a/Quick.Protocol.Udp/QpUdpServerOptions.cs b/Quick.Protocol.Udp/QpUdpServerOptions.cs
@@ -26,5 +26,10 @@ public override void Check()
             if (Port < 0 || Port > 65535)
                 throw new ArgumentException("Port must between 0 and 65535", nameof(Port));
         }
+
+        public override QpServer CreateServer()
+        {
+            return new QpUdpServer(this);
+        }
     }
 }
diff --git a/Quick.Protocol.WebSocket.Client/QpWebSocketClientOptions.cs b/Quick.Protocol.WebSocket.Client/QpWebSocketClientOptions.cs
@@ -26,7 +26,10 @@ public override void Check()
                 throw new ArgumentException("Url must start with qp.ws:// or qp.wss://", nameof(Url));
         }
 
-        public override Type GetQpClientType() => typeof(QpWebSocketClient);
+        public override QpClient CreateClient()
+        {
+            return new QpWebSocketClient(this);
+        }
 
         protected override void LoadFromUri(Uri uri)
         {
diff --git a/Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServerOptions.cs b/Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServerOptions.cs
@@ -30,5 +30,10 @@ public string Path
                 _Path = "/" + value;
             }
         }
+
+        public override QpServer CreateServer()
+        {
+            return new QpWebSocketServer(this);
+        }
     }
 }
diff --git a/Quick.Protocol/QpClientOptions.cs b/Quick.Protocol/QpClientOptions.cs
@@ -57,18 +57,13 @@ public void Init()
             InternalEncrypt = false;
         }
 
-        /// <summary>
-        /// 获取客户端类型
-        /// </summary>
-        /// <returns></returns>
-        public abstract Type GetQpClientType();
         /// <summary>
         /// 创建客户端实例
         /// </summary>
         /// <returns></returns>
         public virtual QpClient CreateClient()
         {
-            return (QpClient)Activator.CreateInstance(GetQpClientType(), new object[] { this });
+            throw new NotImplementedException();
         }
 
         protected virtual void LoadFromUri(Uri uri)
diff --git a/Quick.Protocol/QpServerOptions.cs b/Quick.Protocol/QpServerOptions.cs
@@ -6,7 +6,7 @@
 
 namespace Quick.Protocol
 {
-    public class QpServerOptions : QpChannelOptions
+    public abstract class QpServerOptions : QpChannelOptions
     {
         /// <summary>
         /// 缓存大小(默认128KB)
@@ -27,6 +27,15 @@ public class QpServerOptions : QpChannelOptions
         [JsonIgnore]
         public Action<Stream,ArraySegment<byte>> ProtocolErrorHandler { get; set; }
 
+        /// <summary>
+        /// 创建客户端实例
+        /// </summary>
+        /// <returns></returns>
+        public virtual QpServer CreateServer()
+        {
+            throw new NotImplementedException();
+        }
+
         public virtual QpServerOptions Clone()
         {
             var ret = JsonConvert.DeserializeObject<QpServerOptions>(JsonConvert.SerializeObject(this));
diff --git a/Quick.Protocol/Streams/QpStreamClientOptions.cs b/Quick.Protocol/Streams/QpStreamClientOptions.cs
@@ -9,14 +9,14 @@ public class QpStreamClientOptions : QpClientOptions
     {
         public Stream BaseStream { get; set; }
 
-        public override Type GetQpClientType()
+        public override QpClient CreateClient()
         {
-            return typeof(QpStreamClient);
+            return new QpStreamClient(this);
         }
 
         protected override string ToUriBasic(HashSet<string> ignorePropertyNames)
         {
-            return "stream://" + BaseStream.GetType().Name;
+            return "qp.stream://" + BaseStream.GetType().Name;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ private void btnOk_Click(object sender, EventArgs e)`
`59`	`59`	`ConnectionInfo = new TestConnectionInfo()`
`60`	`60`	`{`
`61`	`61`	`Name = name,`
`62`		`- QpClientTypeName = options.GetQpClientType().FullName,`
	`62`	`+ QpClientTypeName = options.CreateClient().GetType().FullName,`
`63`	`63`	`QpClientOptions = options`
`64`	`64`	`};`
`65`	`65`	`DialogResult = DialogResult.OK;`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,11 @@ public override void Check()`
`24`	`24`	`throw new ArgumentNullException(nameof(PipeName));`
`25`	`25`	`}`
`26`	`26`
`27`		`- public override Type GetQpClientType() => typeof(QpPipelineClient);`
`28`		`-`
	`27`	`+ public override QpClient CreateClient()`
	`28`	`+ {`
	`29`	`+ return new QpPipelineClient(this);`
	`30`	`+ }`
	`31`	`+`
`29`	`32`	`protected override void LoadFromUri(Uri uri)`
`30`	`33`	`{`
`31`	`34`	`ServerName =uri.Host;`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,10 @@ public override void Check()`
`14`	`14`	`if (string.IsNullOrEmpty(PipeName))`
`15`	`15`	`throw new ArgumentNullException(nameof(PipeName));`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+ public override QpServer CreateServer()`
	`19`	`+ {`
	`20`	`+ return new QpPipelineServer(this);`
	`21`	`+ }`
`17`	`22`	`}`
`18`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,11 @@ public override void Check()`
`47`	`47`	`throw new ArgumentNullException(nameof(PortName));`
`48`	`48`	`}`
`49`	`49`
`50`		`- public override Type GetQpClientType() => typeof(QpSerialPortClient);`
`51`		`-`
	`50`	`+ public override QpClient CreateClient()`
	`51`	`+ {`
	`52`	`+ return new QpSerialPortClient(this);`
	`53`	`+ }`
	`54`	`+`
`52`	`55`	`protected override void LoadFromUri(Uri uri)`
`53`	`56`	`{`
`54`	`57`	`PortName = uri.Host;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Quick.Protocol.SerialPort`
`7`	`7`	`{`
`8`		`- public class QpSerialPortServerOptions: QpServerOptions`
	`8`	`+ public class QpSerialPortServerOptions : QpServerOptions`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// 端口名称`
`@@ -34,5 +34,10 @@ public override void Check()`
`34`	`34`	`if (string.IsNullOrEmpty(PortName))`
`35`	`35`	`throw new ArgumentNullException(nameof(PortName));`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+ public override QpServer CreateServer()`
	`39`	`+ {`
	`40`	`+ return new QpSerialPortServer(this);`
	`41`	`+ }`
`37`	`42`	`}`
`38`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,10 @@ public override void Check()`
`42`	`42`	`throw new ArgumentException("Port must between 0 and 65535", nameof(Port));`
`43`	`43`	`}`
`44`	`44`
`45`		`- public override Type GetQpClientType() => typeof(QpTcpClient);`
	`45`	`+ public override QpClient CreateClient()`
	`46`	`+ {`
	`47`	`+ return new QpTcpClient(this);`
	`48`	`+ }`
`46`	`49`
`47`	`50`	`protected override void LoadFromUri(Uri uri)`
`48`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,10 @@ public override void Check()`
`26`	`26`	`if (Port < 0 \|\| Port > 65535)`
`27`	`27`	`throw new ArgumentException("Port must between 0 and 65535", nameof(Port));`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ public override QpServer CreateServer()`
	`31`	`+ {`
	`32`	`+ return new QpTcpServer(this);`
	`33`	`+ }`
`29`	`34`	`}`
`30`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,10 @@ public override void Check()`
`26`	`26`	`throw new ArgumentException("Url must start with qp.ws:// or qp.wss://", nameof(Url));`
`27`	`27`	`}`
`28`	`28`
`29`		`- public override Type GetQpClientType() => typeof(QpWebSocketClient);`
	`29`	`+ public override QpClient CreateClient()`
	`30`	`+ {`
	`31`	`+ return new QpWebSocketClient(this);`
	`32`	`+ }`
`30`	`33`
`31`	`34`	`protected override void LoadFromUri(Uri uri)`
`32`	`35`	`{`