优化部分crash问题,更新为 1.0.4

2.修复部分逻辑的crash问题
3.提升版本号为1.0.3

README.md

@@ -1,5 +1,18 @@
 # WebSocketTool
 
-#### 介绍
+## 介绍
 
-WebSocket测试工具
+WebSocket测试工具, 后续逐步增加功能。
+
+功能列表：
+
+ - [x] ws/wss链接发送消息 
+ - [x] 定时 ping
+
+
+## 版本
+
+### v1.0.4
+
+更新日志: 
+- 优化部分crash问题

WebSocketTool/Client/ClientViewModel.cs

@@ -1,9 +1,12 @@
 using System;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 using System.Timers;
 using log4net;
 using WebSocketSharp;
 using WebSocketTool.Base;
 using WebSocketTool.Util;
+using WebSocketTool.View.Dialog;
 using LogManager = log4net.LogManager;
 
 namespace WebSocketTool.Client
@@ -19,6 +22,7 @@ namespace WebSocketTool.Client
             this.view = view;
         }
 
+        #region data bingding 
         private string mWsUrl;
         public string WsUrl
         {
@@ -41,7 +45,7 @@ namespace WebSocketTool.Client
             }
         }
 
-        private long mPingTime = 1000;
+        private long mPingTime = 2000;
         public long PingTime
         {
             get => mPingTime;
@@ -52,33 +56,52 @@ namespace WebSocketTool.Client
             }
         }
 
-        public void Connect()
+        #region Proxy
+
+        private string proxyAddress;
+        private string proxyUserName;
+        private string proxyPassword;
+        
+        public string ProxyAddress
         {
-            if (string.IsNullOrEmpty(WsUrl))
+            get => proxyAddress;
+            set
             {
-                view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n 请输入正确的WebSocket地址");
-                return;
+                proxyAddress = value;
+                RaisePropertyChanged(nameof(ProxyAddress));
             }
-
-            if (mClient == null)
-            {
-                InitSocketClient();
-            }
-
-            if (mClient.IsAlive())
-            {
-                view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n WebSocket已连接,请先断开上次连接");
-                return;
-            }
-
-            view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n Start Connect Socket");
-            mClient.ConnectAsync();
         }
 
-        public void Send()
+        public string ProxyUserName
         {
-            view.AppendInfo($"You {TimeUtil.GetCurrentDateTime()} \n {SendContent}");
-            mClient.Send(SendContent);
+            get => proxyUserName;
+            set
+            {
+                proxyUserName = value;
+                RaisePropertyChanged(nameof(ProxyUserName));
+            }
+        }
+
+        public string ProxyPassword
+        {
+            get => proxyPassword;
+            set
+            {
+                proxyPassword = value;
+                RaisePropertyChanged(nameof(ProxyPassword));
+            }
+        }
+
+        private bool isProxyChecked;
+
+        public bool IsProxyChecked
+        {
+            get => isProxyChecked;
+            set
+            {
+                isProxyChecked = value;
+                RaisePropertyChanged(nameof(IsProxyChecked));
+            }
         }
 
         private bool mIsAlive = false;
@@ -126,11 +149,83 @@ namespace WebSocketTool.Client
                 RaisePropertyChanged(nameof(IsPingEnable));
             }
         }
+        #endregion
+        
+        #endregion
+
+        private string FormatInfo(string info, int type = 0)
+        {
+            var tag = "【Hint】";
+            switch (type)
+            {
+                case 1:
+                    tag = "【Client】==>【Server】";
+                    break;
+                case 2:
+                    tag = "【Client】<==【Server】";
+                    break;
+            }
+            return $"{tag} {TimeUtil.GetCurrentDateTime()} \n {info}";
+        }
+
+        public void Connect()
+        {
+            if (string.IsNullOrEmpty(WsUrl) || (!WsUrl.StartsWith("wss://") && !WsUrl.StartsWith("ws://")))
+            {
+                view.AppendInfo(FormatInfo("请输入正确的WebSocket地址"));
+                return;
+            }
+
+            if (mClient == null)
+            {
+                InitSocketClient();
+            }
+            
+            if (IsProxyChecked)
+            {
+                if (!string.IsNullOrEmpty(ProxyAddress))
+                {
+                    view.AppendInfo(FormatInfo($"设置代理地址：{ProxyAddress}"));
+                }
+                mClient?.SetHttpProxy(ProxyAddress, ProxyUserName, ProxyPassword);
+            }
+
+            if (mClient != null && mClient.IsAlive())
+            {
+                view.AppendInfo(FormatInfo("WebSocket已连接,请先断开"));
+                return;
+            }
+
+            if (IsProxyChecked)
+            {
+                if (!string.IsNullOrEmpty(ProxyAddress))
+                {
+                    view.AppendInfo(FormatInfo($"使用代理服务器: {ProxyAddress}"));
+                    mClient?.SetHttpProxy(ProxyAddress, ProxyUserName, ProxyPassword);
+                }
+                else
+                {
+                    view.ShowToast("代理地址为空，请输入代理地址!");
+                    view.AppendInfo(FormatInfo("代理地址为空，请输入正确的代理地址！"));
+                }
+            }
+            view.AppendInfo(FormatInfo($"开始连接Socket:{mWsUrl}"));
+            mClient.ConnectAsync();
+        }
+
+        public void Send()
+        {
+            view.AppendInfo(FormatInfo(SendContent, 1));
+            mClient.Send(SendContent);
+        }
 
         public void Close()
         {
-            view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n Start Close Socket");
-            mClient?.CloseAsync();
+            view.AppendInfo(FormatInfo("关闭Socket"));
+            if (mClient != null)
+            {
+                mClient.Close();
+            }
         }
 
         private Timer pingTimer;
@@ -138,58 +233,107 @@ namespace WebSocketTool.Client
         {
             if (!mIsAlive)
             {
-                view.AppendInfo("start ping failure: ws is not connected");
+                view.AppendInfo(FormatInfo("启动 ping 失败: ws 未链接成功！"));
                 return;
             }
 
-            pingTimer = new Timer {Interval = PingTime, AutoReset = false};
+            if (PingTime < 500)
+            {
+                view.AppendInfo(FormatInfo("ping间隔时间必须大于500ms"));
+                return;
+            }
+
+            pingTimer = new Timer {Interval = PingTime, AutoReset = true};
+            pingTimer.Enabled = true;
             pingTimer.Elapsed += (s, e) =>
             {
                 Ping();
             };
             pingTimer.Start();
-            view.AppendInfo($"You {TimeUtil.GetCurrentDateTime()} \n StartPing, TimeSpan:{PingTime}");
+            view.AppendInfo(FormatInfo($"启动ping，时间间隔：{PingTime}"));
         }
 
         private void Ping(string msg = null)
         {
             mClient.Ping(msg);
-            App.RunOnUIThread(() => view.AppendInfo($"You {TimeUtil.GetCurrentDateTime()} \n Send Ping:{msg}"));
+            App.RunOnUIThread(() => view.AppendInfo(FormatInfo("发送ping", 1)));
         }
 
         public void StopPing()
         {
-            view.AppendInfo($"You {TimeUtil.GetCurrentDateTime()} \n StopPing");
+            App.RunOnUIThread(() => view.AppendInfo(FormatInfo("停止ping")));
             if (pingTimer != null)
             {
                 pingTimer.Stop();
                 pingTimer = null;
             }
         }
-
+        
         private void InitSocketClient()
         {
-            view.AppendInfo($"Hint {TimeUtil.GetCurrentDateTime()} \n InitSocketClient");
+            view.AppendInfo(FormatInfo("初始化Socket客户端"));
             mClient = new SocketClient(WsUrl);
+            if (WsUrl.StartsWith("wss:"))
+            {
+                mClient.AddServerCertificateValidationCallback(CertificateValidationCallback);
+            }
             mClient.OpenEvent += ClientOnOpenEvent;
             mClient.CloseEvent += ClientOnCloseEvent;
             mClient.ErrorEvent += ClientOnErrorEvent;
             mClient.MessageEvent += ClientOnMessageEvent;
+            if (IsProxyChecked)
+            {
+                mClient.SetHttpProxy(ProxyAddress, ProxyUserName, ProxyPassword);
+            }
+            
+        }
+
+        private void UninitSocketClient()
+        {
+            if (mClient != null)
+            {
+                if (WsUrl.StartsWith("wss:"))
+                {
+                    mClient.RemoveServerCertificateValidationCallback(CertificateValidationCallback);
+                }
+                mClient.OpenEvent -= ClientOnOpenEvent;
+                mClient.CloseEvent -= ClientOnCloseEvent;
+                mClient.ErrorEvent -= ClientOnErrorEvent;
+                mClient.MessageEvent -= ClientOnMessageEvent;
+                mClient = null;
+            }
+        }
+
+        private bool CertificateValidationCallback(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
+        {
+            App.RunOnUIThread(() => { view.AppendInfo(FormatInfo($"ServerCertificateError:{errors}", 2)); });
+            Log.Info($"error:{errors}");
+            Log.Info($"Issuer: {certificate.Issuer},Subject:{certificate.Subject}");
+            Log.Info("ChainStatus:");
+            foreach (var status in chain.ChainStatus)
+            {
+                Log.Info($"{status.StatusInformation}: {status}");
+            }
+
+            Log.Info("ChainElements:");
+            foreach (var element in chain.ChainElements)
+            {
+                Log.Info($"element: {element.Certificate},{element.Information}");
+            }
+
+            return errors == SslPolicyErrors.None;
         }
 
         private void ClientOnMessageEvent(object sender, MessageEventArgs e)
         {
-            App.RunOnUIThread(() =>
-            {
-                view.AppendInfo($"Server {TimeUtil.GetCurrentDateTime()} \n {e.Data}");
-            });
+            App.RunOnUIThread(() => view.AppendInfo(FormatInfo(e.Data, 2)));
         }
 
         private void ClientOnErrorEvent(object sender, ErrorEventArgs e)
         {
             App.RunOnUIThread(() =>
             {
-                view.AppendInfo($"Server {TimeUtil.GetCurrentDateTime()} \n Socket Error: {e.Message}");
+                view.AppendInfo(FormatInfo($"Socket Error: {e.Message}", 2));
                 SetState(false);
             });
             StopPing();
@@ -220,8 +364,9 @@ namespace WebSocketTool.Client
         {
             App.RunOnUIThread(() =>
             {
-                view.AppendInfo($"Server {TimeUtil.GetCurrentDateTime()} \n Socket Closed:{e.Code}:{e.Reason}");
+                view.AppendInfo(FormatInfo($"Socket Closed:{e.Code}:{e.Reason}", 2));
                 SetState(false);
+                UninitSocketClient();
             });
             StopPing();
         }
@@ -230,7 +375,7 @@ namespace WebSocketTool.Client
         {
             App.RunOnUIThread(() =>
             {
-                view.AppendInfo($"Server {TimeUtil.GetCurrentDateTime()} \n Socket Connected");
+                view.AppendInfo(FormatInfo("Socket Connected", 2));
                 SetState(true);
             });
         }

WebSocketTool/Client/ClientWindow.xaml

@@ -11,6 +11,7 @@
     <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="36"/>
+            <RowDefinition Height="40"/>
             <RowDefinition Height="120"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
@@ -27,8 +28,31 @@
             <Button x:Name="DisconnectBtn" Grid.Column="2" Content="断开" Click="DisconnectBtn_OnClick" Width="80" Height="32"
                 HorizontalAlignment="Center" VerticalAlignment="Center" Cursor="Hand"  IsEnabled="{Binding IsCloseEnable, Mode=OneWay}"/>
         </Grid>
+        
+        <Grid Grid.Row="1" VerticalAlignment="Center" Height="32" Margin="0,4,0,0">
+           <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="2*"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="*"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="*"/>
+               <ColumnDefinition Width="64"/>
+           </Grid.ColumnDefinitions>
+            <TextBlock Grid.Column="0" Text="代理地址:" VerticalAlignment="Center"/>
+            <TextBox Grid.Column="1"  VerticalAlignment="Center" Height="32" VerticalContentAlignment="Center"
+                Text="{Binding ProxyAddress}"/>
+            <TextBlock Grid.Column="2" Text="用户名:"  VerticalAlignment="Center" Margin="4,0,0,0"/>
+            <TextBox Grid.Column="3"  VerticalAlignment="Center" Height="32" VerticalContentAlignment="Center"
+                Text="{Binding ProxyUserName}"/>
+            <TextBlock Grid.Column="4" Text="密码:"  VerticalAlignment="Center" Margin="4,0,0,0"/>
+            <TextBox Grid.Column="5"  VerticalAlignment="Center" Height="32" VerticalContentAlignment="Center"
+                Text="{Binding ProxyPassword}"/>
+            <CheckBox x:Name="ProxyCb" Grid.Column="6" Content="代理" HorizontalAlignment="Right" VerticalAlignment="Center"
+                IsChecked="{Binding IsProxyChecked}"/>
+        </Grid>
 
-        <Grid x:Name="OperateGrid" Grid.Row="1" Margin="0,10,0,0">
+        <Grid x:Name="OperateGrid" Grid.Row="2" Margin="0,10,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="200"/>
@@ -55,7 +79,7 @@
             </Grid>
         </Grid>
 
-        <TextBox x:Name="InfoTb" Grid.Row="2" Margin="0,10,0,0" TextWrapping="Wrap"
+        <TextBox x:Name="InfoTb" Grid.Row="3" Margin="0,10,0,0" TextWrapping="Wrap"
             HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"/>
     </Grid>
 </Window>

WebSocketTool/Client/ClientWindow.xaml.cs

@@ -75,11 +75,18 @@ namespace WebSocketTool.Client
         {
             viewModel.Close();
         }
+
+        public Window GetWindow()
+        {
+            return this;
+        }
     }
 
     public interface IClientView
     {
         void ShowToast(string msg);
         void AppendInfo(string info);
+
+        Window GetWindow();
     }
 }

WebSocketTool/Client/SocketClient.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net.Security;
 using System.Security.Authentication;
 using System.Text;
 using log4net;
@@ -14,11 +15,13 @@ namespace WebSocketTool.Client
         public event EventHandler<MessageEventArgs> MessageEvent;
         public event EventHandler<ErrorEventArgs> ErrorEvent;
         public event EventHandler<EventArgs> OpenEvent;
-        public event EventHandler<CloseEventArgs> CloseEvent; 
+        public event EventHandler<CloseEventArgs> CloseEvent;
+        public string Url { get; private set; }
 
         public SocketClient(string url)
         {
             Log.Info($"create socket:{url}");
+            Url = url;
             mSocket = new WebSocket(url);
             if (url.StartsWith("wss"))
             {
@@ -30,6 +33,42 @@ namespace WebSocketTool.Client
             mSocket.OnMessage += OnMessage;
         }
 
+        #region Config
+
+        public SocketClient AddServerCertificateValidationCallback(RemoteCertificateValidationCallback callback)
+        {
+            Log.Info("SetServerCertificateValidationCallback");
+            mSocket.SslConfiguration.ServerCertificateValidationCallback += callback;
+            return this;
+        }
+
+        public SocketClient RemoveServerCertificateValidationCallback(RemoteCertificateValidationCallback callback)
+        {
+            Log.Info("RemoveServerCertificateValidationCallback");
+            mSocket.SslConfiguration.ServerCertificateValidationCallback -= callback;
+            return this;
+        }
+
+        public SocketClient SetEnableSslProtocols(SslProtocols protocols)
+        {
+            Log.Info($"SetEnableSslProtocols:{protocols}");
+            mSocket.SslConfiguration.EnabledSslProtocols = protocols;
+            return this;
+        }
+
+        public SocketClient SetHttpProxy(string address, string userName, string password)
+        {
+            Log.Info($"SetHttpProxy, address:{address}, userName:{userName}, password:{password}");
+            if (address.StartsWith("http://"))
+            {
+                mSocket.SetProxy(address, userName, password);
+            }
+            return this;
+        }
+
+        #endregion
+
+        #region Event Handler
         private void OnMessage(object sender, MessageEventArgs e)
         {
             Log.Info($"OnMessage, isPing:{e.IsPing}, isText:{e.IsText}, isBinary:{e.IsBinary}, data:{e.Data}, rawData:{e.RawData.Length}");
@@ -53,7 +92,40 @@ namespace WebSocketTool.Client
             Log.Info("OnOpen");
             OpenEvent?.Invoke(this, e);
         }
+        #endregion
 
+        #region State
+        public bool IsAlive()
+        {
+            Log.Info($"IsAlive:{mSocket?.IsAlive ?? false}");
+            return mSocket?.IsAlive ?? false;
+        }
+        #endregion
+        
+        #region Operate
+        public void Connect()
+        {
+            Log.Info("Connect");
+            mSocket.Connect();
+        }
+
+        public void ConnectAsync()
+        {
+            Log.Info("ConnectAsync");
+            mSocket.ConnectAsync();
+        }
+        
+        public void Send(string content)
+        {
+            Log.Info($"send:{content}");
+            if (content == null)
+            {
+                Log.Error("content is null!");
+                return;
+            }
+            mSocket.Send(content);
+        }
+        
         public void Ping(string msg = null)
         {
             Log.Info($"ping:{msg}");
@@ -67,35 +139,6 @@ namespace WebSocketTool.Client
             }
         }
 
-        public void Send(string content)
-        {
-            Log.Info($"send:{content}");
-            if (content == null)
-            {
-                Log.Error("content is null!");
-                return;
-            }
-            mSocket.Send(content);
-        }
-
-        public bool IsAlive()
-        {
-            Log.Info($"IsAlive:{mSocket?.IsAlive ?? false}");
-            return mSocket?.IsAlive ?? false;
-        }
-
-        public void Connect()
-        {
-            Log.Info("Connect");
-            mSocket.Connect();
-        }
-
-        public void ConnectAsync()
-        {
-            Log.Info("ConnectAsync");
-            mSocket.ConnectAsync();
-        }
-
         public void Close()
         {
             Log.Info("Close");
@@ -107,5 +150,6 @@ namespace WebSocketTool.Client
             Log.Info("CloseAsync");
             mSocket.CloseAsync();
         }
+        #endregion
     }
 }

WebSocketTool/MainWindow.xaml.cs

@@ -27,6 +27,8 @@ namespace WebSocketTool
         public MainWindow()
         {
             InitializeComponent();
+            ClientBtn_OnClick(null, null);
+            Close();
         }
 
         private void ClientBtn_OnClick(object sender, RoutedEventArgs e)

WebSocketTool/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("DevWiki")]
 [assembly: AssemblyProduct("WebSocketTool")]
-[assembly: AssemblyCopyright("Copyright DevWiki ©  2022")]
+[assembly: AssemblyCopyright("Copyright DevWiki ©  2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyFileVersion("1.0.3")]

WebSocketTool/pack/build.bat

@@ -1,4 +1,4 @@
-set version=1.0.0
+set version=1.0.4
 
 if not "%~1"=="" (
     set version=%1

websocket-sharp/websocket-sharp.csproj

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>WebSocketSharp</RootNamespace>
     <AssemblyName>websocket-sharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>websocket-sharp.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>